Build with -std=gnu89 (#1750694)

This commit is contained in:
Florian Weimer 2022-10-19 11:03:47 +02:00 committed by Jakub Martisko
parent 0d538e6135
commit 42377b8175
2 changed files with 21 additions and 0 deletions

15
unzip-gnu89-build.patch Normal file
View File

@ -0,0 +1,15 @@
unzip uses C89-only features, so it needs to be built in C89 mode.
diff --git a/unix/Makefile b/unix/Makefile
index ab32270cf4b9b2cf..5eabbe13095e1f58 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -545,7 +545,7 @@ generic: flags # now try autoconfigure first
# make $(MAKEF) unzips CF="${CF} `cat flags`"
generic_gcc:
- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)"
+ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" IZ_BZIP2="$(IZ_BZIP2)"
# extensions to perform SVR4 package-creation after compilation
generic_pkg: generic svr4package

View File

@ -71,6 +71,7 @@ Patch30: unzip-zipbomb-part4.patch
Patch31: unzip-zipbomb-part5.patch Patch31: unzip-zipbomb-part5.patch
Patch32: unzip-zipbomb-part6.patch Patch32: unzip-zipbomb-part6.patch
Patch33: unzip-zipbomb-switch.patch Patch33: unzip-zipbomb-switch.patch
Patch34: unzip-gnu89-build.patch
URL: http://infozip.sourceforge.net URL: http://infozip.sourceforge.net
BuildRequires: make BuildRequires: make
@ -123,6 +124,7 @@ a zip archive.
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1
%patch33 -p1 %patch33 -p1
%patch34 -p1
%build %build
# IZ_HAVE_UXUIDGID is needed for right functionality of unzip -X # IZ_HAVE_UXUIDGID is needed for right functionality of unzip -X
@ -141,6 +143,10 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT%{_
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Nov 09 2022 Jakub Martisko <jamartis@redhat.com> - 6.0-59
- Rebuild with the -std=gnu89 flag
Resolves: rhbz#1750694
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-58 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild