3 changed files with 41 additions and 92 deletions
--- a/SOURCES/buffer_overflow.patch
+++ b/SOURCES/buffer_overflow.patch
@ -1,12 +0,0 @@
-diff -urp zip30/fileio.c zip30/fileio.c
--- zip30/fileio.c	2008-05-29 03:13:24.000000000 +0300
-+++ zip30/fileio.c	2023-05-02 12:19:50.488314853 +0300
-@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
-   if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
-     ZIPERR(ZE_MEM, "local_to_wide_string");
-   }
-  wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1);
-+  wsize = mbstowcs(wc_string, local_string, wsize + 1);
-   wc_string[wsize] = (wchar_t) 0;
- 
-   /* in case wchar_t is not zwchar */
--- a/SOURCES/zip-gnu89-build.patch
+++ b/SOURCES/zip-gnu89-build.patch
@ -1,15 +0,0 @@
-zip uses C89-only features, so it needs to be built in C89 mode.
-
-diff --git a/unix/Makefile b/unix/Makefile
-index 86cf54bf0f56cea9..244390893eab5fc6 100644
--- a/unix/Makefile
-+++ b/unix/Makefile
-@@ -202,7 +202,7 @@ generic: flags
- 	eval $(MAKE) $(MAKEF) zips `cat flags`
- 
- generic_gcc:
-	$(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
-+	$(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" CPP="gcc -E"
- 
- # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
- att6300nodir:
--- a/SPECS/zip.spec
+++ b/SPECS/zip.spec
@ -1,8 +1,8 @@
 Summary: A file compression and packaging utility compatible with PKZIP
 Name: zip
 Version: 3.0
-Release: 42%{?dist}
-License: Info-ZIP
+Release: 35%{?dist}
+License: BSD
 Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
 URL: http://www.info-zip.org/Zip.html

@ -16,9 +16,7 @@ Patch3: zip-3.0-time.patch
 Patch4: man.patch
 Patch5: zip-3.0-format-security.patch
 Patch6: zipnote.patch
-Patch7: zip-gnu89-build.patch
-Patch8: buffer_overflow.patch
-Patch9: zip-3.0-configure.patch
+Patch7: zip-3.0-configure.patch
 BuildRequires: make
 BuildRequires: bzip2-devel, gcc
 Requires: unzip
@ -34,15 +32,13 @@ program.

 %prep
 %setup -q -n zip30
-%patch 1 -p1
-%patch 2 -p1
-%patch 3 -p1
-%patch 4 -p1
-%patch 5 -p1
-%patch 6 -p1
-%patch 7 -p1
-%patch 8 -p1
-%patch 9 -p1
+%patch1 -p1 -b .exec-shield
+%patch2 -p1 -b .currdir
+%patch3 -p1 -b .time
+%patch4 -p1 -b .man
+%patch5 -p1 -b .format-security
+%patch6 -p1 -b .zipnote
+%patch7 -p1 

 %build
 #Remove assembly file to force the c implementation of the crc functions
@ -50,14 +46,14 @@ program.
 rm crc_i386.S
 rm match.S

-%{make_build} -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}"  generic_gcc %{?_smp_mflags}
+make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}"  generic_gcc  %{?_smp_mflags}

 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BULD_ROOT%{_mandir}/man1

-%{make_install} -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
-        MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
+make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
+        MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 install

 %files
 %license LICENSE
@ -73,54 +69,34 @@ mkdir -p $RPM_BULD_ROOT%{_mandir}/man1
 %{_mandir}/man1/zipsplit.1*

 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.0-42
- Rebuilt for MSVSphere 10
-
-* Wed Jul 03 2024 Jakub Martisko <jamartis@redhat.com> - 3.0-42
- Use C implementation of some functions instead of asm
- Fix the missing compiler/linker flags
- Minor spec clean up
-Resolves: RHEL-33526
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.0-41
- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Sep 18 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-39
- Fixc buffer overflow in unicode file names
-Resolves: rhbz#2165653
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Apr 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 3.0-37
- migrate to SPDX license format
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Nov 18 2022 Florian Weimer <fweimer@redhat.com> - 3.0-35
- Really build with -std=gnu89 (#2143565)
-
-* Thu Nov 17 2022 Florian Weimer <fweimer@redhat.com> - 3.0-34
- Build with -std=gnu89 (#2143565)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Mar 05 2021 Jakub Martisko <jamartis@redhat.com> - 3.0-30
- Use generic build instead of generic_gcc
-
-* Fri Mar 05 2021 Jakub Martisko <jamartis@redhat.com> - 3.0-29
- Use build macros
+* Tue Feb 14 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-35
+- Fix the annocheck issus from 3-0-33 without reintroducing the regression from 3.0-34
+Related: rhbz#2162688
+
+* Tue Jan 31 2023 Jakub Martisko <jamartis@redhat.com> - 3.0-34
+- Fix the regression introduced in 3.0-33 that caused some of the zip build flags to be dropped
+Resolves: rhbz#2162688
+
+* Tue Feb 15 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-33
+- Disable the asm implementation of some functions and use the C instead
+- This should fix some of the annocheck issues
+  Related: rhbz#2044902
+
+* Thu Feb 03 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-32
+- Enable gating tests
+  Related: rhbz#2049738
+
+* Wed Feb 02 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-31
+- Add the missing linker flags
+- Add the patch that allows to configure the linker flags from the spec file
+  Resolves: rhbz #2044902
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-30
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-29
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild