Skip to content

Commit 4a090ad

Browse files
madlermadler
committed
zlib 1.2.10
1 parent e13def0 commit 4a090ad

File tree

25 files changed

+58
-54
lines changed

25 files changed

+58
-54
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
33

44
project(zlib C)
55

6-
set(VERSION "1.2.9.1")
6+
set(VERSION "1.2.10")
77

88
option(ASM686 "Enable building i686 assembly implementation")
99
option(AMD64 "Enable building amd64 assembly implementation")

‎ChangeLog

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11

22
ChangeLog file for zlib
33

4-
Changes in 1.2.9.1 (xx Jan 2017)
5-
-
4+
Changes in 1.2.10 (2 Jan 2017)
5+
- Avoid warnings on snprintf() return value
6+
- Fix bug in deflate_stored() for zero-length input
7+
- Fix bug in gzwrite.c that produced corrupt gzip files
8+
- Remove files to be installed before copying them in Makefile.in
9+
- Add warnings when compiling with assembler code
610

711
Changes in 1.2.9 (31 Dec 2016)
812
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]

‎Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CPP=$(CC) -E
3232

3333
STATICLIB=libz.a
3434
SHAREDLIB=libz.so
35-
SHAREDLIBV=libz.so.1.2.9.1
35+
SHAREDLIBV=libz.so.1.2.10
3636
SHAREDLIBM=libz.so.1
3737
LIBS=$(STATICLIB) $(SHAREDLIBV)
3838

‎README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.2.9.1 is a general purpose data compression library. All the code is
3+
zlib 1.2.10 is a general purpose data compression library. All the code is
44
thread safe. The data format used by the zlib library is described by RFCs
55
(Request for Comments) 1950 to 1952 in the files
66
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
3131
issue of Dr. Dobb's Journal; a copy of the article is available at
3232
http://marknelson.us/1997/01/01/zlib-engine/ .
3333

34-
The changes made in version 1.2.9.1 are documented in the file ChangeLog.
34+
The changes made in version 1.2.10 are documented in the file ChangeLog.
3535

3636
Unsupported third party contributions are provided in directory contrib/ .
3737

‎contrib/delphi/ZLib.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152152
const OutBuf: Pointer; BufSize: Integer);
153153

154154
const
155-
zlib_version = '1.2.9.1';
155+
zlib_version = '1.2.10';
156156

157157
type
158158
EZlibError = class(Exception);

‎contrib/dotzlib/DotZLib/UnitTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public class InfoTests
156156
public void Info_Version()
157157
{
158158
Info info = new Info();
159-
Assert.AreEqual("1.2.9.1", Info.Version);
159+
Assert.AreEqual("1.2.10", Info.Version);
160160
Assert.AreEqual(32, info.SizeOfUInt);
161161
Assert.AreEqual(32, info.SizeOfULong);
162162
Assert.AreEqual(32, info.SizeOfPointer);

‎contrib/infback9/inftree9.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate9_copyright[] =
12-
" inflate9 1.2.9.1 Copyright 1995-2017 Mark Adler ";
12+
" inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
1313
/*
1414
If you use the zlib library in a product, an acknowledgment is welcome
1515
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
6464
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6565
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
6666
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67-
133, 133, 133, 133, 144, 203, 201};
67+
133, 133, 133, 133, 144, 192, 202};
6868
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
6969
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
7070
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,

‎contrib/minizip/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- Autoconf -*-
22
# Process this file with autoconf to produce a configure script.
33

4-
AC_INIT([minizip], [1.2.9.1], [bugzilla.redhat.com])
4+
AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com])
55
AC_CONFIG_SRCDIR([minizip.c])
66
AM_INIT_AUTOMAKE([foreign])
77
LT_INIT

‎contrib/pascal/zlibpas.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
interface
1111

1212
const
13-
ZLIB_VERSION = '1.2.9.1';
14-
ZLIB_VERNUM = $1291;
13+
ZLIB_VERSION = '1.2.10';
14+
ZLIB_VERNUM = $12a0;
1515

1616
type
1717
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;

‎contrib/vstudio/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Building instructions for the DLL versions of Zlib 1.2.9.1
1+
Building instructions for the DLL versions of Zlib 1.2.10
22
========================================================
33

44
This directory contains projects that build zlib and minizip using

‎contrib/vstudio/vc10/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1, 2, 9, 1
6-
PRODUCTVERSION 1, 2, 9, 1
5+
FILEVERSION 1, 2, 10, 0
6+
PRODUCTVERSION 1, 2, 10, 0
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9.1\0"
20+
VALUE "FileVersion", "1.2.10\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlibwapi.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc11/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1, 2, 9, 1
6-
PRODUCTVERSION 1, 2, 9, 1
5+
FILEVERSION 1, 2, 10, 0
6+
PRODUCTVERSION 1, 2, 10, 0
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9.1\0"
20+
VALUE "FileVersion", "1.2.10\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlibwapi.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc12/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1, 2, 9, 1
6-
PRODUCTVERSION 1, 2, 9, 1
5+
FILEVERSION 1, 2, 10, 0
6+
PRODUCTVERSION 1, 2, 10, 0
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9.1\0"
20+
VALUE "FileVersion", "1.2.10\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlibwapi.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc14/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1, 2, 9, 1
6-
PRODUCTVERSION 1, 2, 9, 1
5+
FILEVERSION 1, 2, 10, 0
6+
PRODUCTVERSION 1, 2, 10, 0
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9.1\0"
20+
VALUE "FileVersion", "1.2.10\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlibwapi.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc9/zlib.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1, 2, 9, 1
6-
PRODUCTVERSION 1, 2, 9, 1
5+
FILEVERSION 1, 2, 10, 0
6+
PRODUCTVERSION 1, 2, 10, 0
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9.1\0"
20+
VALUE "FileVersion", "1.2.10\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlibwapi.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎deflate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#include "deflate.h"
5353

5454
const char deflate_copyright[] =
55-
" deflate 1.2.9.1 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
55+
" deflate 1.2.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
5656
/*
5757
If you use the zlib library in a product, an acknowledgment is welcome
5858
in the documentation of your product. If for some reason you cannot

‎inftrees.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate_copyright[] =
12-
" inflate 1.2.9.1 Copyright 1995-2017 Mark Adler ";
12+
" inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
1313
/*
1414
If you use the zlib library in a product, an acknowledgment is welcome
1515
in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
6262
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
6363
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6464
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, 203, 201};
65+
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 202};
6666
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
6767
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
6868
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

‎os400/README400

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ZLIB version 1.2.9.1 for OS/400 installation instructions
1+
ZLIB version 1.2.10 for OS/400 installation instructions
22

33
1) Download and unpack the zlib tarball to some IFS directory.
44
(i.e.: /path/to/the/zlib/ifs/source/directory)

‎os400/zlib.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* ZLIB.INC - Interface to the general purpose compression library
22
*
33
* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4-
* Version 1.2.9.1
4+
* Version 1.2.10
55
*
66
*
77
* WARNING:
@@ -22,14 +22,14 @@
2222
*
2323
* Versioning information.
2424
*
25-
D ZLIB_VERSION C '1.2.9.1'
26-
D ZLIB_VERNUM C X'1291'
25+
D ZLIB_VERSION C '1.2.10'
26+
D ZLIB_VERNUM C X'12a0'
2727
D ZLIB_VER_MAJOR C 1
2828
D ZLIB_VER_MINOR C 2
2929
D ZLIB_VER_REVISION...
30-
D C 9
30+
D C 10
3131
D ZLIB_VER_SUBREVISION...
32-
D C 1
32+
D C 0
3333
*
3434
* Other equates.
3535
*

‎qnx/package.qpg

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<QPG:Files>
2626
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
2727
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28-
<QPG:Add file="../libz.so.1.2.9.1" 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.9.1"/>
30-
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9.1"/>
31-
<QPG:Add file="../libz.so.1.2.9.1" install="/opt/lib/" component="slib"/>
28+
<QPG:Add file="../libz.so.1.2.10" 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"/>
30+
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.10"/>
31+
<QPG:Add file="../libz.so.1.2.10" install="/opt/lib/" component="slib"/>
3232
</QPG:Files>
3333

3434
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
6363
</QPM:ProductDescription>
6464

6565
<QPM:ReleaseDescription>
66-
<QPM:ReleaseVersion>1.2.9.1</QPM:ReleaseVersion>
66+
<QPM:ReleaseVersion>1.2.10</QPM:ReleaseVersion>
6767
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
6868
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
6969
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>

‎treebuild.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
2-
<package name="zlib" version="1.2.9.1">
3-
<library name="zlib" dlversion="1.2.9.1" dlname="z">
2+
<package name="zlib" version="1.2.10">
3+
<library name="zlib" dlversion="1.2.10" dlname="z">
44
<property name="description"> zip compression library </property>
55
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
66

‎win32/README-WIN32.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.2.9.1 is a general purpose data compression library. All the code is
3+
zlib 1.2.10 is a general purpose data compression library. All the code is
44
thread safe. The data format used by the zlib library is described by RFCs
55
(Request for Comments) 1950 to 1952 in the files
66
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
2222

2323
Manifest:
2424

25-
The package zlib-1.2.9.1-win32-x86.zip will contain the following files:
25+
The package zlib-1.2.10-win32-x86.zip will contain the following files:
2626

2727
README-WIN32.txt This document
2828
ChangeLog Changes since previous zlib packages

‎zlib.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ZLIB 3 "xx Jan 2017"
1+
.TH ZLIB 3 "2 Jan 2017"
22
.SH NAME
33
zlib \- compression/decompression library
44
.SH SYNOPSIS
@@ -105,7 +105,7 @@ before asking for help.
105105
Send questions and/or comments to [email protected],
106106
or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107107
.SH AUTHORS AND LICENSE
108-
Version 1.2.9.1
108+
Version 1.2.10
109109
.LP
110110
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
111111
.LP

‎zlib.3.pdf

4 Bytes
Binary file not shown.

‎zlib.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* zlib.h -- interface of the 'zlib' general purpose compression library
2-
version 1.2.9.1, January xxth, 2017
2+
version 1.2.10, January 2nd, 2017
33
44
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
55
@@ -37,12 +37,12 @@
3737
extern "C" {
3838
#endif
3939

40-
#define ZLIB_VERSION "1.2.9.1-motley"
41-
#define ZLIB_VERNUM 0x1291
40+
#define ZLIB_VERSION "1.2.10"
41+
#define ZLIB_VERNUM 0x12a0
4242
#define ZLIB_VER_MAJOR 1
4343
#define ZLIB_VER_MINOR 2
44-
#define ZLIB_VER_REVISION 9
45-
#define ZLIB_VER_SUBREVISION 1
44+
#define ZLIB_VER_REVISION 10
45+
#define ZLIB_VER_SUBREVISION 0
4646

4747
/*
4848
The 'zlib' compression library provides in-memory compression and

0 commit comments

Comments
 (0)