From 4a090adef8c773087ec8916ad3c2236ef560df27 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Mon, 2 Jan 2017 17:53:59 -0800 Subject: [PATCH] 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 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 @@ - - - - + + + + @@ -63,7 +63,7 @@ - 1.2.9.1 + 1.2.10 Medium Stable diff --git a/treebuild.xml b/treebuild.xml index 001d15e29..a530cc075 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 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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 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