From aa261346e1544bdc36b13a42f8be0521bc5d5efa Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 09:34:53 +0000 Subject: [PATCH] import zip-3.0-35.el9 --- SPECS/zip.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/SPECS/zip.spec b/SPECS/zip.spec index f9315a2..3365e48 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: 33%{?dist} +Release: 35%{?dist} License: BSD Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz URL: http://www.info-zip.org/Zip.html @@ -41,9 +41,10 @@ program. %patch7 -p1 %build -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 +#Remove assembly file to force the c implementation of the crc functions +#Related to 3.0-33 and 3.0-34 +rm crc_i386.S +rm match.S make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX -DNO_ASM $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags} @@ -68,6 +69,14 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \ %{_mandir}/man1/zipsplit.1* %changelog +* Tue Feb 14 2023 Jakub Martisko - 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 - 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 - 3.0-33 - Disable the asm implementation of some functions and use the C instead - This should fix some of the annocheck issues