Patch source to use io-uring 0.5.8

Update vendor bundle so it includes only memfd & windows

diff --git a/libblkio/0001-Use-io-uring-0.5.8.patch b/libblkio/0001-Use-io-uring-0.5.8.patch
new file mode 100644 (file)
index 0000000..c1b89bc
--- /dev/null
+++ b/libblkio/0001-Use-io-uring-0.5.8.patch
@@ -0,0 +1,103 @@
+From 6758db0ec5359681d29395c9faf7873b835b6fa2 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 31 Oct 2022 09:27:19 +0000
+Subject: [PATCH] Use io-uring 0.5.8
+
+And run cargo update which pulls in some new deps.
+---
+ Cargo.lock       | 24 ++++++++++++------------
+ blkio/Cargo.toml |  2 +-
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 222c7d7..241ae86 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -31,9 +31,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.73"
++version = "1.0.74"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
++checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -59,9 +59,9 @@ checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
+ 
+ [[package]]
+ name = "io-uring"
+-version = "0.5.6"
++version = "0.5.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a645fd8e7048c2f54050f7d0d4de8f624ada437e043bc7d72609bd08d70120b"
++checksum = "00d78c9f2db2a9800dfd15c69543896dae2135112dde0d1944442e83da8ce23a"
+ dependencies = [
+  "bitflags",
+  "libc",
+@@ -85,9 +85,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.132"
++version = "0.2.137"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
++checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+ 
+ [[package]]
+ name = "memfd"
+@@ -150,9 +150,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.43"
++version = "1.0.47"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -168,9 +168,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "1.0.99"
++version = "1.0.103"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -179,9 +179,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "unicode-ident"
+-version = "1.0.3"
++version = "1.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+ 
+ [[package]]
+ name = "virtio-bindings"
+diff --git a/blkio/Cargo.toml b/blkio/Cargo.toml
+index 47e38d9..b380e86 100644
+--- a/blkio/Cargo.toml
++++ b/blkio/Cargo.toml
+@@ -26,7 +26,7 @@ _unsafe-op-in-unsafe-fn = ["virtio-driver/_unsafe-op-in-unsafe-fn"]
+ bitflags = "1.3.2"
+ concat-idents = "1.1.2"
+ const-cstr = "0.3.0"
+-io-uring = { version = "=0.5.6", features = ["unstable"], optional = true }
++io-uring = { version = "=0.5.8", features = ["unstable"], optional = true }
+ lazy_static = "1.4.0"
+ libc = "0.2.87"
+ nix = "0.24.1"
+-- 
+2.37.0.rc2
+

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index 6cf6b66..9715ac6 100644 (file)
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -5,11 +5,13 @@ Version:       1.1.0
 
 Summary:       Block device I/O library
 Name:          libblkio
-Release:       2%{?dist}
+Release:       3%{?dist}
 URL:           %{forgeurl}
 Source0:       %{forgesource}
 License:       ASL 2.0 or MIT
 
+Patch:         0001-Use-io-uring-0.5.8.patch
+
 # Bundled missing dependencies.
 #
 # These were created by running "cargo vendor" in the source tree
@@ -68,7 +70,7 @@ This package contains development tools for %{name}.
 
 
 %prep
-%forgesetup
+%forgeautosetup -p1
 tar zxf %{SOURCE1}
 
 cat >> Cargo.toml <<EOF
@@ -106,5 +108,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
 
 %changelog
-* Fri Oct 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
+* Mon Oct 31 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-3
 - Initial package

diff --git a/libblkio/vendor.tar.gz b/libblkio/vendor.tar.gz
index 02689ca..e7015bb 100644 (file)
Binary files a/libblkio/vendor.tar.gz and b/libblkio/vendor.tar.gz differ