zlib 1.2.9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6dec89e22cc6f22fc5983974327890049123d38..6c59cb5bd923111a5d34a6154393dd93bd8d2131 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.8")
+set(VERSION "1.2.9")
 
 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 2adb4681026a476a22bcf8a98edcb5c8712839e2..b32012f710468e8a8995a5bb832683e1ea220608 100644 (file)
--- a/ChangeLog.zlib
+++ b/ChangeLog.zlib
@@ -1,12 +1,44 @@
-## 
-# 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.9
+##
 
 
 
 
                 ChangeLog file for zlib
 
+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
+- Assure that gzoffset() is correct when appending
+- Improve compress() and uncompress() to support large lengths
+- Fix bug in test/example.c where error code not saved
+- Remedy Coverity warning [Randers-Pehrson]
+- Improve speed of gzprintf() in transparent mode
+- Fix inflateInit2() bug when windowBits is 16 or 32
+- Change DEBUG macro to ZLIB_DEBUG
+- Avoid uninitialized access by gzclose_w()
+- Allow building zlib outside of the source directory
+- Fix bug that accepted invalid zlib header when windowBits is zero
+- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
+- Loop on write() calls in gzwrite.c in case of non-blocking I/O
+- Add --warn (-w) option to ./configure for more compiler warnings
+- Reject a window size of 256 bytes if not using the zlib wrapper
+- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
+- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
+- Fix bugs in creating a very large gzip header
+- Add uncompress2() function, which returns the input size used
+- Assure that deflateParams() will not switch functions mid-block
+- Dramatically speed up deflation for level 0 (storing)
+- Add gzfread(), duplicating the interface of fread()
+- Add gzfwrite(), duplicating the interface of fwrite()
+- Add deflateGetDictionary() function
+- Use snprintf() for later versions of Microsoft C
+- Fix *Init macros to use z_ prefix when requested
+- Replace as400 with os400 for OS/400 support [Monnerat]
+- Add crc32_z() and adler32_z() functions with size_t lengths
+- Update Visual Studio project files [AraHaan]
+
 Changes in 1.2.8 (28 Apr 2013)
 - Update contrib/minizip/iowin32.c for Windows RT [Vollant]
 - Do not force Z_CONST for C++

diff --git a/Makefile.in b/Makefile.in
index f8bf807195e3509675622930aecfef2bdb6729f6..3c0e5c68fec8f873fc7d969999ae3f5d1fd96622 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
 # For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile and test, type:
@@ -27,10 +27,10 @@ LDSHARED=$(CC)
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.8
+SHAREDLIBV=libz.so.1.2.9
 SHAREDLIBM=libz.so.1
 IMPORTLIB=
-SHAREDTARGET=libz.so.1.2.8
+SHAREDTARGET=libz.so.1.2.9
 
 LIBS=$(STATICLIB) $(SHAREDTARGET)
 

diff --git a/adler32.c b/adler32.c
index 1ce855e24f370743669c84e58cb30fdd487e16ed..0da5deed6238545199a3646d14d8e264dd7eb572 100644 (file)
--- a/adler32.c
+++ b/adler32.c
@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2011, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/compress.c b/compress.c
index d4f99bb31a055fd64fe4db447278e70166b90049..78ecb862336654172b73192131e2b89e89f4dfd8 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -1,5 +1,5 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014 Jean-loup Gailly, Mark Adler.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/crc32.c b/crc32.c
index 4cc50575681cbd9bd1dab2ecdb770f1fff1e7a18..d469601c02d31134a23d2f413ecb76f55f136908 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster

diff --git a/deflate.c b/deflate.c
index 2b3e88f2f209d41b7a5902e753b932b4e48ecf1b..71f77a0ac7e8912ee24c89fbab79ae0657fe7338 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.8.f Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
+const char deflate_copyright[] = " deflate 1.2.9.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/deflate.h b/deflate.h
index 7266e53ff47ecb6b09041df393281c52c77ce580..75e14b1b7ddc5ddde2bdf9d8ec4116fcf28bcfda 100644 (file)
--- a/deflate.h
+++ b/deflate.h
@@ -1,7 +1,7 @@
 #ifndef DEFLATE_H_
 #define DEFLATE_H_
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/gzguts.h b/gzguts.h
index e075bfac94c792d16810e416ea15f66ed8a06b25..89bd3ecbacd42a97f16c6c3f88bb9e875a35fa52 100644 (file)
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,7 +1,7 @@
 #ifndef GZGUTS_H_
 #define GZGUTS_H_
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/gzlib.c b/gzlib.c
index f152c1c59c207615046ca014a2dce4a2f0627f4c..04217db562a2e5597c64a85d099d22bd66672c8e 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 Mark Adler
+ * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/gzread.c b/gzread.c
index a48d7bac1222b86c06bf40d870d78bd783212a5e..0928310fe758936d9629984a02e7ad00ed58540f 100644 (file)
--- a/gzread.c
+++ b/gzread.c
@@ -1,5 +1,5 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/gzwrite.c b/gzwrite.c
index 71d50b1e5406239a38d4c8e2ad420b540f3c046a..c1dd3ca4cc106fd66a25ef15d4fdf8c2daaa3d58 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 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/infback.c b/infback.c
index 49c90cc161aaf84e9201564e8e99be025c427a45..81f792e5bd0677e15ff02b8f827868793ae7675b 100644 (file)
--- a/infback.c
+++ b/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

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

diff --git a/inflate.c b/inflate.c
index 0f7e3e7118e882109043730a9e9803452c6db6b6..84ae6e72e47962e77e7e6f36c3e184323ed8f07a 100644 (file)
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/inflate.h b/inflate.h
index a1849e0891fc8b5bc7f0367e05821a28efaaff45..2e2e4e27fa403674bb927f0e265631259688697a 100644 (file)
--- a/inflate.h
+++ b/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/inftrees.c b/inftrees.c
index d943adc74583d46f3786051e95ab678ca521e15d..dba91d31fa83546ec48ea2314b85125d271e721c 100644 (file)
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,7 +8,7 @@
 
 #define MAXBITS 15
 
-const char inflate_copyright[] = " inflate 1.2.8.f Copyright 1995-2013 Mark Adler ";
+const char inflate_copyright[] = " inflate 1.2.9.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, 72, 78};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 79};
     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/test/example.c b/test/example.c
index bd50d9cb2295474a116361db6463a03a4b09a977..604e13b9febb382455cab11fa66c7da3049da880 100644 (file)
--- a/test/example.c
+++ b/test/example.c
@@ -1,5 +1,5 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2006, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/test/infcover.c b/test/infcover.c
index ee8463651646ad9ee1027694807e44c679cf77ba..9f2d33dc44cd40a185745c5298e0c55ac58c349f 100644 (file)
--- a/test/infcover.c
+++ b/test/infcover.c
@@ -1,5 +1,5 @@
 /* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011 Mark Adler
+ * Copyright (C) 2011, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/test/minigzip.c b/test/minigzip.c
index dd81137f1dfcb5b32577f0966be1cc54f8f9a159..286861e2c7165e8f0b51197090f8cc6d8f66c7cd 100644 (file)
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -1,5 +1,5 @@
 /* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/treebuild.xml b/treebuild.xml
index 34a4f779aa56c452cf00db6a0ef7004c503f7d60..931ee5a22162fb46a78edcc4edfeb9841559a0a8 100644 (file)
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<package name="zlib" version="1.2.8">
-    <library name="zlib" dlversion="1.2.8" dlname="z">
+<package name="zlib" version="1.2.9">
+    <library name="zlib" dlversion="1.2.9" dlname="z">
        <property name="description"> zip compression library </property>
        <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
 

diff --git a/trees.c b/trees.c
index 0beafc724cbc474933b1809351741655164588d7..8e419d25dfc4382dea759b50732aa6848c9d05ee 100644 (file)
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */

diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 3d77d521e83f6264cde310ed48ec462ef1177571..5002f3c91173badd2bc61c540a12dedd1faba5d1 100644 (file)
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.8 is a general purpose data compression library.  All the code is
+zlib 1.2.9 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.8-win32-x86.zip will contain the following files:
+The package zlib-1.2.9-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages

diff --git a/win32/zlib.def b/win32/zlib.def
index 1d0c8947a5b0b46a3e53ad205278bb6d4913a694..a2188b000621c489575f1dd4f3165b76c38c0a81 100644 (file)
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -8,6 +8,7 @@ EXPORTS
     inflateEnd
 ; advanced functions
     deflateSetDictionary
+    deflateGetDictionary
     deflateCopy
     deflateReset
     deflateParams
@@ -33,12 +34,46 @@ EXPORTS
     compress2
     compressBound
     uncompress
+    uncompress2
+    gzopen
+    gzdopen
+    gzbuffer
+    gzsetparams
+    gzread
+    gzfread
+    gzwrite
+    gzfwrite
+    gzprintf
+    gzvprintf
+    gzputs
+    gzgets
+    gzputc
+    gzgetc
+    gzungetc
+    gzflush
+    gzseek
+    gzrewind
+    gztell
+    gzoffset
+    gzeof
+    gzdirect
+    gzclose
+    gzclose_r
+    gzclose_w
+    gzerror
+    gzclearerr
 ; large file functions
+    gzopen64
+    gzseek64
+    gztell64
+    gzoffset64
     adler32_combine64
     crc32_combine64
 ; checksum functions
     adler32
+    adler32_z
     crc32
+    crc32_z
     adler32_combine
     crc32_combine
 ; various hacks, don't look :)
@@ -47,9 +82,13 @@ EXPORTS
     inflateInit_
     inflateInit2_
     inflateBackInit_
+    gzgetc_
     zError
     inflateSyncPoint
     get_crc_table
     inflateUndermine
+    inflateValidate
+    inflateCodesUsed
     inflateResetKeep
     deflateResetKeep
+    gzopen_w

diff --git a/zconf.h.in b/zconf.h.in
index 5649aee1cfb8c4ee288963d0cd47a5dc443edb89..597d47642753f09abde062c68978a6fc3f540bcc 100644 (file)
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/zlib.3 b/zlib.3
index 1cc38059d788f8e748c140c176002275896c1f75..cbac458881ed903e1a78680919641d162cae5021 100644 (file)
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "7 July 2015"
+.TH ZLIB 3 "31 Dec 2016"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -48,32 +48,10 @@ Changes to this version are documented in the file
 that accompanies the source.
 .LP
 .I zlib
-is available in Java using the java.util.zip package:
-.IP
-http://java.sun.com/developer/technicalArticles/Programming/compression/
-.LP
-A Perl interface to
-.IR zlib ,
-written by Paul Marquess (pmqs@cpan.org),
-is available at CPAN (Comprehensive Perl Archive Network) sites,
-including:
-.IP
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/
-.LP
-A Python interface to
-.IR zlib ,
-written by A.M. Kuchling (amk@magnet.com),
-is available in Python 1.5 and later versions:
-.IP
-http://docs.python.org/library/zlib.html
+is built in to many languages and operating systems, including but not limited to
+Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
 .LP
-.I zlib
-is built into
-.IR tcl:
-.IP
-http://wiki.tcl.tk/4610
-.LP
-An experimental package to read and write files in .zip format,
+An experimental package to read and write files in the .zip format,
 written on top of
 .I zlib
 by Gilles Vollant (info@winimage.com),
@@ -92,7 +70,9 @@ web site can be found at:
 .IP
 http://zlib.net/
 .LP
-The data format used by the zlib library is described by RFC
+The data format used by the
+.I zlib
+library is described by RFC
 (Request for Comments) 1950 to 1952 in the files:
 .IP
 http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
@@ -125,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.8.1
+Version 1.2.9
 .LP
-Copyright (C) 1995-2015 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2016 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 a346b5d7e24834806b0871b209637c728fb36d60..618a9cee4884bac961e0c4bceb4a7c87b59ed083 100644 (file)
Binary files a/zlib.3.pdf and b/zlib.3.pdf differ

diff --git a/zlib.h b/zlib.h
index 597952bc40dd9ee3055308c6a9f20c1a805464f0..82e533e3df27cfa0c404ea75e162a59552fbc5de 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -1,9 +1,9 @@
 #ifndef ZLIB_H_
 #define ZLIB_H_
 /* zlib.h -- interface of the 'zlib-ng' compression library
-   Forked from and compatible with zlib 1.2.8
+   Forked from and compatible with zlib 1.2.9
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2016 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
@@ -44,11 +44,11 @@ extern "C" {
 #define ZLIBNG_VER_REVISION 9
 #define ZLIBNG_VER_SUBREVISION 0
 
-#define ZLIB_VERSION "1.2.8.zlib-ng"
-#define ZLIB_VERNUM 0x128f
+#define ZLIB_VERSION "1.2.9.zlib-ng"
+#define ZLIB_VERNUM 0x129f
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 9
 #define ZLIB_VER_SUBREVISION 0
 
 /*

diff --git a/zlib.map b/zlib.map
index 55c6647eb46f95a82af2881d4943d0457058480a..82ce98cf7decc91b62f642d70e6a14cc0b218f21 100644 (file)
--- a/zlib.map
+++ b/zlib.map
@@ -81,3 +81,14 @@ ZLIB_1.2.7.1 {
     inflateGetDictionary;
     gzvprintf;
 } ZLIB_1.2.5.2;
+
+ZLIB_1.2.9 {
+    inflateCodesUsed;
+    inflateValidate;
+    uncompress2;
+    gzfread;
+    gzfwrite;
+    deflateGetDictionary;
+    adler32_z;
+    crc32_z;
+} ZLIB_1.2.7.1;

diff --git a/zutil.c b/zutil.c
index 6a26d6f93d99d2f7b2b54f3630d62018effcbc9b..b9b3710b7c367a1d3ed53a03f94ce463a1b1231e 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 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/zutil.h b/zutil.h
index 898eb32d3d95141ef6804606d7066fe44712379d..61054cc5f0ca1fcc90499d0bb29e4028711ba9ef 100644 (file)
--- a/zutil.h
+++ b/zutil.h
@@ -1,7 +1,7 @@
 #ifndef ZUTIL_H_
 #define ZUTIL_H_
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */