Skip to content

Commit 3d4e184

Browse files
SibrasSibras
committed
Merge commit '4a090adef8c773087ec8916ad3c2236ef560df27'
2 parents 7b4f453 + 4a090ad commit 3d4e184

File tree

29 files changed

+111
-93
lines changed

29 files changed

+111
-93
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")
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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11

22
ChangeLog file for zlib
33

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
10+
411
Changes in 1.2.9 (31 Dec 2016)
512
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
613
- Improve contrib/blast to return unused bytes

‎Makefile.in

Lines changed: 6 additions & 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
35+
SHAREDLIBV=libz.so.1.2.10
3636
SHAREDLIBM=libz.so.1
3737
LIBS=$(STATICLIB) $(SHAREDLIBV)
3838

@@ -309,10 +309,12 @@ install-libs: $(LIBS)
309309
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
310310
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
311311
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
312+
rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
312313
cp $(STATICLIB) $(DESTDIR)$(libdir)
313314
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
314315
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
315316
-@if test -n "$(SHAREDLIBV)"; then \
317+
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
316318
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
317319
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
318320
chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
@@ -322,15 +324,18 @@ install-libs: $(LIBS)
322324
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
323325
($(LDCONFIG) || true) >/dev/null 2>&1; \
324326
fi
327+
rm -f $(DESTDIR)$(man3dir)/zlib.3
325328
cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
326329
chmod 644 $(DESTDIR)$(man3dir)/zlib.3
330+
rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
327331
cp zlib.pc $(DESTDIR)$(pkgconfigdir)
328332
chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
329333
# The ranlib in install is needed on NeXTSTEP which checks file times
330334
# ldconfig is for Linux
331335

332336
install: install-libs
333337
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
338+
rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
334339
cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
335340
chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
336341

‎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.9 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 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

@@ -84,7 +84,7 @@ Acknowledgments:
8484

8585
Copyright notice:
8686

87-
(C) 1995-2016 Jean-loup Gailly and Mark Adler
87+
(C) 1995-2017 Jean-loup Gailly and Mark Adler
8888

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

‎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';
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", 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: 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-2016 Mark Adler
2+
* Copyright (C) 1995-2017 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.9 Copyright 1995-2016 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, 192, 79};
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], [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';
14-
ZLIB_VERNUM = $1290;
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: 2 additions & 2 deletions
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+
Building instructions for the DLL versions of Zlib 1.2.10
22
========================================================
33

44
This directory contains projects that build zlib and minizip using
@@ -75,4 +75,4 @@ Gilles Vollant
7575
[email protected]
7676

7777
Visual Studio 2013 and 2015 Projects from Sean Hunt
78-
[email protected]
78+
[email protected]

‎contrib/vstudio/vc10/zlib.rc

Lines changed: 4 additions & 4 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, 0
6-
PRODUCTVERSION 1, 2, 9, 0
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,12 +17,12 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9\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"
2424
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25-
VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
25+
VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎contrib/vstudio/vc11/zlib.rc

Lines changed: 4 additions & 4 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, 0
6-
PRODUCTVERSION 1, 2, 9, 0
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,12 +17,12 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9\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"
2424
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25-
VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
25+
VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎contrib/vstudio/vc12/zlib.rc

Lines changed: 4 additions & 4 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, 0
6-
PRODUCTVERSION 1, 2, 9, 0
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,12 +17,12 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.8.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"
2424
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25-
VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
25+
VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎contrib/vstudio/vc14/zlib.rc

Lines changed: 4 additions & 4 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, 0
6-
PRODUCTVERSION 1, 2, 9, 0
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,12 +17,12 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.8.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"
2424
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25-
VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
25+
VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

‎contrib/vstudio/vc9/zlib.rc

Lines changed: 4 additions & 4 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, 0
6-
PRODUCTVERSION 1, 2, 9, 0
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,12 +17,12 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.9\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"
2424
VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25-
VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
25+
VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
2626
END
2727
END
2828
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)