ad8ad49de3b… — Fossil SCM

A .fossil-settings/binary-glob

+1

		--- a/.fossil-settings/binary-glob
		+++ b/.fossil-settings/binary-glob
		@@ -0,0 +1 @@
	1	+compat/zlib/zlib.3.pdf

	--- a/.fossil-settings/binary-glob
	+++ b/.fossil-settings/binary-glob
	@@ -0,0 +1 @@

	--- a/.fossil-settings/binary-glob
	+++ b/.fossil-settings/binary-glob
	@@ -0,0 +1 @@
1	compat/zlib/zlib.3.pdf

M .fossil-settings/crnl-glob

+3

		--- .fossil-settings/crnl-glob
		+++ .fossil-settings/crnl-glob
		@@ -1,1 +1,4 @@
	1	+compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	2	+compat/zlib/contrib/vstudio/readme.txt
	3	+compat/zlib/contrib/vstudio/*/zlib.rc
1	4	win/buildmsvc.bat
2	5

	--- .fossil-settings/crnl-glob
	+++ .fossil-settings/crnl-glob
	@@ -1,1 +1,4 @@



1	win/buildmsvc.bat
2

	--- .fossil-settings/crnl-glob
	+++ .fossil-settings/crnl-glob
	@@ -1,1 +1,4 @@
1	compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
2	compat/zlib/contrib/vstudio/readme.txt
3	compat/zlib/contrib/vstudio/*/zlib.rc
4	win/buildmsvc.bat
5

M compat/zlib/CMakeLists.txt

+1 -1

		--- compat/zlib/CMakeLists.txt
		+++ compat/zlib/CMakeLists.txt
		@@ -1,11 +1,11 @@
1	1	cmake_minimum_required(VERSION 2.4.4)
2	2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3	3
4	4	project(zlib C)
5	5
6		-set(VERSION "1.2.9")
	6	+set(VERSION "1.2.10")
7	7
8	8	option(ASM686 "Enable building i686 assembly implementation")
9	9	option(AMD64 "Enable building amd64 assembly implementation")
10	10
11	11	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
12	12

	--- compat/zlib/CMakeLists.txt
	+++ compat/zlib/CMakeLists.txt
	@@ -1,11 +1,11 @@
1	cmake_minimum_required(VERSION 2.4.4)
2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3
4	project(zlib C)
5
6	set(VERSION "1.2.9")
7
8	option(ASM686 "Enable building i686 assembly implementation")
9	option(AMD64 "Enable building amd64 assembly implementation")
10
11	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
12

	--- compat/zlib/CMakeLists.txt
	+++ compat/zlib/CMakeLists.txt
	@@ -1,11 +1,11 @@
1	cmake_minimum_required(VERSION 2.4.4)
2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3
4	project(zlib C)
5
6	set(VERSION "1.2.10")
7
8	option(ASM686 "Enable building i686 assembly implementation")
9	option(AMD64 "Enable building amd64 assembly implementation")
10
11	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
12

M compat/zlib/ChangeLog

+7

		--- compat/zlib/ChangeLog
		+++ compat/zlib/ChangeLog
		@@ -1,8 +1,15 @@
1	1
2	2	ChangeLog file for zlib
3	3
	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	+
4	11	Changes in 1.2.9 (31 Dec 2016)
5	12	- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
6	13	- Improve contrib/blast to return unused bytes
7	14	- Assure that gzoffset() is correct when appending
8	15	- Improve compress() and uncompress() to support large lengths
9	16

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,15 @@
1
2	ChangeLog file for zlib
3







4	Changes in 1.2.9 (31 Dec 2016)
5	- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
6	- Improve contrib/blast to return unused bytes
7	- Assure that gzoffset() is correct when appending
8	- Improve compress() and uncompress() to support large lengths
9

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,15 @@
1
2	ChangeLog file for zlib
3
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
11	Changes in 1.2.9 (31 Dec 2016)
12	- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
13	- Improve contrib/blast to return unused bytes
14	- Assure that gzoffset() is correct when appending
15	- Improve compress() and uncompress() to support large lengths
16

M compat/zlib/Makefile.in

+6 -1

		--- compat/zlib/Makefile.in
		+++ compat/zlib/Makefile.in
		@@ -30,11 +30,11 @@
30	30	LDSHARED=$(CC)
31	31	CPP=$(CC) -E
32	32
33	33	STATICLIB=libz.a
34	34	SHAREDLIB=libz.so
35		-SHAREDLIBV=libz.so.1.2.9
	35	+SHAREDLIBV=libz.so.1.2.10
36	36	SHAREDLIBM=libz.so.1
37	37	LIBS=$(STATICLIB) $(SHAREDLIBV)
38	38
39	39	AR=ar
40	40	ARFLAGS=rc
		@@ -307,32 +307,37 @@
307	307	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
308	308	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
309	309	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
310	310	-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
311	311	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
	312	+ rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
312	313	cp $(STATICLIB) $(DESTDIR)$(libdir)
313	314	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
314	315	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a \|\| true) >/dev/null 2>&1
315	316	-@if test -n "$(SHAREDLIBV)"; then \
	317	+ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
316	318	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
317	319	echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
318	320	chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
319	321	echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
320	322	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
321	323	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
322	324	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
323	325	($(LDCONFIG) \|\| true) >/dev/null 2>&1; \
324	326	fi
	327	+ rm -f $(DESTDIR)$(man3dir)/zlib.3
325	328	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
326	329	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
	330	+ rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
327	331	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
328	332	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
329	333	# The ranlib in install is needed on NeXTSTEP which checks file times
330	334	# ldconfig is for Linux
331	335
332	336	install: install-libs
333	337	-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
	338	+ rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
334	339	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
335	340	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
336	341
337	342	uninstall:
338	343	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
339	344

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -30,11 +30,11 @@
30	LDSHARED=$(CC)
31	CPP=$(CC) -E
32
33	STATICLIB=libz.a
34	SHAREDLIB=libz.so
35	SHAREDLIBV=libz.so.1.2.9
36	SHAREDLIBM=libz.so.1
37	LIBS=$(STATICLIB) $(SHAREDLIBV)
38
39	AR=ar
40	ARFLAGS=rc
	@@ -307,32 +307,37 @@
307	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
308	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
309	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
310	-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
311	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi

312	cp $(STATICLIB) $(DESTDIR)$(libdir)
313	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
314	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a \|\| true) >/dev/null 2>&1
315	-@if test -n "$(SHAREDLIBV)"; then \

316	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
317	echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
318	chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
319	echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
320	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
321	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
322	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
323	($(LDCONFIG) \|\| true) >/dev/null 2>&1; \
324	fi

325	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
326	chmod 644 $(DESTDIR)$(man3dir)/zlib.3

327	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
328	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
329	# The ranlib in install is needed on NeXTSTEP which checks file times
330	# ldconfig is for Linux
331
332	install: install-libs
333	-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi

334	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
335	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
336
337	uninstall:
338	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
339

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -30,11 +30,11 @@
30	LDSHARED=$(CC)
31	CPP=$(CC) -E
32
33	STATICLIB=libz.a
34	SHAREDLIB=libz.so
35	SHAREDLIBV=libz.so.1.2.10
36	SHAREDLIBM=libz.so.1
37	LIBS=$(STATICLIB) $(SHAREDLIBV)
38
39	AR=ar
40	ARFLAGS=rc
	@@ -307,32 +307,37 @@
307	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
308	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
309	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
310	-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
311	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
312	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
313	cp $(STATICLIB) $(DESTDIR)$(libdir)
314	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
315	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a \|\| true) >/dev/null 2>&1
316	-@if test -n "$(SHAREDLIBV)"; then \
317	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
318	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
319	echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
320	chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
321	echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
322	rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
323	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
324	ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
325	($(LDCONFIG) \|\| true) >/dev/null 2>&1; \
326	fi
327	rm -f $(DESTDIR)$(man3dir)/zlib.3
328	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
329	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
330	rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
331	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
332	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
333	# The ranlib in install is needed on NeXTSTEP which checks file times
334	# ldconfig is for Linux
335
336	install: install-libs
337	-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
338	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
339	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
340	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
341
342	uninstall:
343	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
344

M compat/zlib/README

+3 -3

		--- compat/zlib/README
		+++ compat/zlib/README
		@@ -1,8 +1,8 @@
1	1	ZLIB DATA COMPRESSION LIBRARY
2	2
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
4	4	thread safe. The data format used by the zlib library is described by RFCs
5	5	(Request for Comments) 1950 to 1952 in the files
6	6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	7	rfc1952 (gzip format).
8	8
		@@ -29,11 +29,11 @@
29	29
30	30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	32	http://marknelson.us/1997/01/01/zlib-engine/ .
33	33
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.
35	35
36	36	Unsupported third party contributions are provided in directory contrib/ .
37	37
38	38	zlib is available in Java using the java.util.zip package, documented at
39	39	http://java.sun.com/developer/technicalArticles/Programming/compression/ .
		@@ -82,11 +82,11 @@
82	82	people who reported problems and suggested various improvements in zlib; they
83	83	are too numerous to cite here.
84	84
85	85	Copyright notice:
86	86
87		- (C) 1995-2016 Jean-loup Gailly and Mark Adler
	87	+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
88	88
89	89	This software is provided 'as-is', without any express or implied
90	90	warranty. In no event will the authors be held liable for any damages
91	91	arising from the use of this software.
92	92
93	93

	--- compat/zlib/README
	+++ compat/zlib/README
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.2.9 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	rfc1952 (gzip format).
8
	@@ -29,11 +29,11 @@
29
30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	http://marknelson.us/1997/01/01/zlib-engine/ .
33
34	The changes made in version 1.2.9 are documented in the file ChangeLog.
35
36	Unsupported third party contributions are provided in directory contrib/ .
37
38	zlib is available in Java using the java.util.zip package, documented at
39	http://java.sun.com/developer/technicalArticles/Programming/compression/ .
	@@ -82,11 +82,11 @@
82	people who reported problems and suggested various improvements in zlib; they
83	are too numerous to cite here.
84
85	Copyright notice:
86
87	(C) 1995-2016 Jean-loup Gailly and Mark Adler
88
89	This software is provided 'as-is', without any express or implied
90	warranty. In no event will the authors be held liable for any damages
91	arising from the use of this software.
92
93

	--- compat/zlib/README
	+++ compat/zlib/README
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.2.10 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	rfc1952 (gzip format).
8
	@@ -29,11 +29,11 @@
29
30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	http://marknelson.us/1997/01/01/zlib-engine/ .
33
34	The changes made in version 1.2.10 are documented in the file ChangeLog.
35
36	Unsupported third party contributions are provided in directory contrib/ .
37
38	zlib is available in Java using the java.util.zip package, documented at
39	http://java.sun.com/developer/technicalArticles/Programming/compression/ .
	@@ -82,11 +82,11 @@
82	people who reported problems and suggested various improvements in zlib; they
83	are too numerous to cite here.
84
85	Copyright notice:
86
87	(C) 1995-2017 Jean-loup Gailly and Mark Adler
88
89	This software is provided 'as-is', without any express or implied
90	warranty. In no event will the authors be held liable for any damages
91	arising from the use of this software.
92
93

M compat/zlib/contrib/delphi/ZLib.pas

+1 -1

		--- compat/zlib/contrib/delphi/ZLib.pas
		+++ compat/zlib/contrib/delphi/ZLib.pas
		@@ -150,11 +150,11 @@
150	150	BufSize = number of bytes in OutBuf }
151	151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	152	const OutBuf: Pointer; BufSize: Integer);
153	153
154	154	const
155		- zlib_version = '1.2.9';
	155	+ zlib_version = '1.2.10';
156	156
157	157	type
158	158	EZlibError = class(Exception);
159	159	ECompressionError = class(EZlibError);
160	160	EDecompressionError = class(EZlibError);
161	161

	--- compat/zlib/contrib/delphi/ZLib.pas
	+++ compat/zlib/contrib/delphi/ZLib.pas
	@@ -150,11 +150,11 @@
150	BufSize = number of bytes in OutBuf }
151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	const OutBuf: Pointer; BufSize: Integer);
153
154	const
155	zlib_version = '1.2.9';
156
157	type
158	EZlibError = class(Exception);
159	ECompressionError = class(EZlibError);
160	EDecompressionError = class(EZlibError);
161

	--- compat/zlib/contrib/delphi/ZLib.pas
	+++ compat/zlib/contrib/delphi/ZLib.pas
	@@ -150,11 +150,11 @@
150	BufSize = number of bytes in OutBuf }
151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	const OutBuf: Pointer; BufSize: Integer);
153
154	const
155	zlib_version = '1.2.10';
156
157	type
158	EZlibError = class(Exception);
159	ECompressionError = class(EZlibError);
160	EDecompressionError = class(EZlibError);
161

M compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

+1 -1

		--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
		+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
		@@ -154,11 +154,11 @@
154	154	#region Info tests
155	155	[Test]
156	156	public void Info_Version()
157	157	{
158	158	Info info = new Info();
159		- Assert.AreEqual("1.2.9", Info.Version);
	159	+ Assert.AreEqual("1.2.10", Info.Version);
160	160	Assert.AreEqual(32, info.SizeOfUInt);
161	161	Assert.AreEqual(32, info.SizeOfULong);
162	162	Assert.AreEqual(32, info.SizeOfPointer);
163	163	Assert.AreEqual(32, info.SizeOfOffset);
164	164	}
165	165

	--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	@@ -154,11 +154,11 @@
154	#region Info tests
155	[Test]
156	public void Info_Version()
157	{
158	Info info = new Info();
159	Assert.AreEqual("1.2.9", Info.Version);
160	Assert.AreEqual(32, info.SizeOfUInt);
161	Assert.AreEqual(32, info.SizeOfULong);
162	Assert.AreEqual(32, info.SizeOfPointer);
163	Assert.AreEqual(32, info.SizeOfOffset);
164	}
165

	--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	@@ -154,11 +154,11 @@
154	#region Info tests
155	[Test]
156	public void Info_Version()
157	{
158	Info info = new Info();
159	Assert.AreEqual("1.2.10", Info.Version);
160	Assert.AreEqual(32, info.SizeOfUInt);
161	Assert.AreEqual(32, info.SizeOfULong);
162	Assert.AreEqual(32, info.SizeOfPointer);
163	Assert.AreEqual(32, info.SizeOfOffset);
164	}
165

M compat/zlib/contrib/infback9/inftree9.c

+3 -3

		--- compat/zlib/contrib/infback9/inftree9.c
		+++ compat/zlib/contrib/infback9/inftree9.c
		@@ -1,17 +1,17 @@
1	1	/* inftree9.c -- generate Huffman trees for efficient decoding
2		- * Copyright (C) 1995-2016 Mark Adler
	2	+ * Copyright (C) 1995-2017 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "zutil.h"
7	7	#include "inftree9.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate9_copyright[] =
12		- " inflate9 1.2.9 Copyright 1995-2016 Mark Adler ";
	12	+ " inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
13	13	/*
14	14	If you use the zlib library in a product, an acknowledgment is welcome
15	15	in the documentation of your product. If for some reason you cannot
16	16	include such an acknowledgment, I would appreciate that you keep this
17	17	copyright string in the executable of your product.
		@@ -62,11 +62,11 @@
62	62	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
63	63	131, 163, 195, 227, 3, 0, 0};
64	64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65	65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66	66	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};
68	68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69	69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70	70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
71	71	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
72	72	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
73	73

	--- compat/zlib/contrib/infback9/inftree9.c
	+++ compat/zlib/contrib/infback9/inftree9.c
	@@ -1,17 +1,17 @@
1	/* inftree9.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2016 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftree9.h"
8
9	#define MAXBITS 15
10
11	const char inflate9_copyright[] =
12	" inflate9 1.2.9 Copyright 1995-2016 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -62,11 +62,11 @@
62	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
63	131, 163, 195, 227, 3, 0, 0};
64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67	133, 133, 133, 133, 144, 192, 79};
68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
71	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
72	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
73

	--- compat/zlib/contrib/infback9/inftree9.c
	+++ compat/zlib/contrib/infback9/inftree9.c
	@@ -1,17 +1,17 @@
1	/* inftree9.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2017 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftree9.h"
8
9	#define MAXBITS 15
10
11	const char inflate9_copyright[] =
12	" inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -62,11 +62,11 @@
62	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
63	131, 163, 195, 227, 3, 0, 0};
64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67	133, 133, 133, 133, 144, 192, 202};
68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
71	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
72	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
73

M compat/zlib/contrib/minizip/configure.ac

+1 -1

		--- compat/zlib/contrib/minizip/configure.ac
		+++ compat/zlib/contrib/minizip/configure.ac
		@@ -1,9 +1,9 @@
1	1	# -- Autoconf --
2	2	# Process this file with autoconf to produce a configure script.
3	3
4		-AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com])
	4	+AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com])
5	5	AC_CONFIG_SRCDIR([minizip.c])
6	6	AM_INIT_AUTOMAKE([foreign])
7	7	LT_INIT
8	8
9	9	AC_MSG_CHECKING([whether to build example programs])
10	10

	--- compat/zlib/contrib/minizip/configure.ac
	+++ compat/zlib/contrib/minizip/configure.ac
	@@ -1,9 +1,9 @@
1	# -- Autoconf --
2	# Process this file with autoconf to produce a configure script.
3
4	AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com])
5	AC_CONFIG_SRCDIR([minizip.c])
6	AM_INIT_AUTOMAKE([foreign])
7	LT_INIT
8
9	AC_MSG_CHECKING([whether to build example programs])
10

	--- compat/zlib/contrib/minizip/configure.ac
	+++ compat/zlib/contrib/minizip/configure.ac
	@@ -1,9 +1,9 @@
1	# -- Autoconf --
2	# Process this file with autoconf to produce a configure script.
3
4	AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com])
5	AC_CONFIG_SRCDIR([minizip.c])
6	AM_INIT_AUTOMAKE([foreign])
7	LT_INIT
8
9	AC_MSG_CHECKING([whether to build example programs])
10

M compat/zlib/contrib/pascal/zlibpas.pas

+2 -2

		--- compat/zlib/contrib/pascal/zlibpas.pas
		+++ compat/zlib/contrib/pascal/zlibpas.pas
		@@ -8,12 +8,12 @@
8	8	unit zlibpas;
9	9
10	10	interface
11	11
12	12	const
13		- ZLIB_VERSION = '1.2.9';
14		- ZLIB_VERNUM = $1290;
	13	+ ZLIB_VERSION = '1.2.10';
	14	+ ZLIB_VERNUM = $12a0;
15	15
16	16	type
17	17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	18	cdecl;
19	19	free_func = procedure(opaque, address: Pointer);
20	20

	--- compat/zlib/contrib/pascal/zlibpas.pas
	+++ compat/zlib/contrib/pascal/zlibpas.pas
	@@ -8,12 +8,12 @@
8	unit zlibpas;
9
10	interface
11
12	const
13	ZLIB_VERSION = '1.2.9';
14	ZLIB_VERNUM = $1290;
15
16	type
17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	cdecl;
19	free_func = procedure(opaque, address: Pointer);
20

	--- compat/zlib/contrib/pascal/zlibpas.pas
	+++ compat/zlib/contrib/pascal/zlibpas.pas
	@@ -8,12 +8,12 @@
8	unit zlibpas;
9
10	interface
11
12	const
13	ZLIB_VERSION = '1.2.10';
14	ZLIB_VERNUM = $12a0;
15
16	type
17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	cdecl;
19	free_func = procedure(opaque, address: Pointer);
20

M compat/zlib/contrib/vstudio/readme.txt

+2 -2

		--- compat/zlib/contrib/vstudio/readme.txt
		+++ compat/zlib/contrib/vstudio/readme.txt
		@@ -1,6 +1,6 @@
1		-Building instructions for the DLL versions of Zlib 1.2.9
	1	+Building instructions for the DLL versions of Zlib 1.2.10
2	2	========================================================
3	3
4	4	This directory contains projects that build zlib and minizip using
5	5	Microsoft Visual C++ 9.0/10.0.
6	6
		@@ -73,6 +73,6 @@
73	73
74	74	Gilles Vollant
75	75	[email protected]
76	76
77	77	Visual Studio 2013 and 2015 Projects from Sean Hunt
78		-[email protected]
	78	+[email protected]
79	79

	--- compat/zlib/contrib/vstudio/readme.txt
	+++ compat/zlib/contrib/vstudio/readme.txt
	@@ -1,6 +1,6 @@
1	Building instructions for the DLL versions of Zlib 1.2.9
2	========================================================
3
4	This directory contains projects that build zlib and minizip using
5	Microsoft Visual C++ 9.0/10.0.
6
	@@ -73,6 +73,6 @@
73
74	Gilles Vollant
75	[email protected]
76
77	Visual Studio 2013 and 2015 Projects from Sean Hunt
78	[email protected]
79

	--- compat/zlib/contrib/vstudio/readme.txt
	+++ compat/zlib/contrib/vstudio/readme.txt
	@@ -1,6 +1,6 @@
1	Building instructions for the DLL versions of Zlib 1.2.10
2	========================================================
3
4	This directory contains projects that build zlib and minizip using
5	Microsoft Visual C++ 9.0/10.0.
6
	@@ -73,6 +73,6 @@
73
74	Gilles Vollant
75	[email protected]
76
77	Visual Studio 2013 and 2015 Projects from Sean Hunt
78	[email protected]
79

M compat/zlib/contrib/vstudio/vc10/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc10/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	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
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	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"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	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"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc10/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 9, 0
6	PRODUCTVERSION 1, 2, 9, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.9\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc10/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 10, 0
6	PRODUCTVERSION 1, 2, 10, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.10\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc11/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc11/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	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
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	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"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	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"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc11/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 9, 0
6	PRODUCTVERSION 1, 2, 9, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.9\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc11/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 10, 0
6	PRODUCTVERSION 1, 2, 10, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.10\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc12/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc12/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	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
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	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"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	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"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc12/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 9, 0
6	PRODUCTVERSION 1, 2, 9, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.8.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc12/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 10, 0
6	PRODUCTVERSION 1, 2, 10, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.10\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc14/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc14/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	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
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	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"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	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"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc14/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 9, 0
6	PRODUCTVERSION 1, 2, 9, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.8.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc14/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 10, 0
6	PRODUCTVERSION 1, 2, 10, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.10\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc9/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc9/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	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
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	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"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	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"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc9/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 9, 0
6	PRODUCTVERSION 1, 2, 9, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.9\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc9/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 2, 10, 0
6	PRODUCTVERSION 1, 2, 10, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.10\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/deflate.c

+22 -20

		--- compat/zlib/deflate.c
		+++ compat/zlib/deflate.c
		@@ -1,7 +1,7 @@
1	1	/* deflate.c -- compress data using the deflation algorithm
2		- * Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
	2	+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/*
7	7	* ALGORITHM
		@@ -50,11 +50,11 @@
50	50	/* @(#) $Id$ */
51	51
52	52	#include "deflate.h"
53	53
54	54	const char deflate_copyright[] =
55		- " deflate 1.2.9 Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
	55	+ " deflate 1.2.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
56	56	/*
57	57	If you use the zlib library in a product, an acknowledgment is welcome
58	58	in the documentation of your product. If for some reason you cannot
59	59	include such an acknowledgment, I would appreciate that you keep this
60	60	copyright string in the executable of your product.
		@@ -86,10 +86,11 @@
86	86	local void lm_init OF((deflate_state *s));
87	87	local void putShortMSB OF((deflate_state *s, uInt b));
88	88	local void flush_pending OF((z_streamp strm));
89	89	local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
90	90	#ifdef ASMV
	91	+# pragma message("Assembler code may have bugs -- use at your own risk")
91	92	void match_init OF((void)); /* asm code initialization */
92	93	uInt longest_match OF((deflate_state *s, IPos cur_match));
93	94	#else
94	95	local uInt longest_match OF((deflate_state *s, IPos cur_match));
95	96	#endif
		@@ -1038,11 +1039,10 @@
1038	1039	s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
1039	1040	return Z_OK;
1040	1041	}
1041	1042	}
1042	1043	}
1043		- Assert(strm->avail_out > 0, "bug2");
1044	1044
1045	1045	if (flush != Z_FINISH) return Z_OK;
1046	1046	if (s->wrap <= 0) return Z_STREAM_END;
1047	1047
1048	1048	/* Write the trailer */
		@@ -1651,21 +1651,23 @@
1651	1651
1652	1652	/* Copy as many min_block or larger stored blocks directly to next_out as
1653	1653	* possible. If flushing, copy the remaining available input to next_out as
1654	1654	* stored blocks, if there is enough space.
1655	1655	*/
1656		- unsigned len, left, have, last;
	1656	+ unsigned len, left, have, last = 0;
1657	1657	unsigned used = s->strm->avail_in;
1658		- for (;;) {
	1658	+ do {
1659	1659	/* Set len to the maximum size block that we can copy directly with the
1660	1660	* available input data and output space. Set left to how much of that
1661	1661	* would be copied from what's left in the window.
1662	1662	*/
1663	1663	len = MAX_STORED; /* maximum deflate stored block length */
1664	1664	have = (s->bi_valid + 42) >> 3; /* number of header bytes */
	1665	+ if (s->strm->avail_out < have) /* need room for header */
	1666	+ break;
1665	1667	/* maximum stored block length that will fit in avail_out: */
1666		- have = s->strm->avail_out > have ? s->strm->avail_out - have : 0;
	1668	+ have = s->strm->avail_out - have;
1667	1669	left = s->strstart - s->block_start; /* bytes left in window */
1668	1670	if (len > (ulg)left + s->strm->avail_in)
1669	1671	len = left + s->strm->avail_in; /* limit len to the input */
1670	1672	if (len > have)
1671	1673	len = have; /* limit len to the output */
		@@ -1675,11 +1677,12 @@
1675	1677	/* If the stored block would be less than min_block in length, or if
1676	1678	* unable to copy all of the available input when flushing, then try
1677	1679	* copying to the window and the pending buffer instead. Also don't
1678	1680	* write an empty block when flushing -- deflate() does that.
1679	1681	*/
1680		- if (len < min_block && (len == 0 \|\| flush == Z_NO_FLUSH \|\|
	1682	+ if (len < min_block && ((len == 0 && flush != Z_FINISH) \|\|
	1683	+ flush == Z_NO_FLUSH \|\|
1681	1684	len - left != s->strm->avail_in))
1682	1685	break;
1683	1686
1684	1687	/* Make a dummy stored block in pending to get the header bytes,
1685	1688	* including any pending bits. This also updates the debugging counts.
		@@ -1719,11 +1722,11 @@
1719	1722	read_buf(s->strm, s->strm->next_out, len);
1720	1723	s->strm->next_out += len;
1721	1724	s->strm->avail_out -= len;
1722	1725	s->strm->total_out += len;
1723	1726	}
1724		- }
	1727	+ } while (last == 0);
1725	1728
1726	1729	/* Update the sliding window with the last s->w_size bytes of the copied
1727	1730	* data, or append all of the copied data to the existing window if less
1728	1731	* than s->w_size bytes were copied. Also update the number of bytes to
1729	1732	* insert in the hash tables, in the event that deflateParams() switches to
		@@ -1752,17 +1755,18 @@
1752	1755	}
1753	1756	s->block_start = s->strstart;
1754	1757	s->insert += MIN(used, s->w_size - s->insert);
1755	1758	}
1756	1759
1757		- /* If flushing or finishing and all input has been consumed, then done. If
1758		- * the code above couldn't write a complete block to next_out, then the
1759		- * code following this won't be able to either.
1760		- */
1761		- if (flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
1762		- (long)s->strstart == s->block_start)
1763		- return flush == Z_FINISH ? finish_done : block_done;
	1760	+ /* If the last block was written to next_out, then done. */
	1761	+ if (last)
	1762	+ return finish_done;
	1763	+
	1764	+ /* If flushing and all input has been consumed, then done. */
	1765	+ if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
	1766	+ s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
	1767	+ return block_done;
1764	1768
1765	1769	/* Fill the window with any remaining input. */
1766	1770	have = s->window_size - s->strstart - 1;
1767	1771	if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
1768	1772	/* Slide the window down. */
		@@ -1789,24 +1793,22 @@
1789	1793	/* maximum stored block length that will fit in pending: */
1790	1794	have = MIN(s->pending_buf_size - have, MAX_STORED);
1791	1795	min_block = MIN(have, s->w_size);
1792	1796	left = s->strstart - s->block_start;
1793	1797	if (left >= min_block \|\|
1794		- (left && flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
1795		- left <= have)) {
	1798	+ ((left \|\| flush == Z_FINISH) && flush != Z_NO_FLUSH &&
	1799	+ s->strm->avail_in == 0 && left <= have)) {
1796	1800	len = MIN(left, have);
1797	1801	last = flush == Z_FINISH && s->strm->avail_in == 0 &&
1798	1802	len == left ? 1 : 0;
1799	1803	_tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
1800	1804	s->block_start += len;
1801	1805	flush_pending(s->strm);
1802		- if (last)
1803		- return finish_started;
1804	1806	}
1805	1807
1806	1808	/* We've done all we can with the available input and output. */
1807		- return need_more;
	1809	+ return last ? finish_started : need_more;
1808	1810	}
1809	1811
1810	1812	/* ===========================================================================
1811	1813	* Compress as much as possible from the input stream, return the current
1812	1814	* block state.
1813	1815

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -1,7 +1,7 @@
1	/* deflate.c -- compress data using the deflation algorithm
2	* Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/*
7	* ALGORITHM
	@@ -50,11 +50,11 @@
50	/* @(#) $Id$ */
51
52	#include "deflate.h"
53
54	const char deflate_copyright[] =
55	" deflate 1.2.9 Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
56	/*
57	If you use the zlib library in a product, an acknowledgment is welcome
58	in the documentation of your product. If for some reason you cannot
59	include such an acknowledgment, I would appreciate that you keep this
60	copyright string in the executable of your product.
	@@ -86,10 +86,11 @@
86	local void lm_init OF((deflate_state *s));
87	local void putShortMSB OF((deflate_state *s, uInt b));
88	local void flush_pending OF((z_streamp strm));
89	local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
90	#ifdef ASMV

91	void match_init OF((void)); /* asm code initialization */
92	uInt longest_match OF((deflate_state *s, IPos cur_match));
93	#else
94	local uInt longest_match OF((deflate_state *s, IPos cur_match));
95	#endif
	@@ -1038,11 +1039,10 @@
1038	s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
1039	return Z_OK;
1040	}
1041	}
1042	}
1043	Assert(strm->avail_out > 0, "bug2");
1044
1045	if (flush != Z_FINISH) return Z_OK;
1046	if (s->wrap <= 0) return Z_STREAM_END;
1047
1048	/* Write the trailer */
	@@ -1651,21 +1651,23 @@
1651
1652	/* Copy as many min_block or larger stored blocks directly to next_out as
1653	* possible. If flushing, copy the remaining available input to next_out as
1654	* stored blocks, if there is enough space.
1655	*/
1656	unsigned len, left, have, last;
1657	unsigned used = s->strm->avail_in;
1658	for (;;) {
1659	/* Set len to the maximum size block that we can copy directly with the
1660	* available input data and output space. Set left to how much of that
1661	* would be copied from what's left in the window.
1662	*/
1663	len = MAX_STORED; /* maximum deflate stored block length */
1664	have = (s->bi_valid + 42) >> 3; /* number of header bytes */


1665	/* maximum stored block length that will fit in avail_out: */
1666	have = s->strm->avail_out > have ? s->strm->avail_out - have : 0;
1667	left = s->strstart - s->block_start; /* bytes left in window */
1668	if (len > (ulg)left + s->strm->avail_in)
1669	len = left + s->strm->avail_in; /* limit len to the input */
1670	if (len > have)
1671	len = have; /* limit len to the output */
	@@ -1675,11 +1677,12 @@
1675	/* If the stored block would be less than min_block in length, or if
1676	* unable to copy all of the available input when flushing, then try
1677	* copying to the window and the pending buffer instead. Also don't
1678	* write an empty block when flushing -- deflate() does that.
1679	*/
1680	if (len < min_block && (len == 0 \|\| flush == Z_NO_FLUSH \|\|

1681	len - left != s->strm->avail_in))
1682	break;
1683
1684	/* Make a dummy stored block in pending to get the header bytes,
1685	* including any pending bits. This also updates the debugging counts.
	@@ -1719,11 +1722,11 @@
1719	read_buf(s->strm, s->strm->next_out, len);
1720	s->strm->next_out += len;
1721	s->strm->avail_out -= len;
1722	s->strm->total_out += len;
1723	}
1724	}
1725
1726	/* Update the sliding window with the last s->w_size bytes of the copied
1727	* data, or append all of the copied data to the existing window if less
1728	* than s->w_size bytes were copied. Also update the number of bytes to
1729	* insert in the hash tables, in the event that deflateParams() switches to
	@@ -1752,17 +1755,18 @@
1752	}
1753	s->block_start = s->strstart;
1754	s->insert += MIN(used, s->w_size - s->insert);
1755	}
1756
1757	/* If flushing or finishing and all input has been consumed, then done. If
1758	* the code above couldn't write a complete block to next_out, then the
1759	* code following this won't be able to either.
1760	*/
1761	if (flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
1762	(long)s->strstart == s->block_start)
1763	return flush == Z_FINISH ? finish_done : block_done;

1764
1765	/* Fill the window with any remaining input. */
1766	have = s->window_size - s->strstart - 1;
1767	if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
1768	/* Slide the window down. */
	@@ -1789,24 +1793,22 @@
1789	/* maximum stored block length that will fit in pending: */
1790	have = MIN(s->pending_buf_size - have, MAX_STORED);
1791	min_block = MIN(have, s->w_size);
1792	left = s->strstart - s->block_start;
1793	if (left >= min_block \|\|
1794	(left && flush != Z_NO_FLUSH && s->strm->avail_in == 0 &&
1795	left <= have)) {
1796	len = MIN(left, have);
1797	last = flush == Z_FINISH && s->strm->avail_in == 0 &&
1798	len == left ? 1 : 0;
1799	_tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
1800	s->block_start += len;
1801	flush_pending(s->strm);
1802	if (last)
1803	return finish_started;
1804	}
1805
1806	/* We've done all we can with the available input and output. */
1807	return need_more;
1808	}
1809
1810	/* ===========================================================================
1811	* Compress as much as possible from the input stream, return the current
1812	* block state.
1813

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -1,7 +1,7 @@
1	/* deflate.c -- compress data using the deflation algorithm
2	* Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/*
7	* ALGORITHM
	@@ -50,11 +50,11 @@
50	/* @(#) $Id$ */
51
52	#include "deflate.h"
53
54	const char deflate_copyright[] =
55	" deflate 1.2.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
56	/*
57	If you use the zlib library in a product, an acknowledgment is welcome
58	in the documentation of your product. If for some reason you cannot
59	include such an acknowledgment, I would appreciate that you keep this
60	copyright string in the executable of your product.
	@@ -86,10 +86,11 @@
86	local void lm_init OF((deflate_state *s));
87	local void putShortMSB OF((deflate_state *s, uInt b));
88	local void flush_pending OF((z_streamp strm));
89	local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
90	#ifdef ASMV
91	# pragma message("Assembler code may have bugs -- use at your own risk")
92	void match_init OF((void)); /* asm code initialization */
93	uInt longest_match OF((deflate_state *s, IPos cur_match));
94	#else
95	local uInt longest_match OF((deflate_state *s, IPos cur_match));
96	#endif
	@@ -1038,11 +1039,10 @@
1039	s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
1040	return Z_OK;
1041	}
1042	}
1043	}

1044
1045	if (flush != Z_FINISH) return Z_OK;
1046	if (s->wrap <= 0) return Z_STREAM_END;
1047
1048	/* Write the trailer */
	@@ -1651,21 +1651,23 @@
1651
1652	/* Copy as many min_block or larger stored blocks directly to next_out as
1653	* possible. If flushing, copy the remaining available input to next_out as
1654	* stored blocks, if there is enough space.
1655	*/
1656	unsigned len, left, have, last = 0;
1657	unsigned used = s->strm->avail_in;
1658	do {
1659	/* Set len to the maximum size block that we can copy directly with the
1660	* available input data and output space. Set left to how much of that
1661	* would be copied from what's left in the window.
1662	*/
1663	len = MAX_STORED; /* maximum deflate stored block length */
1664	have = (s->bi_valid + 42) >> 3; /* number of header bytes */
1665	if (s->strm->avail_out < have) /* need room for header */
1666	break;
1667	/* maximum stored block length that will fit in avail_out: */
1668	have = s->strm->avail_out - have;
1669	left = s->strstart - s->block_start; /* bytes left in window */
1670	if (len > (ulg)left + s->strm->avail_in)
1671	len = left + s->strm->avail_in; /* limit len to the input */
1672	if (len > have)
1673	len = have; /* limit len to the output */
	@@ -1675,11 +1677,12 @@
1677	/* If the stored block would be less than min_block in length, or if
1678	* unable to copy all of the available input when flushing, then try
1679	* copying to the window and the pending buffer instead. Also don't
1680	* write an empty block when flushing -- deflate() does that.
1681	*/
1682	if (len < min_block && ((len == 0 && flush != Z_FINISH) \|\|
1683	flush == Z_NO_FLUSH \|\|
1684	len - left != s->strm->avail_in))
1685	break;
1686
1687	/* Make a dummy stored block in pending to get the header bytes,
1688	* including any pending bits. This also updates the debugging counts.
	@@ -1719,11 +1722,11 @@
1722	read_buf(s->strm, s->strm->next_out, len);
1723	s->strm->next_out += len;
1724	s->strm->avail_out -= len;
1725	s->strm->total_out += len;
1726	}
1727	} while (last == 0);
1728
1729	/* Update the sliding window with the last s->w_size bytes of the copied
1730	* data, or append all of the copied data to the existing window if less
1731	* than s->w_size bytes were copied. Also update the number of bytes to
1732	* insert in the hash tables, in the event that deflateParams() switches to
	@@ -1752,17 +1755,18 @@
1755	}
1756	s->block_start = s->strstart;
1757	s->insert += MIN(used, s->w_size - s->insert);
1758	}
1759
1760	/* If the last block was written to next_out, then done. */
1761	if (last)
1762	return finish_done;
1763
1764	/* If flushing and all input has been consumed, then done. */
1765	if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
1766	s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
1767	return block_done;
1768
1769	/* Fill the window with any remaining input. */
1770	have = s->window_size - s->strstart - 1;
1771	if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
1772	/* Slide the window down. */
	@@ -1789,24 +1793,22 @@
1793	/* maximum stored block length that will fit in pending: */
1794	have = MIN(s->pending_buf_size - have, MAX_STORED);
1795	min_block = MIN(have, s->w_size);
1796	left = s->strstart - s->block_start;
1797	if (left >= min_block \|\|
1798	((left \|\| flush == Z_FINISH) && flush != Z_NO_FLUSH &&
1799	s->strm->avail_in == 0 && left <= have)) {
1800	len = MIN(left, have);
1801	last = flush == Z_FINISH && s->strm->avail_in == 0 &&
1802	len == left ? 1 : 0;
1803	_tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
1804	s->block_start += len;
1805	flush_pending(s->strm);


1806	}
1807
1808	/* We've done all we can with the available input and output. */
1809	return last ? finish_started : need_more;
1810	}
1811
1812	/* ===========================================================================
1813	* Compress as much as possible from the input stream, return the current
1814	* block state.
1815

M compat/zlib/gzlib.c

+4 -4

		--- compat/zlib/gzlib.c
		+++ compat/zlib/gzlib.c
		@@ -209,11 +209,11 @@
209	209	else
210	210	*(state->path) = 0;
211	211	else
212	212	#endif
213	213	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
214		- snprintf(state->path, len + 1, "%s", (const char *)path);
	214	+ (void)snprintf(state->path, len + 1, "%s", (const char *)path);
215	215	#else
216	216	strcpy(state->path, path);
217	217	#endif
218	218
219	219	/* compute the flags for open() */
		@@ -291,11 +291,11 @@
291	291	gzFile gz;
292	292
293	293	if (fd == -1 \|\| (path = (char )malloc(7 + 3 sizeof(int))) == NULL)
294	294	return NULL;
295	295	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
296		- snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
	296	+ (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
297	297	#else
298	298	sprintf(path, "<fd:%d>", fd); /* for debugging */
299	299	#endif
300	300	gz = gz_open(path, fd, mode);
301	301	free(path);
		@@ -606,12 +606,12 @@
606	606	NULL) {
607	607	state->err = Z_MEM_ERROR;
608	608	return;
609	609	}
610	610	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
611		- snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
612		- "%s%s%s", state->path, ": ", msg);
	611	+ (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
	612	+ "%s%s%s", state->path, ": ", msg);
613	613	#else
614	614	strcpy(state->msg, state->path);
615	615	strcat(state->msg, ": ");
616	616	strcat(state->msg, msg);
617	617	#endif
618	618

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -209,11 +209,11 @@
209	else
210	*(state->path) = 0;
211	else
212	#endif
213	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
214	snprintf(state->path, len + 1, "%s", (const char *)path);
215	#else
216	strcpy(state->path, path);
217	#endif
218
219	/* compute the flags for open() */
	@@ -291,11 +291,11 @@
291	gzFile gz;
292
293	if (fd == -1 \|\| (path = (char )malloc(7 + 3 sizeof(int))) == NULL)
294	return NULL;
295	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
296	snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
297	#else
298	sprintf(path, "<fd:%d>", fd); /* for debugging */
299	#endif
300	gz = gz_open(path, fd, mode);
301	free(path);
	@@ -606,12 +606,12 @@
606	NULL) {
607	state->err = Z_MEM_ERROR;
608	return;
609	}
610	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
611	snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
612	"%s%s%s", state->path, ": ", msg);
613	#else
614	strcpy(state->msg, state->path);
615	strcat(state->msg, ": ");
616	strcat(state->msg, msg);
617	#endif
618

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -209,11 +209,11 @@
209	else
210	*(state->path) = 0;
211	else
212	#endif
213	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
214	(void)snprintf(state->path, len + 1, "%s", (const char *)path);
215	#else
216	strcpy(state->path, path);
217	#endif
218
219	/* compute the flags for open() */
	@@ -291,11 +291,11 @@
291	gzFile gz;
292
293	if (fd == -1 \|\| (path = (char )malloc(7 + 3 sizeof(int))) == NULL)
294	return NULL;
295	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
296	(void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
297	#else
298	sprintf(path, "<fd:%d>", fd); /* for debugging */
299	#endif
300	gz = gz_open(path, fd, mode);
301	free(path);
	@@ -606,12 +606,12 @@
606	NULL) {
607	state->err = Z_MEM_ERROR;
608	return;
609	}
610	#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
611	(void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
612	"%s%s%s", state->path, ": ", msg);
613	#else
614	strcpy(state->msg, state->path);
615	strcat(state->msg, ": ");
616	strcat(state->msg, msg);
617	#endif
618

M compat/zlib/gzwrite.c

+1

		--- compat/zlib/gzwrite.c
		+++ compat/zlib/gzwrite.c
		@@ -115,10 +115,11 @@
115	115	state->x.next += writ;
116	116	}
117	117	if (strm->avail_out == 0) {
118	118	strm->avail_out = state->size;
119	119	strm->next_out = state->out;
	120	+ state->x.next = state->out;
120	121	}
121	122	}
122	123
123	124	/* compress */
124	125	have = strm->avail_out;
125	126

	--- compat/zlib/gzwrite.c
	+++ compat/zlib/gzwrite.c
	@@ -115,10 +115,11 @@
115	state->x.next += writ;
116	}
117	if (strm->avail_out == 0) {
118	strm->avail_out = state->size;
119	strm->next_out = state->out;

120	}
121	}
122
123	/* compress */
124	have = strm->avail_out;
125

	--- compat/zlib/gzwrite.c
	+++ compat/zlib/gzwrite.c
	@@ -115,10 +115,11 @@
115	state->x.next += writ;
116	}
117	if (strm->avail_out == 0) {
118	strm->avail_out = state->size;
119	strm->next_out = state->out;
120	state->x.next = state->out;
121	}
122	}
123
124	/* compress */
125	have = strm->avail_out;
126

M compat/zlib/inffast.c

+3 -1

		--- compat/zlib/inffast.c
		+++ compat/zlib/inffast.c
		@@ -6,11 +6,13 @@
6	6	#include "zutil.h"
7	7	#include "inftrees.h"
8	8	#include "inflate.h"
9	9	#include "inffast.h"
10	10
11		-#ifndef ASMINF
	11	+#ifdef ASMINF
	12	+# pragma message("Assembler code may have bugs -- use at your own risk")
	13	+#else
12	14
13	15	/*
14	16	Decode literal, length, and distance codes and write out the resulting
15	17	literal and match bytes until either not enough input or output is
16	18	available, an end-of-block is encountered, or a data error is encountered.
17	19

	--- compat/zlib/inffast.c
	+++ compat/zlib/inffast.c
	@@ -6,11 +6,13 @@
6	#include "zutil.h"
7	#include "inftrees.h"
8	#include "inflate.h"
9	#include "inffast.h"
10
11	#ifndef ASMINF


12
13	/*
14	Decode literal, length, and distance codes and write out the resulting
15	literal and match bytes until either not enough input or output is
16	available, an end-of-block is encountered, or a data error is encountered.
17

	--- compat/zlib/inffast.c
	+++ compat/zlib/inffast.c
	@@ -6,11 +6,13 @@
6	#include "zutil.h"
7	#include "inftrees.h"
8	#include "inflate.h"
9	#include "inffast.h"
10
11	#ifdef ASMINF
12	# pragma message("Assembler code may have bugs -- use at your own risk")
13	#else
14
15	/*
16	Decode literal, length, and distance codes and write out the resulting
17	literal and match bytes until either not enough input or output is
18	available, an end-of-block is encountered, or a data error is encountered.
19

M compat/zlib/inftrees.c

+3 -3

		--- compat/zlib/inftrees.c
		+++ compat/zlib/inftrees.c
		@@ -1,17 +1,17 @@
1	1	/* inftrees.c -- generate Huffman trees for efficient decoding
2		- * Copyright (C) 1995-2016 Mark Adler
	2	+ * Copyright (C) 1995-2017 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "zutil.h"
7	7	#include "inftrees.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate_copyright[] =
12		- " inflate 1.2.9 Copyright 1995-2016 Mark Adler ";
	12	+ " inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
13	13	/*
14	14	If you use the zlib library in a product, an acknowledgment is welcome
15	15	in the documentation of your product. If for some reason you cannot
16	16	include such an acknowledgment, I would appreciate that you keep this
17	17	copyright string in the executable of your product.
		@@ -60,11 +60,11 @@
60	60	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
61	61	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
62	62	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63	63	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64	64	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, 192, 79};
	65	+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 202};
66	66	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67	67	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68	68	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
69	69	8193, 12289, 16385, 24577, 0, 0};
70	70	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
71	71

	--- compat/zlib/inftrees.c
	+++ compat/zlib/inftrees.c
	@@ -1,17 +1,17 @@
1	/* inftrees.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2016 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftrees.h"
8
9	#define MAXBITS 15
10
11	const char inflate_copyright[] =
12	" inflate 1.2.9 Copyright 1995-2016 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -60,11 +60,11 @@
60	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
61	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
62	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64	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, 192, 79};
66	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
69	8193, 12289, 16385, 24577, 0, 0};
70	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
71

	--- compat/zlib/inftrees.c
	+++ compat/zlib/inftrees.c
	@@ -1,17 +1,17 @@
1	/* inftrees.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2017 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftrees.h"
8
9	#define MAXBITS 15
10
11	const char inflate_copyright[] =
12	" inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -60,11 +60,11 @@
60	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
61	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
62	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64	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, 192, 202};
66	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
69	8193, 12289, 16385, 24577, 0, 0};
70	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
71

M compat/zlib/os400/README400

+1 -1

		--- compat/zlib/os400/README400
		+++ compat/zlib/os400/README400
		@@ -1,6 +1,6 @@
1		- ZLIB version 1.2.9 for OS/400 installation instructions
	1	+ ZLIB version 1.2.10 for OS/400 installation instructions
2	2
3	3	1) Download and unpack the zlib tarball to some IFS directory.
4	4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5	5
6	6	If the installed IFS command suppors gzip format, this is straightforward,
7	7

	--- compat/zlib/os400/README400
	+++ compat/zlib/os400/README400
	@@ -1,6 +1,6 @@
1	ZLIB version 1.2.9 for OS/400 installation instructions
2
3	1) Download and unpack the zlib tarball to some IFS directory.
4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5
6	If the installed IFS command suppors gzip format, this is straightforward,
7

	--- compat/zlib/os400/README400
	+++ compat/zlib/os400/README400
	@@ -1,6 +1,6 @@
1	ZLIB version 1.2.10 for OS/400 installation instructions
2
3	1) Download and unpack the zlib tarball to some IFS directory.
4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5
6	If the installed IFS command suppors gzip format, this is straightforward,
7

M compat/zlib/os400/zlib.inc

+4 -4

		--- compat/zlib/os400/zlib.inc
		+++ compat/zlib/os400/zlib.inc
		@@ -1,9 +1,9 @@
1	1	* ZLIB.INC - Interface to the general purpose compression library
2	2	*
3	3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4		- * Version 1.2.9
	4	+ * Version 1.2.10
5	5	*
6	6	*
7	7	* WARNING:
8	8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	9	* deflateInit2() and inflateBackInit() need to be called with
		@@ -20,16 +20,16 @@
20	20	* Constants
21	21	**************************************************************************
22	22	*
23	23	* Versioning information.
24	24	*
25		- D ZLIB_VERSION C '1.2.9'
26		- D ZLIB_VERNUM C X'1290'
	25	+ D ZLIB_VERSION C '1.2.10'
	26	+ D ZLIB_VERNUM C X'12a0'
27	27	D ZLIB_VER_MAJOR C 1
28	28	D ZLIB_VER_MINOR C 2
29	29	D ZLIB_VER_REVISION...
30		- D C 9
	30	+ D C 10
31	31	D ZLIB_VER_SUBREVISION...
32	32	D C 0
33	33	*
34	34	* Other equates.
35	35	*
36	36

	--- compat/zlib/os400/zlib.inc
	+++ compat/zlib/os400/zlib.inc
	@@ -1,9 +1,9 @@
1	* ZLIB.INC - Interface to the general purpose compression library
2	*
3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4	* Version 1.2.9
5	*
6	*
7	* WARNING:
8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	* deflateInit2() and inflateBackInit() need to be called with
	@@ -20,16 +20,16 @@
20	* Constants
21	**************************************************************************
22	*
23	* Versioning information.
24	*
25	D ZLIB_VERSION C '1.2.9'
26	D ZLIB_VERNUM C X'1290'
27	D ZLIB_VER_MAJOR C 1
28	D ZLIB_VER_MINOR C 2
29	D ZLIB_VER_REVISION...
30	D C 9
31	D ZLIB_VER_SUBREVISION...
32	D C 0
33	*
34	* Other equates.
35	*
36

	--- compat/zlib/os400/zlib.inc
	+++ compat/zlib/os400/zlib.inc
	@@ -1,9 +1,9 @@
1	* ZLIB.INC - Interface to the general purpose compression library
2	*
3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4	* Version 1.2.10
5	*
6	*
7	* WARNING:
8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	* deflateInit2() and inflateBackInit() need to be called with
	@@ -20,16 +20,16 @@
20	* Constants
21	**************************************************************************
22	*
23	* Versioning information.
24	*
25	D ZLIB_VERSION C '1.2.10'
26	D ZLIB_VERNUM C X'12a0'
27	D ZLIB_VER_MAJOR C 1
28	D ZLIB_VER_MINOR C 2
29	D ZLIB_VER_REVISION...
30	D C 10
31	D ZLIB_VER_SUBREVISION...
32	D C 0
33	*
34	* Other equates.
35	*
36

M compat/zlib/qnx/package.qpg

+5 -5

		--- compat/zlib/qnx/package.qpg
		+++ compat/zlib/qnx/package.qpg
		@@ -23,14 +23,14 @@
23	23
24	24	<QPG:Values>
25	25	<QPG:Files>
26	26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28		- <QPG:Add file="../libz.so.1.2.9" 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"/>
30		- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9"/>
31		- <QPG:Add file="../libz.so.1.2.9" 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"/>
32	32	</QPG:Files>
33	33
34	34	<QPG:PackageFilter>
35	35	<QPM:PackageManifest>
36	36	<QPM:PackageDescription>
		@@ -61,11 +61,11 @@
61	61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	63	</QPM:ProductDescription>
64	64
65	65	<QPM:ReleaseDescription>
66		- <QPM:ReleaseVersion>1.2.9</QPM:ReleaseVersion>
	66	+ <QPM:ReleaseVersion>1.2.10</QPM:ReleaseVersion>
67	67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	71	<QPM:ExcludeCountries>
72	72

	--- compat/zlib/qnx/package.qpg
	+++ compat/zlib/qnx/package.qpg
	@@ -23,14 +23,14 @@
23
24	<QPG:Values>
25	<QPG:Files>
26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28	<QPG:Add file="../libz.so.1.2.9" 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"/>
30	<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9"/>
31	<QPG:Add file="../libz.so.1.2.9" install="/opt/lib/" component="slib"/>
32	</QPG:Files>
33
34	<QPG:PackageFilter>
35	<QPM:PackageManifest>
36	<QPM:PackageDescription>
	@@ -61,11 +61,11 @@
61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	</QPM:ProductDescription>
64
65	<QPM:ReleaseDescription>
66	<QPM:ReleaseVersion>1.2.9</QPM:ReleaseVersion>
67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	<QPM:ExcludeCountries>
72

	--- compat/zlib/qnx/package.qpg
	+++ compat/zlib/qnx/package.qpg
	@@ -23,14 +23,14 @@
23
24	<QPG:Values>
25	<QPG:Files>
26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
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"/>
32	</QPG:Files>
33
34	<QPG:PackageFilter>
35	<QPM:PackageManifest>
36	<QPM:PackageDescription>
	@@ -61,11 +61,11 @@
61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	</QPM:ProductDescription>
64
65	<QPM:ReleaseDescription>
66	<QPM:ReleaseVersion>1.2.10</QPM:ReleaseVersion>
67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	<QPM:ExcludeCountries>
72

M compat/zlib/treebuild.xml

+2 -2

		--- compat/zlib/treebuild.xml
		+++ compat/zlib/treebuild.xml
		@@ -1,8 +1,8 @@
1	1	<?xml version="1.0" ?>
2		-<package name="zlib" version="1.2.9">
3		- <library name="zlib" dlversion="1.2.9" dlname="z">
	2	+<package name="zlib" version="1.2.10">
	3	+ <library name="zlib" dlversion="1.2.10" dlname="z">
4	4	<property name="description"> zip compression library </property>
5	5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6	6
7	7	<!-- fixme: not implemented yet -->
8	8	<property name="compiler/c/inline" value="yes" />
9	9

	--- compat/zlib/treebuild.xml
	+++ compat/zlib/treebuild.xml
	@@ -1,8 +1,8 @@
1	<?xml version="1.0" ?>
2	<package name="zlib" version="1.2.9">
3	<library name="zlib" dlversion="1.2.9" dlname="z">
4	<property name="description"> zip compression library </property>
5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6
7	<!-- fixme: not implemented yet -->
8	<property name="compiler/c/inline" value="yes" />
9

	--- compat/zlib/treebuild.xml
	+++ compat/zlib/treebuild.xml
	@@ -1,8 +1,8 @@
1	<?xml version="1.0" ?>
2	<package name="zlib" version="1.2.10">
3	<library name="zlib" dlversion="1.2.10" dlname="z">
4	<property name="description"> zip compression library </property>
5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6
7	<!-- fixme: not implemented yet -->
8	<property name="compiler/c/inline" value="yes" />
9

M compat/zlib/win32/README-WIN32.txt

+2 -2

		--- compat/zlib/win32/README-WIN32.txt
		+++ compat/zlib/win32/README-WIN32.txt
		@@ -1,8 +1,8 @@
1	1	ZLIB DATA COMPRESSION LIBRARY
2	2
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
4	4	thread safe. The data format used by the zlib library is described by RFCs
5	5	(Request for Comments) 1950 to 1952 in the files
6	6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	7	and rfc1952.txt (gzip format).
8	8
		@@ -20,11 +20,11 @@
20	20	before asking for help.
21	21
22	22
23	23	Manifest:
24	24
25		-The package zlib-1.2.9-win32-x86.zip will contain the following files:
	25	+The package zlib-1.2.10-win32-x86.zip will contain the following files:
26	26
27	27	README-WIN32.txt This document
28	28	ChangeLog Changes since previous zlib packages
29	29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31	31

	--- compat/zlib/win32/README-WIN32.txt
	+++ compat/zlib/win32/README-WIN32.txt
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.2.9 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	and rfc1952.txt (gzip format).
8
	@@ -20,11 +20,11 @@
20	before asking for help.
21
22
23	Manifest:
24
25	The package zlib-1.2.9-win32-x86.zip will contain the following files:
26
27	README-WIN32.txt This document
28	ChangeLog Changes since previous zlib packages
29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31

	--- compat/zlib/win32/README-WIN32.txt
	+++ compat/zlib/win32/README-WIN32.txt
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.2.10 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	and rfc1952.txt (gzip format).
8
	@@ -20,11 +20,11 @@
20	before asking for help.
21
22
23	Manifest:
24
25	The package zlib-1.2.10-win32-x86.zip will contain the following files:
26
27	README-WIN32.txt This document
28	ChangeLog Changes since previous zlib packages
29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31

M compat/zlib/zlib.3

+3 -3

		--- compat/zlib/zlib.3
		+++ compat/zlib/zlib.3
		@@ -1,6 +1,6 @@
1		-.TH ZLIB 3 "31 Dec 2016"
	1	+.TH ZLIB 3 "2 Jan 2017"
2	2	.SH NAME
3	3	zlib \- compression/decompression library
4	4	.SH SYNOPSIS
5	5	[see
6	6	.I zlib.h
		@@ -103,13 +103,13 @@
103	103	.LP
104	104	before asking for help.
105	105	Send questions and/or comments to [email protected],
106	106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	107	.SH AUTHORS AND LICENSE
108		-Version 1.2.9
	108	+Version 1.2.10
109	109	.LP
110		-Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
	110	+Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
111	111	.LP
112	112	This software is provided 'as-is', without any express or implied
113	113	warranty. In no event will the authors be held liable for any damages
114	114	arising from the use of this software.
115	115	.LP
116	116

	--- compat/zlib/zlib.3
	+++ compat/zlib/zlib.3
	@@ -1,6 +1,6 @@
1	.TH ZLIB 3 "31 Dec 2016"
2	.SH NAME
3	zlib \- compression/decompression library
4	.SH SYNOPSIS
5	[see
6	.I zlib.h
	@@ -103,13 +103,13 @@
103	.LP
104	before asking for help.
105	Send questions and/or comments to [email protected],
106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	.SH AUTHORS AND LICENSE
108	Version 1.2.9
109	.LP
110	Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
111	.LP
112	This software is provided 'as-is', without any express or implied
113	warranty. In no event will the authors be held liable for any damages
114	arising from the use of this software.
115	.LP
116

	--- compat/zlib/zlib.3
	+++ compat/zlib/zlib.3
	@@ -1,6 +1,6 @@
1	.TH ZLIB 3 "2 Jan 2017"
2	.SH NAME
3	zlib \- compression/decompression library
4	.SH SYNOPSIS
5	[see
6	.I zlib.h
	@@ -103,13 +103,13 @@
103	.LP
104	before asking for help.
105	Send questions and/or comments to [email protected],
106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	.SH AUTHORS AND LICENSE
108	Version 1.2.10
109	.LP
110	Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
111	.LP
112	This software is provided 'as-is', without any express or implied
113	warranty. In no event will the authors be held liable for any damages
114	arising from the use of this software.
115	.LP
116

M compat/zlib/zlib.3.pdf

		--- compat/zlib/zlib.3.pdf
		+++ compat/zlib/zlib.3.pdf
		cannot compute difference between binary files
1	1

	--- compat/zlib/zlib.3.pdf
	+++ compat/zlib/zlib.3.pdf
0	annot compute difference between binary files
1

	--- compat/zlib/zlib.3.pdf
	+++ compat/zlib/zlib.3.pdf
0	annot compute difference between binary files
1

M compat/zlib/zlib.h

+13 -12

		--- compat/zlib/zlib.h
		+++ compat/zlib/zlib.h
		@@ -1,9 +1,9 @@
1	1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2		- version 1.2.9, December 31st, 2016
	2	+ version 1.2.10, January 2nd, 2017
3	3
4		- Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
	4	+ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
5	5
6	6	This software is provided 'as-is', without any express or implied
7	7	warranty. In no event will the authors be held liable for any damages
8	8	arising from the use of this software.
9	9
		@@ -35,15 +35,15 @@
35	35
36	36	#ifdef __cplusplus
37	37	extern "C" {
38	38	#endif
39	39
40		-#define ZLIB_VERSION "1.2.9"
41		-#define ZLIB_VERNUM 0x1290
	40	+#define ZLIB_VERSION "1.2.10"
	41	+#define ZLIB_VERNUM 0x12a0
42	42	#define ZLIB_VER_MAJOR 1
43	43	#define ZLIB_VER_MINOR 2
44		-#define ZLIB_VER_REVISION 9
	44	+#define ZLIB_VER_REVISION 10
45	45	#define ZLIB_VER_SUBREVISION 0
46	46
47	47	/*
48	48	The 'zlib' compression library provides in-memory compression and
49	49	decompression functions, including integrity checks of the uncompressed data.
		@@ -377,14 +377,15 @@
377	377	/*
378	378	ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
379	379
380	380	Initializes the internal stream state for decompression. The fields
381	381	next_in, avail_in, zalloc, zfree and opaque must be initialized before by
382		- the caller. In the current version of inflate, the provide input is not
383		- read or consumed. Any memory allocation will be deferred to the first call
384		- of inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them
385		- to use default allocation functions.
	382	+ the caller. In the current version of inflate, the provided input is not
	383	+ read or consumed. The allocation of a sliding window will be deferred to
	384	+ the first call of inflate (if the decompression does not complete on the
	385	+ first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
	386	+ them to use default allocation functions.
386	387
387	388	inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
388	389	memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
389	390	version assumed by the caller, or Z_STREAM_ERROR if the parameters are
390	391	invalid, such as a null pointer to the structure. msg is set to null if
		@@ -406,11 +407,11 @@
406	407	The detailed semantics are as follows. inflate performs one or both of the
407	408	following actions:
408	409
409	410	- Decompress more input starting at next_in and update next_in and avail_in
410	411	accordingly. If not all input can be processed (because there is not
411		- enough room in the output buffer), then next_in and avail_on are updated
	412	+ enough room in the output buffer), then next_in and avail_in are updated
412	413	accordingly, and processing will resume at this point for the next call of
413	414	inflate().
414	415
415	416	- Generate more output starting at next_out and update next_out and avail_out
416	417	accordingly. inflate() provides as much output as possible, until there is
		@@ -1227,11 +1228,11 @@
1227	1228	/*
1228	1229	Compresses the source buffer into the destination buffer. sourceLen is
1229	1230	the byte length of the source buffer. Upon entry, destLen is the total size
1230	1231	of the destination buffer, which must be at least the value returned by
1231	1232	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1232		- compressed buffer. compress() is equivalent to compress2() with a level
	1233	+ compressed data. compress() is equivalent to compress2() with a level
1233	1234	parameter of Z_DEFAULT_COMPRESSION.
1234	1235
1235	1236	compress returns Z_OK if success, Z_MEM_ERROR if there was not
1236	1237	enough memory, Z_BUF_ERROR if there was not enough room in the output
1237	1238	buffer.
		@@ -1244,11 +1245,11 @@
1244	1245	Compresses the source buffer into the destination buffer. The level
1245	1246	parameter has the same meaning as in deflateInit. sourceLen is the byte
1246	1247	length of the source buffer. Upon entry, destLen is the total size of the
1247	1248	destination buffer, which must be at least the value returned by
1248	1249	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1249		- compressed buffer.
	1250	+ compressed data.
1250	1251
1251	1252	compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
1252	1253	memory, Z_BUF_ERROR if there was not enough room in the output buffer,
1253	1254	Z_STREAM_ERROR if the level parameter is invalid.
1254	1255	*/
1255	1256

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,9 +1,9 @@
1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2	version 1.2.9, December 31st, 2016
3
4	Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
5
6	This software is provided 'as-is', without any express or implied
7	warranty. In no event will the authors be held liable for any damages
8	arising from the use of this software.
9
	@@ -35,15 +35,15 @@
35
36	#ifdef __cplusplus
37	extern "C" {
38	#endif
39
40	#define ZLIB_VERSION "1.2.9"
41	#define ZLIB_VERNUM 0x1290
42	#define ZLIB_VER_MAJOR 1
43	#define ZLIB_VER_MINOR 2
44	#define ZLIB_VER_REVISION 9
45	#define ZLIB_VER_SUBREVISION 0
46
47	/*
48	The 'zlib' compression library provides in-memory compression and
49	decompression functions, including integrity checks of the uncompressed data.
	@@ -377,14 +377,15 @@
377	/*
378	ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
379
380	Initializes the internal stream state for decompression. The fields
381	next_in, avail_in, zalloc, zfree and opaque must be initialized before by
382	the caller. In the current version of inflate, the provide input is not
383	read or consumed. Any memory allocation will be deferred to the first call
384	of inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them
385	to use default allocation functions.

386
387	inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
388	memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
389	version assumed by the caller, or Z_STREAM_ERROR if the parameters are
390	invalid, such as a null pointer to the structure. msg is set to null if
	@@ -406,11 +407,11 @@
406	The detailed semantics are as follows. inflate performs one or both of the
407	following actions:
408
409	- Decompress more input starting at next_in and update next_in and avail_in
410	accordingly. If not all input can be processed (because there is not
411	enough room in the output buffer), then next_in and avail_on are updated
412	accordingly, and processing will resume at this point for the next call of
413	inflate().
414
415	- Generate more output starting at next_out and update next_out and avail_out
416	accordingly. inflate() provides as much output as possible, until there is
	@@ -1227,11 +1228,11 @@
1227	/*
1228	Compresses the source buffer into the destination buffer. sourceLen is
1229	the byte length of the source buffer. Upon entry, destLen is the total size
1230	of the destination buffer, which must be at least the value returned by
1231	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1232	compressed buffer. compress() is equivalent to compress2() with a level
1233	parameter of Z_DEFAULT_COMPRESSION.
1234
1235	compress returns Z_OK if success, Z_MEM_ERROR if there was not
1236	enough memory, Z_BUF_ERROR if there was not enough room in the output
1237	buffer.
	@@ -1244,11 +1245,11 @@
1244	Compresses the source buffer into the destination buffer. The level
1245	parameter has the same meaning as in deflateInit. sourceLen is the byte
1246	length of the source buffer. Upon entry, destLen is the total size of the
1247	destination buffer, which must be at least the value returned by
1248	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1249	compressed buffer.
1250
1251	compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
1252	memory, Z_BUF_ERROR if there was not enough room in the output buffer,
1253	Z_STREAM_ERROR if the level parameter is invalid.
1254	*/
1255

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,9 +1,9 @@
1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2	version 1.2.10, January 2nd, 2017
3
4	Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
5
6	This software is provided 'as-is', without any express or implied
7	warranty. In no event will the authors be held liable for any damages
8	arising from the use of this software.
9
	@@ -35,15 +35,15 @@
35
36	#ifdef __cplusplus
37	extern "C" {
38	#endif
39
40	#define ZLIB_VERSION "1.2.10"
41	#define ZLIB_VERNUM 0x12a0
42	#define ZLIB_VER_MAJOR 1
43	#define ZLIB_VER_MINOR 2
44	#define ZLIB_VER_REVISION 10
45	#define ZLIB_VER_SUBREVISION 0
46
47	/*
48	The 'zlib' compression library provides in-memory compression and
49	decompression functions, including integrity checks of the uncompressed data.
	@@ -377,14 +377,15 @@
377	/*
378	ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
379
380	Initializes the internal stream state for decompression. The fields
381	next_in, avail_in, zalloc, zfree and opaque must be initialized before by
382	the caller. In the current version of inflate, the provided input is not
383	read or consumed. The allocation of a sliding window will be deferred to
384	the first call of inflate (if the decompression does not complete on the
385	first call). If zalloc and zfree are set to Z_NULL, inflateInit updates
386	them to use default allocation functions.
387
388	inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
389	memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
390	version assumed by the caller, or Z_STREAM_ERROR if the parameters are
391	invalid, such as a null pointer to the structure. msg is set to null if
	@@ -406,11 +407,11 @@
407	The detailed semantics are as follows. inflate performs one or both of the
408	following actions:
409
410	- Decompress more input starting at next_in and update next_in and avail_in
411	accordingly. If not all input can be processed (because there is not
412	enough room in the output buffer), then next_in and avail_in are updated
413	accordingly, and processing will resume at this point for the next call of
414	inflate().
415
416	- Generate more output starting at next_out and update next_out and avail_out
417	accordingly. inflate() provides as much output as possible, until there is
	@@ -1227,11 +1228,11 @@
1228	/*
1229	Compresses the source buffer into the destination buffer. sourceLen is
1230	the byte length of the source buffer. Upon entry, destLen is the total size
1231	of the destination buffer, which must be at least the value returned by
1232	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1233	compressed data. compress() is equivalent to compress2() with a level
1234	parameter of Z_DEFAULT_COMPRESSION.
1235
1236	compress returns Z_OK if success, Z_MEM_ERROR if there was not
1237	enough memory, Z_BUF_ERROR if there was not enough room in the output
1238	buffer.
	@@ -1244,11 +1245,11 @@
1245	Compresses the source buffer into the destination buffer. The level
1246	parameter has the same meaning as in deflateInit. sourceLen is the byte
1247	length of the source buffer. Upon entry, destLen is the total size of the
1248	destination buffer, which must be at least the value returned by
1249	compressBound(sourceLen). Upon exit, destLen is the actual size of the
1250	compressed data.
1251
1252	compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
1253	memory, Z_BUF_ERROR if there was not enough room in the output buffer,
1254	Z_STREAM_ERROR if the level parameter is invalid.
1255	*/
1256

M compat/zlib/zutil.c

+1 -1

		--- compat/zlib/zutil.c
		+++ compat/zlib/zutil.c
		@@ -111,11 +111,11 @@
111	111	#endif
112	112	return flags;
113	113	}
114	114
115	115	#ifdef ZLIB_DEBUG
116		-
	116	+#include <stdlib.h>
117	117	# ifndef verbose
118	118	# define verbose 0
119	119	# endif
120	120	int ZLIB_INTERNAL z_verbose = verbose;
121	121
122	122

	--- compat/zlib/zutil.c
	+++ compat/zlib/zutil.c
	@@ -111,11 +111,11 @@
111	#endif
112	return flags;
113	}
114
115	#ifdef ZLIB_DEBUG
116
117	# ifndef verbose
118	# define verbose 0
119	# endif
120	int ZLIB_INTERNAL z_verbose = verbose;
121
122

	--- compat/zlib/zutil.c
	+++ compat/zlib/zutil.c
	@@ -111,11 +111,11 @@
111	#endif
112	return flags;
113	}
114
115	#ifdef ZLIB_DEBUG
116	#include <stdlib.h>
117	# ifndef verbose
118	# define verbose 0
119	# endif
120	int ZLIB_INTERNAL z_verbose = verbose;
121
122

M www/changes.wiki

+2

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -31,10 +31,12 @@
31	31	* Remove the "fusefs" command from builds that do not have the underlying
32	32	support enabled.
33	33	* Fixes for incremental git import/export.
34	34	* Minor security enhancements to
35	35	[./encryptedrepos.wiki\|encrypted repositories].
	36	+ * Update the built-in SQLite to version 3.16.
	37	+ * Update the built-in Zlib to version 1.2.10.
36	38
37	39	<a name='v1_36'></a>
38	40	<h2>Changes for Version 1.36 (2016-10-24)</h2>
39	41
40	42	* Add support for [./unvers.wiki\|unversioned content],
41	43

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -31,10 +31,12 @@
31	* Remove the "fusefs" command from builds that do not have the underlying
32	support enabled.
33	* Fixes for incremental git import/export.
34	* Minor security enhancements to
35	[./encryptedrepos.wiki\|encrypted repositories].


36
37	<a name='v1_36'></a>
38	<h2>Changes for Version 1.36 (2016-10-24)</h2>
39
40	* Add support for [./unvers.wiki\|unversioned content],
41

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -31,10 +31,12 @@
31	* Remove the "fusefs" command from builds that do not have the underlying
32	support enabled.
33	* Fixes for incremental git import/export.
34	* Minor security enhancements to
35	[./encryptedrepos.wiki\|encrypted repositories].
36	* Update the built-in SQLite to version 3.16.
37	* Update the built-in Zlib to version 1.2.10.
38
39	<a name='v1_36'></a>
40	<h2>Changes for Version 1.36 (2016-10-24)</h2>
41
42	* Add support for [./unvers.wiki\|unversioned content],
43

Fossil SCM

Keyboard Shortcuts