From 07017368d8f65c879a19b7e7f4dda87e3d148f2b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 5 Apr 2022 07:05:31 -0400
Subject: [PATCH] import zip-3.0-33.el9

---
 SOURCES/zip-3.0-configure.patch | 12 ++++++++++++
 SPECS/zip.spec                  | 24 ++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/zip-3.0-configure.patch

diff --git a/SOURCES/zip-3.0-configure.patch b/SOURCES/zip-3.0-configure.patch
new file mode 100644
index 0000000..f2bdf86
--- /dev/null
+++ b/SOURCES/zip-3.0-configure.patch
@@ -0,0 +1,12 @@
+diff -up zip30/unix/configure.nostrip zip30/unix/configure
+--- zip30/unix/configure.nostrip	2009-11-30 10:18:09.000000000 +0100
++++ zip30/unix/configure	2009-11-30 10:21:08.354264213 +0100
+@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
+ CC=${1-cc}
+ CFLAGS=${2-"-I. -DUNIX"}
+ LFLAGS1=''
+-LFLAGS2=''
++LFLAGS2="${LFLAGS2}"
+ LN="ln -s"
+ 
+ CFLAGS_OPT=''
diff --git a/SPECS/zip.spec b/SPECS/zip.spec
index 8c9018a..f9315a2 100644
--- a/SPECS/zip.spec
+++ b/SPECS/zip.spec
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP
 Name: zip
 Version: 3.0
-Release: 30%{?dist}
+Release: 33%{?dist}
 License: BSD
 Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
 URL: http://www.info-zip.org/Zip.html
@@ -16,6 +16,7 @@ Patch3: zip-3.0-time.patch
 Patch4: man.patch
 Patch5: zip-3.0-format-security.patch
 Patch6: zipnote.patch
+Patch7: zip-3.0-configure.patch
 BuildRequires: make
 BuildRequires: bzip2-devel, gcc
 Requires: unzip
@@ -37,9 +38,14 @@ program.
 %patch4 -p1 -b .man
 %patch5 -p1 -b .format-security
 %patch6 -p1 -b .zipnote
+%patch7 -p1 
 
 %build
-make -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc  %{?_smp_mflags}
+sed -i -e 's:-DASM_CRC::g' unix/configure
+sed -i -e 's:CRC32OA="crc_gcc.o":CRC32OA="":g' unix/configure
+sed -i -e 's:OBJA=.*:OBJA="":g' unix/configure
+
+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}
@@ -62,6 +68,20 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
 %{_mandir}/man1/zipsplit.1*
 
 %changelog
+* 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