From b00a1db745a50d5da57024ce2ebbba9ba24a1b0d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 24 Feb 2026 09:43:59 +0000 Subject: [PATCH] Update to version 8.1.0; Fixes RHBZ#2429557 --- .gitignore | 2 ++ rust-zip.spec | 33 +++++++++------------ rust2rpm.toml | 14 ++------- sources | 4 +-- zip-fix-metadata-auto.diff | 14 ++++----- zip-fix-metadata.diff | 59 ++++++++------------------------------ 6 files changed, 38 insertions(+), 88 deletions(-) diff --git a/.gitignore b/.gitignore index 0f4f7bd..1122a33 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /zip2-7.0.0-filtered.tar.gz /zip-7.2.0.crate /zip2-7.2.0-filtered.tar.gz +/zip-8.1.0.crate +/zip2-8.1.0-filtered.tar.gz diff --git a/rust-zip.spec b/rust-zip.spec index fbe7f18..f98635d 100644 --- a/rust-zip.spec +++ b/rust-zip.spec @@ -5,7 +5,7 @@ %global crate zip Name: rust-zip -Version: 7.2.0 +Version: 8.1.0 Release: %autorelease Summary: Library to support the reading and writing of zip files @@ -27,13 +27,6 @@ Patch: zip-fix-metadata-auto.diff # * Patch out the nt-time features; rust-nt-time not yet packaged # * Patch out the deflate-flate2-zlib-ng-compat feature, which requires # flate2/zlib-ng-compat, not packaged. -# * Unpin generic-array; see https://github.com/zip-rs/zip2/pull/458 for the -# upstream rationale, but we cannot use an old version and are not so -# concerned about deprecation warnings anyway. -# * Update constant_time_eq from 0.3.1 to 0.4.2. Downstream-only for MSRV -# reasons. -# * Remove WASM-only wasm-bindgen feature from time crate dependency -# * Update lzma-rust2 to 0.16.1: https://github.com/zip-rs/zip2/pull/651 Patch: zip-fix-metadata.diff # * Downstream-only: patch out tests that would need omitted test files to # compile @@ -79,18 +72,6 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+_all-features-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+_all-features-devel %{_description} - -This package contains library source intended for building other packages which -use the "_all-features" feature of the "%{crate}" crate. - -%files -n %{name}+_all-features-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+_arbitrary-devel Summary: %{summary} BuildArch: noarch @@ -271,6 +252,18 @@ use the "deflate64" feature of the "%{crate}" crate. %files -n %{name}+deflate64-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+deprecated-time-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+deprecated-time-devel %{_description} + +This package contains library source intended for building other packages which +use the "deprecated-time" feature of the "%{crate}" crate. + +%files -n %{name}+deprecated-time-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+getrandom-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.toml b/rust2rpm.toml index 77dba34..6999ad0 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -6,16 +6,6 @@ cargo-toml-patch-comments = [ Patch out the deflate-flate2-zlib-ng-compat feature, which requires \ flate2/zlib-ng-compat, not packaged.\ """, - """\ -Unpin generic-array; see https://github.com/zip-rs/zip2/pull/458 for the \ -upstream rationale, but we cannot use an old version and are not so concerned \ -about deprecation warnings anyway.\ -""", - """\ -Update constant_time_eq from 0.3.1 to 0.4.2. Downstream-only for MSRV reasons.\ -""", - "Remove WASM-only wasm-bindgen feature from time crate dependency", - "Update lzma-rust2 to 0.16.1: https://github.com/zip-rs/zip2/pull/651", ] doc-files.exclude = ["pull_request_template.md"] exclude-crate-files = [ @@ -31,8 +21,8 @@ comments = [ """\ A copy of the GitHub source archive for zip-rs/zip2, with everything but the \ test/data/ subdirectory removed, and additionally, from which test files with \ -known license issues have been removed. Fortunately, no removed test files \ -are required for any of the tests that are present in the published crates.\ +known license issues have been removed. Fortunately, no removed test files are \ +required for any of the tests that are present in the published crates.\ """, ] [[package.extra-sources]] diff --git a/sources b/sources index dd94514..1d282bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (zip-7.2.0.crate) = ee53b053a4c10c991d43d2241241a54ff478b0a89e728e30d4b8127d5496d2bec9af4cec93fd24e752d7d5283fe809d1f34075d836e5ae5ef0ec7be6811b6483 -SHA512 (zip2-7.2.0-filtered.tar.gz) = 49e1d6bedc26c687d41c8af44e2173788af32d33f03f2537d5355004e3b39f613bc3292461abafd689272ee0de028778427e632eeb6b2c45847663b7f43b1501 +SHA512 (zip-8.1.0.crate) = 7b2136a72e021d32de63ba54516fa1082052108a2c1270cd20fe9befc149cfede4aa03a9ee0c2e7aa2e1183b0de5da9c42e8f7cf08580e9013b39739985b7de7 +SHA512 (zip2-8.1.0-filtered.tar.gz) = ecf99c6c175dbbb1b38ec8bfe1c18f7cd05577c452b887ead8d7697f24a71f9926dbac49813f8c8f990aebd644f8d3b1ece84b0831dbb9d7e1d38a4de9d0db11 diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff index d527a90..315eb3c 100644 --- a/zip-fix-metadata-auto.diff +++ b/zip-fix-metadata-auto.diff @@ -1,17 +1,17 @@ ---- zip-7.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-7.2.0/Cargo.toml 2026-02-12T19:17:39.916142+00:00 -@@ -302,25 +302,3 @@ - version = "0.3" +--- zip-8.1.0/Cargo.toml 2006-07-24T01:21:28+00:00 ++++ zip-8.1.0/Cargo.toml 2026-02-24T09:34:16.388170+00:00 +@@ -277,25 +277,3 @@ + version = "0.4" default-features = false -[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom] --version = "0.3" +-version = "0.4" -features = ["wasm_js"] -optional = true -default-features = false - -[target.'cfg(target_arch = "wasm32")'.dependencies.time] --version = "0.3" +-version = "0.3.47" -features = [ - "std", - "wasm-bindgen", @@ -20,7 +20,7 @@ -default-features = false - -[target.'cfg(target_arch = "wasm32")'.dev-dependencies.getrandom] --version = "0.3" +-version = "0.4" -features = ["wasm_js"] -default-features = false - diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff index 2171dfb..5cb103f 100644 --- a/zip-fix-metadata.diff +++ b/zip-fix-metadata.diff @@ -1,6 +1,6 @@ ---- zip-7.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-7.2.0/Cargo.toml 2026-02-12T19:17:50.358945+00:00 -@@ -110,10 +110,6 @@ +--- zip-8.1.0/Cargo.toml 2006-07-24T01:21:28+00:00 ++++ zip-8.1.0/Cargo.toml 2026-02-24T09:34:16.389426+00:00 +@@ -109,10 +109,6 @@ "deflate-flate2", "flate2/zlib-ng", ] @@ -17,66 +17,31 @@ lzma = ["dep:lzma-rust2"] -nt-time = ["dep:nt-time"] ppmd = ["dep:ppmd-rust"] + time = ["dep:time"] unreserved = [] - xz = ["dep:lzma-rust2"] -@@ -174,7 +169,7 @@ - default-features = false - - [dependencies.constant_time_eq] --version = "0.3" -+version = "0.4.2" - optional = true - - [dependencies.crc32fast] -@@ -190,7 +185,7 @@ - default-features = false - - [dependencies.generic-array] --version = "=0.14.7" -+version = "0.14.7" - optional = true - - [dependencies.hmac] -@@ -206,7 +201,7 @@ - optional = true - - [dependencies.lzma-rust2] --version = "0.15" -+version = "0.16.1" - features = [ - "std", - "encoder", -@@ -219,11 +214,6 @@ +@@ -201,11 +196,6 @@ [dependencies.memchr] version = "2.7" -[dependencies.nt-time] --version = "0.10.6" +-version = "0.13" -optional = true -default-features = false - [dependencies.pbkdf2] version = "0.12" optional = true -@@ -259,13 +249,6 @@ +@@ -234,13 +224,6 @@ + version = "^0.13.3" optional = true default-features = false - +- -[dev-dependencies.bencher] -version = "0.1" - -[dev-dependencies.clap] --version = "=4.4.18" +-version = "^4.4.18" -features = ["derive"] -- + [dev-dependencies.getrandom] - version = "0.3" - features = [] -@@ -294,7 +277,6 @@ - - [target.'cfg(not(target_arch = "wasm32"))'.dependencies.time] - version = "0.3" --features = ["wasm-bindgen"] - optional = true - default-features = false - + version = "0.4"