public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-zip] f45: Update to version 9.8.1; Fixes RHBZ#2568928
@ 2026-11-20 10:06 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-11-20 10:06 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-zip
Branch : f45
Commit : 62c0082065ce34971677f6358d831a16ce4276f9
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-11-20T09:31:42+00:00
Stats  : +82/-18 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-zip/c/62c0082065ce34971677f6358d831a16ce4276f9?branch=f45

Log:
Update to version 9.8.1; Fixes RHBZ#2568928

---
diff --git a/rust-zip.spec b/rust-zip.spec
index cbe89f1..a711158 100644
--- a/rust-zip.spec
+++ b/rust-zip.spec
@@ -5,7 +5,7 @@
 %global crate zip
 
 Name:           rust-zip
-Version:        9.7.3
+Version:        9.8.1
 Release:        %autorelease
 Summary:        Library to support the reading and writing of zip files
 
@@ -28,6 +28,14 @@ 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.
+# * Patch out the zstd-rs feature, which would bring in zstd/rust-backend, “Use
+#   the libzstd-rs-sys Rust port instead of the C library. Experimental, see the
+#   readme.” See also https://github.com/trifectatechfoundation/libzstd-rs-sys.
+#   We are not interested in packaging a crate that is *not even at 0.0.1 yet*.
+# * Temporarily allow zstd 0.14.3; upstream wants 0.14.4, but this is for the
+#   rust-backend feature, which would only be needed for zip’s zstd-rs feature,
+#   which we have patched out. See
+#   https://bugzilla.redhat.com/show_bug.cgi?id=2572927.
 Patch:          zip-fix-metadata.diff
 # * Downstream-only: patch out tests that would need omitted test files to
 #   compile
@@ -84,6 +92,18 @@ use the "_arbitrary" feature of the "%{crate}" crate.
 %files       -n %{name}+_arbitrary-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+_bsd_compatible_features-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+_bsd_compatible_features-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "_bsd_compatible_features" feature of the "%{crate}" crate.
+
+%files       -n %{name}+_bsd_compatible_features-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+_bzip2_any-devel
 Summary:        %{summary}
 BuildArch:      noarch

diff --git a/rust2rpm.toml b/rust2rpm.toml
index e0ef007..76e45d8 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -9,6 +9,20 @@ example-only: clap, count_instructions, criterion, rand, walkdir\
 Patch out the deflate-flate2-zlib-ng-compat feature, which requires \
 flate2/zlib-ng-compat, not packaged.\
 """,
+    """\
+Patch out the zstd-rs feature, which would bring in zstd/rust-backend, \
+“Use the libzstd-rs-sys Rust port instead of the C library. \
+Experimental, see the readme.” \
+See also https://github.com/trifectatechfoundation/libzstd-rs-sys. \
+We are not interested in packaging a crate that is *not even at 0.0.1 yet*.\
+""",
+    """\
+Temporarily allow zstd 0.14.3; upstream wants 0.14.4, \
+but this is for the rust-backend feature, \
+which would only be needed for zip’s zstd-rs feature, \
+which we have patched out. \
+See https://bugzilla.redhat.com/show_bug.cgi?id=2572927.\
+""",
 ]
 exclude-crate-files = [
     "cliff.toml",

diff --git a/sources b/sources
index d973681..1a7ee6e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zip-9.7.3.crate) = 02b97d9bc028ad62ce9d673e8547548c79be6a57f33963aabb1e8c0386ebb7c34111dae4bb81c27847d7530e0b2a170804bb08ad77e152f5e42f7679f02a2a4b
-SHA512 (zip2-9.7.3-filtered.tar.gz) = 18640b5b5b726a36fde897b8c3f59a679713b60b30ee07580d938047053ac13432df159aa4242b4f1187362fb724bb3cb7c03031f78480c0548def1201039d6a
+SHA512 (zip-9.8.1.crate) = 94d631949a006462188ece9623f1559c51646dca71258409fb2b33bf7760fee67620f1cd89f155eacfeded875da125153dcf9f62b1154a2f237f3834a69dfab8
+SHA512 (zip2-9.8.1-filtered.tar.gz) = 9e0abb89377563ad202c364a521cf6cecc8a62bbb5f1ac212376388f1156971fe6b2005a3b6962a32697f2ca42268ccb834f97a1a042893fe50dba8b79defef9

diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff
index fa1dcba..e3aa490 100644
--- a/zip-fix-metadata-auto.diff
+++ b/zip-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- zip-9.7.3/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ zip-9.7.3/Cargo.toml	2026-11-19T06:22:39.942689+00:00
-@@ -272,11 +272,6 @@
+--- zip-9.8.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ zip-9.8.1/Cargo.toml	2026-11-20T09:31:25.268149+00:00
+@@ -294,11 +294,6 @@
  [dev-dependencies.walkdir]
  version = "2.5"
  
@@ -12,7 +12,7 @@
  [target."cfg(not(miri))".dev-dependencies.count_instructions]
  version = "0.2.1"
  
-@@ -300,41 +295,6 @@
+@@ -322,41 +317,6 @@
  [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.rand]
  version = "0.10.3"
  

diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff
index 7ba6cd1..87571e1 100644
--- a/zip-fix-metadata.diff
+++ b/zip-fix-metadata.diff
@@ -1,6 +1,6 @@
---- zip-9.7.3/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ zip-9.7.3/Cargo.toml	2026-11-19T06:22:39.953352+00:00
-@@ -70,7 +70,6 @@
+--- zip-9.8.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ zip-9.8.1/Cargo.toml	2026-11-20T09:31:31.925407+00:00
+@@ -69,7 +69,6 @@
      "jiff-02",
      "legacy-zip",
      "lzma",
@@ -8,7 +8,20 @@
      "ppmd",
      "unreserved",
      "xz",
-@@ -122,10 +121,6 @@
+@@ -87,12 +86,10 @@
+     "jiff-02",
+     "legacy-zip",
+     "lzma",
+-    "nt-time",
+     "ppmd",
+     "unreserved",
+     "xz",
+     "time",
+-    "zstd-rs",
+ ]
+ aes-crypto = [
+     "dep:aes",
+@@ -140,10 +137,6 @@
      "deflate-flate2",
      "flate2/zlib-ng",
  ]
@@ -19,7 +32,7 @@
  deflate-flate2-zlib-rs = [
      "deflate-flate2",
      "flate2/zlib-rs",
-@@ -138,7 +133,6 @@
+@@ -156,7 +149,6 @@
  jiff-02 = ["dep:jiff"]
  legacy-zip = ["bitstream-io"]
  lzma = ["dep:lzma-rust2"]
@@ -27,7 +40,18 @@
  ppmd = ["dep:ppmd-rust"]
  rayon = ["dep:rayon"]
  time = ["dep:time"]
-@@ -217,11 +211,6 @@
+@@ -164,10 +156,6 @@
+ xz = ["dep:lzma-rust2"]
+ zeroize = []
+ zstd = ["dep:zstd"]
+-zstd-rs = [
+-    "zstd",
+-    "zstd/rust-backend",
+-]
+ 
+ [lib]
+ name = "zip"
+@@ -239,11 +227,6 @@
  [dependencies.memchr]
  version = "2.7"
  
@@ -39,18 +63,24 @@
  [dependencies.pbkdf2]
  version = "0.13"
  optional = true
-@@ -254,10 +243,6 @@
- version = "^0.14.2"
+@@ -273,13 +256,9 @@
  optional = true
- default-features = false
+ 
+ [dependencies.zstd]
+-version = "^0.14.4"
+-optional = true
+-default-features = false
 -
 -[dev-dependencies.clap]
 -version = "^4.4.18"
 -features = ["derive"]
++version = "^0.14.3"
++optional = true
++default-features = false
  
  [dev-dependencies.rayon]
  version = "1.11"
-@@ -269,12 +254,6 @@
+@@ -291,12 +270,6 @@
      "macros",
  ]
  
@@ -63,7 +93,7 @@
  [target."cfg(not(miri))".dev-dependencies.tempfile]
  version = "3.15"
  
-@@ -288,13 +267,6 @@
+@@ -310,13 +283,6 @@
  optional = true
  default-features = false
  

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-20 10:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-20 10:06 [rpms/rust-zip] f45: Update to version 9.8.1; Fixes RHBZ#2568928 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox