From: Mark Adler Date: Sun, 15 Jan 2017 16:22:16 +0000 (-0800) Subject: zlib 1.2.11 X-Git-Tag: 1.9.9-b1~698 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21bffda72c25370230dff6a0b28e3f629b5acd91;p=thirdparty%2Fzlib-ng.git zlib 1.2.11 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c59cb5bd..f0b242565 100644 --- 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 b32012f71..d38c0a842 100644 --- 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 8da63b407..f234f3e59 100644 --- 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 acb9aba64..34c80ad9e 100644 --- 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 cd212cb7b..25d3d0f7b 100644 --- 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 200579260..51106de47 100644 --- 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 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 99e59d6da..ce4b0e6ab 100644 --- 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 688902aa6..61f71da11 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 6746b6679..07417f41b 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 51c276378..2e5108010 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 dba91d31f..3f4bb0189 100644 --- 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 931ee5a22..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 5002f3c91..7a859bb23 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.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 cbac45888..eddeec024 100644 --- 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 618a9cee4..6fa519c5b 100644 Binary files a/zlib.3.pdf and b/zlib.3.pdf differ diff --git a/zlib.h b/zlib.h index 119b39266..05b28c2f6 100644 --- 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 b9b3710b7..6df7abfcd 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 */ @@ -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) {