From 23ff1c1985c630aa273fc505a058aee03bbad2e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 17:48:35 +0000 Subject: [PATCH 1/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a48e2d9f0e672830aed7816958e6be1e59f7ebeb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 16 Dec 2025 12:48:44 +0000 Subject: [PATCH 2/3] Allow bzip2 0.6 --- rust-zip2.spec | 5 ++++- rust2rpm.toml | 5 +++++ zip-fix-metadata-auto.diff | 2 +- zip-fix-metadata.diff | 11 ++++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/rust-zip2.spec b/rust-zip2.spec index 714b53f..753d855 100644 --- a/rust-zip2.spec +++ b/rust-zip2.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 27 +# Generated by rust2rpm 28 %bcond check 1 %global debug_package %{nil} @@ -30,6 +30,9 @@ Patch: zip-fix-metadata-auto.diff # feature is counter to upstream guidance,” # https://github.com/zip-rs/zip2/issues/336. # * patch out the nt-time features; rust-nt-time not yet packaged +# * allow bzip2 0.6; see +# https://github.com/zip-rs/zip2/commit/c8278990c40ddfbeb4a23877c1221792535d21b3, +# released upstream in 4.3.0 Patch: zip-fix-metadata.diff # * Downstream-only: patch out tests that would need omitted test files to # compile diff --git a/rust2rpm.toml b/rust2rpm.toml index 4b5018a..fc148ea 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -9,6 +9,11 @@ cargo-toml-patch-comments = [ https://github.com/zip-rs/zip2/issues/336.\ """, "patch out the nt-time features; rust-nt-time not yet packaged", + """\ + allow bzip2 0.6; see \ + https://github.com/zip-rs/zip2/commit/c8278990c40ddfbeb4a23877c1221792535d21b3, \ + released upstream in 4.3.0\ + """, ] doc-files.exclude = ["pull_request_template.md"] exclude-crate-files = [ diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff index d80db08..bd8007b 100644 --- a/zip-fix-metadata-auto.diff +++ b/zip-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- zip-2.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-2.4.2/Cargo.toml 2025-05-19T21:37:14.924593+00:00 ++++ zip-2.4.2/Cargo.toml 2025-12-16T12:48:24.463681+00:00 @@ -251,6 +251,3 @@ [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies.crossbeam-utils] version = "0.8.21" diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff index 5f64a9c..a17fa01 100644 --- a/zip-fix-metadata.diff +++ b/zip-fix-metadata.diff @@ -1,5 +1,5 @@ --- zip-2.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-2.4.2/Cargo.toml 2025-05-19T21:37:14.925705+00:00 ++++ zip-2.4.2/Cargo.toml 2025-12-16T12:48:34.409439+00:00 @@ -98,7 +98,6 @@ "_deflate-any", ] @@ -8,6 +8,15 @@ unreserved = [] xz = ["dep:xz2"] +@@ -126,7 +125,7 @@ + optional = true + + [dependencies.bzip2] +-version = "0.5.0" ++version = ">=0.5.0, <0.7.0" + optional = true + + [dependencies.chrono] @@ -156,7 +155,6 @@ [dependencies.getrandom] version = "0.3.1" From 6c075f67dd2a031678e6d31ba3a9d0c27c473510 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 9 Jan 2026 22:17:51 +0000 Subject: [PATCH 3/3] Update constant_time_eq from 0.3 to 0.4 --- rust-zip2.spec | 1 + rust2rpm.toml | 1 + zip-fix-metadata-auto.diff | 2 +- zip-fix-metadata.diff | 11 ++++++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rust-zip2.spec b/rust-zip2.spec index 753d855..aa8b399 100644 --- a/rust-zip2.spec +++ b/rust-zip2.spec @@ -33,6 +33,7 @@ Patch: zip-fix-metadata-auto.diff # * allow bzip2 0.6; see # https://github.com/zip-rs/zip2/commit/c8278990c40ddfbeb4a23877c1221792535d21b3, # released upstream in 4.3.0 +# * Update constant_time_eq from 0.3 to 0.4. Downstream-only for MSRV reasons. Patch: zip-fix-metadata.diff # * Downstream-only: patch out tests that would need omitted test files to # compile diff --git a/rust2rpm.toml b/rust2rpm.toml index fc148ea..9745f5e 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -14,6 +14,7 @@ cargo-toml-patch-comments = [ https://github.com/zip-rs/zip2/commit/c8278990c40ddfbeb4a23877c1221792535d21b3, \ released upstream in 4.3.0\ """, + "Update constant_time_eq from 0.3 to 0.4. Downstream-only for MSRV reasons.", ] doc-files.exclude = ["pull_request_template.md"] exclude-crate-files = [ diff --git a/zip-fix-metadata-auto.diff b/zip-fix-metadata-auto.diff index bd8007b..403fe4a 100644 --- a/zip-fix-metadata-auto.diff +++ b/zip-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- zip-2.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-2.4.2/Cargo.toml 2025-12-16T12:48:24.463681+00:00 ++++ zip-2.4.2/Cargo.toml 2026-01-09T22:17:36.639224+00:00 @@ -251,6 +251,3 @@ [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies.crossbeam-utils] version = "0.8.21" diff --git a/zip-fix-metadata.diff b/zip-fix-metadata.diff index a17fa01..81072db 100644 --- a/zip-fix-metadata.diff +++ b/zip-fix-metadata.diff @@ -1,5 +1,5 @@ --- zip-2.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zip-2.4.2/Cargo.toml 2025-12-16T12:48:34.409439+00:00 ++++ zip-2.4.2/Cargo.toml 2026-01-09T22:17:36.640416+00:00 @@ -98,7 +98,6 @@ "_deflate-any", ] @@ -17,6 +17,15 @@ optional = true [dependencies.chrono] +@@ -134,7 +133,7 @@ + optional = true + + [dependencies.constant_time_eq] +-version = "0.3" ++version = "0.4" + optional = true + + [dependencies.crc32fast] @@ -156,7 +155,6 @@ [dependencies.getrandom] version = "0.3.1"