Skip to content

Commit 09155ea

Browse files
committed
zlib 1.3
1 parent 899ffef commit 09155ea

File tree

31 files changed

+87
-74
lines changed

31 files changed

+87
-74
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.13.1")
6+
set(VERSION "1.3")
77

88
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
99
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")

ChangeLog

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11

22
ChangeLog file for zlib
33

4-
Changes in 1.2.13.1 (xx Oct 2022)
5-
-
4+
Changes in 1.3 (18 Aug 2023)
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
621

722
Changes in 1.2.13 (13 Oct 2022)
823
- Fix configure issue that discarded provided CC definition
@@ -1448,7 +1463,7 @@ Changes in 0.99 (27 Jan 96)
14481463
- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
14491464
- in fcalloc, normalize pointer if size > 65520 bytes
14501465
- 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.
14521467
- use Z_BINARY instead of BINARY
14531468
- document that gzclose after gzdopen will close the file
14541469
- allow "a" as mode in gzopen

Makefile.in

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

2929
STATICLIB=libz.a
3030
SHAREDLIB=libz.so
31-
SHAREDLIBV=libz.so.1.2.13.1
31+
SHAREDLIBV=libz.so.1.3
3232
SHAREDLIBM=libz.so.1
3333
LIBS=$(STATICLIB) $(SHAREDLIBV)
3434

README

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

3-
zlib 1.2.13.1 is a general purpose data compression library. All the code is
3+
zlib 1.3 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
https://marknelson.us/posts/1997/01/01/zlib-engine.html .
3333

34-
The changes made in version 1.2.13.1 are documented in the file ChangeLog.
34+
The changes made in version 1.3 are documented in the file ChangeLog.
3535

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

@@ -83,7 +83,7 @@ Acknowledgments:
8383

8484
Copyright notice:
8585

86-
(C) 1995-2022 Jean-loup Gailly and Mark Adler
86+
(C) 1995-2023 Jean-loup Gailly and Mark Adler
8787

8888
This software is provided 'as-is', without any express or implied
8989
warranty. In no event will the authors be held liable for any damages

configure

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ STATICLIB=libz.a
4444

4545
# extract zlib version numbers from zlib.h
4646
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
47-
VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
48-
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
4947
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
5048

5149
# establish commands for library building
@@ -265,7 +263,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
265263
SHAREDLIB=libz$shared_ext
266264
SHAREDLIBV=libz.$VER$shared_ext
267265
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"}
269267
if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then
270268
AR="${CROSS_PREFIX}libtool"
271269
elif libtool -V 2>&1 | grep Apple > /dev/null; then

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.13.1';
155+
zlib_version = '1.3.0';
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.13.1", Info.Version);
159+
Assert.AreEqual("1.3.0", 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* inftree9.c -- generate Huffman trees for efficient decoding
2-
* Copyright (C) 1995-2022 Mark Adler
2+
* Copyright (C) 1995-2023 Mark Adler
33
* For conditions of distribution and use, see copyright notice in zlib.h
44
*/
55

@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate9_copyright[] =
12-
" inflate9 1.2.13.1 Copyright 1995-2022 Mark Adler ";
12+
" inflate9 1.3 Copyright 1995-2023 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
@@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes,
5959
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6060
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
6161
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};
6363
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
6464
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
6565
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.13.1], [bugzilla.redhat.com])
4+
AC_INIT([minizip], [1.3.0], [bugzilla.redhat.com])
55
AC_CONFIG_SRCDIR([minizip.c])
66
AM_INIT_AUTOMAKE([foreign])
77
LT_INIT

contrib/pascal/zlibpas.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
interface
1111

1212
const
13-
ZLIB_VERSION = '1.2.13.1';
13+
ZLIB_VERSION = '1.3.0';
1414
ZLIB_VERNUM = $12a0;
1515

1616
type

0 commit comments

Comments
 (0)