zlib 1.2.11

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c59cb5bd923111a5d34a6154393dd93bd8d2131..f0b242565987b08a33cbe071fbae20bc933b3b39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 
 project(zlib C)
 
-set(VERSION "1.2.9")
+set(VERSION "1.2.11")
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")

diff --git a/ChangeLog.zlib b/ChangeLog.zlib
index b32012f710468e8a8995a5bb832683e1ea220608..d38c0a8423b22c906a0e666815fae669d83bbce7 100644 (file)
--- a/ChangeLog.zlib
+++ b/ChangeLog.zlib
@@ -7,6 +7,17 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
+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]
 - Improve contrib/blast to return unused bytes

diff --git a/FAQ.zlib b/FAQ.zlib
index 8da63b40767dbb1f3f3a40bb3bcdcf9c226a452a..f234f3e5921d64ef0a711c2172e8f6c87107e01d 100644 (file)
--- a/FAQ.zlib
+++ b/FAQ.zlib
@@ -1,5 +1,5 @@
 ##
-# THIS IS AN UNMAINTAINED COPY OF THE ORIGINAL FILE DISTRIBUTED WITH ZLIB 1.2.8
+# THIS IS AN UNMAINTAINED COPY OF THE ORIGINAL FILE DISTRIBUTED WITH ZLIB 1.2.11
 ##
 
 

diff --git a/INDEX b/INDEX
index acb9aba64c30a30670cafcaa17c56d8cf2e26530..34c80ad9e0161b94d7899759cfc57ea19cd8a2ee 100644 (file)
--- a/INDEX
+++ b/INDEX
@@ -1,11 +1,11 @@
 CMakeLists.txt  cmake build file
-ChangeLog.zlib  history of changes up to the fork from zlib 1.2.8
-FAQ.zlib        Frequently Asked Questions about zlib, as distributed in zlib 1.2.8
+ChangeLog.zlib  history of changes up to the fork from zlib 1.2.11
+FAQ.zlib        Frequently Asked Questions about zlib, as distributed in zlib 1.2.11
 INDEX           this file
 Makefile        dummy Makefile that tells you to ./configure
 Makefile.in     template for Unix Makefile
 README          guess what
-README.zlib     Copy of the original README file distributed in zlib 1.2.8
+README.zlib     Copy of the original README file distributed in zlib 1.2.11
 configure       configure script for Unix
 test/example.c  zlib usages examples for build testing
 test/minigzip.c minimal gzip-like functionality for build testing

diff --git a/Makefile.in b/Makefile.in
index cd212cb7bfdbae3add71c9d902a3d9ed2db775c0..25d3d0f7b35b2055e8ca72cc8c888acfef022408 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,10 +27,10 @@ LDSHARED=$(CC)
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.9
+SHAREDLIBV=libz.so.1.2.11
 SHAREDLIBM=libz.so.1
 IMPORTLIB=
-SHAREDTARGET=libz.so.1.2.9
+SHAREDTARGET=libz.so.1.2.11
 
 LIBS=$(STATICLIB) $(SHAREDTARGET)
 

diff --git a/README.zlib b/README.zlib
index 200579260ac675b2995986a43419ee58e98488fd..51106de4753292ad59de03de9e634e6814eeb7a2 100644 (file)
--- a/README.zlib
+++ b/README.zlib
@@ -1,12 +1,6 @@
-## 
-# THIS IS AN UNMAINTAINED COPY OF THE ORIGINAL FILE DISTRIBUTED WITH ZLIB 1.2.8
-## 
-
-
-
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.8 is a general purpose data compression library.  All the code is
+zlib 1.2.11 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
@@ -37,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.8 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -90,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2013 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/deflate.c b/deflate.c
index 99e59d6da426528b7ff268b8161cec2d7d6c52f6..ce4b0e6ab87aa9b049ee89a834a5ce01ff31f349 100644 (file)
--- a/deflate.c
+++ b/deflate.c
@@ -53,7 +53,7 @@
 #include "deflate_p.h"
 #include "match.h"
 
-const char deflate_copyright[] = " deflate 1.2.9.f Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
+const char deflate_copyright[] = " deflate 1.2.11.f Copyright 1995-2016 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/gzlib.c b/gzlib.c
index 688902aa6e0568ba966aa3da8d2b5f64964fed17..61f71da118b026b20c5d472d97b92b37e65c110d 100644 (file)
--- a/gzlib.c
+++ b/gzlib.c
@@ -1,5 +1,5 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/gzwrite.c b/gzwrite.c
index 6746b66791a29768d9fb7c0e183b3f1fe3271752..07417f41bc9615c1b41b67bbdf8b9eacaaeed9af 100644 (file)
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -1,5 +1,5 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/inffast.c b/inffast.c
index 51c276378a0959592d8be12d47333551f1cc6500..2e510801019352afd26ac5967e090a7bacd42c8d 100644 (file)
--- a/inffast.c
+++ b/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013, 2016 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/inftrees.c b/inftrees.c
index dba91d31fa83546ec48ea2314b85125d271e721c..3f4bb0189936cdb8055d0cd3acf6b9e271f44be7 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -8,7 +8,7 @@
 
 #define MAXBITS 15
 
-const char inflate_copyright[] = " inflate 1.2.9.f Copyright 1995-2016 Mark Adler ";
+const char inflate_copyright[] = " inflate 1.2.11.f Copyright 1995-2016 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
@@ -55,7 +55,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, uint16_t *lens, unsigned codes,
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const uint16_t 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, 77, 202};
     static const uint16_t 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/treebuild.xml b/treebuild.xml
index 931ee5a22162fb46a78edcc4edfeb9841559a0a8..fd75525f99595de4ad5589070e43fa8969b37b1f 100644 (file)
--- 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.11">
+    <library name="zlib" dlversion="1.2.11" 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 5002f3c91173badd2bc61c540a12dedd1faba5d1..7a859bb234b84ea0fccf909a91c61cd1dde39234 100644 (file)
--- 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.11 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.11-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 cbac458881ed903e1a78680919641d162cae5021..eddeec024453527aa3b1a2c2802cb6fb4bb9e279 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "31 Dec 2016"
+.TH ZLIB 3 "15 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
+Version 1.2.11
 .LP
 Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
 .LP

diff --git a/zlib.3.pdf b/zlib.3.pdf
index 618a9cee4884bac961e0c4bceb4a7c87b59ed083..6fa519c5bdf5df33b2f17549e1df142c619c916c 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 119b392668017cbbd5717976f0968a9d86a9bff9..05b28c2f639a6a5d04f7b7880bc2dc62c1218465 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
 #ifndef ZLIB_H_
 #define ZLIB_H_
 /* zlib.h -- interface of the 'zlib-ng' compression library
-   Forked from and compatible with zlib 1.2.9
+   Forked from and compatible with zlib 1.2.11
 
   Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
 
@@ -44,11 +44,11 @@ extern "C" {
 #define ZLIBNG_VER_REVISION 9
 #define ZLIBNG_VER_SUBREVISION 0
 
-#define ZLIB_VERSION "1.2.9.zlib-ng"
-#define ZLIB_VERNUM 0x129f
+#define ZLIB_VERSION "1.2.11.zlib-ng"
+#define ZLIB_VERNUM 0x12bf
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 9
+#define ZLIB_VER_REVISION 11
 #define ZLIB_VER_SUBREVISION 0
 
 /*

diff --git a/zutil.c b/zutil.c
index b9b3710b7c367a1d3ed53a03f94ce463a1b1231e..6df7abfcd67fc851ce3a6426b62f45d6702baab6 100644 (file)
--- a/zutil.c
+++ b/zutil.c
@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -24,7 +24,7 @@ const char * const z_errmsg[10] = {
 };
 
 const char zlibng_string[] =
-   " zlib-ng 1.9.9 forked from zlib 1.2.8 ";
+   " zlib-ng 1.9.9 forked from zlib 1.2.11 ";
 
 const char * ZEXPORT zlibVersion(void)
 {