From 234f7b0bb4d39611e8cba248be324f1904ed4d19 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 24 Dec 2024 13:43:07 +0800 Subject: [PATCH 1/2] [BUG]update to unzip-6.0-47 to #IBDC8V update to unzip-6.0-47 for bugfix Signed-off-by: Zhao Hang --- dist | 1 + ....0-fix-warning-messages-on-big-files.patch | 15 +++++++++ unzip.spec | 33 ++++++------------- 3 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 dist create mode 100644 unzip-6.0-fix-warning-messages-on-big-files.patch diff --git a/dist b/dist new file mode 100644 index 0000000..1fe92cf --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8_10 diff --git a/unzip-6.0-fix-warning-messages-on-big-files.patch b/unzip-6.0-fix-warning-messages-on-big-files.patch new file mode 100644 index 0000000..55a115a --- /dev/null +++ b/unzip-6.0-fix-warning-messages-on-big-files.patch @@ -0,0 +1,15 @@ +From: "Steven M. Schweda" +Subject: Fix lame code in fileio.c +Bug-Debian: https://bugs.debian.org/929502 +X-Debian-version: 6.0-23 + +--- a/fileio.c ++++ b/fileio.c +@@ -2477,6 +2477,7 @@ + */ + return (((zusz_t)sig[7]) << 56) + + (((zusz_t)sig[6]) << 48) ++ + (((zusz_t)sig[5]) << 40) + + (((zusz_t)sig[4]) << 32) + + (zusz_t)((((ulg)sig[3]) << 24) + + (((ulg)sig[2]) << 16) diff --git a/unzip.spec b/unzip.spec index 2882479..c9cb945 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 + # Settings for EL <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} @@ -7,7 +7,7 @@ Summary: A utility for unpacking zip files Name: unzip Version: 6.0 -Release: 46%{anolis_release}%{?dist} +Release: 47%{?dist} License: BSD Group: Applications/Archiving Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz @@ -76,17 +76,11 @@ Patch32: unzip-zipbomb-part5.patch Patch33: unzip-zipbomb-part6.patch Patch34: unzip-zipbomb-switch.patch + +Patch35: unzip-6.0-fix-warning-messages-on-big-files.patch URL: http://www.info-zip.org/UnZip.html BuildRequires: bzip2-devel -Requires: glibc -Provides: /usr/bin/funzip -Provides: /usr/bin/unzip -Provides: /usr/bin/unzipsfx -Provides: /usr/bin/zipgrep -Provides: /usr/bin/zipinfo - - %description The unzip utility is used to list, test, or extract files from a zip archive. Zip archives are commonly found on MS-DOS systems. The zip @@ -98,14 +92,6 @@ in some respects. Install the unzip package if you need to list, test or extract files from a zip archive. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %setup -q -n unzip60 %patch1 -p1 -b .bzip2-configure @@ -145,6 +131,7 @@ Doc pages for %{name}. %patch32 -p1 %patch33 -p1 %patch34 -p1 +%patch35 -p1 %build # IZ_HAVE_UXUIDGID is needed for right functionality of unzip -X @@ -160,15 +147,15 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{ %files %defattr(-,root,root) %license LICENSE COPYING.OLD +%doc README BUGS %{_bindir}/* %{_mandir}/*/* -%files doc -%doc README BUGS - %changelog -* Mon Jul 18 2022 Hangbo Fan - 6.0-46.0.1 -- Add doc sub package +* Wed Jul 03 2024 Jakub Martisko - 6.0-47 +- Fix: Unzip Fails on Large Zip Files +- Use the patch from Debian dealing with this +Resolves: RHEL-45997 * Thu Dec 16 2021 Jakub Martisko - 6.0-46 - Add environment variable that disables the zipbomb detection -- Gitee From fbfabdc13a05203ca24fb7f892d12168cc7195f8 Mon Sep 17 00:00:00 2001 From: HangBo Fan Date: Mon, 18 Jul 2022 11:09:11 +0800 Subject: [PATCH 2/2] spec: add doc sub package --- unzip.spec | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/unzip.spec b/unzip.spec index c9cb945..fc6963e 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,4 +1,4 @@ - +%define anolis_release .0.1 # Settings for EL <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} @@ -7,7 +7,7 @@ Summary: A utility for unpacking zip files Name: unzip Version: 6.0 -Release: 47%{?dist} +Release: 47%{anolis_release}%{?dist} License: BSD Group: Applications/Archiving Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz @@ -81,6 +81,14 @@ Patch35: unzip-6.0-fix-warning-messages-on-big-files.patch URL: http://www.info-zip.org/UnZip.html BuildRequires: bzip2-devel +Requires: glibc +Provides: /usr/bin/funzip +Provides: /usr/bin/unzip +Provides: /usr/bin/unzipsfx +Provides: /usr/bin/zipgrep +Provides: /usr/bin/zipinfo + + %description The unzip utility is used to list, test, or extract files from a zip archive. Zip archives are commonly found on MS-DOS systems. The zip @@ -92,6 +100,14 @@ in some respects. Install the unzip package if you need to list, test or extract files from a zip archive. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %setup -q -n unzip60 %patch1 -p1 -b .bzip2-configure @@ -147,11 +163,16 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{ %files %defattr(-,root,root) %license LICENSE COPYING.OLD -%doc README BUGS %{_bindir}/* %{_mandir}/*/* +%files doc +%doc README BUGS + %changelog +* Tue Dec 24 2024 Hangbo Fan - 6.0-47.0.1 +- Add doc sub package + * Wed Jul 03 2024 Jakub Martisko - 6.0-47 - Fix: Unzip Fails on Large Zip Files - Use the patch from Debian dealing with this -- Gitee