From: Richard W.M. Jones Date: Tue, 22 Nov 2022 17:20:19 +0000 (+0000) Subject: Update to 1.1.1 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=fe9171c61f3b1a9c5066d0e5b6811b2568e1ed30;p=fedora-reviews.git Update to 1.1.1 Remove downstream patches. Remove memfd, memmap, memoffset dependencies. Add memmap2 dependency. --- diff --git a/libblkio/0001-Use-io-uring-0.5.8.patch b/libblkio/0001-Use-io-uring-0.5.8.patch deleted file mode 100644 index 8218eb1..0000000 --- a/libblkio/0001-Use-io-uring-0.5.8.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 6758db0ec5359681d29395c9faf7873b835b6fa2 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 31 Oct 2022 09:27:19 +0000 -Subject: [PATCH 1/2] 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/0002-virtio-driver-upgrade-to-memfd-0.6.1.patch b/libblkio/0002-virtio-driver-upgrade-to-memfd-0.6.1.patch deleted file mode 100644 index 5d88b7a..0000000 --- a/libblkio/0002-virtio-driver-upgrade-to-memfd-0.6.1.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 2ad24655a51cbbc630cc9eece8b294627275e3f8 Mon Sep 17 00:00:00 2001 -From: Stefan Hajnoczi -Date: Mon, 7 Nov 2022 09:41:59 -0500 -Subject: [PATCH 2/2] virtio-driver: upgrade to memfd 0.6.1 - -The memfd crate is outdated. Fedora would like to package the latest -crate. Upgrade to the latest memfd version. - -Suggested-by: Fabio Valentini -Signed-off-by: Stefan Hajnoczi ---- - Cargo.lock | 110 +++++++++++++++++++++++++++++++++++++-- - virtio-driver/Cargo.toml | 2 +- - 2 files changed, 108 insertions(+), 4 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 241ae86..20f0714 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,6 +57,33 @@ version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" - -+[[package]] -+name = "errno" -+version = "0.2.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -+dependencies = [ -+ "errno-dragonfly", -+ "libc", -+ "winapi", -+] -+ -+[[package]] -+name = "errno-dragonfly" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -+dependencies = [ -+ "cc", -+ "libc", -+] -+ -+[[package]] -+name = "io-lifetimes" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -+ - [[package]] - name = "io-uring" - version = "0.5.8" -@@ -89,13 +116,19 @@ version = "0.2.137" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -+[[package]] -+name = "linux-raw-sys" -+version = "0.0.46" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" -+ - [[package]] - name = "memfd" --version = "0.4.1" -+version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" -+checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" - dependencies = [ -- "libc", -+ "rustix", - ] - - [[package]] -@@ -166,6 +199,20 @@ dependencies = [ - "proc-macro2", - ] - -+[[package]] -+name = "rustix" -+version = "0.35.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -+dependencies = [ -+ "bitflags", -+ "errno", -+ "io-lifetimes", -+ "libc", -+ "linux-raw-sys", -+ "windows-sys", -+] -+ - [[package]] - name = "syn" - version = "1.0.103" -@@ -223,3 +270,60 @@ name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+ -+[[package]] -+name = "windows-sys" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -+dependencies = [ -+ "windows_aarch64_gnullvm", -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_gnullvm", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" -diff --git a/virtio-driver/Cargo.toml b/virtio-driver/Cargo.toml -index d66aba1..2e754eb 100644 ---- a/virtio-driver/Cargo.toml -+++ b/virtio-driver/Cargo.toml -@@ -19,7 +19,7 @@ _unsafe-op-in-unsafe-fn = [] - bitflags = "1.3" - libc = "0.2.87" - nix = "0.24.1" --memfd = { version = "0.4.1", optional = true } -+memfd = { version = "0.6.1", optional = true } - memmap = { version = "0.7.0", optional = true } - pci-driver = { version = "0.1.2", default-features = false, optional = true } - virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"], optional = true } --- -2.37.0.rc2 - diff --git a/libblkio/libblkio-v1.1.0.tar.bz2 b/libblkio/libblkio-v1.1.0.tar.bz2 deleted file mode 100644 index aff23ab..0000000 Binary files a/libblkio/libblkio-v1.1.0.tar.bz2 and /dev/null differ diff --git a/libblkio/libblkio-v1.1.1.tar.bz2 b/libblkio/libblkio-v1.1.1.tar.bz2 new file mode 100644 index 0000000..bcbfa23 Binary files /dev/null and b/libblkio/libblkio-v1.1.1.tar.bz2 differ diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec index fabc43a..68c0704 100644 --- a/libblkio/libblkio.spec +++ b/libblkio/libblkio.spec @@ -1,18 +1,15 @@ -Version: 1.1.0 +Version: 1.1.1 %global forgeurl https://gitlab.com/libblkio/libblkio %global tag v%{version} %forgemeta Summary: Block device I/O library Name: libblkio -Release: 5%{?dist} +Release: 6%{?dist} URL: %{forgeurl} Source0: %{forgesource} License: Apache-2.0 OR MIT -Patch: 0001-Use-io-uring-0.5.8.patch -Patch: 0002-virtio-driver-upgrade-to-memfd-0.6.1.patch - # Basic build requirements. BuildRequires: gcc, gcc-c++ BuildRequires: make @@ -31,9 +28,7 @@ BuildRequires: crate(const-cstr/default) BuildRequires: crate(io-uring/default) BuildRequires: crate(lazy_static/default) BuildRequires: crate(libc/default) -BuildRequires: crate(memfd/default) -BuildRequires: crate(memmap/default) -BuildRequires: crate(memoffset/default) +BuildRequires: crate(memmap2/default) BuildRequires: crate(nix/default) BuildRequires: crate(num-traits/default) BuildRequires: crate(pci-driver/default) @@ -90,5 +85,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh %changelog -* Mon Oct 31 2022 Richard W.M. Jones - 1.1.0-5 +* Tue Nov 22 2022 Richard W.M. Jones - 1.1.1-6 - Initial package