From 6bdca5060d25755fb1def3ae7a78d635215eff21 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 1 Jan 2017 22:12:12 -0800
Subject: [PATCH 01/10] Fix some stray 1.2.8.1 version numbers.

---
 contrib/vstudio/vc12/zlib.rc | 4 ++--
 contrib/vstudio/vc14/zlib.rc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index 4f6396d17..24727c83d 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.8.1\0"
+      VALUE "FileVersion",	"1.2.9\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index 4f6396d17..24727c83d 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.8.1\0"
+      VALUE "FileVersion",	"1.2.9\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"

From 20e472546e1fb3018cebe59040644f0b6198902d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 1 Jan 2017 22:21:21 -0800
Subject: [PATCH 02/10] Change version number to zlib 1.2.9.1.

---
 CMakeLists.txt                       |   2 +-
 ChangeLog                            |   3 +++
 Makefile.in                          |   2 +-
 README                               |   6 +++---
 contrib/delphi/ZLib.pas              |   2 +-
 contrib/dotzlib/DotZLib/UnitTests.cs |   2 +-
 contrib/infback9/inftree9.c          |   6 +++---
 contrib/minizip/configure.ac         |   2 +-
 contrib/pascal/zlibpas.pas           |   4 ++--
 contrib/vstudio/readme.txt           |   4 ++--
 contrib/vstudio/vc10/zlib.rc         |   8 ++++----
 contrib/vstudio/vc11/zlib.rc         |   8 ++++----
 contrib/vstudio/vc12/zlib.rc         |   8 ++++----
 contrib/vstudio/vc14/zlib.rc         |   8 ++++----
 contrib/vstudio/vc9/zlib.rc          |   8 ++++----
 deflate.c                            |   4 ++--
 inftrees.c                           |   6 +++---
 os400/README400                      |   2 +-
 os400/zlib.inc                       |   8 ++++----
 qnx/package.qpg                      |  10 +++++-----
 treebuild.xml                        |   4 ++--
 win32/README-WIN32.txt               |   4 ++--
 zlib.3                               |   6 +++---
 zlib.3.pdf                           | Bin 19422 -> 19320 bytes
 zlib.h                               |  10 +++++-----
 25 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14411a437..659afa914 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.9")
+set(VERSION "1.2.9.1")
 
 option(ASM686 "Enable building i686 assembly implementation")
 option(AMD64 "Enable building amd64 assembly implementation")
diff --git a/ChangeLog b/ChangeLog
index 63d04953d..758485194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.9.1 (xx Jan 2017)
+- 
+
 Changes in 1.2.9 (31 Dec 2016)
 - Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
 - Improve contrib/blast to return unused bytes
diff --git a/Makefile.in b/Makefile.in
index c8b487c28..82bbe5031 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.9
+SHAREDLIBV=libz.so.1.2.9.1
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
diff --git a/README b/README
index 8002f3988..661033579 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.9 is a general purpose data compression library.  All the code is
+zlib 1.2.9.1 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.9 are documented in the file ChangeLog.
+The changes made in version 1.2.9.1 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -84,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2016 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 7a3cb6649..4c654cf0b 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.2.9';
+  zlib_version = '1.2.9.1';
 
 type
   EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 3d156f429..f22a8ded8 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ public class InfoTests
         public void Info_Version()
         {
             Info info = new Info();
-            Assert.AreEqual("1.2.9", Info.Version);
+            Assert.AreEqual("1.2.9.1", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);
             Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 2103aee46..97f330beb 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.9 Copyright 1995-2016 Mark Adler ";
+   " inflate9 1.2.9.1 Copyright 1995-2017 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 192, 79};
+        133, 133, 133, 133, 144, 203, 201};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 54d823f67..6496d7129 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.9.1], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index aebaea0c1..0ae6d7579 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,8 +10,8 @@
 interface
 
 const
-  ZLIB_VERSION = '1.2.9';
-  ZLIB_VERNUM  = $1290;
+  ZLIB_VERSION = '1.2.9.1';
+  ZLIB_VERNUM  = $1291;
 
 type
   alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 3954bc402..439d59527 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.9
+Building instructions for the DLL versions of Zlib 1.2.9.1
 ========================================================
 
 This directory contains projects that build zlib and minizip using
@@ -75,4 +75,4 @@ Gilles Vollant
 info@winimage.com
 
 Visual Studio 2013 and 2015 Projects from Sean Hunt
-seandhunt_7@yahoo.com
\ No newline at end of file
+seandhunt_7@yahoo.com
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index d84682018..a947595cd 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 0
-  PRODUCTVERSION 1, 2, 9, 0
+  FILEVERSION	 1, 2, 9, 1
+  PRODUCTVERSION 1, 2, 9, 1
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9\0"
+      VALUE "FileVersion",	"1.2.9.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index d84682018..a947595cd 100644
--- a/contrib/vstudio/vc11/zlib.rc
+++ b/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 0
-  PRODUCTVERSION 1, 2, 9, 0
+  FILEVERSION	 1, 2, 9, 1
+  PRODUCTVERSION 1, 2, 9, 1
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9\0"
+      VALUE "FileVersion",	"1.2.9.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index 24727c83d..e7c1d65dd 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 0
-  PRODUCTVERSION 1, 2, 9, 0
+  FILEVERSION	 1, 2, 9, 1
+  PRODUCTVERSION 1, 2, 9, 1
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9\0"
+      VALUE "FileVersion",	"1.2.9.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index 24727c83d..e7c1d65dd 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 0
-  PRODUCTVERSION 1, 2, 9, 0
+  FILEVERSION	 1, 2, 9, 1
+  PRODUCTVERSION 1, 2, 9, 1
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9\0"
+      VALUE "FileVersion",	"1.2.9.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index d84682018..a947595cd 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 0
-  PRODUCTVERSION 1, 2, 9, 0
+  FILEVERSION	 1, 2, 9, 1
+  PRODUCTVERSION 1, 2, 9, 1
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9\0"
+      VALUE "FileVersion",	"1.2.9.1\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/deflate.c b/deflate.c
index 415adbf94..f13af8f76 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.9 Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.9.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/inftrees.c b/inftrees.c
index fa27dcbda..2e8514af4 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2016 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.9 Copyright 1995-2016 Mark Adler ";
+   " inflate 1.2.9.1 Copyright 1995-2017 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 79};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 201};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 7926d7c5f..7f10a3b23 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.9 for OS/400 installation instructions
+        ZLIB version 1.2.9.1 for OS/400 installation instructions
 
 1) Download and unpack the zlib tarball to some IFS directory.
    (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/zlib.inc b/os400/zlib.inc
index 5431e540f..cdc2f72cf 100644
--- a/os400/zlib.inc
+++ b/os400/zlib.inc
@@ -1,7 +1,7 @@
       *  ZLIB.INC - Interface to the general purpose compression library
       *
       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.9
+      *  Version 1.2.9.1
       *
       *
       *  WARNING:
@@ -22,14 +22,14 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.9'
-     D ZLIB_VERNUM     C                   X'1290'
+     D ZLIB_VERSION    C                   '1.2.9.1'
+     D ZLIB_VERNUM     C                   X'1291'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   2
      D ZLIB_VER_REVISION...
      D                 C                   9
      D ZLIB_VER_SUBREVISION...
-     D                 C                   0
+     D                 C                   1
       *
       *  Other equates.
       *
diff --git a/qnx/package.qpg b/qnx/package.qpg
index 67a877762..d95eb0364 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
       <QPG:Files>
          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.9" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.9"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9"/>
-         <QPG:Add file="../libz.so.1.2.9" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.2.9.1" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.9.1"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9.1"/>
+         <QPG:Add file="../libz.so.1.2.9.1" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.9</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.9.1</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/treebuild.xml b/treebuild.xml
index 931ee5a22..001d15e29 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.9">
-    <library name="zlib" dlversion="1.2.9" dlname="z">
+<package name="zlib" version="1.2.9.1">
+    <library name="zlib" dlversion="1.2.9.1" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
 
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 5002f3c91..592b215bf 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.9 is a general purpose data compression library.  All the code is
+zlib 1.2.9.1 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
 
 Manifest:
 
-The package zlib-1.2.9-win32-x86.zip will contain the following files:
+The package zlib-1.2.9.1-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/zlib.3 b/zlib.3
index cbac45888..20c64b571 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "31 Dec 2016"
+.TH ZLIB 3 "xx Jan 2017"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -105,9 +105,9 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS AND LICENSE
-Version 1.2.9
+Version 1.2.9.1
 .LP
-Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 .LP
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
diff --git a/zlib.3.pdf b/zlib.3.pdf
index 5c71eedad26a17b0696fadf1110d138d0f01973b..141466ac162b86f3b85d917741f8762c204978e6 100644
GIT binary patch
delta 7453
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

delta 7417
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

diff --git a/zlib.h b/zlib.h
index 69fbb978e..16ce8f235 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.9, December 31st, 2016
+  version 1.2.9.1, January xxth, 2017
 
-  Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.9"
-#define ZLIB_VERNUM 0x1290
+#define ZLIB_VERSION "1.2.9.1-motley"
+#define ZLIB_VERNUM 0x1291
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
 #define ZLIB_VER_REVISION 9
-#define ZLIB_VER_SUBREVISION 0
+#define ZLIB_VER_SUBREVISION 1
 
 /*
     The 'zlib' compression library provides in-memory compression and

From 7358ef23c2b412543196df58c333ebc9aabb1d62 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 1 Jan 2017 12:23:04 -0800
Subject: [PATCH 03/10] Avoid warnings on snprintf() return value.

---
 gzlib.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gzlib.c b/gzlib.c
index a87d3d19e..e142ffb3d 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -211,7 +211,7 @@ local gzFile gz_open(path, fd, mode)
     else
 #endif
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        snprintf(state->path, len + 1, "%s", (const char *)path);
+        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
 #else
         strcpy(state->path, path);
 #endif
@@ -293,7 +293,7 @@ gzFile ZEXPORT gzdopen(fd, mode)
     if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
         return NULL;
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
+    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
 #else
     sprintf(path, "<fd:%d>", fd);   /* for debugging */
 #endif
@@ -608,8 +608,8 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
         return;
     }
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
-             "%s%s%s", state->path, ": ", msg);
+    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+                   "%s%s%s", state->path, ": ", msg);
 #else
     strcpy(state->msg, state->path);
     strcat(state->msg, ": ");

From 52aa5501ecfffed933d39647092852cab397ca39 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 1 Jan 2017 20:02:24 -0800
Subject: [PATCH 04/10] Minor edits and clarifications of comments.

---
 zlib.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/zlib.h b/zlib.h
index 16ce8f235..263e6f630 100644
--- a/zlib.h
+++ b/zlib.h
@@ -379,10 +379,11 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provide input is not
-   read or consumed.  Any memory allocation will be deferred to the first call
-   of inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them
-   to use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -408,7 +409,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_on are updated
+    enough room in the output buffer), then next_in and avail_in are updated
     accordingly, and processing will resume at this point for the next call of
     inflate().
 
@@ -1229,7 +1230,7 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.  compress() is equivalent to compress2() with a level
+   compressed data.  compress() is equivalent to compress2() with a level
    parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
@@ -1246,7 +1247,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,

From bc5503b224b64e2dfafe1f6d6f2dace191eb219d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 15:17:59 -0800
Subject: [PATCH 05/10] Fix bug in deflate_stored() for zero-length input.

---
 deflate.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/deflate.c b/deflate.c
index f13af8f76..781753083 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1040,7 +1040,6 @@ int ZEXPORT deflate (strm, flush)
             }
         }
     }
-    Assert(strm->avail_out > 0, "bug2");
 
     if (flush != Z_FINISH) return Z_OK;
     if (s->wrap <= 0) return Z_STREAM_END;
@@ -1653,17 +1652,19 @@ local block_state deflate_stored(s, flush)
      * possible. If flushing, copy the remaining available input to next_out as
      * stored blocks, if there is enough space.
      */
-    unsigned len, left, have, last;
+    unsigned len, left, have, last = 0;
     unsigned used = s->strm->avail_in;
-    for (;;) {
+    do {
         /* Set len to the maximum size block that we can copy directly with the
          * available input data and output space. Set left to how much of that
          * would be copied from what's left in the window.
          */
         len = MAX_STORED;       /* maximum deflate stored block length */
         have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        if (s->strm->avail_out < have)          /* need room for header */
+            break;
             /* maximum stored block length that will fit in avail_out: */
-        have = s->strm->avail_out > have ? s->strm->avail_out - have : 0;
+        have = s->strm->avail_out - have;
         left = s->strstart - s->block_start;    /* bytes left in window */
         if (len > (ulg)left + s->strm->avail_in)
             len = left + s->strm->avail_in;     /* limit len to the input */
@@ -1677,7 +1678,8 @@ local block_state deflate_stored(s, flush)
          * copying to the window and the pending buffer instead. Also don't
          * write an empty block when flushing -- deflate() does that.
          */
-        if (len < min_block && (len == 0 || flush == Z_NO_FLUSH ||
+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+                                flush == Z_NO_FLUSH ||
                                 len - left != s->strm->avail_in))
             break;
 
@@ -1721,7 +1723,7 @@ local block_state deflate_stored(s, flush)
             s->strm->avail_out -= len;
             s->strm->total_out += len;
         }
-    }
+    } while (last == 0);
 
     /* Update the sliding window with the last s->w_size bytes of the copied
      * data, or append all of the copied data to the existing window if less
@@ -1754,13 +1756,14 @@ local block_state deflate_stored(s, flush)
         s->insert += MIN(used, s->w_size - s->insert);
     }
 
-    /* If flushing or finishing and all input has been consumed, then done. If
-     * the code above couldn't write a complete block to next_out, then the
-     * code following this won't be able to either.
-     */
-    if (flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
-        (long)s->strstart == s->block_start)
-        return flush == Z_FINISH ? finish_done : block_done;
+    /* If the last block was written to next_out, then done. */
+    if (last)
+        return finish_done;
+
+    /* If flushing and all input has been consumed, then done. */
+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        return block_done;
 
     /* Fill the window with any remaining input. */
     have = s->window_size - s->strstart - 1;
@@ -1791,20 +1794,18 @@ local block_state deflate_stored(s, flush)
     min_block = MIN(have, s->w_size);
     left = s->strstart - s->block_start;
     if (left >= min_block ||
-        (left && flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
-         left <= have)) {
+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+         s->strm->avail_in == 0 && left <= have)) {
         len = MIN(left, have);
         last = flush == Z_FINISH && s->strm->avail_in == 0 &&
                len == left ? 1 : 0;
         _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
         s->block_start += len;
         flush_pending(s->strm);
-        if (last)
-            return finish_started;
     }
 
     /* We've done all we can with the available input and output. */
-    return need_more;
+    return last ? finish_started : need_more;
 }
 
 /* ===========================================================================

From 0b5c158cc717839956e541a99df9986423c4cae4 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 16:17:43 -0800
Subject: [PATCH 06/10] Fix bug in gzwrite.c that produced corrupt gzip files.

---
 gzwrite.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gzwrite.c b/gzwrite.c
index a2ee573db..1ec1da409 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -117,6 +117,7 @@ local int gz_comp(state, flush)
             if (strm->avail_out == 0) {
                 strm->avail_out = state->size;
                 strm->next_out = state->out;
+                state->x.next = state->out;
             }
         }
 

From c7d77756d01210790b6d87442eba83dcc586a305 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 17:04:38 -0800
Subject: [PATCH 07/10] Remove files to be installed before copying them in
 Makefile.in.

---
 Makefile.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 82bbe5031..3f80985b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -309,10 +309,12 @@ install-libs: $(LIBS)
 	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
 	cp $(STATICLIB) $(DESTDIR)$(libdir)
 	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
 	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
 	-@if test -n "$(SHAREDLIBV)"; then \
+	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
 	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
 	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
 	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
@@ -322,8 +324,10 @@ install-libs: $(LIBS)
 	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
 	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
 	fi
+	rm -f $(DESTDIR)$(man3dir)/zlib.3
 	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
 	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+	rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
 	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
 	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 # The ranlib in install is needed on NeXTSTEP which checks file times
@@ -331,6 +335,7 @@ install-libs: $(LIBS)
 
 install: install-libs
 	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
 	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
 	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
 

From 1e3bccd4965d34cfd34e3fed7329b1b2c4b28d1d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 17:25:27 -0800
Subject: [PATCH 08/10] Add warnings when compiling with assembler code.

There have been many reports of bugs in the assembler codes
intended to speed up deflate and inflate. They are third-party
contributions in contrib, and so are not supported by the zlib
maintainers.
---
 deflate.c | 1 +
 inffast.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/deflate.c b/deflate.c
index 781753083..9161f296a 100644
--- a/deflate.c
+++ b/deflate.c
@@ -88,6 +88,7 @@ local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
 #ifdef ASMV
+#  pragma message("Assembler code may have bugs -- use at your own risk")
       void match_init OF((void)); /* asm code initialization */
       uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
diff --git a/inffast.c b/inffast.c
index a15876d4e..29eb7d824 100644
--- a/inffast.c
+++ b/inffast.c
@@ -8,7 +8,9 @@
 #include "inflate.h"
 #include "inffast.h"
 
-#ifndef ASMINF
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
 
 /*
    Decode literal, length, and distance codes and write out the resulting

From e13def040e1236f2e3dd4333a6ece955967478b3 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 18:18:31 -0800
Subject: [PATCH 09/10] Fix compilation with --solo and --debug combined.

However this ends up not really being solo, since it has to
include external libraries.
---
 zutil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zutil.c b/zutil.c
index 3b4d90451..56534fba0 100644
--- a/zutil.c
+++ b/zutil.c
@@ -113,7 +113,7 @@ uLong ZEXPORT zlibCompileFlags()
 }
 
 #ifdef ZLIB_DEBUG
-
+#include <stdlib.h>
 #  ifndef verbose
 #    define verbose 0
 #  endif

From 4a090adef8c773087ec8916ad3c2236ef560df27 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 2 Jan 2017 17:53:59 -0800
Subject: [PATCH 10/10] zlib 1.2.10

---
 CMakeLists.txt                       |   2 +-
 ChangeLog                            |   8 ++++++--
 Makefile.in                          |   2 +-
 README                               |   4 ++--
 contrib/delphi/ZLib.pas              |   2 +-
 contrib/dotzlib/DotZLib/UnitTests.cs |   2 +-
 contrib/infback9/inftree9.c          |   4 ++--
 contrib/minizip/configure.ac         |   2 +-
 contrib/pascal/zlibpas.pas           |   4 ++--
 contrib/vstudio/readme.txt           |   2 +-
 contrib/vstudio/vc10/zlib.rc         |   6 +++---
 contrib/vstudio/vc11/zlib.rc         |   6 +++---
 contrib/vstudio/vc12/zlib.rc         |   6 +++---
 contrib/vstudio/vc14/zlib.rc         |   6 +++---
 contrib/vstudio/vc9/zlib.rc          |   6 +++---
 deflate.c                            |   2 +-
 inftrees.c                           |   4 ++--
 os400/README400                      |   2 +-
 os400/zlib.inc                       |  10 +++++-----
 qnx/package.qpg                      |  10 +++++-----
 treebuild.xml                        |   4 ++--
 win32/README-WIN32.txt               |   4 ++--
 zlib.3                               |   4 ++--
 zlib.3.pdf                           | Bin 19320 -> 19324 bytes
 zlib.h                               |  10 +++++-----
 25 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659afa914..1a954a640 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.9.1")
+set(VERSION "1.2.10")
 
 option(ASM686 "Enable building i686 assembly implementation")
 option(AMD64 "Enable building amd64 assembly implementation")
diff --git a/ChangeLog b/ChangeLog
index 758485194..fed9adb52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 
                 ChangeLog file for zlib
 
-Changes in 1.2.9.1 (xx Jan 2017)
-- 
+Changes in 1.2.10 (2 Jan 2017)
+- Avoid warnings on snprintf() return value
+- Fix bug in deflate_stored() for zero-length input
+- Fix bug in gzwrite.c that produced corrupt gzip files
+- Remove files to be installed before copying them in Makefile.in
+- Add warnings when compiling with assembler code
 
 Changes in 1.2.9 (31 Dec 2016)
 - Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
diff --git a/Makefile.in b/Makefile.in
index 3f80985b9..185219254 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.9.1
+SHAREDLIBV=libz.so.1.2.10
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
diff --git a/README b/README
index 661033579..e2250bdbc 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.9.1 is a general purpose data compression library.  All the code is
+zlib 1.2.10 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.9.1 are documented in the file ChangeLog.
+The changes made in version 1.2.10 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 4c654cf0b..e9d72f021 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.2.9.1';
+  zlib_version = '1.2.10';
 
 type
   EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index f22a8ded8..a0e39857c 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ public class InfoTests
         public void Info_Version()
         {
             Info info = new Info();
-            Assert.AreEqual("1.2.9.1", Info.Version);
+            Assert.AreEqual("1.2.10", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);
             Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 97f330beb..ea5604731 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.9.1 Copyright 1995-2017 Mark Adler ";
+   " inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 203, 201};
+        133, 133, 133, 133, 144, 192, 202};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 6496d7129..bbb2283a7 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.9.1], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 0ae6d7579..2330898c4 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,8 +10,8 @@
 interface
 
 const
-  ZLIB_VERSION = '1.2.9.1';
-  ZLIB_VERNUM  = $1291;
+  ZLIB_VERSION = '1.2.10';
+  ZLIB_VERNUM  = $12a0;
 
 type
   alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 439d59527..98d8a05a5 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.9.1
+Building instructions for the DLL versions of Zlib 1.2.10
 ========================================================
 
 This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index a947595cd..f1c19bcec 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 1
-  PRODUCTVERSION 1, 2, 9, 1
+  FILEVERSION	 1, 2, 10, 0
+  PRODUCTVERSION 1, 2, 10, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9.1\0"
+      VALUE "FileVersion",	"1.2.10\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index a947595cd..f1c19bcec 100644
--- a/contrib/vstudio/vc11/zlib.rc
+++ b/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 1
-  PRODUCTVERSION 1, 2, 9, 1
+  FILEVERSION	 1, 2, 10, 0
+  PRODUCTVERSION 1, 2, 10, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9.1\0"
+      VALUE "FileVersion",	"1.2.10\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index e7c1d65dd..ef3829898 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 1
-  PRODUCTVERSION 1, 2, 9, 1
+  FILEVERSION	 1, 2, 10, 0
+  PRODUCTVERSION 1, 2, 10, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9.1\0"
+      VALUE "FileVersion",	"1.2.10\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index e7c1d65dd..ef3829898 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 1
-  PRODUCTVERSION 1, 2, 9, 1
+  FILEVERSION	 1, 2, 10, 0
+  PRODUCTVERSION 1, 2, 10, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9.1\0"
+      VALUE "FileVersion",	"1.2.10\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index a947595cd..f1c19bcec 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 9, 1
-  PRODUCTVERSION 1, 2, 9, 1
+  FILEVERSION	 1, 2, 10, 0
+  PRODUCTVERSION 1, 2, 10, 0
   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
   FILEFLAGS	0
   FILEOS	VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.9.1\0"
+      VALUE "FileVersion",	"1.2.10\0"
       VALUE "InternalName",	"zlib\0"
       VALUE "OriginalFilename",	"zlibwapi.dll\0"
       VALUE "ProductName",	"ZLib.DLL\0"
diff --git a/deflate.c b/deflate.c
index 9161f296a..2ad890e35 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.9.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/inftrees.c b/inftrees.c
index 2e8514af4..8a904ddbc 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.9.1 Copyright 1995-2017 Mark Adler ";
+   " inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 201};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 202};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 7f10a3b23..28dca8cd1 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
-        ZLIB version 1.2.9.1 for OS/400 installation instructions
+        ZLIB version 1.2.10 for OS/400 installation instructions
 
 1) Download and unpack the zlib tarball to some IFS directory.
    (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/zlib.inc b/os400/zlib.inc
index cdc2f72cf..a2147dd0a 100644
--- a/os400/zlib.inc
+++ b/os400/zlib.inc
@@ -1,7 +1,7 @@
       *  ZLIB.INC - Interface to the general purpose compression library
       *
       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.9.1
+      *  Version 1.2.10
       *
       *
       *  WARNING:
@@ -22,14 +22,14 @@
       *
       *  Versioning information.
       *
-     D ZLIB_VERSION    C                   '1.2.9.1'
-     D ZLIB_VERNUM     C                   X'1291'
+     D ZLIB_VERSION    C                   '1.2.10'
+     D ZLIB_VERNUM     C                   X'12a0'
      D ZLIB_VER_MAJOR  C                   1
      D ZLIB_VER_MINOR  C                   2
      D ZLIB_VER_REVISION...
-     D                 C                   9
+     D                 C                   10
      D ZLIB_VER_SUBREVISION...
-     D                 C                   1
+     D                 C                   0
       *
       *  Other equates.
       *
diff --git a/qnx/package.qpg b/qnx/package.qpg
index d95eb0364..d9a1229e9 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
       <QPG:Files>
          <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
          <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.9.1" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.9.1"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9.1"/>
-         <QPG:Add file="../libz.so.1.2.9.1" install="/opt/lib/" component="slib"/>
+         <QPG:Add file="../libz.so.1.2.10" install="/opt/lib/" user="root:bin" permission="644"/>
+         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.10"/>
+         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.10"/>
+         <QPG:Add file="../libz.so.1.2.10" install="/opt/lib/" component="slib"/>
       </QPG:Files>
 
       <QPG:PackageFilter>
@@ -63,7 +63,7 @@
             </QPM:ProductDescription>
 
             <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.9.1</QPM:ReleaseVersion>
+               <QPM:ReleaseVersion>1.2.10</QPM:ReleaseVersion>
                <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
                <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
                <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/treebuild.xml b/treebuild.xml
index 001d15e29..a530cc075 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.9.1">
-    <library name="zlib" dlversion="1.2.9.1" dlname="z">
+<package name="zlib" version="1.2.10">
+    <library name="zlib" dlversion="1.2.10" dlname="z">
 	<property name="description"> zip compression library </property>
 	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
 
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 592b215bf..16adcca5d 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.9.1 is a general purpose data compression library.  All the code is
+zlib 1.2.10 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
 
 Manifest:
 
-The package zlib-1.2.9.1-win32-x86.zip will contain the following files:
+The package zlib-1.2.10-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/zlib.3 b/zlib.3
index 20c64b571..00dc06119 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "xx Jan 2017"
+.TH ZLIB 3 "2 Jan 2017"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -105,7 +105,7 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS AND LICENSE
-Version 1.2.9.1
+Version 1.2.10
 .LP
 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 .LP
diff --git a/zlib.3.pdf b/zlib.3.pdf
index 141466ac162b86f3b85d917741f8762c204978e6..20008cd71397f40bf983f2923b6313117e085178 100644
GIT binary patch
delta 2839
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
QiX!5102B__H#dO(0Z<sP)Bpeg

delta 2858
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

diff --git a/zlib.h b/zlib.h
index 263e6f630..dc90dc8d2 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.9.1, January xxth, 2017
+  version 1.2.10, January 2nd, 2017
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.9.1-motley"
-#define ZLIB_VERNUM 0x1291
+#define ZLIB_VERSION "1.2.10"
+#define ZLIB_VERNUM 0x12a0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 9
-#define ZLIB_VER_SUBREVISION 1
+#define ZLIB_VER_REVISION 10
+#define ZLIB_VER_SUBREVISION 0
 
 /*
     The 'zlib' compression library provides in-memory compression and