From 42377b81755f4b8387df80b18bde4ecdb2b35a99 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 19 Oct 2022 11:03:47 +0200
Subject: [PATCH] Build with -std=gnu89 (#1750694)

---
 unzip-gnu89-build.patch | 15 +++++++++++++++
 unzip.spec              |  6 ++++++
 2 files changed, 21 insertions(+)
 create mode 100644 unzip-gnu89-build.patch

diff --git a/unzip-gnu89-build.patch b/unzip-gnu89-build.patch
new file mode 100644
index 0000000..706f125
--- /dev/null
+++ b/unzip-gnu89-build.patch
@@ -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
diff --git a/unzip.spec b/unzip.spec
index bc5dfae..a871b90 100644
--- a/unzip.spec
+++ b/unzip.spec
@@ -71,6 +71,7 @@ Patch30: unzip-zipbomb-part4.patch
 Patch31: unzip-zipbomb-part5.patch
 Patch32: unzip-zipbomb-part6.patch
 Patch33: unzip-zipbomb-switch.patch
+Patch34: unzip-gnu89-build.patch
 
 URL: http://infozip.sourceforge.net
 BuildRequires: make
@@ -123,6 +124,7 @@ a zip archive.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 
 %build
 # 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}/*/*
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild