From 965d5021a90efceade8964771257b385036c84de Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 11 Dec 2024 11:58:26 +0100 Subject: [PATCH 1/5] Manpages: --no-extra option is actually called --strip-extra --- zip-3.0-man-strip-extra.patch | 11 +++++++++++ zip.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 zip-3.0-man-strip-extra.patch diff --git a/zip-3.0-man-strip-extra.patch b/zip-3.0-man-strip-extra.patch new file mode 100644 index 0000000..abb9f7c --- /dev/null +++ b/zip-3.0-man-strip-extra.patch @@ -0,0 +1,11 @@ +--- ./man/zip.1.old 2024-12-11 10:51:22.837845520 +0100 ++++ ./man/zip.1 2024-12-11 10:51:34.458142392 +0100 +@@ -2297,7 +2297,7 @@ + .B \-X + .TP + .PD +-.B \-\-no\-extra ++.B \-\-strip\-extra + Do not save extra file attributes (Extended Attributes on OS/2, uid/gid + and file times on Unix). The zip format uses extra fields to include + additional information for each entry. Some extra fields are specific diff --git a/zip.spec b/zip.spec index e8f8334..2a22eb1 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 41%{?dist} +Release: 42%{?dist} License: Info-ZIP Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -18,6 +18,7 @@ Patch5: zip-3.0-format-security.patch Patch6: zipnote.patch Patch7: zip-gnu89-build.patch Patch8: buffer_overflow.patch +Patch9: zip-3.0-man-strip-extra.patch BuildRequires: make BuildRequires: bzip2-devel, gcc Requires: unzip @@ -41,6 +42,7 @@ program. %patch -P6 -p1 -b .zipnote %patch -P7 -p1 -b .gnu89-build %patch -P8 -p1 +%patch -P9 -p1 %build %{make_build} -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc @@ -66,6 +68,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Wed Dec 11 2024 Jakub Martisko - 3.0-42 +- Fix teh manpage: --no-extra option is actually called --strip-extra + * Sat Jul 20 2024 Fedora Release Engineering - 3.0-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8acab478a5db907f8568d2593308a9bf64b08693 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:47:24 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zip.spec b/zip.spec index 2a22eb1..9c8bbd2 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 42%{?dist} +Release: 43%{?dist} License: Info-ZIP Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -68,6 +68,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 11 2024 Jakub Martisko - 3.0-42 - Fix teh manpage: --no-extra option is actually called --strip-extra From 6375da78ffeaa94516e9e220aa4c3bd81a9a8ed9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:18:51 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zip.spec b/zip.spec index 9c8bbd2..c1b23e3 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 43%{?dist} +Release: 44%{?dist} License: Info-ZIP Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -68,6 +68,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.0-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 249d2942a96a1ef840e0316ed2dd6d8c06b18c40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:08:47 +0000 Subject: [PATCH 4/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zip.spec b/zip.spec index c1b23e3..b9a90c7 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 44%{?dist} +Release: 45%{?dist} License: Info-ZIP Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -68,6 +68,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.0-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.0-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4046c210d122112880062571f20bb5d127fdabca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:41:10 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zip.spec b/zip.spec index b9a90c7..d06aaf5 100644 --- a/zip.spec +++ b/zip.spec @@ -1,7 +1,7 @@ Summary: A file compression and packaging utility compatible with PKZIP Name: zip Version: 3.0 -Release: 45%{?dist} +Release: 46%{?dist} License: Info-ZIP Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -68,6 +68,9 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.0-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild