public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-zip] f43: Update to version 9.4.1; Fixes RHBZ#2548378
Date: Sat, 07 Nov 2026 07:31:29 GMT [thread overview]
Message-ID: <179403668925.1.18182960068346169635.rpms-rust-zip-851ec3c25fc0@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-zip
Branch : f43
Commit : 851ec3c25fc02d6a5202e5f6795ff28d6329bf95
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-11-06T07:12:06+00:00
Stats : +120/-108 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-zip/c/851ec3c25fc02d6a5202e5f6795ff28d6329bf95?branch=f43
Log:
Update to version 9.4.1; Fixes RHBZ#2548378
---
diff --git a/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch b/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
index f229e58..8e9f57a 100644
--- a/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
+++ b/0001-Downstream-patch-out-tests-that-would-need-omitted-t.patch
@@ -1,40 +1,26 @@
-From 94cc062574f07952bbcf73d6600c421ef1d70b55 Mon Sep 17 00:00:00 2001
+From c643f6da64a96a28d3f95b9a581fa5598ea9682a Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 20 May 2026 22:00:28 +0100
Subject: [PATCH] Downstream: patch out tests that would need omitted test
files
---
- src/read.rs | 2 ++
src/read/zip_archive.rs | 2 ++
- 2 files changed, 4 insertions(+)
+ 1 file changed, 2 insertions(+)
-diff --git a/src/read.rs b/src/read.rs
-index c081f3c0..94eee475 100644
---- a/src/read.rs
-+++ b/src/read.rs
-@@ -1270,6 +1270,8 @@ mod tests {
- Ok(())
- }
-
-+ // Downstream patch: we do not include the test file needed for this test.
-+ #[cfg(false)]
- #[test]
- #[cfg(feature = "deflate-flate2")]
- fn test_utf8_extra_field() {
diff --git a/src/read/zip_archive.rs b/src/read/zip_archive.rs
-index 3aed59a9..024e1bf8 100644
+index b8462b1d6..f0cdf6858 100644
--- a/src/read/zip_archive.rs
+++ b/src/read/zip_archive.rs
-@@ -857,6 +857,8 @@ mod tests {
+@@ -1159,6 +1159,8 @@ mod tests {
assert_eq!(file.read(&mut decompressed).unwrap(), 12);
}
+ // Downstream patch: we do not include the test file needed for this test.
+ #[cfg(false)]
- /// Only on little endian because we cannot use fs with miri CI
- #[cfg(all(target_endian = "little", not(miri)))]
+ /// Cannot use fs with miri CI
+ #[cfg(not(miri))]
#[test]
--
-2.54.0
+2.56.0
diff --git a/rust-zip.rpmlintrc b/rust-zip.rpmlintrc
new file mode 100644
index 0000000..901890c
--- /dev/null
+++ b/rust-zip.rpmlintrc
@@ -0,0 +1,2 @@
+# This Source cannot be a URL because we must filter out certain files.
+addFilter(r" invalid-url Source[0-9]+: zip2-.*-filtered\.tar\.gz")
diff --git a/rust-zip.spec b/rust-zip.spec
index a0ce4ce..e6ad99f 100644
--- a/rust-zip.spec
+++ b/rust-zip.spec
@@ -5,7 +5,7 @@
%global crate zip
Name: rust-zip
-Version: 8.6.0
+Version: 9.4.1
Release: %autorelease
Summary: Library to support the reading and writing of zip files
@@ -23,20 +23,11 @@ Source11: get_test_data.sh
# Automatically generated patch to strip dependencies and normalize metadata
Patch: zip-fix-metadata-auto.diff
# Manually created patch for downstream crate metadata changes
-# * Drop unused benchmark-only / example-only dev-dependencies
+# * Drop unused dev-dependencies, e.g. those that are benchmark-only or
+# example-only: clap, count_instructions, criterion, rand, walkdir
# * 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.
-# * Update lzma-rust2 to 0.23: https://github.com/zip-rs/zip2/pull/891,
-# https://github.com/zip-rs/zip2/pull/905,
-# https://github.com/zip-rs/zip2/pull/942,
-# https://github.com/zip-rs/zip2/pull/963,
-# https://github.com/zip-rs/zip2/pull/1017,
-# https://github.com/zip-rs/zip2/pull/1060,
-# https://github.com/zip-rs/zip2/pull/1096
-# * Allow typed-path 0.13: https://github.com/zip-rs/zip2/pull/1115
-# * Allow constant_time_eq 0.6:
-# https://github.com/zip-rs/zip2/commit/4bf486b4cf0c2495ae2a02bda60108b2b289c4fc
Patch: zip-fix-metadata.diff
# * Downstream-only: patch out tests that would need omitted test files to
# compile
@@ -117,6 +108,18 @@ use the "_deflate-any" feature of the "%{crate}" crate.
%files -n %{name}+_deflate-any-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+_miri_compatible_features-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+_miri_compatible_features-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "_miri_compatible_features" feature of the "%{crate}" crate.
+
+%files -n %{name}+_miri_compatible_features-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%package -n %{name}+aes-crypto-devel
Summary: %{summary}
BuildArch: noarch
@@ -261,18 +264,6 @@ 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
@@ -333,6 +324,18 @@ use the "ppmd" feature of the "%{crate}" crate.
%files -n %{name}+ppmd-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+rayon-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+rayon-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "rayon" feature of the "%{crate}" crate.
+
+%files -n %{name}+rayon-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%package -n %{name}+time-devel
Summary: %{summary}
BuildArch: noarch
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 4b39693..e0ef007 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,26 +1,14 @@
[package]
cargo-toml-patch-comments = [
- "Drop unused benchmark-only / example-only dev-dependencies",
+ """\
+Drop unused dev-dependencies, e.g. those that are benchmark-only or \
+example-only: clap, count_instructions, criterion, rand, walkdir\
+""",
"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.\
""",
- """\
-Update lzma-rust2 to 0.23: \
-https://github.com/zip-rs/zip2/pull/891, \
-https://github.com/zip-rs/zip2/pull/905, \
-https://github.com/zip-rs/zip2/pull/942, \
-https://github.com/zip-rs/zip2/pull/963, \
-https://github.com/zip-rs/zip2/pull/1017, \
-https://github.com/zip-rs/zip2/pull/1060, \
-https://github.com/zip-rs/zip2/pull/1096\
-""",
- "Allow typed-path 0.13: https://github.com/zip-rs/zip2/pull/1115",
- """\
-Allow constant_time_eq 0.6: \
-https://github.com/zip-rs/zip2/commit/4bf486b4cf0c2495ae2a02bda60108b2b289c4fc\
-""",
]
exclude-crate-files = [
"cliff.toml",
diff --git a/sources b/sources
index 4eab748..c449dfe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zip-8.6.0.crate) = 40323b439c9cf1075c668e1c44df1084a74cc1f508c23ad0b33d1a537b6b3f289b28bc80efe019f014b8e9469a96ea680557707d3bfeecbac72b3a9447c4cbbb
-SHA512 (zip2-8.6.0-filtered.tar.gz) = a2dae587e7b3220287a23278abfa45af5c97603a14081f45be5ee02a54c3c880c476df7f74b6b567cbc3be5eac0c19eaecf876feb28bd8ea4bccdbc98a36eb81
+SHA512 (zip-9.4.1.crate) = 5ebd805593a678464d1f21c31f057712d7bb6ac5223b84cce5e80e7223b0edf13053114fe655f9e2c4a6158e75f622c55a2e794003309325e26691da0c778c13
+SHA512 (zip2-9.4.1-filtered.tar.gz) = d76f16ea563380a7b80cca627f08b98fb7461e916f7f111aff5f19ad00aba0b9d4dbaafb2cbf063914b726453560a04f832691ce6a5e51e4c1467bd1f069fddd
diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff
index bf474cc..7144e48 100644
--- a/zip-fix-metadata-auto.diff
+++ b/zip-fix-metadata-auto.diff
@@ -1,13 +1,24 @@
---- zip-8.6.0/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ zip-8.6.0/Cargo.toml 2026-10-28T23:28:11.487374+00:00
-@@ -275,25 +275,3 @@
- version = "0.4"
- default-features = false
+--- zip-9.4.1/Cargo.toml 2006-07-24T01:21:28+00:00
++++ zip-9.4.1/Cargo.toml 2026-11-06T07:08:25.385237+00:00
+@@ -273,11 +273,6 @@
+ [dev-dependencies.walkdir]
+ version = "2.5"
+
+-[target.'cfg(any(target_os = "macos", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly"))'.dependencies.nix]
+-version = "^0.31.3"
+-features = ["fs"]
+-default-features = false
+-
+ [target."cfg(not(miri))".dev-dependencies.count_instructions]
+ version = "0.2.1"
+
+@@ -301,41 +296,6 @@
+ [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand]
+ version = "0.10.3"
-[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom]
-version = "0.4"
-features = ["wasm_js"]
--optional = true
-default-features = false
-
-[target.'cfg(target_arch = "wasm32")'.dependencies.time]
@@ -19,6 +30,11 @@
-optional = true
-default-features = false
-
+-[target.'cfg(target_arch = "wasm32")'.dev-dependencies.criterion]
+-version = "0.8"
+-features = ["html_reports"]
+-default-features = false
+-
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies.getrandom]
-version = "0.4"
-features = ["wasm_js"]
@@ -26,3 +42,15 @@
-
-[target.'cfg(target_arch = "wasm32")'.dev-dependencies.wasm-bindgen-test]
-version = "^0.3.56"
+-
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
+
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.61.2"
+-features = [
+- "Win32_Foundation",
+- "Win32_Security",
+- "Win32_Security_Authorization",
+- "Win32_Storage_FileSystem",
+-]
diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff
index 4180aab..ca82eb4 100644
--- a/zip-fix-metadata.diff
+++ b/zip-fix-metadata.diff
@@ -1,6 +1,14 @@
---- zip-8.6.0/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ zip-8.6.0/Cargo.toml 2026-10-28T23:28:24.289970+00:00
-@@ -108,10 +108,6 @@
+--- zip-9.4.1/Cargo.toml 2006-07-24T01:21:28+00:00
++++ zip-9.4.1/Cargo.toml 2026-11-06T07:09:10.046894+00:00
+@@ -70,7 +70,6 @@
+ "jiff-02",
+ "legacy-zip",
+ "lzma",
+- "nt-time",
+ "ppmd",
+ "unreserved",
+ "xz",
+@@ -123,10 +122,6 @@
"deflate-flate2",
"flate2/zlib-ng",
]
@@ -11,33 +19,15 @@
deflate-flate2-zlib-rs = [
"deflate-flate2",
"flate2/zlib-rs",
-@@ -124,7 +120,6 @@
+@@ -139,7 +134,6 @@
jiff-02 = ["dep:jiff"]
legacy-zip = ["bitstream-io"]
lzma = ["dep:lzma-rust2"]
-nt-time = ["dep:nt-time"]
ppmd = ["dep:ppmd-rust"]
+ rayon = ["dep:rayon"]
time = ["dep:time"]
- unreserved = []
-@@ -159,7 +154,7 @@
- default-features = false
-
- [dependencies.constant_time_eq]
--version = "0.4"
-+version = ">=0.4, <0.7"
- optional = true
-
- [dependencies.crc32fast]
-@@ -187,7 +182,7 @@
- optional = true
-
- [dependencies.lzma-rust2]
--version = "^0.16.1"
-+version = "^0.23.0"
- features = [
- "std",
- "encoder",
-@@ -200,11 +195,6 @@
+@@ -218,11 +212,6 @@
[dependencies.memchr]
version = "2.7"
@@ -49,26 +39,41 @@
[dependencies.pbkdf2]
version = "0.13"
optional = true
-@@ -218,7 +208,7 @@
+@@ -255,10 +244,6 @@
+ version = "^0.14.2"
optional = true
+ default-features = false
+-
+-[dev-dependencies.clap]
+-version = "^4.4.18"
+-features = ["derive"]
+
+ [dev-dependencies.rayon]
+ version = "1.11"
+@@ -270,12 +255,6 @@
+ "macros",
+ ]
- [dependencies.typed-path]
--version = "0.12"
-+version = ">=0.12, <0.14"
+-[dev-dependencies.walkdir]
+-version = "2.5"
+-
+-[target."cfg(not(miri))".dev-dependencies.count_instructions]
+-version = "0.2.1"
+-
+ [target."cfg(not(miri))".dev-dependencies.tempfile]
+ version = "3.15"
- [dependencies.zeroize]
- version = "1.8"
-@@ -232,13 +222,6 @@
- version = "^0.13.3"
+@@ -289,13 +268,6 @@
optional = true
default-features = false
+
+-[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.criterion]
+-version = "0.8"
+-features = ["html_reports"]
-
--[dev-dependencies.bencher]
--version = "0.1"
+-[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand]
+-version = "0.10.3"
-
--[dev-dependencies.clap]
--version = "^4.4.18"
--features = ["derive"]
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
- [dev-dependencies.getrandom]
- version = "0.4"
reply other threads:[~2026-11-07 7:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179403668925.1.18182960068346169635.rpms-rust-zip-851ec3c25fc0@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox