diff --git a/ChangeLog b/ChangeLog index af454b9008a910f26b96865e5a496bb9f5d7504b..6570d9fffcde79cc2b09c667df6cb5b36935a06c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ChangeLog file for zlib +Changes in 1.2.7.3 (xx Apr 2013) +- + Changes in 1.2.7.2 (13 Apr 2013) - Change check for a four-byte type back to hexadecimal - Fix typo in win32/Makefile.msc diff --git a/Makefile.in b/Makefile.in index ef70d30f91d81db1ce855791cb3d29356bef5398..351389a603bf880ea1552861b7995e5a10163775 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.7.2 +SHAREDLIBV=libz.so.1.2.7.3 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) diff --git a/README b/README index 801ecb5841c98e7e179afafef397a0ca547b48b4..da0153fb365d1fb5be77269c6616458317e043a4 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.7.2 is a general purpose data compression library. All the code is +zlib 1.2.7.3 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.7.2 are documented in the file ChangeLog. +The changes made in version 1.2.7.3 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . diff --git a/as400/compile.clp b/as400/compile.clp index f8af93877ae89760dc985504d6b3a3ac627f48d1..67a5fd08a89eea8e0edc9052716b64ee011ff545 100644 --- a/as400/compile.clp +++ b/as400/compile.clp @@ -105,6 +105,6 @@ &MODLIB/TREES &MODLIB/UNCOMPR + &MODLIB/ZUTIL) + SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) + - TEXT('ZLIB 1.2.7.2') TGTRLS(&TGTRLS) + TEXT('ZLIB 1.2.7.3') TGTRLS(&TGTRLS) ENDPGM diff --git a/as400/readme.txt b/as400/readme.txt index cdcf88bf61b8268967e31b3a6f0e5bc2de87b3ee..ca224cbea557c44c39f9261a693f750d0fe76f2c 100644 --- a/as400/readme.txt +++ b/as400/readme.txt @@ -1,4 +1,4 @@ - ZLIB version 1.2.7.2 for AS400 installation instructions + ZLIB version 1.2.7.3 for AS400 installation instructions I) From an AS400 *SAVF file: diff --git a/as400/zlib.inc b/as400/zlib.inc index a557a047f15d193e398493e2d4d4878038581dcf..54565b7bc5a85446ba63081eb4a16af4f50db47c 100644 --- a/as400/zlib.inc +++ b/as400/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.7.2 + * Version 1.2.7.3 * * * WARNING: @@ -22,14 +22,14 @@ * * Versioning information. * - D ZLIB_VERSION C '1.2.7.2' - D ZLIB_VERNUM C X'1272' + D ZLIB_VERSION C '1.2.7.3' + D ZLIB_VERNUM C X'1273' D ZLIB_VER_MAJOR C 1 D ZLIB_VER_MINOR C 2 D ZLIB_VER_REVISION... D C 7 D ZLIB_VER_SUBREVISION... - D C 2 + D C 3 * * Other equates. * diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 05e426f17ac13045cef1fd37a4ae4c975f994c89..b0b5171dc627e2484c9566cc808ae405d60149af 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.7.2'; + zlib_version = '1.2.7.3'; type EZlibError = class(Exception); diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 5277329f303a1bb2ba91eb95c108b408333f077c..978dc076753687eb0c1c91e47d0494eaf1477648 100644 --- a/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/contrib/dotzlib/DotZLib/UnitTests.cs @@ -156,7 +156,7 @@ namespace DotZLibTests public void Info_Version() { Info info = new Info(); - Assert.AreEqual("1.2.7.2", Info.Version); + Assert.AreEqual("1.2.7.3", 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 2422456f2c3691661115edf90cb0701f5f44a85c..57224382adfde9efb310c31534bda30c654c5257 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.7.2 Copyright 1995-2013 Mark Adler "; + " inflate9 1.2.7.3 Copyright 1995-2013 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, 193, 70}; + 133, 133, 133, 133, 144, 68, 72}; 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 26fcea998cb156d37bb9cbe7ea07a942a55d916d..a75ba890fc8bf5fd19bc60f69b64eff4420948ad 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.7.2], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.2.7.3], [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 97a031b07bbf0425671ededcd398d112575b2ffc..18d6665ce7428af56577451728738362b2eed153 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas @@ -10,8 +10,8 @@ unit zlibpas; interface const - ZLIB_VERSION = '1.2.7.2'; - ZLIB_VERNUM = $1272; + ZLIB_VERSION = '1.2.7.3'; + ZLIB_VERNUM = $1273; type alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 799e360cbbf9271d41af69ddfe4ab0dec46e086f..60d50f9b3338c74d434d313ff7e480641cf2cf60 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.7.2 +Building instructions for the DLL versions of Zlib 1.2.7.3 ======================================================== 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 fd49cd6af3a445f7349b884a7c4e96d64c757975..9f5938a76fb7169f6b17dfedc57b123238453e40 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.7.2,1 - PRODUCTVERSION 1.2.7.2,1 + FILEVERSION 1.2.7.3,1 + PRODUCTVERSION 1.2.7.3,1 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.7.2\0" + VALUE "FileVersion", "1.2.7.3\0" VALUE "InternalName", "zlib\0" VALUE "OriginalFilename", "zlib.dll\0" VALUE "ProductName", "ZLib.DLL\0" diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index 42b5aa4872f77007a8762aaeab75b1b0f0f617f0..a589c9ddb247fb07716ad2f0fb3240e2b6848887 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def @@ -1,7 +1,7 @@ LIBRARY ; zlib data compression and ZIP file I/O library -VERSION 1.2.7.2 +VERSION 1.2.7.3 EXPORTS adler32 @1 diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc index fd49cd6af3a445f7349b884a7c4e96d64c757975..9f5938a76fb7169f6b17dfedc57b123238453e40 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.7.2,1 - PRODUCTVERSION 1.2.7.2,1 + FILEVERSION 1.2.7.3,1 + PRODUCTVERSION 1.2.7.3,1 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.7.2\0" + VALUE "FileVersion", "1.2.7.3\0" VALUE "InternalName", "zlib\0" VALUE "OriginalFilename", "zlib.dll\0" VALUE "ProductName", "ZLib.DLL\0" diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index 500e3f2f0345158151222bfa0658fc0ba28045e9..cfcb699d164ecfd8dd8520ccd2e330d760265d6b 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def @@ -1,7 +1,7 @@ LIBRARY ; zlib data compression and ZIP file I/O library -VERSION 1.2.7.2 +VERSION 1.2.7.3 EXPORTS adler32 @1 diff --git a/deflate.c b/deflate.c index 4a1004b4e0ceb06db13d0e87eade4b68302f2496..67d522cf988ccb1930844f75fc949d7b7017b0cc 100644 --- a/deflate.c +++ b/deflate.c @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.7.2 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.7.3 Copyright 1995-2013 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 310a82f19e155cab8a3be59f41e3f96522651c47..55b706e19b98c3f980e54c74c03a365290b79556 100644 --- a/inftrees.c +++ b/inftrees.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.7.2 Copyright 1995-2013 Mark Adler "; + " inflate 1.2.7.3 Copyright 1995-2013 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, 193, 70}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 68, 72}; 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/qnx/package.qpg b/qnx/package.qpg index 67abc19755fc0b1054c375d576e09a55eeba4963..79ec9b4eeb98501b9b9da8bf430a63cd57818acb 100644 --- a/qnx/package.qpg +++ b/qnx/package.qpg @@ -25,10 +25,10 @@ - - - - + + + + @@ -63,7 +63,7 @@ - 1.2.7.2 + 1.2.7.3 Medium Stable diff --git a/treebuild.xml b/treebuild.xml index 1ebe76c3419831b849021b51e012478f9693cd18..dea41efe08fad94e7e4f3b21aa84ca597ee42b70 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 66f998d36fefe3e03d27f11ff363a75874fe9811..4ae00cb730d753aa55da6b08d3e95191562e37d8 100644 --- a/win32/README-WIN32.txt +++ b/win32/README-WIN32.txt @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.7.2 is a general purpose data compression library. All the code is +zlib 1.2.7.3 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.7.2-win32-x86.zip will contain the following files: +The package zlib-1.2.7.3-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 c0fcaa929aa96b6099d443c74f0124712ef82f9d..62df11b689df57f9ac6a31a609743abb87010344 100644 --- a/zlib.3 +++ b/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "13 Apr 2013" +.TH ZLIB 3 "xx Apr 2013" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -125,7 +125,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 -Version 1.2.7.2 +Version 1.2.7.3 Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org) and Mark Adler (madler@alumni.caltech.edu). .LP diff --git a/zlib.3.pdf b/zlib.3.pdf index f5672ccde5cf46330279d415d0d88b088acb8e6b..e1a11a58eee35f4c09088173ddd7a4f4992006d4 100644 Binary files a/zlib.3.pdf and b/zlib.3.pdf differ diff --git a/zlib.h b/zlib.h index c217cbd54d86cad9e7300ade611989326dcb546b..1ee8850d38db4de32de4bf9abc70f1dec330b771 100644 --- a/zlib.h +++ b/zlib.h @@ -1,5 +1,5 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.7.2, April 13th, 2013 + version 1.2.7.3, April xxth, 2013 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler @@ -37,12 +37,12 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.7.2-motley" -#define ZLIB_VERNUM 0x1272 +#define ZLIB_VERSION "1.2.7.3-motley" +#define ZLIB_VERNUM 0x1273 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 #define ZLIB_VER_REVISION 7 -#define ZLIB_VER_SUBREVISION 2 +#define ZLIB_VER_SUBREVISION 3 /* The 'zlib' compression library provides in-memory compression and