40 changed files with 3 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/unzip60.tar.gz
+SOURCES/unzip60.tar.gz
--- a/.unzip.metadata
+++ b/.unzip.metadata
@ -0,0 +1 @@
+abf7de8a4018a983590ed6f5cbd990d4740f8a22 SOURCES/unzip60.tar.gz
--- a/SOURCES/0001-Fix-CVE-2016-9844-rhbz-1404283.patch
+++ b/SOURCES/0001-Fix-CVE-2016-9844-rhbz-1404283.patch
--- a/SOURCES/unzip-6.0-COVSCAN-fix-unterminated-string.patch
+++ b/SOURCES/unzip-6.0-COVSCAN-fix-unterminated-string.patch
--- a/SOURCES/unzip-6.0-COVSCAN-strcpy-with-overlapping-strings.patch
+++ b/SOURCES/unzip-6.0-COVSCAN-strcpy-with-overlapping-strings.patch
--- a/SOURCES/unzip-6.0-alt-iconv-utf8-print.patch
+++ b/SOURCES/unzip-6.0-alt-iconv-utf8-print.patch
--- a/SOURCES/unzip-6.0-alt-iconv-utf8.patch
+++ b/SOURCES/unzip-6.0-alt-iconv-utf8.patch
--- a/SOURCES/unzip-6.0-attribs-overflow.patch
+++ b/SOURCES/unzip-6.0-attribs-overflow.patch
--- a/SOURCES/unzip-6.0-bzip2-configure.patch
+++ b/SOURCES/unzip-6.0-bzip2-configure.patch
--- a/SOURCES/unzip-6.0-caseinsensitive.patch
+++ b/SOURCES/unzip-6.0-caseinsensitive.patch
--- a/SOURCES/unzip-6.0-close.patch
+++ b/SOURCES/unzip-6.0-close.patch
--- a/SOURCES/unzip-6.0-configure.patch
+++ b/SOURCES/unzip-6.0-configure.patch
--- a/SOURCES/unzip-6.0-cve-2014-8139.patch
+++ b/SOURCES/unzip-6.0-cve-2014-8139.patch
--- a/SOURCES/unzip-6.0-cve-2014-8140.patch
+++ b/SOURCES/unzip-6.0-cve-2014-8140.patch
--- a/SOURCES/unzip-6.0-cve-2014-8141.patch
+++ b/SOURCES/unzip-6.0-cve-2014-8141.patch
--- a/SOURCES/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
+++ b/SOURCES/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
--- a/SOURCES/unzip-6.0-cve-2018-18384.patch
+++ b/SOURCES/unzip-6.0-cve-2018-18384.patch
--- a/SOURCES/unzip-6.0-exec-shield.patch
+++ b/SOURCES/unzip-6.0-exec-shield.patch
--- a/SOURCES/unzip-6.0-fix-recmatch.patch
+++ b/SOURCES/unzip-6.0-fix-recmatch.patch
--- a/SOURCES/unzip-6.0-format-secure.patch
+++ b/SOURCES/unzip-6.0-format-secure.patch
--- a/SOURCES/unzip-6.0-heap-overflow-infloop.patch
+++ b/SOURCES/unzip-6.0-heap-overflow-infloop.patch
--- a/SOURCES/unzip-6.0-manpage-fix.patch
+++ b/SOURCES/unzip-6.0-manpage-fix.patch
--- a/SOURCES/unzip-6.0-overflow-long-fsize.patch
+++ b/SOURCES/unzip-6.0-overflow-long-fsize.patch
--- a/SOURCES/unzip-6.0-overflow.patch
+++ b/SOURCES/unzip-6.0-overflow.patch
--- a/SOURCES/unzip-6.0-symlink.patch
+++ b/SOURCES/unzip-6.0-symlink.patch
--- a/SOURCES/unzip-6.0-timestamp.patch
+++ b/SOURCES/unzip-6.0-timestamp.patch
--- a/SOURCES/unzip-6.0-valgrind.patch
+++ b/SOURCES/unzip-6.0-valgrind.patch
--- a/SOURCES/unzip-6.0-x-option.patch
+++ b/SOURCES/unzip-6.0-x-option.patch
--- a/SOURCES/unzip-zipbomb-manpage.patch
+++ b/SOURCES/unzip-zipbomb-manpage.patch
--- a/SOURCES/unzip-zipbomb-part1.patch
+++ b/SOURCES/unzip-zipbomb-part1.patch
--- a/SOURCES/unzip-zipbomb-part2.patch
+++ b/SOURCES/unzip-zipbomb-part2.patch
--- a/SOURCES/unzip-zipbomb-part3.patch
+++ b/SOURCES/unzip-zipbomb-part3.patch
--- a/SOURCES/unzip-zipbomb-part4.patch
+++ b/SOURCES/unzip-zipbomb-part4.patch
--- a/SOURCES/unzip-zipbomb-part5.patch
+++ b/SOURCES/unzip-zipbomb-part5.patch
--- a/SOURCES/unzip-zipbomb-part6.patch
+++ b/SOURCES/unzip-zipbomb-part6.patch
--- a/SOURCES/unzip-zipbomb-switch.patch
+++ b/SOURCES/unzip-zipbomb-switch.patch
--- a/SPECS/unzip.spec
+++ b/SPECS/unzip.spec
@ -7,7 +7,7 @@
 Summary: A utility for unpacking zip files
 Name: unzip
 Version: 6.0
-Release: 47%{?dist}
+Release: 46%{?dist}
 License: BSD
 Group: Applications/Archiving
 Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz
@ -76,8 +76,6 @@ 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

@ -131,7 +129,6 @@ a zip archive.
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%patch35 -p1

 %build
 # IZ_HAVE_UXUIDGID is needed for right functionality of unzip -X
@ -152,11 +149,6 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{
 %{_mandir}/*/*

 %changelog
-* Wed Jul 03 2024 Jakub Martisko <jamartis@redhat.com> - 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 <jamartis@redhat.com> - 6.0-46
 - Add environment variable that disables the zipbomb detection
 - Resolves: rhbz#2020320
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (unzip60.tar.gz) = 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
--- a/unzip-6.0-fix-warning-messages-on-big-files.patch
+++ b/unzip-6.0-fix-warning-messages-on-big-files.patch
@ -1,15 +0,0 @@
-From: "Steven M. Schweda" <sms@antinode.info>
-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)
				`@ -0,0 +1 @@`
				`abf7de8a4018a983590ed6f5cbd990d4740f8a22 SOURCES/unzip60.tar.gz`
				`@ -1 +0,0 @@`
				`SHA512 (unzip60.tar.gz) = 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d`