df91c2277f6… — Fossil SCM

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.10")
	6	+set(VERSION "1.2.11")
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.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

	--- 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.11")
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

+4

		--- compat/zlib/ChangeLog
		+++ compat/zlib/ChangeLog
		@@ -1,8 +1,12 @@
1	1
2	2	ChangeLog file for zlib
3	3
	4	+Changes in 1.2.11 (15 Jan 2017)
	5	+- Fix deflate stored bug when pulling last block from window
	6	+- Permit immediate deflateParams changes before any deflate input
	7	+
4	8	Changes in 1.2.10 (2 Jan 2017)
5	9	- Avoid warnings on snprintf() return value
6	10	- Fix bug in deflate_stored() for zero-length input
7	11	- Fix bug in gzwrite.c that produced corrupt gzip files
8	12	- Remove files to be installed before copying them in Makefile.in
9	13

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,12 @@
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

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,12 @@
1
2	ChangeLog file for zlib
3
4	Changes in 1.2.11 (15 Jan 2017)
5	- Fix deflate stored bug when pulling last block from window
6	- Permit immediate deflateParams changes before any deflate input
7
8	Changes in 1.2.10 (2 Jan 2017)
9	- Avoid warnings on snprintf() return value
10	- Fix bug in deflate_stored() for zero-length input
11	- Fix bug in gzwrite.c that produced corrupt gzip files
12	- Remove files to be installed before copying them in Makefile.in
13

M compat/zlib/Makefile.in

+2 -2

		--- compat/zlib/Makefile.in
		+++ compat/zlib/Makefile.in
		@@ -1,7 +1,7 @@
1	1	# Makefile for zlib
2		-# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
	2	+# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
3	3	# For conditions of distribution and use, see copyright notice in zlib.h
4	4
5	5	# To compile and test, type:
6	6	# ./configure; make test
7	7	# Normally configure builds both a static and a shared library.
		@@ -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.10
	35	+SHAREDLIBV=libz.so.1.2.11
36	36	SHAREDLIBM=libz.so.1
37	37	LIBS=$(STATICLIB) $(SHAREDLIBV)
38	38
39	39	AR=ar
40	40	ARFLAGS=rc
41	41

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -1,7 +1,7 @@
1	# Makefile for zlib
2	# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3	# For conditions of distribution and use, see copyright notice in zlib.h
4
5	# To compile and test, type:
6	# ./configure; make test
7	# Normally configure builds both a static and a shared library.
	@@ -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
41

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -1,7 +1,7 @@
1	# Makefile for zlib
2	# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
3	# For conditions of distribution and use, see copyright notice in zlib.h
4
5	# To compile and test, type:
6	# ./configure; make test
7	# Normally configure builds both a static and a shared library.
	@@ -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.11
36	SHAREDLIBM=libz.so.1
37	LIBS=$(STATICLIB) $(SHAREDLIBV)
38
39	AR=ar
40	ARFLAGS=rc
41

M compat/zlib/README

+2 -2

		--- compat/zlib/README
		+++ compat/zlib/README
		@@ -1,8 +1,8 @@
1	1	ZLIB DATA COMPRESSION LIBRARY
2	2
3		-zlib 1.2.10 is a general purpose data compression library. All the code is
	3	+zlib 1.2.11 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.10 are documented in the file ChangeLog.
	34	+The changes made in version 1.2.11 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/ .
40	40

	--- 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/ .
40

	--- compat/zlib/README
	+++ compat/zlib/README
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.2.11 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.11 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/ .
40

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.10';
	155	+ zlib_version = '1.2.11';
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.10';
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.11';
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.10", Info.Version);
	159	+ Assert.AreEqual("1.2.11", 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.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

	--- 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.11", 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

+2 -2

		--- compat/zlib/contrib/infback9/inftree9.c
		+++ compat/zlib/contrib/infback9/inftree9.c
		@@ -7,11 +7,11 @@
7	7	#include "inftree9.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate9_copyright[] =
12		- " inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
	12	+ " inflate9 1.2.11 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, 202};
	67	+ 133, 133, 133, 133, 144, 77, 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
	@@ -7,11 +7,11 @@
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

	--- compat/zlib/contrib/infback9/inftree9.c
	+++ compat/zlib/contrib/infback9/inftree9.c
	@@ -7,11 +7,11 @@
7	#include "inftree9.h"
8
9	#define MAXBITS 15
10
11	const char inflate9_copyright[] =
12	" inflate9 1.2.11 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, 77, 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.10], [bugzilla.redhat.com])
	4	+AC_INIT([minizip], [1.2.11], [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.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

	--- 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.11], [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

+1 -1

		--- compat/zlib/contrib/pascal/zlibpas.pas
		+++ compat/zlib/contrib/pascal/zlibpas.pas
		@@ -8,11 +8,11 @@
8	8	unit zlibpas;
9	9
10	10	interface
11	11
12	12	const
13		- ZLIB_VERSION = '1.2.10';
	13	+ ZLIB_VERSION = '1.2.11';
14	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

	--- compat/zlib/contrib/pascal/zlibpas.pas
	+++ compat/zlib/contrib/pascal/zlibpas.pas
	@@ -8,11 +8,11 @@
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

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

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

+1 -1

		--- 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
	1	+Building instructions for the DLL versions of Zlib 1.2.11
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
7	7

	--- 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
7

	--- 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.11
2	========================================================
3
4	This directory contains projects that build zlib and minizip using
5	Microsoft Visual C++ 9.0/10.0.
6
7

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

+3 -3

		--- 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, 10, 0
6		- PRODUCTVERSION 1, 2, 10, 0
	5	+ FILEVERSION 1, 2, 11, 0
	6	+ PRODUCTVERSION 1, 2, 11, 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,11 +15,11 @@
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.10\0"
	20	+ VALUE "FileVersion", "1.2.11\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	25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	26

	--- 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,11 +15,11 @@
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

	--- 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, 11, 0
6	PRODUCTVERSION 1, 2, 11, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,11 +15,11 @@
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.11\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

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

+3 -3

		--- 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, 10, 0
6		- PRODUCTVERSION 1, 2, 10, 0
	5	+ FILEVERSION 1, 2, 11, 0
	6	+ PRODUCTVERSION 1, 2, 11, 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,11 +15,11 @@
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.10\0"
	20	+ VALUE "FileVersion", "1.2.11\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	25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	26

	--- 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,11 +15,11 @@
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

	--- 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, 11, 0
6	PRODUCTVERSION 1, 2, 11, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,11 +15,11 @@
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.11\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

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

+3 -3

		--- 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, 10, 0
6		- PRODUCTVERSION 1, 2, 10, 0
	5	+ FILEVERSION 1, 2, 11, 0
	6	+ PRODUCTVERSION 1, 2, 11, 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,11 +15,11 @@
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.10\0"
	20	+ VALUE "FileVersion", "1.2.11\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	25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	26
27	27	DELETED compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
28	28	DELETED compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
29	29	DELETED compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
30	30	DELETED compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user

	--- 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,11 +15,11 @@
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
27	ELETED compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
28	ELETED compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
29	ELETED compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
30	ELETED compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user

	--- 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, 11, 0
6	PRODUCTVERSION 1, 2, 11, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,11 +15,11 @@
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.11\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
27	ELETED compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
28	ELETED compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
29	ELETED compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
30	ELETED compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user

D compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
	@@ -1,4 +0,0 @@

D compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user
	@@ -1,4 +0,0 @@

D compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
	@@ -1,4 +0,0 @@

D compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
	@@ -1,4 +0,0 @@

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

+3 -3

		--- 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, 10, 0
6		- PRODUCTVERSION 1, 2, 10, 0
	5	+ FILEVERSION 1, 2, 11, 0
	6	+ PRODUCTVERSION 1, 2, 11, 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,11 +15,11 @@
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.10\0"
	20	+ VALUE "FileVersion", "1.2.11\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	25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	26
27	27	DELETED compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
28	28	DELETED compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user

	--- 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,11 +15,11 @@
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
27	ELETED compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
28	ELETED compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user

	--- 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, 11, 0
6	PRODUCTVERSION 1, 2, 11, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,11 +15,11 @@
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.11\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
27	ELETED compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
28	ELETED compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user

D compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
	@@ -1,4 +0,0 @@

D compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user

-4

		--- a/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
		+++ b/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
		@@ -1,4 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3		- <PropertyGroup />
4		-</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
	@@ -1,4 +0,0 @@
1	<?xml version="1.0" encoding="utf-8"?>
2	<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3	<PropertyGroup />
4	</Project>

	--- a/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
	+++ b/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
	@@ -1,4 +0,0 @@

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

+3 -3

		--- 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, 10, 0
6		- PRODUCTVERSION 1, 2, 10, 0
	5	+ FILEVERSION 1, 2, 11, 0
	6	+ PRODUCTVERSION 1, 2, 11, 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,11 +15,11 @@
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.10\0"
	20	+ VALUE "FileVersion", "1.2.11\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	25	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
26	26

	--- 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,11 +15,11 @@
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

	--- 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, 11, 0
6	PRODUCTVERSION 1, 2, 11, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,11 +15,11 @@
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.11\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

M compat/zlib/deflate.c

+12 -7

		--- compat/zlib/deflate.c
		+++ compat/zlib/deflate.c
		@@ -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.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
	55	+ " deflate 1.2.11 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.
		@@ -584,11 +584,12 @@
584	584	if (level < 0 \|\| level > 9 \|\| strategy < 0 \|\| strategy > Z_FIXED) {
585	585	return Z_STREAM_ERROR;
586	586	}
587	587	func = configuration_table[s->level].func;
588	588
589		- if ((strategy != s->strategy \|\| func != configuration_table[level].func)) {
	589	+ if ((strategy != s->strategy \|\| func != configuration_table[level].func) &&
	590	+ s->high_water) {
590	591	/* Flush the last buffer: */
591	592	int err = deflate(strm, Z_BLOCK);
592	593	if (err == Z_STREAM_ERROR)
593	594	return err;
594	595	if (strm->avail_out == 0)
		@@ -1669,27 +1670,25 @@
1669	1670	left = s->strstart - s->block_start; /* bytes left in window */
1670	1671	if (len > (ulg)left + s->strm->avail_in)
1671	1672	len = left + s->strm->avail_in; /* limit len to the input */
1672	1673	if (len > have)
1673	1674	len = have; /* limit len to the output */
1674		- if (left > len)
1675		- left = len; /* limit window pull to len */
1676	1675
1677	1676	/* If the stored block would be less than min_block in length, or if
1678	1677	* unable to copy all of the available input when flushing, then try
1679	1678	* copying to the window and the pending buffer instead. Also don't
1680	1679	* write an empty block when flushing -- deflate() does that.
1681	1680	*/
1682	1681	if (len < min_block && ((len == 0 && flush != Z_FINISH) \|\|
1683	1682	flush == Z_NO_FLUSH \|\|
1684		- len - left != s->strm->avail_in))
	1683	+ len != left + s->strm->avail_in))
1685	1684	break;
1686	1685
1687	1686	/* Make a dummy stored block in pending to get the header bytes,
1688	1687	* including any pending bits. This also updates the debugging counts.
1689	1688	*/
1690		- last = flush == Z_FINISH && len - left == s->strm->avail_in ? 1 : 0;
	1689	+ last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
1691	1690	_tr_stored_block(s, (char *)0, 0L, last);
1692	1691
1693	1692	/* Replace the lengths in the dummy stored block with len. */
1694	1693	s->pending_buf[s->pending - 4] = len;
1695	1694	s->pending_buf[s->pending - 3] = len >> 8;
		@@ -1697,18 +1696,20 @@
1697	1696	s->pending_buf[s->pending - 1] = ~len >> 8;
1698	1697
1699	1698	/* Write the stored block header bytes. */
1700	1699	flush_pending(s->strm);
1701	1700
1702		- /* Update debugging counts for the data about to be copied. */
1703	1701	#ifdef ZLIB_DEBUG
	1702	+ /* Update debugging counts for the data about to be copied. */
1704	1703	s->compressed_len += len << 3;
1705	1704	s->bits_sent += len << 3;
1706	1705	#endif
1707	1706
1708	1707	/* Copy uncompressed bytes from the window to next_out. */
1709	1708	if (left) {
	1709	+ if (left > len)
	1710	+ left = len;
1710	1711	zmemcpy(s->strm->next_out, s->window + s->block_start, left);
1711	1712	s->strm->next_out += left;
1712	1713	s->strm->avail_out -= left;
1713	1714	s->strm->total_out += left;
1714	1715	s->block_start += left;
		@@ -1754,10 +1755,12 @@
1754	1755	s->strstart += used;
1755	1756	}
1756	1757	s->block_start = s->strstart;
1757	1758	s->insert += MIN(used, s->w_size - s->insert);
1758	1759	}
	1760	+ if (s->high_water < s->strstart)
	1761	+ s->high_water = s->strstart;
1759	1762
1760	1763	/* If the last block was written to next_out, then done. */
1761	1764	if (last)
1762	1765	return finish_done;
1763	1766
		@@ -1781,10 +1784,12 @@
1781	1784	have = s->strm->avail_in;
1782	1785	if (have) {
1783	1786	read_buf(s->strm, s->window + s->strstart, have);
1784	1787	s->strstart += have;
1785	1788	}
	1789	+ if (s->high_water < s->strstart)
	1790	+ s->high_water = s->strstart;
1786	1791
1787	1792	/* There was not enough avail_out to write a complete worthy or flushed
1788	1793	* stored block to next_out. Write a stored block to pending instead, if we
1789	1794	* have enough input for a worthy block, or if flushing and there is enough
1790	1795	* room for the remaining input as a stored block in the pending buffer.
1791	1796

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -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.
	@@ -584,11 +584,12 @@
584	if (level < 0 \|\| level > 9 \|\| strategy < 0 \|\| strategy > Z_FIXED) {
585	return Z_STREAM_ERROR;
586	}
587	func = configuration_table[s->level].func;
588
589	if ((strategy != s->strategy \|\| func != configuration_table[level].func)) {

590	/* Flush the last buffer: */
591	int err = deflate(strm, Z_BLOCK);
592	if (err == Z_STREAM_ERROR)
593	return err;
594	if (strm->avail_out == 0)
	@@ -1669,27 +1670,25 @@
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 */
1674	if (left > len)
1675	left = len; /* limit window pull to len */
1676
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.
1689	*/
1690	last = flush == Z_FINISH && len - left == s->strm->avail_in ? 1 : 0;
1691	_tr_stored_block(s, (char *)0, 0L, last);
1692
1693	/* Replace the lengths in the dummy stored block with len. */
1694	s->pending_buf[s->pending - 4] = len;
1695	s->pending_buf[s->pending - 3] = len >> 8;
	@@ -1697,18 +1696,20 @@
1697	s->pending_buf[s->pending - 1] = ~len >> 8;
1698
1699	/* Write the stored block header bytes. */
1700	flush_pending(s->strm);
1701
1702	/* Update debugging counts for the data about to be copied. */
1703	#ifdef ZLIB_DEBUG

1704	s->compressed_len += len << 3;
1705	s->bits_sent += len << 3;
1706	#endif
1707
1708	/* Copy uncompressed bytes from the window to next_out. */
1709	if (left) {


1710	zmemcpy(s->strm->next_out, s->window + s->block_start, left);
1711	s->strm->next_out += left;
1712	s->strm->avail_out -= left;
1713	s->strm->total_out += left;
1714	s->block_start += left;
	@@ -1754,10 +1755,12 @@
1754	s->strstart += used;
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
	@@ -1781,10 +1784,12 @@
1781	have = s->strm->avail_in;
1782	if (have) {
1783	read_buf(s->strm, s->window + s->strstart, have);
1784	s->strstart += have;
1785	}


1786
1787	/* There was not enough avail_out to write a complete worthy or flushed
1788	* stored block to next_out. Write a stored block to pending instead, if we
1789	* have enough input for a worthy block, or if flushing and there is enough
1790	* room for the remaining input as a stored block in the pending buffer.
1791

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -50,11 +50,11 @@
50	/* @(#) $Id$ */
51
52	#include "deflate.h"
53
54	const char deflate_copyright[] =
55	" deflate 1.2.11 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.
	@@ -584,11 +584,12 @@
584	if (level < 0 \|\| level > 9 \|\| strategy < 0 \|\| strategy > Z_FIXED) {
585	return Z_STREAM_ERROR;
586	}
587	func = configuration_table[s->level].func;
588
589	if ((strategy != s->strategy \|\| func != configuration_table[level].func) &&
590	s->high_water) {
591	/* Flush the last buffer: */
592	int err = deflate(strm, Z_BLOCK);
593	if (err == Z_STREAM_ERROR)
594	return err;
595	if (strm->avail_out == 0)
	@@ -1669,27 +1670,25 @@
1670	left = s->strstart - s->block_start; /* bytes left in window */
1671	if (len > (ulg)left + s->strm->avail_in)
1672	len = left + s->strm->avail_in; /* limit len to the input */
1673	if (len > have)
1674	len = have; /* limit len to the output */


1675
1676	/* If the stored block would be less than min_block in length, or if
1677	* unable to copy all of the available input when flushing, then try
1678	* copying to the window and the pending buffer instead. Also don't
1679	* write an empty block when flushing -- deflate() does that.
1680	*/
1681	if (len < min_block && ((len == 0 && flush != Z_FINISH) \|\|
1682	flush == Z_NO_FLUSH \|\|
1683	len != left + s->strm->avail_in))
1684	break;
1685
1686	/* Make a dummy stored block in pending to get the header bytes,
1687	* including any pending bits. This also updates the debugging counts.
1688	*/
1689	last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
1690	_tr_stored_block(s, (char *)0, 0L, last);
1691
1692	/* Replace the lengths in the dummy stored block with len. */
1693	s->pending_buf[s->pending - 4] = len;
1694	s->pending_buf[s->pending - 3] = len >> 8;
	@@ -1697,18 +1696,20 @@
1696	s->pending_buf[s->pending - 1] = ~len >> 8;
1697
1698	/* Write the stored block header bytes. */
1699	flush_pending(s->strm);
1700

1701	#ifdef ZLIB_DEBUG
1702	/* Update debugging counts for the data about to be copied. */
1703	s->compressed_len += len << 3;
1704	s->bits_sent += len << 3;
1705	#endif
1706
1707	/* Copy uncompressed bytes from the window to next_out. */
1708	if (left) {
1709	if (left > len)
1710	left = len;
1711	zmemcpy(s->strm->next_out, s->window + s->block_start, left);
1712	s->strm->next_out += left;
1713	s->strm->avail_out -= left;
1714	s->strm->total_out += left;
1715	s->block_start += left;
	@@ -1754,10 +1755,12 @@
1755	s->strstart += used;
1756	}
1757	s->block_start = s->strstart;
1758	s->insert += MIN(used, s->w_size - s->insert);
1759	}
1760	if (s->high_water < s->strstart)
1761	s->high_water = s->strstart;
1762
1763	/* If the last block was written to next_out, then done. */
1764	if (last)
1765	return finish_done;
1766
	@@ -1781,10 +1784,12 @@
1784	have = s->strm->avail_in;
1785	if (have) {
1786	read_buf(s->strm, s->window + s->strstart, have);
1787	s->strstart += have;
1788	}
1789	if (s->high_water < s->strstart)
1790	s->high_water = s->strstart;
1791
1792	/* There was not enough avail_out to write a complete worthy or flushed
1793	* stored block to next_out. Write a stored block to pending instead, if we
1794	* have enough input for a worthy block, or if flushing and there is enough
1795	* room for the remaining input as a stored block in the pending buffer.
1796

M compat/zlib/gzlib.c

+1 -1

		--- compat/zlib/gzlib.c
		+++ compat/zlib/gzlib.c
		@@ -1,7 +1,7 @@
1	1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2		- * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
	2	+ * Copyright (C) 2004-2017 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "gzguts.h"
7	7
8	8

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -1,7 +1,7 @@
1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2	* Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
8

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -1,7 +1,7 @@
1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2	* Copyright (C) 2004-2017 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
8

M compat/zlib/gzwrite.c

+1 -1

		--- compat/zlib/gzwrite.c
		+++ compat/zlib/gzwrite.c
		@@ -1,7 +1,7 @@
1	1	/* gzwrite.c -- zlib functions for writing gzip files
2		- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
	2	+ * Copyright (C) 2004-2017 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "gzguts.h"
7	7
8	8

	--- compat/zlib/gzwrite.c
	+++ compat/zlib/gzwrite.c
	@@ -1,7 +1,7 @@
1	/* gzwrite.c -- zlib functions for writing gzip files
2	* Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
8

	--- compat/zlib/gzwrite.c
	+++ compat/zlib/gzwrite.c
	@@ -1,7 +1,7 @@
1	/* gzwrite.c -- zlib functions for writing gzip files
2	* Copyright (C) 2004-2017 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
8

M compat/zlib/inffast.c

+1 -1

		--- compat/zlib/inffast.c
		+++ compat/zlib/inffast.c
		@@ -1,7 +1,7 @@
1	1	/* inffast.c -- fast decoding
2		- * Copyright (C) 1995-2008, 2010, 2013, 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

	--- compat/zlib/inffast.c
	+++ compat/zlib/inffast.c
	@@ -1,7 +1,7 @@
1	/* inffast.c -- fast decoding
2	* Copyright (C) 1995-2008, 2010, 2013, 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

	--- compat/zlib/inffast.c
	+++ compat/zlib/inffast.c
	@@ -1,7 +1,7 @@
1	/* inffast.c -- fast 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

M compat/zlib/inftrees.c

+2 -2

		--- compat/zlib/inftrees.c
		+++ compat/zlib/inftrees.c
		@@ -7,11 +7,11 @@
7	7	#include "inftrees.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate_copyright[] =
12		- " inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
	12	+ " inflate 1.2.11 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, 202};
	65	+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 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
	@@ -7,11 +7,11 @@
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

	--- compat/zlib/inftrees.c
	+++ compat/zlib/inftrees.c
	@@ -7,11 +7,11 @@
7	#include "inftrees.h"
8
9	#define MAXBITS 15
10
11	const char inflate_copyright[] =
12	" inflate 1.2.11 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, 77, 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.10 for OS/400 installation instructions
	1	+ ZLIB version 1.2.11 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.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

	--- compat/zlib/os400/README400
	+++ compat/zlib/os400/README400
	@@ -1,6 +1,6 @@
1	ZLIB version 1.2.11 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/make.sh

+1 -1

		--- compat/zlib/os400/make.sh
		+++ compat/zlib/os400/make.sh
		@@ -258,11 +258,11 @@
258	258	# Create and compile the identification source file.
259	259
260	260	echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
261	261	echo '#pragma comment(user, __DATE__)' >> os400.c
262	262	echo '#pragma comment(user, __TIME__)' >> os400.c
263		-echo '#pragma comment(copyright, "Copyright (C) 1995-2016 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
	263	+echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
264	264	make_module OS400 os400.c
265	265	LINK= # No need to rebuild service program yet.
266	266	MODULES=
267	267
268	268
269	269

	--- compat/zlib/os400/make.sh
	+++ compat/zlib/os400/make.sh
	@@ -258,11 +258,11 @@
258	# Create and compile the identification source file.
259
260	echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
261	echo '#pragma comment(user, __DATE__)' >> os400.c
262	echo '#pragma comment(user, __TIME__)' >> os400.c
263	echo '#pragma comment(copyright, "Copyright (C) 1995-2016 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
264	make_module OS400 os400.c
265	LINK= # No need to rebuild service program yet.
266	MODULES=
267
268
269

	--- compat/zlib/os400/make.sh
	+++ compat/zlib/os400/make.sh
	@@ -258,11 +258,11 @@
258	# Create and compile the identification source file.
259
260	echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
261	echo '#pragma comment(user, __DATE__)' >> os400.c
262	echo '#pragma comment(user, __TIME__)' >> os400.c
263	echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
264	make_module OS400 os400.c
265	LINK= # No need to rebuild service program yet.
266	MODULES=
267
268
269

M compat/zlib/os400/zlib.inc

+3 -3

		--- 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.10
	4	+ * Version 1.2.11
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.10'
	25	+ D ZLIB_VERSION C '1.2.11'
26	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 10
	30	+ D C 11
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.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

	--- 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.11
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.11'
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 11
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.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"/>
	28	+ <QPG:Add file="../libz.so.1.2.11" 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.11"/>
	30	+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
	31	+ <QPG:Add file="../libz.so.1.2.11" 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.10</QPM:ReleaseVersion>
	66	+ <QPM:ReleaseVersion>1.2.11</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.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

	--- 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.11" 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.11"/>
30	<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
31	<QPG:Add file="../libz.so.1.2.11" 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.11</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.10">
3		- <library name="zlib" dlversion="1.2.10" dlname="z">
	2	+<package name="zlib" version="1.2.11">
	3	+ <library name="zlib" dlversion="1.2.11" 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.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

	--- compat/zlib/treebuild.xml
	+++ compat/zlib/treebuild.xml
	@@ -1,8 +1,8 @@
1	<?xml version="1.0" ?>
2	<package name="zlib" version="1.2.11">
3	<library name="zlib" dlversion="1.2.11" 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/trees.c

+2 -2

		--- compat/zlib/trees.c
		+++ compat/zlib/trees.c
		@@ -1,7 +1,7 @@
1	1	/* trees.c -- output deflated data using Huffman coding
2		- * Copyright (C) 1995-2016 Jean-loup Gailly
	2	+ * Copyright (C) 1995-2017 Jean-loup Gailly
3	3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	4	* For conditions of distribution and use, see copyright notice in zlib.h
5	5	*/
6	6
7	7	/*
		@@ -904,11 +904,11 @@
904	904	bi_flush(s);
905	905	}
906	906
907	907	/* ===========================================================================
908	908	* Determine the best encoding for the current block: dynamic trees, static
909		- * trees or store, and output the encoded block to the zip file.
	909	+ * trees or store, and write out the encoded block.
910	910	*/
911	911	void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
912	912	deflate_state *s;
913	913	charf buf; / input block, or NULL if too old */
914	914	ulg stored_len; /* length of input block */
915	915

	--- compat/zlib/trees.c
	+++ compat/zlib/trees.c
	@@ -1,7 +1,7 @@
1	/* trees.c -- output deflated data using Huffman coding
2	* Copyright (C) 1995-2016 Jean-loup Gailly
3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	* For conditions of distribution and use, see copyright notice in zlib.h
5	*/
6
7	/*
	@@ -904,11 +904,11 @@
904	bi_flush(s);
905	}
906
907	/* ===========================================================================
908	* Determine the best encoding for the current block: dynamic trees, static
909	* trees or store, and output the encoded block to the zip file.
910	*/
911	void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
912	deflate_state *s;
913	charf buf; / input block, or NULL if too old */
914	ulg stored_len; /* length of input block */
915

	--- compat/zlib/trees.c
	+++ compat/zlib/trees.c
	@@ -1,7 +1,7 @@
1	/* trees.c -- output deflated data using Huffman coding
2	* Copyright (C) 1995-2017 Jean-loup Gailly
3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	* For conditions of distribution and use, see copyright notice in zlib.h
5	*/
6
7	/*
	@@ -904,11 +904,11 @@
904	bi_flush(s);
905	}
906
907	/* ===========================================================================
908	* Determine the best encoding for the current block: dynamic trees, static
909	* trees or store, and write out the encoded block.
910	*/
911	void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
912	deflate_state *s;
913	charf buf; / input block, or NULL if too old */
914	ulg stored_len; /* length of input block */
915

M compat/zlib/win32/Makefile.msc

+1 -1

		--- compat/zlib/win32/Makefile.msc
		+++ compat/zlib/win32/Makefile.msc
		@@ -1,7 +1,7 @@
1	1	# Makefile for zlib using Microsoft (Visual) C
2		-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
	2	+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
3	3	#
4	4	# Usage:
5	5	# nmake -f win32/Makefile.msc (standard build)
6	6	# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
7	7	# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
8	8

	--- compat/zlib/win32/Makefile.msc
	+++ compat/zlib/win32/Makefile.msc
	@@ -1,7 +1,7 @@
1	# Makefile for zlib using Microsoft (Visual) C
2	# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
3	#
4	# Usage:
5	# nmake -f win32/Makefile.msc (standard build)
6	# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
7	# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
8

	--- compat/zlib/win32/Makefile.msc
	+++ compat/zlib/win32/Makefile.msc
	@@ -1,7 +1,7 @@
1	# Makefile for zlib using Microsoft (Visual) C
2	# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
3	#
4	# Usage:
5	# nmake -f win32/Makefile.msc (standard build)
6	# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
7	# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
8

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

+3 -3

		--- 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.10 is a general purpose data compression library. All the code is
	3	+zlib 1.2.11 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.10-win32-x86.zip will contain the following files:
	25	+The package zlib-1.2.11-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
		@@ -70,11 +70,11 @@
70	70	are too numerous to cite here.
71	71
72	72
73	73	Copyright notice:
74	74
75		- (C) 1995-2012 Jean-loup Gailly and Mark Adler
	75	+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
76	76
77	77	This software is provided 'as-is', without any express or implied
78	78	warranty. In no event will the authors be held liable for any damages
79	79	arising from the use of this software.
80	80
81	81

	--- 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
	@@ -70,11 +70,11 @@
70	are too numerous to cite here.
71
72
73	Copyright notice:
74
75	(C) 1995-2012 Jean-loup Gailly and Mark Adler
76
77	This software is provided 'as-is', without any express or implied
78	warranty. In no event will the authors be held liable for any damages
79	arising from the use of this software.
80
81

	--- 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.11 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.11-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
	@@ -70,11 +70,11 @@
70	are too numerous to cite here.
71
72
73	Copyright notice:
74
75	(C) 1995-2017 Jean-loup Gailly and Mark Adler
76
77	This software is provided 'as-is', without any express or implied
78	warranty. In no event will the authors be held liable for any damages
79	arising from the use of this software.
80
81

M compat/zlib/win32/VisualC.txt

+1 -1

		--- compat/zlib/win32/VisualC.txt
		+++ compat/zlib/win32/VisualC.txt
		@@ -1,3 +1,3 @@
1	1
2	2	To build zlib using the Microsoft Visual C++ environment,
3		-use the appropriate project from the projects/ directory.
	3	+use the appropriate project from the contrib/vstudio/ directory.
4	4

	--- compat/zlib/win32/VisualC.txt
	+++ compat/zlib/win32/VisualC.txt
	@@ -1,3 +1,3 @@
1
2	To build zlib using the Microsoft Visual C++ environment,
3	use the appropriate project from the projects/ directory.
4

	--- compat/zlib/win32/VisualC.txt
	+++ compat/zlib/win32/VisualC.txt
	@@ -1,3 +1,3 @@
1
2	To build zlib using the Microsoft Visual C++ environment,
3	use the appropriate project from the contrib/vstudio/ directory.
4

M compat/zlib/win32/zlib1.rc

+1 -1

		--- compat/zlib/win32/zlib1.rc
		+++ compat/zlib/win32/zlib1.rc
		@@ -24,11 +24,11 @@
24	24	//language ID = U.S. English, char set = Windows, Multilingual
25	25	BEGIN
26	26	VALUE "FileDescription", "zlib data compression library\0"
27	27	VALUE "FileVersion", ZLIB_VERSION "\0"
28	28	VALUE "InternalName", "zlib1.dll\0"
29		- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
	29	+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
30	30	VALUE "OriginalFilename", "zlib1.dll\0"
31	31	VALUE "ProductName", "zlib\0"
32	32	VALUE "ProductVersion", ZLIB_VERSION "\0"
33	33	VALUE "Comments", "For more information visit http://www.zlib.net/\0"
34	34	END
35	35

	--- compat/zlib/win32/zlib1.rc
	+++ compat/zlib/win32/zlib1.rc
	@@ -24,11 +24,11 @@
24	//language ID = U.S. English, char set = Windows, Multilingual
25	BEGIN
26	VALUE "FileDescription", "zlib data compression library\0"
27	VALUE "FileVersion", ZLIB_VERSION "\0"
28	VALUE "InternalName", "zlib1.dll\0"
29	VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
30	VALUE "OriginalFilename", "zlib1.dll\0"
31	VALUE "ProductName", "zlib\0"
32	VALUE "ProductVersion", ZLIB_VERSION "\0"
33	VALUE "Comments", "For more information visit http://www.zlib.net/\0"
34	END
35

	--- compat/zlib/win32/zlib1.rc
	+++ compat/zlib/win32/zlib1.rc
	@@ -24,11 +24,11 @@
24	//language ID = U.S. English, char set = Windows, Multilingual
25	BEGIN
26	VALUE "FileDescription", "zlib data compression library\0"
27	VALUE "FileVersion", ZLIB_VERSION "\0"
28	VALUE "InternalName", "zlib1.dll\0"
29	VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
30	VALUE "OriginalFilename", "zlib1.dll\0"
31	VALUE "ProductName", "zlib\0"
32	VALUE "ProductVersion", ZLIB_VERSION "\0"
33	VALUE "Comments", "For more information visit http://www.zlib.net/\0"
34	END
35

M compat/zlib/zlib.3

+2 -2

		--- compat/zlib/zlib.3
		+++ compat/zlib/zlib.3
		@@ -1,6 +1,6 @@
1		-.TH ZLIB 3 "2 Jan 2017"
	1	+.TH ZLIB 3 "15 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,11 +103,11 @@
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.10
	108	+Version 1.2.11
109	109	.LP
110	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

	--- 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,11 +103,11 @@
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

	--- compat/zlib/zlib.3
	+++ compat/zlib/zlib.3
	@@ -1,6 +1,6 @@
1	.TH ZLIB 3 "15 Jan 2017"
2	.SH NAME
3	zlib \- compression/decompression library
4	.SH SYNOPSIS
5	[see
6	.I zlib.h
	@@ -103,11 +103,11 @@
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.11
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

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

+9 -8

		--- compat/zlib/zlib.h
		+++ compat/zlib/zlib.h
		@@ -1,7 +1,7 @@
1	1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2		- version 1.2.10, January 2nd, 2017
	2	+ version 1.2.11, January 15th, 2017
3	3
4	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
		@@ -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.10"
41		-#define ZLIB_VERNUM 0x12a0
	40	+#define ZLIB_VERSION "1.2.11"
	41	+#define ZLIB_VERNUM 0x12b0
42	42	#define ZLIB_VER_MAJOR 1
43	43	#define ZLIB_VER_MINOR 2
44		-#define ZLIB_VER_REVISION 10
	44	+#define ZLIB_VER_REVISION 11
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.
		@@ -710,14 +710,15 @@
710	710	Dynamically update the compression level and compression strategy. The
711	711	interpretation of level and strategy is as in deflateInit2(). This can be
712	712	used to switch between compression and straight copy of the input data, or
713	713	to switch to a different kind of input data requiring a different strategy.
714	714	If the compression approach (which is a function of the level) or the
715		- strategy is changed, then the input available so far is compressed with the
716		- old level and strategy using deflate(strm, Z_BLOCK). There are three
717		- approaches for the compression levels 0, 1..3, and 4..9 respectively. The
718		- new level and strategy will take effect at the next call of deflate().
	715	+ strategy is changed, and if any input has been consumed in a previous
	716	+ deflate() call, then the input available so far is compressed with the old
	717	+ level and strategy using deflate(strm, Z_BLOCK). There are three approaches
	718	+ for the compression levels 0, 1..3, and 4..9 respectively. The new level
	719	+ and strategy will take effect at the next call of deflate().
719	720
720	721	If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
721	722	not have enough output space to complete, then the parameter change will not
722	723	take effect. In this case, deflateParams() can be called again with the
723	724	same parameters and more output space to try again.
724	725

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,7 +1,7 @@
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
	@@ -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.
	@@ -710,14 +710,15 @@
710	Dynamically update the compression level and compression strategy. The
711	interpretation of level and strategy is as in deflateInit2(). This can be
712	used to switch between compression and straight copy of the input data, or
713	to switch to a different kind of input data requiring a different strategy.
714	If the compression approach (which is a function of the level) or the
715	strategy is changed, then the input available so far is compressed with the
716	old level and strategy using deflate(strm, Z_BLOCK). There are three
717	approaches for the compression levels 0, 1..3, and 4..9 respectively. The
718	new level and strategy will take effect at the next call of deflate().

719
720	If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
721	not have enough output space to complete, then the parameter change will not
722	take effect. In this case, deflateParams() can be called again with the
723	same parameters and more output space to try again.
724

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,7 +1,7 @@
1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2	version 1.2.11, January 15th, 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
	@@ -35,15 +35,15 @@
35
36	#ifdef __cplusplus
37	extern "C" {
38	#endif
39
40	#define ZLIB_VERSION "1.2.11"
41	#define ZLIB_VERNUM 0x12b0
42	#define ZLIB_VER_MAJOR 1
43	#define ZLIB_VER_MINOR 2
44	#define ZLIB_VER_REVISION 11
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.
	@@ -710,14 +710,15 @@
710	Dynamically update the compression level and compression strategy. The
711	interpretation of level and strategy is as in deflateInit2(). This can be
712	used to switch between compression and straight copy of the input data, or
713	to switch to a different kind of input data requiring a different strategy.
714	If the compression approach (which is a function of the level) or the
715	strategy is changed, and if any input has been consumed in a previous
716	deflate() call, then the input available so far is compressed with the old
717	level and strategy using deflate(strm, Z_BLOCK). There are three approaches
718	for the compression levels 0, 1..3, and 4..9 respectively. The new level
719	and strategy will take effect at the next call of deflate().
720
721	If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
722	not have enough output space to complete, then the parameter change will not
723	take effect. In this case, deflateParams() can be called again with the
724	same parameters and more output space to try again.
725

M compat/zlib/zutil.c

+1 -1

		--- compat/zlib/zutil.c
		+++ compat/zlib/zutil.c
		@@ -1,7 +1,7 @@
1	1	/* zutil.c -- target dependent utility functions for the compression library
2		- * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
	2	+ * Copyright (C) 1995-2017 Jean-loup Gailly
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* @(#) $Id$ */
7	7
8	8

	--- compat/zlib/zutil.c
	+++ compat/zlib/zutil.c
	@@ -1,7 +1,7 @@
1	/* zutil.c -- target dependent utility functions for the compression library
2	* Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
8

	--- compat/zlib/zutil.c
	+++ compat/zlib/zutil.c
	@@ -1,7 +1,7 @@
1	/* zutil.c -- target dependent utility functions for the compression library
2	* Copyright (C) 1995-2017 Jean-loup Gailly
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
8

M www/changes.wiki

+2 -2

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -31,12 +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.1.
37		- * Update the built-in Zlib to version 1.2.10.
	36	+ * Update the built-in SQLite to version 3.16.2.
	37	+ * Update the built-in Zlib to version 1.2.11.
38	38
39	39	<a name='v1_36'></a>
40	40	<h2>Changes for Version 1.36 (2016-10-24)</h2>
41	41
42	42	* Add support for [./unvers.wiki\|unversioned content],
43	43

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -31,12 +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.1.
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

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -31,12 +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.2.
37	* Update the built-in Zlib to version 1.2.11.
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