From cacf7f1d4e3d44d871b605da3b647f07d718623f Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 15 Jan 2017 09:18:46 -0800 Subject: [PATCH] zlib 1.2.11 --- CMakeLists.txt | 2 +- ChangeLog | 4 ++++ 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 | 2 +- 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 +- gzlib.c | 2 +- gzwrite.c | 2 +- inffast.c | 2 +- inftrees.c | 4 ++-- os400/README400 | 2 +- os400/zlib.inc | 8 ++++---- qnx/package.qpg | 10 +++++----- treebuild.xml | 4 ++-- win32/README-WIN32.txt | 4 ++-- zlib.3 | 4 ++-- zlib.3.pdf | Bin 19325 -> 19318 bytes zlib.h | 10 +++++----- zutil.c | 2 +- 29 files changed, 58 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87e763763..0fe939df6 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.10.1") +set(VERSION "1.2.11") option(ASM686 "Enable building i686 assembly implementation") option(AMD64 "Enable building amd64 assembly implementation") diff --git a/ChangeLog b/ChangeLog index fed9adb52..30199a65a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 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 diff --git a/Makefile.in b/Makefile.in index 4aec16f3e..5a77949ff 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.10.1 +SHAREDLIBV=libz.so.1.2.11 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) diff --git a/README b/README index ff82e0cec..51106de47 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.10.1 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 @@ -31,7 +31,7 @@ Mark Nelson 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.10.1 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/ . diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 5f00f07b1..060e19911 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.10.1'; + zlib_version = '1.2.11'; type EZlibError = class(Exception); diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 2319dd6c2..44f76332b 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.10.1", Info.Version); + Assert.AreEqual("1.2.11", 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 b61592f5e..5f4a76798 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.10.1 Copyright 1995-2017 Mark Adler "; + " inflate9 1.2.11 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, 204, 64}; + 133, 133, 133, 133, 144, 77, 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 50a7101ad..5b1197097 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.10.1], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.2.11], [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 63242116c..a0dff11b5 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas @@ -10,7 +10,7 @@ interface const - ZLIB_VERSION = '1.2.10.1'; + ZLIB_VERSION = '1.2.11'; ZLIB_VERNUM = $12a0; type diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 60305f45e..f67eae867 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.10.1 +Building instructions for the DLL versions of Zlib 1.2.11 ======================================================== 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 385a17224..fee177a71 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, 10, 1 - PRODUCTVERSION 1, 2, 10, 1 + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.10.1\0" + VALUE "FileVersion", "1.2.11\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 385a17224..fee177a71 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, 10, 1 - PRODUCTVERSION 1, 2, 10, 1 + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.10.1\0" + VALUE "FileVersion", "1.2.11\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 25822c5f1..c4e4b016e 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, 10, 1 - PRODUCTVERSION 1, 2, 10, 1 + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.10.1\0" + VALUE "FileVersion", "1.2.11\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 25822c5f1..c4e4b016e 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, 10, 1 - PRODUCTVERSION 1, 2, 10, 1 + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.10.1\0" + VALUE "FileVersion", "1.2.11\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 385a17224..fee177a71 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, 10, 1 - PRODUCTVERSION 1, 2, 10, 1 + FILEVERSION 1, 2, 11, 0 + PRODUCTVERSION 1, 2, 11, 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.10.1\0" + VALUE "FileVersion", "1.2.11\0" VALUE "InternalName", "zlib\0" VALUE "OriginalFilename", "zlibwapi.dll\0" VALUE "ProductName", "ZLib.DLL\0" diff --git a/deflate.c b/deflate.c index f14600147..1ec761448 100644 --- a/deflate.c +++ b/deflate.c @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.10.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.11 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/gzlib.c b/gzlib.c index e142ffb3d..4105e6aff 100644 --- 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 1ec1da409..c7b5651d7 100644 --- 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 29eb7d824..0dbd1dbc0 100644 --- 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 67989154c..2ea08fc13 100644 --- a/inftrees.c +++ b/inftrees.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.10.1 Copyright 1995-2017 Mark Adler "; + " inflate 1.2.11 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, 204, 64}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 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 f57a7b08f..4f98334f5 100644 --- a/os400/README400 +++ b/os400/README400 @@ -1,4 +1,4 @@ - ZLIB version 1.2.10.1 for OS/400 installation instructions + ZLIB version 1.2.11 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 e663e79f4..c6aca2cbd 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.10.1 + * Version 1.2.11 * * * WARNING: @@ -22,14 +22,14 @@ * * Versioning information. * - D ZLIB_VERSION C '1.2.10.1' + D ZLIB_VERSION C '1.2.11' D ZLIB_VERNUM C X'12a0' D ZLIB_VER_MAJOR C 1 D ZLIB_VER_MINOR C 2 D ZLIB_VER_REVISION... - D C 10 + D C 11 D ZLIB_VER_SUBREVISION... - D C 1 + D C 0 * * Other equates. * diff --git a/qnx/package.qpg b/qnx/package.qpg index 15bc09ae9..31e8e90db 100644 --- a/qnx/package.qpg +++ b/qnx/package.qpg @@ -25,10 +25,10 @@ - - - - + + + + @@ -63,7 +63,7 @@ - 1.2.10.1 + 1.2.11 Medium Stable diff --git a/treebuild.xml b/treebuild.xml index 68473e51a..fd75525f9 100644 --- a/treebuild.xml +++ b/treebuild.xml @@ -1,6 +1,6 @@ - - + + zip compression library diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt index 234adfe46..df7ab7f4b 100644 --- a/win32/README-WIN32.txt +++ b/win32/README-WIN32.txt @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.10.1 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.10.1-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 b476e94ab..bda4eb073 100644 --- a/zlib.3 +++ b/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "3 Jan 2017" +.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.10.1 +Version 1.2.11 .LP Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler .LP diff --git a/zlib.3.pdf b/zlib.3.pdf index fab0f81441f41ad09791f49b7901b9f28086a7ff..6fa519c5bdf5df33b2f17549e1df142c619c916c 100644 GIT binary patch delta 6424 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 Tkzo0R0t|-}aB?bYJSO-L&(Dy2 delta 6473 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 diff --git a/zlib.h b/zlib.h index a4b3bafcb..f09cdaf1e 100644 --- a/zlib.h +++ b/zlib.h @@ -1,5 +1,5 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.10.1, January 3rd, 2017 + version 1.2.11, January 15th, 2017 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler @@ -37,12 +37,12 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.10.1-motley" -#define ZLIB_VERNUM 0x12a1 +#define ZLIB_VERSION "1.2.11" +#define ZLIB_VERNUM 0x12b0 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 10 -#define ZLIB_VER_SUBREVISION 1 +#define ZLIB_VER_REVISION 11 +#define ZLIB_VER_SUBREVISION 0 /* The 'zlib' compression library provides in-memory compression and diff --git a/zutil.c b/zutil.c index 56534fba0..a76c6b0c7 100644 --- 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 */