From 64704e73bce559f2bd1a2dc75e926b733eab7fee Mon Sep 17 00:00:00 2001
From: Tom "spot" Callaway <tcallawa@redhat.com>
Date: Nov 11 2011 17:24:51 +0000
Subject: fix minizip to permit uncrypt when NOUNCRYPT is not defined


---

diff --git a/zlib-1.2.5-minizip-fixuncrypt.patch b/zlib-1.2.5-minizip-fixuncrypt.patch
new file mode 100644
index 0000000..d113879
--- /dev/null
+++ b/zlib-1.2.5-minizip-fixuncrypt.patch
@@ -0,0 +1,14 @@
+diff -up zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt zlib-1.2.5/contrib/minizip/unzip.c
+--- zlib-1.2.5/contrib/minizip/unzip.c.fixuncrypt	2011-11-11 12:13:56.335867758 -0500
++++ zlib-1.2.5/contrib/minizip/unzip.c	2011-11-11 12:14:01.747799372 -0500
+@@ -68,10 +68,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifndef NOUNCRYPT
+-        #define NOUNCRYPT
+-#endif
+-
+ #include "zlib.h"
+ #include "unzip.h"
+ 
diff --git a/zlib.spec b/zlib.spec
index 637f9ba..ed17d90 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,13 +1,14 @@
 Summary: The zlib compression and decompression library
 Name: zlib
 Version: 1.2.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.bz2
 Patch3: zlib-1.2.4-autotools.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=591317
 Patch4: zlib-1.2.5-gentoo.patch
 Patch5: minizip-null.patch
+Patch6: zlib-1.2.5-minizip-fixuncrypt.patch
 URL: http://www.gzip.org/zlib/
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
@@ -62,6 +63,7 @@ developing applications which use minizip.
 %patch3 -p1 -b .atools
 %patch4 -p1 -b .g
 %patch5 -p1 -b .null
+%patch6 -p1 -b .fixuncrypt
 # patch cannot create an empty dir
 mkdir contrib/minizip/m4
 cp minigzip.c contrib/minizip
@@ -141,6 +143,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/minizip.pc
 
 %changelog
+* Fri Nov 11 2011 Tom Callaway <spot@fedoraproject.org> - 1.2.5-5
+- fix minizip to permit uncrypt when NOUNCRYPT is not defined
+
 * Wed Apr  6 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 1.2.5-4
 - Resolves: #678603
   zlib from minizip allowed NULL pointer parameter of function unzGetCurrentFileInfo