From 077b03a6a96f2fa9118c3ecf9f9d0d1aaeecc2d5 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Tue, 1 Jul 2025 14:09:21 +0200 Subject: [PATCH] Fix: wrongly named long option in the manpage Resolves: RHEL-70867 --- zip-3.0-man-strip-extra.patch | 11 +++++++++++ zip.spec | 8 +++++++- 2 files changed, 18 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 c16a45f..87dee82 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 @@ -20,6 +20,7 @@ Patch7: zip-gnu89-build.patch Patch8: buffer_overflow.patch Patch9: zip-3.0-configure.patch Patch10: sast.patch +Patch11: zip-3.0-man-strip-extra.patch BuildRequires: make BuildRequires: bzip2-devel, gcc Requires: unzip @@ -45,6 +46,7 @@ program. %patch 8 -p1 %patch 9 -p1 %patch 10 -p1 +%patch 11 -p1 %build #Remove assembly file to force the c implementation of the crc functions @@ -75,6 +77,10 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1 %{_mandir}/man1/zipsplit.1* %changelog +* Tue Jul 01 2025 Jakub Martisko - 3.0-45 +- Fix wrongly named option in the manpage + Resolves: RHEL-70867 + * Tue Jan 28 2025 Jakub Martisko - 3.0-44 - Fix overlaping strcpy Resolves: RHEL-44646