summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog21
-rw-r--r--Makefile.in2
-rw-r--r--README6
-rwxr-xr-xconfigure4
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/pascal/zlibpas.pas2
-rw-r--r--contrib/vstudio/readme.txt2
-rw-r--r--contrib/vstudio/vc10/zlib.rc8
-rw-r--r--contrib/vstudio/vc10/zlibvc.def2
-rw-r--r--contrib/vstudio/vc11/zlib.rc8
-rw-r--r--contrib/vstudio/vc11/zlibvc.def2
-rw-r--r--contrib/vstudio/vc12/zlib.rc8
-rw-r--r--contrib/vstudio/vc12/zlibvc.def2
-rw-r--r--contrib/vstudio/vc14/zlib.rc8
-rw-r--r--contrib/vstudio/vc14/zlibvc.def2
-rw-r--r--contrib/vstudio/vc9/zlib.rc8
-rw-r--r--contrib/vstudio/vc9/zlibvc.def2
-rw-r--r--deflate.c4
-rw-r--r--inftrees.c6
-rw-r--r--os400/README4002
-rw-r--r--os400/zlib.inc10
-rw-r--r--qnx/package.qpg10
-rw-r--r--treebuild.xml4
-rw-r--r--win32/README-WIN32.txt4
-rw-r--r--zlib.36
-rw-r--r--zlib.3.pdfbin19366 -> 19505 bytes
-rw-r--r--zlib.h14
31 files changed, 87 insertions, 74 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec10fca..7f1b69f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3 3
4project(zlib C) 4project(zlib C)
5 5
6set(VERSION "1.2.13.1") 6set(VERSION "1.3")
7 7
8set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") 8set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
9set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") 9set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
diff --git a/ChangeLog b/ChangeLog
index 4c5619c..8707988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,23 @@
1 1
2 ChangeLog file for zlib 2 ChangeLog file for zlib
3 3
4Changes in 1.2.13.1 (xx Oct 2022) 4Changes in 1.3 (18 Aug 2023)
5- 5- Remove K&R function definitions and zlib2ansi
6- Fix bug in deflateBound() for level 0 and memLevel 9
7- Fix bug when gzungetc() is used immediately after gzopen()
8- Fix bug when using gzflush() with a very small buffer
9- Fix crash when gzsetparams() attempted for transparent write
10- Fix test/example.c to work with FORCE_STORED
11- Rewrite of zran in examples (see zran.c version history)
12- Fix minizip to allow it to open an empty zip file
13- Fix reading disk number start on zip64 files in minizip
14- Fix logic error in minizip argument processing
15- Add minizip testing to Makefile
16- Read multiple bytes instead of byte-by-byte in minizip unzip.c
17- Add memory sanitizer to configure (--memory)
18- Various portability improvements
19- Various documentation improvements
20- Various spelling and typo corrections
6 21
7Changes in 1.2.13 (13 Oct 2022) 22Changes in 1.2.13 (13 Oct 2022)
8- Fix configure issue that discarded provided CC definition 23- Fix configure issue that discarded provided CC definition
@@ -1448,7 +1463,7 @@ Changes in 0.99 (27 Jan 96)
1448- fix typo in Make_vms.com (f$trnlnm -> f$getsyi) 1463- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
1449- in fcalloc, normalize pointer if size > 65520 bytes 1464- in fcalloc, normalize pointer if size > 65520 bytes
1450- don't use special fcalloc for 32 bit Borland C++ 1465- don't use special fcalloc for 32 bit Borland C++
1451- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... 1466- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc.
1452- use Z_BINARY instead of BINARY 1467- use Z_BINARY instead of BINARY
1453- document that gzclose after gzdopen will close the file 1468- document that gzclose after gzdopen will close the file
1454- allow "a" as mode in gzopen 1469- allow "a" as mode in gzopen
diff --git a/Makefile.in b/Makefile.in
index 2184448..34d3cd7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ CPP=$(CC) -E
28 28
29STATICLIB=libz.a 29STATICLIB=libz.a
30SHAREDLIB=libz.so 30SHAREDLIB=libz.so
31SHAREDLIBV=libz.so.1.2.13.1 31SHAREDLIBV=libz.so.1.3
32SHAREDLIBM=libz.so.1 32SHAREDLIBM=libz.so.1
33LIBS=$(STATICLIB) $(SHAREDLIBV) 33LIBS=$(STATICLIB) $(SHAREDLIBV)
34 34
diff --git a/README b/README
index a7df446..e02fc5a 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.13.1 is a general purpose data compression library. All the code is 3zlib 1.3 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread 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
6http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and 6http://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
31issue of Dr. Dobb's Journal; a copy of the article is available at 31issue of Dr. Dobb's Journal; a copy of the article is available at
32https://marknelson.us/posts/1997/01/01/zlib-engine.html . 32https://marknelson.us/posts/1997/01/01/zlib-engine.html .
33 33
34The changes made in version 1.2.13.1 are documented in the file ChangeLog. 34The changes made in version 1.3 are documented in the file ChangeLog.
35 35
36Unsupported third party contributions are provided in directory contrib/ . 36Unsupported third party contributions are provided in directory contrib/ .
37 37
@@ -83,7 +83,7 @@ Acknowledgments:
83 83
84Copyright notice: 84Copyright notice:
85 85
86 (C) 1995-2022 Jean-loup Gailly and Mark Adler 86 (C) 1995-2023 Jean-loup Gailly and Mark Adler
87 87
88 This software is provided 'as-is', without any express or implied 88 This software is provided 'as-is', without any express or implied
89 warranty. In no event will the authors be held liable for any damages 89 warranty. In no event will the authors be held liable for any damages
diff --git a/configure b/configure
index 5a48bde..cc867c9 100755
--- a/configure
+++ b/configure
@@ -44,8 +44,6 @@ STATICLIB=libz.a
44 44
45# extract zlib version numbers from zlib.h 45# extract zlib version numbers from zlib.h
46VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h` 46VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
47VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
48VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
49VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` 47VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
50 48
51# establish commands for library building 49# establish commands for library building
@@ -265,7 +263,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
265 SHAREDLIB=libz$shared_ext 263 SHAREDLIB=libz$shared_ext
266 SHAREDLIBV=libz.$VER$shared_ext 264 SHAREDLIBV=libz.$VER$shared_ext
267 SHAREDLIBM=libz.$VER1$shared_ext 265 SHAREDLIBM=libz.$VER1$shared_ext
268 LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} 266 LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"}
269 if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then 267 if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then
270 AR="${CROSS_PREFIX}libtool" 268 AR="${CROSS_PREFIX}libtool"
271 elif libtool -V 2>&1 | grep Apple > /dev/null; then 269 elif libtool -V 2>&1 | grep Apple > /dev/null; then
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index d4f80ae..814ffa6 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
154const 154const
155 zlib_version = '1.2.13.1'; 155 zlib_version = '1.3.0';
156 156
157type 157type
158 EZlibError = class(Exception); 158 EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index d76c317..c5fce22 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.13.1", Info.Version); 159 Assert.AreEqual("1.3.0", 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 4faec86..dc38f24 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2022 Mark Adler 2 * Copyright (C) 1995-2023 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
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.2.13.1 Copyright 1995-2022 Mark Adler "; 12 " inflate9 1.3 Copyright 1995-2023 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
@@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes,
59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, 61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62 133, 133, 133, 133, 144, 77, 76}; 62 133, 133, 133, 133, 144, 198, 203};
63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 65 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 707e133..df80e5b 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
4AC_INIT([minizip], [1.2.13.1], [bugzilla.redhat.com]) 4AC_INIT([minizip], [1.3.0], [bugzilla.redhat.com])
5AC_CONFIG_SRCDIR([minizip.c]) 5AC_CONFIG_SRCDIR([minizip.c])
6AM_INIT_AUTOMAKE([foreign]) 6AM_INIT_AUTOMAKE([foreign])
7LT_INIT 7LT_INIT
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 3aa9206..a2b24a5 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
10interface 10interface
11 11
12const 12const
13 ZLIB_VERSION = '1.2.13.1'; 13 ZLIB_VERSION = '1.3.0';
14 ZLIB_VERNUM = $12a0; 14 ZLIB_VERNUM = $12a0;
15 15
16type 16type
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 342cb6b..05ba487 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
1Building instructions for the DLL versions of Zlib 1.2.13.1 1Building instructions for the DLL versions of Zlib 1.3.0
2======================================================== 2========================================================
3 3
4This directory contains projects that build zlib and minizip using 4This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 45a29e6..29af8e1 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 13, 1 5 FILEVERSION 1, 3, 0, 0
6 PRODUCTVERSION 1, 2, 13, 1 6 PRODUCTVERSION 1, 3, 0, 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,12 +17,12 @@ 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.13.1\0" 20 VALUE "FileVersion", "1.3.0\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index ba09bc1..f28aa6c 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.3
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index 45a29e6..29af8e1 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 13, 1 5 FILEVERSION 1, 3, 0, 0
6 PRODUCTVERSION 1, 2, 13, 1 6 PRODUCTVERSION 1, 3, 0, 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,12 +17,12 @@ 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.13.1\0" 20 VALUE "FileVersion", "1.3.0\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def
index ba09bc1..f28aa6c 100644
--- a/contrib/vstudio/vc11/zlibvc.def
+++ b/contrib/vstudio/vc11/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.3
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index c415844..57fb31a 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 13, 1 5 FILEVERSION 1, 3, 0, 0
6 PRODUCTVERSION 1, 2, 13, 1 6 PRODUCTVERSION 1, 3, 0, 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,12 +17,12 @@ 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.13.1\0" 20 VALUE "FileVersion", "1.3.0\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index ba09bc1..f28aa6c 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.3
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index c415844..57fb31a 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 13, 1 5 FILEVERSION 1, 3, 0, 0
6 PRODUCTVERSION 1, 2, 13, 1 6 PRODUCTVERSION 1, 3, 0, 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,12 +17,12 @@ 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.13.1\0" 20 VALUE "FileVersion", "1.3.0\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def
index ba09bc1..f28aa6c 100644
--- a/contrib/vstudio/vc14/zlibvc.def
+++ b/contrib/vstudio/vc14/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.3
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 45a29e6..29af8e1 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 13, 1 5 FILEVERSION 1, 3, 0, 0
6 PRODUCTVERSION 1, 2, 13, 1 6 PRODUCTVERSION 1, 3, 0, 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,12 +17,12 @@ 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.13.1\0" 20 VALUE "FileVersion", "1.3.0\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index ba09bc1..f28aa6c 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.3
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
diff --git a/deflate.c b/deflate.c
index 1ede12a..bd01175 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
1/* deflate.c -- compress data using the deflation algorithm 1/* deflate.c -- compress data using the deflation algorithm
2 * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler 2 * Copyright (C) 1995-2023 Jean-loup Gailly and 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
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.2.13.1 Copyright 1995-2022 Jean-loup Gailly and Mark Adler "; 55 " deflate 1.3 Copyright 1995-2023 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
diff --git a/inftrees.c b/inftrees.c
index afc4c42..8a208c2 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
1/* inftrees.c -- generate Huffman trees for efficient decoding 1/* inftrees.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2022 Mark Adler 2 * Copyright (C) 1995-2023 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
11const char inflate_copyright[] = 11const char inflate_copyright[] =
12 " inflate 1.2.13.1 Copyright 1995-2022 Mark Adler "; 12 " inflate 1.3 Copyright 1995-2023 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
@@ -57,7 +57,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
57 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 57 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
58 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 58 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
59 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 59 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
60 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 76}; 60 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 198, 203};
61 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 61 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
62 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 62 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
63 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 63 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 05b95d1..6dd41aa 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
1 ZLIB version 1.2.13.1 for OS/400 installation instructions 1 ZLIB version 1.3.0 for OS/400 installation instructions
2 2
31) Download and unpack the zlib tarball to some IFS directory. 31) 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 bc202b0..0d9e2f2 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.13.1 4 * Version 1.3.0
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.13.1' 25 D ZLIB_VERSION C '1.3.0'
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 3
29 D ZLIB_VER_REVISION... 29 D ZLIB_VER_REVISION...
30 D C 13 30 D C 0
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 28ff662..d882af2 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.13.1" install="/opt/lib/" user="root:bin" permission="644"/> 28 <QPG:Add file="../libz.so.1.3.0" 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.13.1"/> 29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.0"/>
30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.13.1"/> 30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.0"/>
31 <QPG:Add file="../libz.so.1.2.13.1" install="/opt/lib/" component="slib"/> 31 <QPG:Add file="../libz.so.1.3.0" 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.13.1</QPM:ReleaseVersion> 66 <QPM:ReleaseVersion>1.3.0</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 cac937b..1d1b007 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.13.1"> 2<package name="zlib" version="1.3">
3 <library name="zlib" dlversion="1.2.13.1" dlname="z"> 3 <library name="zlib" dlversion="1.3" 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 3b52d4e..384c988 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.13.1 is a general purpose data compression library. All the code is 3zlib 1.3.0 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread 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
6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) 6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
22 22
23Manifest: 23Manifest:
24 24
25The package zlib-1.2.13.1-win32-x86.zip will contain the following files: 25The package zlib-1.3.0-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
diff --git a/zlib.3 b/zlib.3
index e733b5a..4dd2896 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
1.TH ZLIB 3 "xx Oct 2022" 1.TH ZLIB 3 "18 Aug 2023"
2.SH NAME 2.SH NAME
3zlib \- compression/decompression library 3zlib \- compression/decompression library
4.SH SYNOPSIS 4.SH SYNOPSIS
@@ -105,9 +105,9 @@ before asking for help.
105Send questions and/or comments to zlib@gzip.org, 105Send questions and/or comments to zlib@gzip.org,
106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). 106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
107.SH AUTHORS AND LICENSE 107.SH AUTHORS AND LICENSE
108Version 1.2.13.1 108Version 1.3
109.LP 109.LP
110Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler 110Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
111.LP 111.LP
112This software is provided 'as-is', without any express or implied 112This software is provided 'as-is', without any express or implied
113warranty. In no event will the authors be held liable for any damages 113warranty. In no event will the authors be held liable for any damages
diff --git a/zlib.3.pdf b/zlib.3.pdf
index 8132d84..da12d37 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index 13d8357..6b7244f 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
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.13.1, October xxth, 2022 2 version 1.3, August 18th, 2023
3 3
4 Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
5 5
6 This software is provided 'as-is', without any express or implied 6 This software is provided 'as-is', without any express or implied
7 warranty. In no event will the authors be held liable for any damages 7 warranty. In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
37extern "C" { 37extern "C" {
38#endif 38#endif
39 39
40#define ZLIB_VERSION "1.2.13.1-motley" 40#define ZLIB_VERSION "1.3"
41#define ZLIB_VERNUM 0x12d1 41#define ZLIB_VERNUM 0x1300
42#define ZLIB_VER_MAJOR 1 42#define ZLIB_VER_MAJOR 1
43#define ZLIB_VER_MINOR 2 43#define ZLIB_VER_MINOR 3
44#define ZLIB_VER_REVISION 13 44#define ZLIB_VER_REVISION 0
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