cygwin-zlib 1.2.11

6 files changed, 38 insertions, 86 deletions

diff --git a/.gitignore b/.gitignore
index 65ff587..64fadaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zlib-1.2.8.tar.gz
+/zlib-1.2.11.tar.gz
diff --git a/cygwin-zlib.spec b/cygwin-zlib.spec
index 1d4fef7..a10875c 100644
--- a/cygwin-zlib.spec
+++ b/cygwin-zlib.spec
@@ -1,8 +1,8 @@
 %{?cygwin_package_header}
 
 Name:           cygwin-zlib
-Version:        1.2.8
-Release:        3%{?dist}
+Version:        1.2.11
+Release:        1%{?dist}
 Summary:        Cygwin zlib compression library
 
 License:        zlib
@@ -12,10 +12,9 @@ BuildArch:      noarch
 
 Source0:        http://www.zlib.net/zlib-%{version}.tar.gz
 Patch0:         zlib-1.2.5-minizip-fixuncrypt.patch
-Patch2:         zlib-1.2.7-z-block-flush.patch
-Patch3:         zlib-1.2.8-minizip-include.patch
 Patch100:       zlib-1.2.7-minizip-cygwin.patch
 Patch101:       zlib-1.2.8-vpath.patch
+Patch102:       zlib-1.2.11-gzopen_w.patch
 
 BuildRequires:  cygwin32-filesystem >= 11
 BuildRequires:  cygwin32-gcc
@@ -33,8 +32,6 @@ Cygwin zlib compression library.
 %package -n cygwin32-zlib
 Summary:        Cygwin32 zlib compression library
 Group:          Development/Libraries
-Provides:       cygwin-zlib = %{version}-%{release}
-Obsoletes:      cygwin-zlib < %{version}-%{release}
 
 %description -n cygwin32-zlib
 zlib compression library for Cygwin i686 toolchain.
@@ -50,8 +47,6 @@ zlib compression library for Cygwin x86_64 toolchain.
 Summary:        Static libraries for cygwin32-zlib development.
 Group:          Development/Libraries
 Requires:       cygwin32-zlib = %{version}-%{release}
-Provides:       cygwin-zlib-static = %{version}-%{release} 
-Obsoletes:      cygwin-zlib-static < %{version}-%{release} 
 
 %description -n cygwin32-zlib-static
 The cygwin32-zlib-static package contains static library for cygwin32-zlib development.
@@ -68,8 +63,6 @@ The cygwin64-zlib-static package contains static library for cygwin64-zlib devel
 Summary:        Minizip library for Cygwin32 toolchain
 Group:          Development/Libraries
 Requires:       cygwin32-zlib = %{version}-%{release}
-Provides:       cygwin-minizip = %{version}-%{release}
-Obsoletes:      cygwin-minizip < %{version}-%{release}
 
 %description -n cygwin32-minizip
 Minizip library for the Cygwin i686 cross-compiler toolchain.
@@ -89,12 +82,10 @@ Minizip library for the Cygwin x86_64 cross-compiler toolchain.
 %prep
 %setup -q -n zlib-%{version}
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1
 %patch100 -p2
 %patch101 -p2
+%patch102 -p2
 iconv -f windows-1252 -t utf-8 <ChangeLog >ChangeLog.tmp
-sed -i -e '/gzopen_w/d' win32/zlib.def
 pushd contrib/minizip
 %cygwin_autoreconf
 popd
@@ -205,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT/%{cygwin64_mandir}
 
 
 %changelog
+* Tue Dec 05 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.11-1
+- new version
+
 * Wed Mar 04 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 1.2.8-3
 - Fix build on EL6
 
diff --git a/sources b/sources
index 6a41bed..d35f7a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44d667c142d7cda120332623eab69f40  zlib-1.2.8.tar.gz
+1c9f62f0778697a09d36121ead88e08e  zlib-1.2.11.tar.gz
diff --git a/zlib-1.2.11-gzopen_w.patch b/zlib-1.2.11-gzopen_w.patch
new file mode 100644
index 0000000..2073635
--- /dev/null
+++ b/zlib-1.2.11-gzopen_w.patch
@@ -0,0 +1,29 @@
+--- origsrc/zlib-1.2.11/gzguts.h	2017-01-01 01:37:10.000000000 -0600
++++ src/zlib-1.2.11/gzguts.h	2017-03-03 15:38:57.326064400 -0600
+@@ -39,7 +39,7 @@
+ #  include <io.h>
+ #endif
+ 
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+ #  define WIDECHAR
+ #endif
+ 
+--- origsrc/zlib-1.2.11/win32/zlib.def	2017-01-01 01:37:10.000000000 -0600
++++ src/zlib-1.2.11/win32/zlib.def	2017-03-03 15:41:32.326386500 -0600
+@@ -91,4 +91,3 @@ EXPORTS
+     inflateCodesUsed

+     inflateResetKeep

+     deflateResetKeep

+-    gzopen_w

+--- origsrc/zlib-1.2.11/zlib.h	2017-01-15 11:29:40.000000000 -0600
++++ src/zlib-1.2.11/zlib.h	2017-03-03 15:37:21.402184600 -0600
+@@ -1893,7 +1893,7 @@ ZEXTERN int            ZEXPORT inflateVa
+ ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
+ ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
++#if defined(_WIN32) && !defined(Z_SOLO)
+ ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                             const char *mode));
+ #endif
diff --git a/zlib-1.2.7-z-block-flush.patch b/zlib-1.2.7-z-block-flush.patch
deleted file mode 100644
index 9bca519..0000000
--- a/zlib-1.2.7-z-block-flush.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f1b8edadc3c733990f8a8de4d643f968e571ae85 Mon Sep 17 00:00:00 2001
-From: Adam Tkac <atkac@redhat.com>
-Date: Fri, 17 Aug 2012 15:13:48 +0200
-Subject: [PATCH] Rank Z_BLOCK flush below Z_PARTIAL_FLUSH only when last
- flush was Z_BLOCK.
-
-This fixes regression introduced by f1ebdd6a9c495a5db9a22aa80dd7d54ae7db42e9
-(Permit stronger flushes after Z_BLOCK flushes.). Now this code is valid
-again:
-
-deflate(stream, Z_SYNC_FLUSH);
-deflateParams(stream, newLevel, Z_DEFAULT_STRATEGY);
-
-Signed-off-by: Adam Tkac <atkac@redhat.com>
----
- deflate.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index 9e4c2cb..3422f72 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -882,9 +882,16 @@ int ZEXPORT deflate (strm, flush)
-      * flushes. For repeated and useless calls with Z_FINISH, we keep
-      * returning Z_STREAM_END instead of Z_BUF_ERROR.
-      */
--    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
--               flush != Z_FINISH) {
--        ERR_RETURN(strm, Z_BUF_ERROR);
-+    } else if (strm->avail_in == 0 && flush != Z_FINISH) {
-+        char err;
-+
-+        /* Degrade Z_BLOCK only when last flush was Z_BLOCK */
-+        err = (old_flush == Z_BLOCK) ?
-+              RANK(flush) <= RANK(old_flush) : flush <= old_flush;
-+
-+        if (err) {
-+            ERR_RETURN(strm, Z_BUF_ERROR);
-+        }
-     }
- 
-     /* User must not provide more input after the first FINISH: */
--- 
-1.7.11.4
-
diff --git a/zlib-1.2.8-minizip-include.patch b/zlib-1.2.8-minizip-include.patch
deleted file mode 100644
index e8afe95..0000000
--- a/zlib-1.2.8-minizip-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 790c73ad93732d31ec6ae5ba4d7116d7f8fb46a2 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Sat, 10 Aug 2013 14:54:04 +0200
-Subject: [PATCH] minizip: Add missing include
-
-Include zconf.h for z_crc_t, fixes a regression from commit
-63ba7582b80eb81b126c2931e485481c35596aab.
----
- contrib/minizip/crypt.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
-index 1e9e820..835a2ba 100644
---- a/contrib/minizip/crypt.h
-+++ b/contrib/minizip/crypt.h
-@@ -27,6 +27,8 @@
-    Encryption is not supported.
- */
- 
-+#include "zconf.h"
-+
- #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
- 
- /***********************************************************************
--- 
-1.8.3.1
-