summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2013-04-13 08:08:57 -0700
committerMark Adler <madler@alumni.caltech.edu>2013-04-13 08:08:57 -0700
commit8a93f49c86044934de225a395d3b5b851879257c (patch)
tree8ba600cb3c5bc74a38f273683c9f9b6591865777
parent0b166094092efa2b92200cbb67f390e86c181ab4 (diff)
downloadzlib-8a93f49c86044934de225a395d3b5b851879257c.tar.gz
Change version number to 1.2.7.2.
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in2
-rw-r--r--README6
-rw-r--r--as400/compile.clp2
-rw-r--r--as400/readme.txt2
-rw-r--r--as400/zlib.inc8
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs4
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/pascal/zlibpas.pas4
-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/vc9/zlib.rc8
-rw-r--r--contrib/vstudio/vc9/zlibvc.def2
-rw-r--r--deflate.c2
-rw-r--r--inftrees.c4
-rw-r--r--qnx/package.qpg10
-rw-r--r--treebuild.xml4
-rw-r--r--win32/README-WIN32.txt4
-rw-r--r--zlib.34
-rw-r--r--zlib.3.pdfbin8730 -> 8733 bytes
-rw-r--r--zlib.h8
24 files changed, 51 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog
index cedc53a..39b3102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
ChangeLog file for zlib
+Changes in 1.2.7.2 (xx Apr 2013)
+-
+
Changes in 1.2.7.1 (24 Mar 2013)
- Replace use of unsafe string functions with snprintf if available
- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
diff --git a/Makefile.in b/Makefile.in
index 23c8b6a..ef70d30 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.1
+SHAREDLIBV=libz.so.1.2.7.2
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
diff --git a/README b/README
index ec670a8..801ecb5 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.7.1 is a general purpose data compression library. All the code is
+zlib 1.2.7.2 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.7.1 are documented in the file ChangeLog.
+The changes made in version 1.2.7.2 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
@@ -84,7 +84,7 @@ Acknowledgments:
Copyright notice:
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2013 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
diff --git a/as400/compile.clp b/as400/compile.clp
index c5e341d..f8af938 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.1') TGTRLS(&TGTRLS)
+ TEXT('ZLIB 1.2.7.2') TGTRLS(&TGTRLS)
ENDPGM
diff --git a/as400/readme.txt b/as400/readme.txt
index 8dd867a..cdcf88b 100644
--- a/as400/readme.txt
+++ b/as400/readme.txt
@@ -1,4 +1,4 @@
- ZLIB version 1.2.7.1 for AS400 installation instructions
+ ZLIB version 1.2.7.2 for AS400 installation instructions
I) From an AS400 *SAVF file:
diff --git a/as400/zlib.inc b/as400/zlib.inc
index 9c94be8..a557a04 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.1
+ * Version 1.2.7.2
*
*
* WARNING:
@@ -22,14 +22,14 @@
*
* Versioning information.
*
- D ZLIB_VERSION C '1.2.7.1'
- D ZLIB_VERNUM C X'1271'
+ D ZLIB_VERSION C '1.2.7.2'
+ D ZLIB_VERNUM C X'1272'
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 1
+ D C 2
*
* Other equates.
*
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index fe92819..05e426f 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.1';
+ zlib_version = '1.2.7.2';
type
EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 3b7df8f..5277329 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -1,5 +1,5 @@
//
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -156,7 +156,7 @@ namespace DotZLibTests
public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.7.1", Info.Version);
+ Assert.AreEqual("1.2.7.2", 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 14dde49..2422456 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
/* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2013 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
- " inflate9 1.2.7.1 Copyright 1995-2012 Mark Adler ";
+ " inflate9 1.2.7.2 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, 79, 204};
+ 133, 133, 133, 133, 144, 193, 70};
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 2036e41..26fcea9 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.1], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.7.2], [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 38d4b43..97a031b 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,8 +10,8 @@ unit zlibpas;
interface
const
- ZLIB_VERSION = '1.2.7.1';
- ZLIB_VERNUM = $1271;
+ ZLIB_VERSION = '1.2.7.2';
+ ZLIB_VERNUM = $1272;
type
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index d7f52a0..799e360 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.1
+Building instructions for the DLL versions of Zlib 1.2.7.2
========================================================
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 143f1d3..fd49cd6 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.1,1
- PRODUCTVERSION 1.2.7.1,1
+ FILEVERSION 1.2.7.2,1
+ PRODUCTVERSION 1.2.7.2,1
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.7.1\0"
+ VALUE "FileVersion", "1.2.7.2\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index a382aec..42b5aa4 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.1
+VERSION 1.2.7.2
EXPORTS
adler32 @1
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 143f1d3..fd49cd6 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.1,1
- PRODUCTVERSION 1.2.7.1,1
+ FILEVERSION 1.2.7.2,1
+ PRODUCTVERSION 1.2.7.2,1
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.7.1\0"
+ VALUE "FileVersion", "1.2.7.2\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
END
END
BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 9dc6aad..500e3f2 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.1
+VERSION 1.2.7.2
EXPORTS
adler32 @1
diff --git a/deflate.c b/deflate.c
index 65d9101..4a1004b 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.7.1 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.7.2 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 9ed56c7..310a82f 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.7.1 Copyright 1995-2013 Mark Adler ";
+ " inflate 1.2.7.2 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, 79, 204};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 193, 70};
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 8b1d777..67abc19 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.7.1" 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.7.1"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7.1"/>
- <QPG:Add file="../libz.so.1.2.7.1" install="/opt/lib/" component="slib"/>
+ <QPG:Add file="../libz.so.1.2.7.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.7.2"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7.2"/>
+ <QPG:Add file="../libz.so.1.2.7.2" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.7.1</QPM:ReleaseVersion>
+ <QPM:ReleaseVersion>1.2.7.2</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 4b8a3da..1ebe76c 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<package name="zlib" version="1.2.7.1">
- <library name="zlib" dlversion="1.2.7.1" dlname="z">
+<package name="zlib" version="1.2.7.2">
+ <library name="zlib" dlversion="1.2.7.2" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 250ddb3..66f998d 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.7.1 is a general purpose data compression library. All the code is
+zlib 1.2.7.2 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.1-win32-x86.zip will contain the following files:
+The package zlib-1.2.7.2-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 0df33de..c39ccb1 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "24 Mar 2012"
+.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.1
+Version 1.2.7.2
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 3fc85b6..5f03a0e 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index cc5363d..25e14a2 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.1, March 24th, 2013
+ version 1.2.7.2, 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.1"
-#define ZLIB_VERNUM 0x1271
+#define ZLIB_VERSION "1.2.7.2-motley"
+#define ZLIB_VERNUM 0x1272
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
#define ZLIB_VER_REVISION 7
-#define ZLIB_VER_SUBREVISION 1
+#define ZLIB_VER_SUBREVISION 2
/*
The 'zlib' compression library provides in-memory compression and
View Lorry Controller Status