From 6fd2806b7799bd3d89beccd5b367fd42c440b65d0c8dd3fd3f9cc8da5cac8195 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Fri, 11 Mar 2022 17:51:58 +0000
Subject: [PATCH] Accepting request 961115 from home:adkorte

- Don't install (internal) crypt.h header in minizip

OBS-URL: https://build.opensuse.org/request/show/961115
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=73
---
 minizip-dont-install-crypt-header.patch | 32 +++++++++++++++++++++++++
 zlib.changes                            |  5 ++++
 zlib.spec                               |  3 +++
 3 files changed, 40 insertions(+)
 create mode 100644 minizip-dont-install-crypt-header.patch

diff --git a/minizip-dont-install-crypt-header.patch b/minizip-dont-install-crypt-header.patch
new file mode 100644
index 0000000..fee3585
--- /dev/null
+++ b/minizip-dont-install-crypt-header.patch
@@ -0,0 +1,32 @@
+From e490ddad3091574a0c2e3b5a66a8fee9a7ab212f Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Sun, 19 Feb 2017 16:42:12 +0100
+Subject: [PATCH] minizip: don't install crypt.h
+
+People did mistakenly or unintentionally include crypt.h before,
+don't install this internal header from now.
+---
+ contrib/minizip/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
+index d343011eb..4f4661023 100644
+--- a/contrib/minizip/Makefile.am
++++ b/contrib/minizip/Makefile.am
+@@ -26,13 +26,15 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
+ 
+ minizip_includedir = $(includedir)/minizip
+ minizip_include_HEADERS = \
+-	crypt.h \
+ 	ioapi.h \
+ 	mztools.h \
+ 	unzip.h \
+ 	zip.h \
+ 	${iowin32_h}
+ 
++noinst_HEADERS = \
++	crypt.h
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = minizip.pc
+ 
diff --git a/zlib.changes b/zlib.changes
index b628350..f19880c 100644
--- a/zlib.changes
+++ b/zlib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 11 17:38:09 UTC 2022 - Arjen de Korte <suse+build@de-korte.org>
+
+- Don't install (internal) crypt.h header in minizip
+
 -------------------------------------------------------------------
 Mon Nov  9 08:00:35 UTC 2020 - Ali Abdallah <ali.abdallah@suse.com>
 
diff --git a/zlib.spec b/zlib.spec
index 00691c9..207a3d3 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -46,6 +46,8 @@ Patch7:         bsc1174551-fxi-imcomplete-raw-streams.patch
 Patch8:         zlib-compression-switching.patch
 #PATCH-FIX-SUSE: bsc#1176201, sent upstream by IBM
 Patch9:         zlib-s390x-z15-fix-hw-compression.patch
+#PATCH-FIX-UPSTREAM https://github.com/madler/zlib/pull/229
+Patch10:        minizip-dont-install-crypt-header.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -140,6 +142,7 @@ It should exit 0
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 cp %{SOURCE4} .
 
 %build