diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | contrib/delphi/ZLib.pas | 2 | ||||
-rw-r--r-- | contrib/dotzlib/DotZLib/UnitTests.cs | 2 | ||||
-rw-r--r-- | contrib/infback9/inftree9.c | 4 | ||||
-rw-r--r-- | contrib/minizip/configure.ac | 2 | ||||
-rw-r--r-- | contrib/pascal/zlibpas.pas | 2 | ||||
-rw-r--r-- | contrib/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc14/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlib.rc | 6 | ||||
-rw-r--r-- | deflate.c | 2 | ||||
-rw-r--r-- | gzlib.c | 2 | ||||
-rw-r--r-- | gzwrite.c | 2 | ||||
-rw-r--r-- | inffast.c | 2 | ||||
-rw-r--r-- | inftrees.c | 4 | ||||
-rw-r--r-- | os400/README400 | 2 | ||||
-rw-r--r-- | os400/zlib.inc | 8 | ||||
-rw-r--r-- | qnx/package.qpg | 10 | ||||
-rw-r--r-- | treebuild.xml | 4 | ||||
-rw-r--r-- | win32/README-WIN32.txt | 4 | ||||
-rw-r--r-- | zlib.3 | 4 | ||||
-rw-r--r-- | zlib.3.pdf | bin | 19325 -> 19318 bytes | |||
-rw-r--r-- | zlib.h | 10 | ||||
-rw-r--r-- | zutil.c | 2 |
29 files changed, 58 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 87e7637..0fe939d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) | |||
3 | 3 | ||
4 | project(zlib C) | 4 | project(zlib C) |
5 | 5 | ||
6 | set(VERSION "1.2.10.1") | 6 | set(VERSION "1.2.11") |
7 | 7 | ||
8 | option(ASM686 "Enable building i686 assembly implementation") | 8 | option(ASM686 "Enable building i686 assembly implementation") |
9 | option(AMD64 "Enable building amd64 assembly implementation") | 9 | option(AMD64 "Enable building amd64 assembly implementation") |
@@ -1,6 +1,10 @@ | |||
1 | 1 | ||
2 | ChangeLog file for zlib | 2 | ChangeLog file for zlib |
3 | 3 | ||
4 | Changes in 1.2.11 (15 Jan 2017) | ||
5 | - Fix deflate stored bug when pulling last block from window | ||
6 | - Permit immediate deflateParams changes before any deflate input | ||
7 | |||
4 | Changes in 1.2.10 (2 Jan 2017) | 8 | Changes in 1.2.10 (2 Jan 2017) |
5 | - Avoid warnings on snprintf() return value | 9 | - Avoid warnings on snprintf() return value |
6 | - Fix bug in deflate_stored() for zero-length input | 10 | - Fix bug in deflate_stored() for zero-length input |
diff --git a/Makefile.in b/Makefile.in index 4aec16f..5a77949 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -32,7 +32,7 @@ CPP=$(CC) -E | |||
32 | 32 | ||
33 | STATICLIB=libz.a | 33 | STATICLIB=libz.a |
34 | SHAREDLIB=libz.so | 34 | SHAREDLIB=libz.so |
35 | SHAREDLIBV=libz.so.1.2.10.1 | 35 | SHAREDLIBV=libz.so.1.2.11 |
36 | SHAREDLIBM=libz.so.1 | 36 | SHAREDLIBM=libz.so.1 |
37 | LIBS=$(STATICLIB) $(SHAREDLIBV) | 37 | LIBS=$(STATICLIB) $(SHAREDLIBV) |
38 | 38 | ||
@@ -1,6 +1,6 @@ | |||
1 | ZLIB DATA COMPRESSION LIBRARY | 1 | ZLIB DATA COMPRESSION LIBRARY |
2 | 2 | ||
3 | zlib 1.2.10.1 is a general purpose data compression library. All the code is | 3 | zlib 1.2.11 is a general purpose data compression library. All the code is |
4 | thread safe. The data format used by the zlib library is described by RFCs | 4 | thread safe. The data format used by the zlib library is described by RFCs |
5 | (Request for Comments) 1950 to 1952 in the files | 5 | (Request for Comments) 1950 to 1952 in the files |
6 | http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and | 6 | http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and |
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997 | |||
31 | issue of Dr. Dobb's Journal; a copy of the article is available at | 31 | issue of Dr. Dobb's Journal; a copy of the article is available at |
32 | http://marknelson.us/1997/01/01/zlib-engine/ . | 32 | http://marknelson.us/1997/01/01/zlib-engine/ . |
33 | 33 | ||
34 | The changes made in version 1.2.10.1 are documented in the file ChangeLog. | 34 | The changes made in version 1.2.11 are documented in the file ChangeLog. |
35 | 35 | ||
36 | Unsupported third party contributions are provided in directory contrib/ . | 36 | Unsupported third party contributions are provided in directory contrib/ . |
37 | 37 | ||
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 5f00f07..060e199 100644 --- a/contrib/delphi/ZLib.pas +++ b/contrib/delphi/ZLib.pas | |||
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; | |||
152 | const OutBuf: Pointer; BufSize: Integer); | 152 | const OutBuf: Pointer; BufSize: Integer); |
153 | 153 | ||
154 | const | 154 | const |
155 | zlib_version = '1.2.10.1'; | 155 | zlib_version = '1.2.11'; |
156 | 156 | ||
157 | type | 157 | type |
158 | EZlibError = class(Exception); | 158 | EZlibError = class(Exception); |
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 2319dd6..44f7633 100644 --- a/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/contrib/dotzlib/DotZLib/UnitTests.cs | |||
@@ -156,7 +156,7 @@ namespace DotZLibTests | |||
156 | public void Info_Version() | 156 | public void Info_Version() |
157 | { | 157 | { |
158 | Info info = new Info(); | 158 | Info info = new Info(); |
159 | Assert.AreEqual("1.2.10.1", Info.Version); | 159 | Assert.AreEqual("1.2.11", Info.Version); |
160 | Assert.AreEqual(32, info.SizeOfUInt); | 160 | Assert.AreEqual(32, info.SizeOfUInt); |
161 | Assert.AreEqual(32, info.SizeOfULong); | 161 | Assert.AreEqual(32, info.SizeOfULong); |
162 | Assert.AreEqual(32, info.SizeOfPointer); | 162 | Assert.AreEqual(32, info.SizeOfPointer); |
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index b61592f..5f4a767 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
10 | 10 | ||
11 | const char inflate9_copyright[] = | 11 | const char inflate9_copyright[] = |
12 | " inflate9 1.2.10.1 Copyright 1995-2017 Mark Adler "; | 12 | " inflate9 1.2.11 Copyright 1995-2017 Mark Adler "; |
13 | /* | 13 | /* |
14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
@@ -64,7 +64,7 @@ unsigned short FAR *work; | |||
64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, | 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, | 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
67 | 133, 133, 133, 133, 144, 204, 64}; | 67 | 133, 133, 133, 133, 144, 77, 202}; |
68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ | 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, | 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, | 70 | 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 50a7101..5b11970 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- Autoconf -*- | 1 | # -*- Autoconf -*- |
2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
3 | 3 | ||
4 | AC_INIT([minizip], [1.2.10.1], [bugzilla.redhat.com]) | 4 | AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com]) |
5 | AC_CONFIG_SRCDIR([minizip.c]) | 5 | AC_CONFIG_SRCDIR([minizip.c]) |
6 | AM_INIT_AUTOMAKE([foreign]) | 6 | AM_INIT_AUTOMAKE([foreign]) |
7 | LT_INIT | 7 | LT_INIT |
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas index 6324211..a0dff11 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas | |||
@@ -10,7 +10,7 @@ unit zlibpas; | |||
10 | interface | 10 | interface |
11 | 11 | ||
12 | const | 12 | const |
13 | ZLIB_VERSION = '1.2.10.1'; | 13 | ZLIB_VERSION = '1.2.11'; |
14 | ZLIB_VERNUM = $12a0; | 14 | ZLIB_VERNUM = $12a0; |
15 | 15 | ||
16 | type | 16 | type |
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 60305f4..f67eae8 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
@@ -1,4 +1,4 @@ | |||
1 | Building instructions for the DLL versions of Zlib 1.2.10.1 | 1 | Building instructions for the DLL versions of Zlib 1.2.11 |
2 | ======================================================== | 2 | ======================================================== |
3 | 3 | ||
4 | This directory contains projects that build zlib and minizip using | 4 | 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 385a172..fee177a 100644 --- a/contrib/vstudio/vc10/zlib.rc +++ b/contrib/vstudio/vc10/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 10, 1 | 5 | FILEVERSION 1, 2, 11, 0 |
6 | PRODUCTVERSION 1, 2, 10, 1 | 6 | PRODUCTVERSION 1, 2, 11, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,7 +17,7 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.10.1\0" | 20 | VALUE "FileVersion", "1.2.11\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc index 385a172..fee177a 100644 --- a/contrib/vstudio/vc11/zlib.rc +++ b/contrib/vstudio/vc11/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 10, 1 | 5 | FILEVERSION 1, 2, 11, 0 |
6 | PRODUCTVERSION 1, 2, 10, 1 | 6 | PRODUCTVERSION 1, 2, 11, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,7 +17,7 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.10.1\0" | 20 | VALUE "FileVersion", "1.2.11\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc index 25822c5..c4e4b01 100644 --- a/contrib/vstudio/vc12/zlib.rc +++ b/contrib/vstudio/vc12/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 10, 1 | 5 | FILEVERSION 1, 2, 11, 0 |
6 | PRODUCTVERSION 1, 2, 10, 1 | 6 | PRODUCTVERSION 1, 2, 11, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,7 +17,7 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.10.1\0" | 20 | VALUE "FileVersion", "1.2.11\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc index 25822c5..c4e4b01 100644 --- a/contrib/vstudio/vc14/zlib.rc +++ b/contrib/vstudio/vc14/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 10, 1 | 5 | FILEVERSION 1, 2, 11, 0 |
6 | PRODUCTVERSION 1, 2, 10, 1 | 6 | PRODUCTVERSION 1, 2, 11, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,7 +17,7 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.10.1\0" | 20 | VALUE "FileVersion", "1.2.11\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc index 385a172..fee177a 100644 --- a/contrib/vstudio/vc9/zlib.rc +++ b/contrib/vstudio/vc9/zlib.rc | |||
@@ -2,8 +2,8 @@ | |||
2 | 2 | ||
3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
5 | FILEVERSION 1, 2, 10, 1 | 5 | FILEVERSION 1, 2, 11, 0 |
6 | PRODUCTVERSION 1, 2, 10, 1 | 6 | PRODUCTVERSION 1, 2, 11, 0 |
7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
@@ -17,7 +17,7 @@ BEGIN | |||
17 | 17 | ||
18 | BEGIN | 18 | BEGIN |
19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" | 19 | VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" |
20 | VALUE "FileVersion", "1.2.10.1\0" | 20 | VALUE "FileVersion", "1.2.11\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
@@ -52,7 +52,7 @@ | |||
52 | #include "deflate.h" | 52 | #include "deflate.h" |
53 | 53 | ||
54 | const char deflate_copyright[] = | 54 | const char deflate_copyright[] = |
55 | " deflate 1.2.10.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; | 55 | " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler "; |
56 | /* | 56 | /* |
57 | If you use the zlib library in a product, an acknowledgment is welcome | 57 | If you use the zlib library in a product, an acknowledgment is welcome |
58 | in the documentation of your product. If for some reason you cannot | 58 | in the documentation of your product. If for some reason you cannot |
@@ -1,5 +1,5 @@ | |||
1 | /* gzlib.c -- zlib functions common to reading and writing gzip files | 1 | /* gzlib.c -- zlib functions common to reading and writing gzip files |
2 | * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler | 2 | * Copyright (C) 2004-2017 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -1,5 +1,5 @@ | |||
1 | /* gzwrite.c -- zlib functions for writing gzip files | 1 | /* gzwrite.c -- zlib functions for writing gzip files |
2 | * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler | 2 | * Copyright (C) 2004-2017 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -1,5 +1,5 @@ | |||
1 | /* inffast.c -- fast decoding | 1 | /* inffast.c -- fast decoding |
2 | * Copyright (C) 1995-2008, 2010, 2013, 2016 Mark Adler | 2 | * Copyright (C) 1995-2017 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -9,7 +9,7 @@ | |||
9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
10 | 10 | ||
11 | const char inflate_copyright[] = | 11 | const char inflate_copyright[] = |
12 | " inflate 1.2.10.1 Copyright 1995-2017 Mark Adler "; | 12 | " inflate 1.2.11 Copyright 1995-2017 Mark Adler "; |
13 | /* | 13 | /* |
14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
@@ -62,7 +62,7 @@ unsigned short FAR *work; | |||
62 | 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; | 62 | 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; |
63 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 63 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
64 | 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, | 64 | 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, |
65 | 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 204, 64}; | 65 | 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202}; |
66 | static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ | 66 | static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ |
67 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, | 67 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, |
68 | 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, | 68 | 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, |
diff --git a/os400/README400 b/os400/README400 index f57a7b0..4f98334 100644 --- a/os400/README400 +++ b/os400/README400 | |||
@@ -1,4 +1,4 @@ | |||
1 | ZLIB version 1.2.10.1 for OS/400 installation instructions | 1 | ZLIB version 1.2.11 for OS/400 installation instructions |
2 | 2 | ||
3 | 1) Download and unpack the zlib tarball to some IFS directory. | 3 | 1) Download and unpack the zlib tarball to some IFS directory. |
4 | (i.e.: /path/to/the/zlib/ifs/source/directory) | 4 | (i.e.: /path/to/the/zlib/ifs/source/directory) |
diff --git a/os400/zlib.inc b/os400/zlib.inc index e663e79..c6aca2c 100644 --- a/os400/zlib.inc +++ b/os400/zlib.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | * ZLIB.INC - Interface to the general purpose compression library | 1 | * ZLIB.INC - Interface to the general purpose compression library |
2 | * | 2 | * |
3 | * ILE RPG400 version by Patrick Monnerat, DATASPHERE. | 3 | * ILE RPG400 version by Patrick Monnerat, DATASPHERE. |
4 | * Version 1.2.10.1 | 4 | * Version 1.2.11 |
5 | * | 5 | * |
6 | * | 6 | * |
7 | * WARNING: | 7 | * WARNING: |
@@ -22,14 +22,14 @@ | |||
22 | * | 22 | * |
23 | * Versioning information. | 23 | * Versioning information. |
24 | * | 24 | * |
25 | D ZLIB_VERSION C '1.2.10.1' | 25 | D ZLIB_VERSION C '1.2.11' |
26 | D ZLIB_VERNUM C X'12a0' | 26 | D ZLIB_VERNUM C X'12a0' |
27 | D ZLIB_VER_MAJOR C 1 | 27 | D ZLIB_VER_MAJOR C 1 |
28 | D ZLIB_VER_MINOR C 2 | 28 | D ZLIB_VER_MINOR C 2 |
29 | D ZLIB_VER_REVISION... | 29 | D ZLIB_VER_REVISION... |
30 | D C 10 | 30 | D C 11 |
31 | D ZLIB_VER_SUBREVISION... | 31 | D ZLIB_VER_SUBREVISION... |
32 | D C 1 | 32 | D C 0 |
33 | * | 33 | * |
34 | * Other equates. | 34 | * Other equates. |
35 | * | 35 | * |
diff --git a/qnx/package.qpg b/qnx/package.qpg index 15bc09a..31e8e90 100644 --- a/qnx/package.qpg +++ b/qnx/package.qpg | |||
@@ -25,10 +25,10 @@ | |||
25 | <QPG:Files> | 25 | <QPG:Files> |
26 | <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> | 26 | <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> |
27 | <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> | 27 | <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> |
28 | <QPG:Add file="../libz.so.1.2.10.1" install="/opt/lib/" user="root:bin" permission="644"/> | 28 | <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" user="root:bin" permission="644"/> |
29 | <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.10.1"/> | 29 | <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11"/> |
30 | <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.10.1"/> | 30 | <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/> |
31 | <QPG:Add file="../libz.so.1.2.10.1" install="/opt/lib/" component="slib"/> | 31 | <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" component="slib"/> |
32 | </QPG:Files> | 32 | </QPG:Files> |
33 | 33 | ||
34 | <QPG:PackageFilter> | 34 | <QPG:PackageFilter> |
@@ -63,7 +63,7 @@ | |||
63 | </QPM:ProductDescription> | 63 | </QPM:ProductDescription> |
64 | 64 | ||
65 | <QPM:ReleaseDescription> | 65 | <QPM:ReleaseDescription> |
66 | <QPM:ReleaseVersion>1.2.10.1</QPM:ReleaseVersion> | 66 | <QPM:ReleaseVersion>1.2.11</QPM:ReleaseVersion> |
67 | <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> | 67 | <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> |
68 | <QPM:ReleaseStability>Stable</QPM:ReleaseStability> | 68 | <QPM:ReleaseStability>Stable</QPM:ReleaseStability> |
69 | <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> | 69 | <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> |
diff --git a/treebuild.xml b/treebuild.xml index 68473e5..fd75525 100644 --- a/treebuild.xml +++ b/treebuild.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <package name="zlib" version="1.2.10.1"> | 2 | <package name="zlib" version="1.2.11"> |
3 | <library name="zlib" dlversion="1.2.10.1" dlname="z"> | 3 | <library name="zlib" dlversion="1.2.11" dlname="z"> |
4 | <property name="description"> zip compression library </property> | 4 | <property name="description"> zip compression library </property> |
5 | <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> | 5 | <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> |
6 | 6 | ||
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt index 234adfe..df7ab7f 100644 --- a/win32/README-WIN32.txt +++ b/win32/README-WIN32.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | ZLIB DATA COMPRESSION LIBRARY | 1 | ZLIB DATA COMPRESSION LIBRARY |
2 | 2 | ||
3 | zlib 1.2.10.1 is a general purpose data compression library. All the code is | 3 | zlib 1.2.11 is a general purpose data compression library. All the code is |
4 | thread safe. The data format used by the zlib library is described by RFCs | 4 | thread safe. The data format used by the zlib library is described by RFCs |
5 | (Request for Comments) 1950 to 1952 in the files | 5 | (Request for Comments) 1950 to 1952 in the files |
6 | http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) | 6 | http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) |
@@ -22,7 +22,7 @@ before asking for help. | |||
22 | 22 | ||
23 | Manifest: | 23 | Manifest: |
24 | 24 | ||
25 | The package zlib-1.2.10.1-win32-x86.zip will contain the following files: | 25 | The package zlib-1.2.11-win32-x86.zip will contain the following files: |
26 | 26 | ||
27 | README-WIN32.txt This document | 27 | README-WIN32.txt This document |
28 | ChangeLog Changes since previous zlib packages | 28 | ChangeLog Changes since previous zlib packages |
@@ -1,4 +1,4 @@ | |||
1 | .TH ZLIB 3 "3 Jan 2017" | 1 | .TH ZLIB 3 "15 Jan 2017" |
2 | .SH NAME | 2 | .SH NAME |
3 | zlib \- compression/decompression library | 3 | zlib \- compression/decompression library |
4 | .SH SYNOPSIS | 4 | .SH SYNOPSIS |
@@ -105,7 +105,7 @@ before asking for help. | |||
105 | Send questions and/or comments to zlib@gzip.org, | 105 | Send questions and/or comments to zlib@gzip.org, |
106 | or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). | 106 | or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). |
107 | .SH AUTHORS AND LICENSE | 107 | .SH AUTHORS AND LICENSE |
108 | Version 1.2.10.1 | 108 | Version 1.2.11 |
109 | .LP | 109 | .LP |
110 | Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler | 110 | Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler |
111 | .LP | 111 | .LP |
Binary files differ | |||
@@ -1,5 +1,5 @@ | |||
1 | /* zlib.h -- interface of the 'zlib' general purpose compression library | 1 | /* zlib.h -- interface of the 'zlib' general purpose compression library |
2 | version 1.2.10.1, January 3rd, 2017 | 2 | version 1.2.11, January 15th, 2017 |
3 | 3 | ||
4 | Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler | 4 | Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler |
5 | 5 | ||
@@ -37,12 +37,12 @@ | |||
37 | extern "C" { | 37 | extern "C" { |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #define ZLIB_VERSION "1.2.10.1-motley" | 40 | #define ZLIB_VERSION "1.2.11" |
41 | #define ZLIB_VERNUM 0x12a1 | 41 | #define ZLIB_VERNUM 0x12b0 |
42 | #define ZLIB_VER_MAJOR 1 | 42 | #define ZLIB_VER_MAJOR 1 |
43 | #define ZLIB_VER_MINOR 2 | 43 | #define ZLIB_VER_MINOR 2 |
44 | #define ZLIB_VER_REVISION 10 | 44 | #define ZLIB_VER_REVISION 11 |
45 | #define ZLIB_VER_SUBREVISION 1 | 45 | #define ZLIB_VER_SUBREVISION 0 |
46 | 46 | ||
47 | /* | 47 | /* |
48 | The 'zlib' compression library provides in-memory compression and | 48 | The 'zlib' compression library provides in-memory compression and |
@@ -1,5 +1,5 @@ | |||
1 | /* zutil.c -- target dependent utility functions for the compression library | 1 | /* zutil.c -- target dependent utility functions for the compression library |
2 | * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly | 2 | * Copyright (C) 1995-2017 Jean-loup Gailly |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||