summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-12-18 12:07:25 -0800
committerMark Adler <madler@alumni.caltech.edu>2011-12-18 12:07:25 -0800
commitdf60b50769ae9441c6ebd853948ee7da559286e0 (patch)
tree225cbbcf02368acfcf716d0104dabe77d4f5ef86
parentfe61dfb8a27754137c2f6a1ff59b1e55d615210e (diff)
downloadProject-Tick-df60b50769ae9441c6ebd853948ee7da559286e0.tar.gz
Project-Tick-df60b50769ae9441c6ebd853948ee7da559286e0.zip
Change version numbers to 1.2.5.3.
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in2
-rw-r--r--README4
-rw-r--r--as400/compile.clp2
-rw-r--r--as400/readme.txt2
-rw-r--r--as400/zlib.inc6
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c4
-rw-r--r--contrib/pascal/zlibpas.pas2
-rw-r--r--contrib/vstudio/vc10/zlib.rc6
-rw-r--r--contrib/vstudio/vc9/zlib.rc6
-rw-r--r--deflate.c2
-rw-r--r--inftrees.c4
-rw-r--r--qnx/package.qpg10
-rw-r--r--treebuild.xml4
-rw-r--r--zlib.34
-rw-r--r--zlib.3.pdfbin8718 -> 8720 bytes
-rw-r--r--zlib.h8
19 files changed, 38 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b12c6465e..3d27f00b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
ChangeLog file for zlib
+Changes in 1.2.5.3 (xx Dec 2011)
+-
+
Changes in 1.2.5.2 (17 Dec 2011)
- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
- use relative symlinks for shared libs
diff --git a/Makefile.in b/Makefile.in
index 1d6a8c7284..81aa4fd9b8 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.5.2
+SHAREDLIBV=libz.so.1.2.5.3
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
diff --git a/README b/README
index 02dc3dc5d0..d52aafda6c 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.5.2 is a general purpose data compression library. All the code is
+zlib 1.2.5.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 <markn@ieee.org> 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.5.2 are documented in the file ChangeLog.
+The changes made in version 1.2.5.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 a6d94d4bd1..b649b2a2c6 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.5.2') TGTRLS(&TGTRLS)
+ TEXT('ZLIB 1.2.5.3') TGTRLS(&TGTRLS)
ENDPGM
diff --git a/as400/readme.txt b/as400/readme.txt
index 0b66f266d6..c3690d7898 100644
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
- ZLIB version 1.2.5.2 for AS400 installation instructions
+ ZLIB version 1.2.5.3 for AS400 installation instructions
I) From an AS400 *SAVF file:
diff --git a/as400/zlib.inc b/as400/zlib.inc
index f0915c8206..d710e13d13 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.5.2
+ * Version 1.2.5.3
*
*
* WARNING:
@@ -22,8 +22,8 @@
*
* Versioning information.
*
- D ZLIB_VERSION C '1.2.5.2'
- D ZLIB_VERNUM C X'1252'
+ D ZLIB_VERSION C '1.2.5.3'
+ D ZLIB_VERNUM C X'1253'
D ZLIB_VER_MAJOR C 1
D ZLIB_VER_MINOR C 2
D ZLIB_VER_REVISION...
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 44384a7a70..79a6b44ac9 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.5.2';
+ zlib_version = '1.2.5.3';
type
EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 97af4d5b5a..39c0eb3c6a 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.5.2", Info.Version);
+ Assert.AreEqual("1.2.5.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 8f60cfdbd9..440e5dd375 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.5.2 Copyright 1995-2011 Mark Adler ";
+ " inflate9 1.2.5.3 Copyright 1995-2011 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, 202, 194};
+ 133, 133, 133, 133, 144, 71, 64};
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/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index e34f35664c..be0d4be3f6 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
interface
const
- ZLIB_VERSION = '1.2.5.2';
+ ZLIB_VERSION = '1.2.5.3';
type
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 7de67b9cba..304a42ffd1 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.5.2,1
- PRODUCTVERSION 1.2.5.2,1
+ FILEVERSION 1.2.5.3,1
+ PRODUCTVERSION 1.2.5.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.5.2\0"
+ VALUE "FileVersion", "1.2.5.3\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 7de67b9cba..304a42ffd1 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.5.2,1
- PRODUCTVERSION 1.2.5.2,1
+ FILEVERSION 1.2.5.3,1
+ PRODUCTVERSION 1.2.5.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.5.2\0"
+ VALUE "FileVersion", "1.2.5.3\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/deflate.c b/deflate.c
index 096207d6c3..f27febbbd1 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.5.2 Copyright 1995-2011 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.5.3 Copyright 1995-2011 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 6cd53f0150..b8a2aa4c2b 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.5.2 Copyright 1995-2011 Mark Adler ";
+ " inflate 1.2.5.3 Copyright 1995-2011 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, 202, 194};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 71, 64};
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 4072d80116..c3f33daf2b 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
<QPG:Files>
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../libz.so.1.2.5.2" install="/opt/lib/" user="root:bin" permission="644"/>
- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5.2"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5.2"/>
- <QPG:Add file="../libz.so.1.2.5.2" install="/opt/lib/" component="slib"/>
+ <QPG:Add file="../libz.so.1.2.5.3" install="/opt/lib/" user="root:bin" permission="644"/>
+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.5.3"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.5.3"/>
+ <QPG:Add file="../libz.so.1.2.5.3" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.5.2</QPM:ReleaseVersion>
+ <QPM:ReleaseVersion>1.2.5.3</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/treebuild.xml b/treebuild.xml
index e1091d4749..9878af120c 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<package name="zlib" version="1.2.5.2">
- <library name="zlib" dlversion="1.2.5.2" dlname="z">
+<package name="zlib" version="1.2.5.3">
+ <library name="zlib" dlversion="1.2.5.3" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
diff --git a/zlib.3 b/zlib.3
index 69e28551ca..e906b8d8ed 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "17 Dec 2011"
+.TH ZLIB 3 "xx Dec 2011"
.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.5.2
+Version 1.2.5.3
Copyright (C) 1995-2011 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 1ff8ac7920..cd4a7aefa4 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index fbe0854ce6..4364ccfcec 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.5.2, December 17th, 2011
+ version 1.2.5.3, December xxth, 2011
Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler
@@ -37,12 +37,12 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.5.2"
-#define ZLIB_VERNUM 0x1252
+#define ZLIB_VERSION "1.2.5.3-motley"
+#define ZLIB_VERNUM 0x1253
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
#define ZLIB_VER_REVISION 5
-#define ZLIB_VER_SUBREVISION 2
+#define ZLIB_VER_SUBREVISION 3
/*
The 'zlib' compression library provides in-memory compression and
generated by cgit 0.0.5-2-1-g0f52 (git 2.46.0) at 2026-04-06 14:33:54 +0000