summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-01-15 23:21:16 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-01-15 23:21:16 +0000
commit9f71fce2109eea9f43a91783cc8ef1a4c7f72554 (patch)
tree107340d7597153cc81e2a59ed601b09bf1f9698f /Build/source
parent5a79470161218f61a3ba5a6db27e0fb612c67d7d (diff)
zlib 1.2.11
git-svn-id: svn://tug.org/texlive/trunk@42963 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/zlib/ChangeLog4
-rw-r--r--Build/source/libs/zlib/README4
-rwxr-xr-xBuild/source/libs/zlib/configure20
-rw-r--r--Build/source/libs/zlib/version.ac2
-rw-r--r--Build/source/libs/zlib/zlib-PATCHES/ChangeLog6
-rw-r--r--Build/source/libs/zlib/zlib-PATCHES/TL-Changes4
-rw-r--r--Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin6
-rw-r--r--Build/source/libs/zlib/zlib-src/CMakeLists.txt2
-rw-r--r--Build/source/libs/zlib/zlib-src/ChangeLog4
-rw-r--r--Build/source/libs/zlib/zlib-src/Makefile.in4
-rw-r--r--Build/source/libs/zlib/zlib-src/README4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/delphi/ZLib.pas2
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/infback9/inftree9.c4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/minizip/configure.ac2
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas2
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/readme.txt2
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def306
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj.user4
-rw-r--r--Build/source/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-src/deflate.c19
-rw-r--r--Build/source/libs/zlib/zlib-src/gzlib.c2
-rw-r--r--Build/source/libs/zlib/zlib-src/gzwrite.c2
-rw-r--r--Build/source/libs/zlib/zlib-src/inffast.c2
-rw-r--r--Build/source/libs/zlib/zlib-src/inftrees.c4
-rw-r--r--Build/source/libs/zlib/zlib-src/os400/README4002
-rwxr-xr-xBuild/source/libs/zlib/zlib-src/os400/make.sh2
-rw-r--r--Build/source/libs/zlib/zlib-src/os400/zlib.inc6
-rw-r--r--Build/source/libs/zlib/zlib-src/qnx/package.qpg10
-rw-r--r--Build/source/libs/zlib/zlib-src/treebuild.xml4
-rw-r--r--Build/source/libs/zlib/zlib-src/trees.c4
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/Makefile.msc2
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt6
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/VisualC.txt2
-rw-r--r--Build/source/libs/zlib/zlib-src/win32/zlib1.rc2
-rw-r--r--Build/source/libs/zlib/zlib-src/zlib.34
-rw-r--r--Build/source/libs/zlib/zlib-src/zlib.3.pdfbin19324 -> 19318 bytes
-rw-r--r--Build/source/libs/zlib/zlib-src/zlib.h17
-rw-r--r--Build/source/libs/zlib/zlib-src/zutil.c2
49 files changed, 259 insertions, 269 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 5394c09b9ac..1387820c535 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -62,7 +62,7 @@ xpdf 3.04 - checked 28may14
ftp://ftp.foolabs.com/pub/xpdf/
with modifications for pdftex
-zlib 1.2.10 - checked 03jan17
+zlib 1.2.11 - checked 15jan17
http://www.zlib.net/ - used by many
zziplib 0.13.62 - checked 31mar16
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog
index 2cb7f45003d..91e20320620 100644
--- a/Build/source/libs/zlib/ChangeLog
+++ b/Build/source/libs/zlib/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import zlib-1.2.11.
+
2017-01-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import zlib-1.2.10.
diff --git a/Build/source/libs/zlib/README b/Build/source/libs/zlib/README
index 387b1992ea8..b63d7cb19bc 100644
--- a/Build/source/libs/zlib/README
+++ b/Build/source/libs/zlib/README
@@ -1,4 +1,4 @@
- Building zlib-1.2.10 as part of the TL tree
+ Building zlib-1.2.11 as part of the TL tree
==========================================
This directory libs/zlib/ uses a proxy Makefile.am to build the zlib library
@@ -15,4 +15,4 @@ translated into equivalent test in libs/zlib/configure.ac.
=============================
2009-01-28 Peter Breitenlohner <peb@mppmu.mpg.de>
-2017-01-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure
index ebba2bf74b5..b7ad3d69010 100755
--- a/Build/source/libs/zlib/configure
+++ b/Build/source/libs/zlib/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for zlib (TeX Live) 1.2.10.
+# Generated by GNU Autoconf 2.69 for zlib (TeX Live) 1.2.11.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='zlib (TeX Live)'
PACKAGE_TARNAME='zlib--tex-live-'
-PACKAGE_VERSION='1.2.10'
-PACKAGE_STRING='zlib (TeX Live) 1.2.10'
+PACKAGE_VERSION='1.2.11'
+PACKAGE_STRING='zlib (TeX Live) 1.2.11'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1280,7 +1280,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures zlib (TeX Live) 1.2.10 to adapt to many kinds of systems.
+\`configure' configures zlib (TeX Live) 1.2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.10:";;
+ short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.11:";;
esac
cat <<\_ACEOF
@@ -1444,7 +1444,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zlib (TeX Live) configure 1.2.10
+zlib (TeX Live) configure 1.2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1746,7 +1746,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zlib (TeX Live) $as_me 1.2.10, which was
+It was created by zlib (TeX Live) $as_me 1.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3669,7 +3669,7 @@ fi
# Define the identity of the package.
PACKAGE='zlib--tex-live-'
- VERSION='1.2.10'
+ VERSION='1.2.11'
cat >>confdefs.h <<_ACEOF
@@ -6120,7 +6120,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zlib (TeX Live) $as_me 1.2.10, which was
+This file was extended by zlib (TeX Live) $as_me 1.2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6186,7 +6186,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-zlib (TeX Live) config.status 1.2.10
+zlib (TeX Live) config.status 1.2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/zlib/version.ac b/Build/source/libs/zlib/version.ac
index 23d3f4a9279..bfd03c8c1c4 100644
--- a/Build/source/libs/zlib/version.ac
+++ b/Build/source/libs/zlib/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current zlib version
-m4_define([zlib_version], [1.2.10])
+m4_define([zlib_version], [1.2.11])
diff --git a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-PATCHES/ChangeLog
index 31775dc1ecc..15dd50372f0 100644
--- a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog
+++ b/Build/source/libs/zlib/zlib-PATCHES/ChangeLog
@@ -1,7 +1,7 @@
-2017-01-13 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+2017-01-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
- Add patch-01-not-define-WIDECHAR-for-cygwin, in order to not define
- WIDECHAR for __CYGWIN__. Report from Luigi, David.
+ Import zlib-1.2.11.
+ * Add patch-01-not-define-WIDECHAR-for-cygwin: Adapted.
2017-01-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
diff --git a/Build/source/libs/zlib/zlib-PATCHES/TL-Changes b/Build/source/libs/zlib/zlib-PATCHES/TL-Changes
index 787796bae9e..f31d2bbedde 100644
--- a/Build/source/libs/zlib/zlib-PATCHES/TL-Changes
+++ b/Build/source/libs/zlib/zlib-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the zlib-1.2.10/ tree as obtained from:
- http://zlib.net/zlib-1.2.10.tar.xz
+Changes applied to the zlib-1.2.11/ tree as obtained from:
+ http://zlib.net/zlib-1.2.11.tar.xz
Removed:
Makefile
diff --git a/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin b/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin
index 5faf06ce055..87e08bcd382 100644
--- a/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin
+++ b/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin
@@ -1,6 +1,6 @@
-diff -ur zlib-1.2.10.orig/gzguts.h zlib-1.2.10/gzguts.h
---- zlib-1.2.10.orig/gzguts.h Sun Jan 01 16:37:10 2017
-+++ zlib-1.2.10/gzguts.h Sat Jan 14 07:48:15 2017
+diff -ur zlib-1.2.11.orig/gzguts.h zlib-1.2.11/gzguts.h
+--- zlib-1.2.11.orig/gzguts.h Sun Jan 01 16:37:10 2017
++++ zlib-1.2.11/gzguts.h Mon Jan 16 07:53:25 2017
@@ -39,7 +39,7 @@
# include <io.h>
#endif
diff --git a/Build/source/libs/zlib/zlib-src/CMakeLists.txt b/Build/source/libs/zlib/zlib-src/CMakeLists.txt
index 1a954a64038..0fe939df689 100644
--- a/Build/source/libs/zlib/zlib-src/CMakeLists.txt
+++ b/Build/source/libs/zlib/zlib-src/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
project(zlib C)
-set(VERSION "1.2.10")
+set(VERSION "1.2.11")
option(ASM686 "Enable building i686 assembly implementation")
option(AMD64 "Enable building amd64 assembly implementation")
diff --git a/Build/source/libs/zlib/zlib-src/ChangeLog b/Build/source/libs/zlib/zlib-src/ChangeLog
index fed9adb5277..30199a65a03 100644
--- a/Build/source/libs/zlib/zlib-src/ChangeLog
+++ b/Build/source/libs/zlib/zlib-src/ChangeLog
@@ -1,6 +1,10 @@
ChangeLog file for zlib
+Changes in 1.2.11 (15 Jan 2017)
+- Fix deflate stored bug when pulling last block from window
+- Permit immediate deflateParams changes before any deflate input
+
Changes in 1.2.10 (2 Jan 2017)
- Avoid warnings on snprintf() return value
- Fix bug in deflate_stored() for zero-length input
diff --git a/Build/source/libs/zlib/zlib-src/Makefile.in b/Build/source/libs/zlib/zlib-src/Makefile.in
index 1852192546a..5a77949ff06 100644
--- a/Build/source/libs/zlib/zlib-src/Makefile.in
+++ b/Build/source/libs/zlib/zlib-src/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for zlib
-# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
# For conditions of distribution and use, see copyright notice in zlib.h
# To compile and test, type:
@@ -32,7 +32,7 @@ CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.10
+SHAREDLIBV=libz.so.1.2.11
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
diff --git a/Build/source/libs/zlib/zlib-src/README b/Build/source/libs/zlib/zlib-src/README
index e2250bdbc2c..51106de4753 100644
--- a/Build/source/libs/zlib/zlib-src/README
+++ b/Build/source/libs/zlib/zlib-src/README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.10 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.10 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
diff --git a/Build/source/libs/zlib/zlib-src/contrib/delphi/ZLib.pas b/Build/source/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
index e9d72f021da..060e1991186 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
+++ b/Build/source/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
const OutBuf: Pointer; BufSize: Integer);
const
- zlib_version = '1.2.10';
+ zlib_version = '1.2.11';
type
EZlibError = class(Exception);
diff --git a/Build/source/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs b/Build/source/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
index 236013f5034..6d8aebb7994 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/Build/source/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.10", Info.Version);
+ Assert.AreEqual("1.2.11", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/Build/source/libs/zlib/zlib-src/contrib/infback9/inftree9.c b/Build/source/libs/zlib/zlib-src/contrib/infback9/inftree9.c
index ea5604731a7..5f4a76798d8 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/infback9/inftree9.c
+++ b/Build/source/libs/zlib/zlib-src/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
- " inflate9 1.2.10 Copyright 1995-2017 Mark Adler ";
+ " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 133, 133, 133, 133, 144, 192, 202};
+ 133, 133, 133, 133, 144, 77, 202};
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/Build/source/libs/zlib/zlib-src/contrib/minizip/configure.ac b/Build/source/libs/zlib/zlib-src/contrib/minizip/configure.ac
index bbb2283a7d7..5b11970977f 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/minizip/configure.ac
+++ b/Build/source/libs/zlib/zlib-src/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
AC_CONFIG_SRCDIR([minizip.c])
AM_INIT_AUTOMAKE([foreign])
LT_INIT
diff --git a/Build/source/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas b/Build/source/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
index 2330898c418..a0dff11b505 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
+++ b/Build/source/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
interface
const
- ZLIB_VERSION = '1.2.10';
+ ZLIB_VERSION = '1.2.11';
ZLIB_VERNUM = $12a0;
type
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/readme.txt b/Build/source/libs/zlib/zlib-src/contrib/vstudio/readme.txt
index 587972a4907..48cccc0d2a2 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/readme.txt
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.10
+Building instructions for the DLL versions of Zlib 1.2.11
========================================================
This directory contains projects that build zlib and minizip using
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
index ef3829898b6..c4e4b016e9c 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 10, 0
- PRODUCTVERSION 1, 2, 10, 0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.10\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
index ef3829898b6..c4e4b016e9c 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 10, 0
- PRODUCTVERSION 1, 2, 10, 0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.10\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
index ef3829898b6..c4e4b016e9c 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 10, 0
- PRODUCTVERSION 1, 2, 10, 0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.10\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
index f876c3bcab8..54e683d99c3 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.def
@@ -1,153 +1,153 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION 1.2
-
-EXPORTS
- adler32 @1
- compress @2
- crc32 @3
- deflate @4
- deflateCopy @5
- deflateEnd @6
- deflateInit2_ @7
- deflateInit_ @8
- deflateParams @9
- deflateReset @10
- deflateSetDictionary @11
- gzclose @12
- gzdopen @13
- gzerror @14
- gzflush @15
- gzopen @16
- gzread @17
- gzwrite @18
- inflate @19
- inflateEnd @20
- inflateInit2_ @21
- inflateInit_ @22
- inflateReset @23
- inflateSetDictionary @24
- inflateSync @25
- uncompress @26
- zlibVersion @27
- gzprintf @28
- gzputc @29
- gzgetc @30
- gzseek @31
- gzrewind @32
- gztell @33
- gzeof @34
- gzsetparams @35
- zError @36
- inflateSyncPoint @37
- get_crc_table @38
- compress2 @39
- gzputs @40
- gzgets @41
- inflateCopy @42
- inflateBackInit_ @43
- inflateBack @44
- inflateBackEnd @45
- compressBound @46
- deflateBound @47
- gzclearerr @48
- gzungetc @49
- zlibCompileFlags @50
- deflatePrime @51
- deflatePending @52
-
- unzOpen @61
- unzClose @62
- unzGetGlobalInfo @63
- unzGetCurrentFileInfo @64
- unzGoToFirstFile @65
- unzGoToNextFile @66
- unzOpenCurrentFile @67
- unzReadCurrentFile @68
- unzOpenCurrentFile3 @69
- unztell @70
- unzeof @71
- unzCloseCurrentFile @72
- unzGetGlobalComment @73
- unzStringFileNameCompare @74
- unzLocateFile @75
- unzGetLocalExtrafield @76
- unzOpen2 @77
- unzOpenCurrentFile2 @78
- unzOpenCurrentFilePassword @79
-
- zipOpen @80
- zipOpenNewFileInZip @81
- zipWriteInFileInZip @82
- zipCloseFileInZip @83
- zipClose @84
- zipOpenNewFileInZip2 @86
- zipCloseFileInZipRaw @87
- zipOpen2 @88
- zipOpenNewFileInZip3 @89
-
- unzGetFilePos @100
- unzGoToFilePos @101
-
- fill_win32_filefunc @110
-
-; zlibwapi v1.2.4 added:
- fill_win32_filefunc64 @111
- fill_win32_filefunc64A @112
- fill_win32_filefunc64W @113
-
- unzOpen64 @120
- unzOpen2_64 @121
- unzGetGlobalInfo64 @122
- unzGetCurrentFileInfo64 @124
- unzGetCurrentFileZStreamPos64 @125
- unztell64 @126
- unzGetFilePos64 @127
- unzGoToFilePos64 @128
-
- zipOpen64 @130
- zipOpen2_64 @131
- zipOpenNewFileInZip64 @132
- zipOpenNewFileInZip2_64 @133
- zipOpenNewFileInZip3_64 @134
- zipOpenNewFileInZip4_64 @135
- zipCloseFileInZipRaw64 @136
-
-; zlib1 v1.2.4 added:
- adler32_combine @140
- crc32_combine @142
- deflateSetHeader @144
- deflateTune @145
- gzbuffer @146
- gzclose_r @147
- gzclose_w @148
- gzdirect @149
- gzoffset @150
- inflateGetHeader @156
- inflateMark @157
- inflatePrime @158
- inflateReset2 @159
- inflateUndermine @160
-
-; zlib1 v1.2.6 added:
- gzgetc_ @161
- inflateResetKeep @163
- deflateResetKeep @164
-
-; zlib1 v1.2.7 added:
- gzopen_w @165
-
-; zlib1 v1.2.8 added:
- inflateGetDictionary @166
- gzvprintf @167
-
-; zlib1 v1.2.9 added:
- inflateCodesUsed @168
- inflateValidate @169
- uncompress2 @170
- gzfread @171
- gzfwrite @172
- deflateGetDictionary @173
- adler32_z @174
- crc32_z @175
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION 1.2
+
+EXPORTS
+ adler32 @1
+ compress @2
+ crc32 @3
+ deflate @4
+ deflateCopy @5
+ deflateEnd @6
+ deflateInit2_ @7
+ deflateInit_ @8
+ deflateParams @9
+ deflateReset @10
+ deflateSetDictionary @11
+ gzclose @12
+ gzdopen @13
+ gzerror @14
+ gzflush @15
+ gzopen @16
+ gzread @17
+ gzwrite @18
+ inflate @19
+ inflateEnd @20
+ inflateInit2_ @21
+ inflateInit_ @22
+ inflateReset @23
+ inflateSetDictionary @24
+ inflateSync @25
+ uncompress @26
+ zlibVersion @27
+ gzprintf @28
+ gzputc @29
+ gzgetc @30
+ gzseek @31
+ gzrewind @32
+ gztell @33
+ gzeof @34
+ gzsetparams @35
+ zError @36
+ inflateSyncPoint @37
+ get_crc_table @38
+ compress2 @39
+ gzputs @40
+ gzgets @41
+ inflateCopy @42
+ inflateBackInit_ @43
+ inflateBack @44
+ inflateBackEnd @45
+ compressBound @46
+ deflateBound @47
+ gzclearerr @48
+ gzungetc @49
+ zlibCompileFlags @50
+ deflatePrime @51
+ deflatePending @52
+
+ unzOpen @61
+ unzClose @62
+ unzGetGlobalInfo @63
+ unzGetCurrentFileInfo @64
+ unzGoToFirstFile @65
+ unzGoToNextFile @66
+ unzOpenCurrentFile @67
+ unzReadCurrentFile @68
+ unzOpenCurrentFile3 @69
+ unztell @70
+ unzeof @71
+ unzCloseCurrentFile @72
+ unzGetGlobalComment @73
+ unzStringFileNameCompare @74
+ unzLocateFile @75
+ unzGetLocalExtrafield @76
+ unzOpen2 @77
+ unzOpenCurrentFile2 @78
+ unzOpenCurrentFilePassword @79
+
+ zipOpen @80
+ zipOpenNewFileInZip @81
+ zipWriteInFileInZip @82
+ zipCloseFileInZip @83
+ zipClose @84
+ zipOpenNewFileInZip2 @86
+ zipCloseFileInZipRaw @87
+ zipOpen2 @88
+ zipOpenNewFileInZip3 @89
+
+ unzGetFilePos @100
+ unzGoToFilePos @101
+
+ fill_win32_filefunc @110
+
+; zlibwapi v1.2.4 added:
+ fill_win32_filefunc64 @111
+ fill_win32_filefunc64A @112
+ fill_win32_filefunc64W @113
+
+ unzOpen64 @120
+ unzOpen2_64 @121
+ unzGetGlobalInfo64 @122
+ unzGetCurrentFileInfo64 @124
+ unzGetCurrentFileZStreamPos64 @125
+ unztell64 @126
+ unzGetFilePos64 @127
+ unzGoToFilePos64 @128
+
+ zipOpen64 @130
+ zipOpen2_64 @131
+ zipOpenNewFileInZip64 @132
+ zipOpenNewFileInZip2_64 @133
+ zipOpenNewFileInZip3_64 @134
+ zipOpenNewFileInZip4_64 @135
+ zipCloseFileInZipRaw64 @136
+
+; zlib1 v1.2.4 added:
+ adler32_combine @140
+ crc32_combine @142
+ deflateSetHeader @144
+ deflateTune @145
+ gzbuffer @146
+ gzclose_r @147
+ gzclose_w @148
+ gzdirect @149
+ gzoffset @150
+ inflateGetHeader @156
+ inflateMark @157
+ inflatePrime @158
+ inflateReset2 @159
+ inflateUndermine @160
+
+; zlib1 v1.2.6 added:
+ gzgetc_ @161
+ inflateResetKeep @163
+ deflateResetKeep @164
+
+; zlib1 v1.2.7 added:
+ gzopen_w @165
+
+; zlib1 v1.2.8 added:
+ inflateGetDictionary @166
+ gzvprintf @167
+
+; zlib1 v1.2.9 added:
+ inflateCodesUsed @168
+ inflateValidate @169
+ uncompress2 @170
+ gzfread @171
+ gzfwrite @172
+ deflateGetDictionary @173
+ adler32_z @174
+ crc32_z @175
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/miniunz.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/minizip.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlibdll.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
index ef3829898b6..c4e4b016e9c 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 10, 0
- PRODUCTVERSION 1, 2, 10, 0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.10\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj.user b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj.user
deleted file mode 100644
index abe8dd8961e..00000000000
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project> \ No newline at end of file
diff --git a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
index ef3829898b6..c4e4b016e9c 100644
--- a/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
+++ b/Build/source/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 10, 0
- PRODUCTVERSION 1, 2, 10, 0
+ FILEVERSION 1, 2, 11, 0
+ PRODUCTVERSION 1, 2, 11, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.10\0"
+ VALUE "FileVersion", "1.2.11\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-src/deflate.c b/Build/source/libs/zlib/zlib-src/deflate.c
index 2ad890e3547..1ec761448de 100644
--- a/Build/source/libs/zlib/zlib-src/deflate.c
+++ b/Build/source/libs/zlib/zlib-src/deflate.c
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.10 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -586,7 +586,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
}
func = configuration_table[s->level].func;
- if ((strategy != s->strategy || func != configuration_table[level].func)) {
+ if ((strategy != s->strategy || func != configuration_table[level].func) &&
+ s->high_water) {
/* Flush the last buffer: */
int err = deflate(strm, Z_BLOCK);
if (err == Z_STREAM_ERROR)
@@ -1671,8 +1672,6 @@ local block_state deflate_stored(s, flush)
len = left + s->strm->avail_in; /* limit len to the input */
if (len > have)
len = have; /* limit len to the output */
- if (left > len)
- left = len; /* limit window pull to len */
/* If the stored block would be less than min_block in length, or if
* unable to copy all of the available input when flushing, then try
@@ -1681,13 +1680,13 @@ local block_state deflate_stored(s, flush)
*/
if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
flush == Z_NO_FLUSH ||
- len - left != s->strm->avail_in))
+ len != left + s->strm->avail_in))
break;
/* Make a dummy stored block in pending to get the header bytes,
* including any pending bits. This also updates the debugging counts.
*/
- last = flush == Z_FINISH && len - left == s->strm->avail_in ? 1 : 0;
+ last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
_tr_stored_block(s, (char *)0, 0L, last);
/* Replace the lengths in the dummy stored block with len. */
@@ -1699,14 +1698,16 @@ local block_state deflate_stored(s, flush)
/* Write the stored block header bytes. */
flush_pending(s->strm);
- /* Update debugging counts for the data about to be copied. */
#ifdef ZLIB_DEBUG
+ /* Update debugging counts for the data about to be copied. */
s->compressed_len += len << 3;
s->bits_sent += len << 3;
#endif
/* Copy uncompressed bytes from the window to next_out. */
if (left) {
+ if (left > len)
+ left = len;
zmemcpy(s->strm->next_out, s->window + s->block_start, left);
s->strm->next_out += left;
s->strm->avail_out -= left;
@@ -1756,6 +1757,8 @@ local block_state deflate_stored(s, flush)
s->block_start = s->strstart;
s->insert += MIN(used, s->w_size - s->insert);
}
+ if (s->high_water < s->strstart)
+ s->high_water = s->strstart;
/* If the last block was written to next_out, then done. */
if (last)
@@ -1783,6 +1786,8 @@ local block_state deflate_stored(s, flush)
read_buf(s->strm, s->window + s->strstart, have);
s->strstart += have;
}
+ if (s->high_water < s->strstart)
+ s->high_water = s->strstart;
/* There was not enough avail_out to write a complete worthy or flushed
* stored block to next_out. Write a stored block to pending instead, if we
diff --git a/Build/source/libs/zlib/zlib-src/gzlib.c b/Build/source/libs/zlib/zlib-src/gzlib.c
index e142ffb3d75..4105e6aff92 100644
--- a/Build/source/libs/zlib/zlib-src/gzlib.c
+++ b/Build/source/libs/zlib/zlib-src/gzlib.c
@@ -1,5 +1,5 @@
/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/Build/source/libs/zlib/zlib-src/gzwrite.c b/Build/source/libs/zlib/zlib-src/gzwrite.c
index 1ec1da40954..c7b5651d70b 100644
--- a/Build/source/libs/zlib/zlib-src/gzwrite.c
+++ b/Build/source/libs/zlib/zlib-src/gzwrite.c
@@ -1,5 +1,5 @@
/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/Build/source/libs/zlib/zlib-src/inffast.c b/Build/source/libs/zlib/zlib-src/inffast.c
index 29eb7d8244a..0dbd1dbc09f 100644
--- a/Build/source/libs/zlib/zlib-src/inffast.c
+++ b/Build/source/libs/zlib/zlib-src/inffast.c
@@ -1,5 +1,5 @@
/* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013, 2016 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
diff --git a/Build/source/libs/zlib/zlib-src/inftrees.c b/Build/source/libs/zlib/zlib-src/inftrees.c
index 8a904ddbcef..2ea08fc13ea 100644
--- a/Build/source/libs/zlib/zlib-src/inftrees.c
+++ b/Build/source/libs/zlib/zlib-src/inftrees.c
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.10 Copyright 1995-2017 Mark Adler ";
+ " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 202};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/Build/source/libs/zlib/zlib-src/os400/README400 b/Build/source/libs/zlib/zlib-src/os400/README400
index 28dca8cd14a..4f98334f5ac 100644
--- a/Build/source/libs/zlib/zlib-src/os400/README400
+++ b/Build/source/libs/zlib/zlib-src/os400/README400
@@ -1,4 +1,4 @@
- ZLIB version 1.2.10 for OS/400 installation instructions
+ ZLIB version 1.2.11 for OS/400 installation instructions
1) Download and unpack the zlib tarball to some IFS directory.
(i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/Build/source/libs/zlib/zlib-src/os400/make.sh b/Build/source/libs/zlib/zlib-src/os400/make.sh
index ddbfb16b8a3..19eec117a67 100755
--- a/Build/source/libs/zlib/zlib-src/os400/make.sh
+++ b/Build/source/libs/zlib/zlib-src/os400/make.sh
@@ -260,7 +260,7 @@ fi
echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
echo '#pragma comment(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1995-2016 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
MODULES=
diff --git a/Build/source/libs/zlib/zlib-src/os400/zlib.inc b/Build/source/libs/zlib/zlib-src/os400/zlib.inc
index a2147dd0abe..c6aca2cbd6a 100644
--- a/Build/source/libs/zlib/zlib-src/os400/zlib.inc
+++ b/Build/source/libs/zlib/zlib-src/os400/zlib.inc
@@ -1,7 +1,7 @@
* ZLIB.INC - Interface to the general purpose compression library
*
* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
- * Version 1.2.10
+ * Version 1.2.11
*
*
* WARNING:
@@ -22,12 +22,12 @@
*
* Versioning information.
*
- D ZLIB_VERSION C '1.2.10'
+ D ZLIB_VERSION C '1.2.11'
D ZLIB_VERNUM C X'12a0'
D ZLIB_VER_MAJOR C 1
D ZLIB_VER_MINOR C 2
D ZLIB_VER_REVISION...
- D C 10
+ D C 11
D ZLIB_VER_SUBREVISION...
D C 0
*
diff --git a/Build/source/libs/zlib/zlib-src/qnx/package.qpg b/Build/source/libs/zlib/zlib-src/qnx/package.qpg
index d9a1229e96e..31e8e90db4d 100644
--- a/Build/source/libs/zlib/zlib-src/qnx/package.qpg
+++ b/Build/source/libs/zlib/zlib-src/qnx/package.qpg
@@ -25,10 +25,10 @@
<QPG:Files>
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../libz.so.1.2.10" install="/opt/lib/" user="root:bin" permission="644"/>
- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.10"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.10"/>
- <QPG:Add file="../libz.so.1.2.10" install="/opt/lib/" component="slib"/>
+ <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" user="root:bin" permission="644"/>
+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
+ <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.10</QPM:ReleaseVersion>
+ <QPM:ReleaseVersion>1.2.11</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/Build/source/libs/zlib/zlib-src/treebuild.xml b/Build/source/libs/zlib/zlib-src/treebuild.xml
index a530cc075cb..fd75525f995 100644
--- a/Build/source/libs/zlib/zlib-src/treebuild.xml
+++ b/Build/source/libs/zlib/zlib-src/treebuild.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<package name="zlib" version="1.2.10">
- <library name="zlib" dlversion="1.2.10" dlname="z">
+<package name="zlib" version="1.2.11">
+ <library name="zlib" dlversion="1.2.11" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
diff --git a/Build/source/libs/zlib/zlib-src/trees.c b/Build/source/libs/zlib/zlib-src/trees.c
index 357f3139254..50cf4b4571c 100644
--- a/Build/source/libs/zlib/zlib-src/trees.c
+++ b/Build/source/libs/zlib/zlib-src/trees.c
@@ -1,5 +1,5 @@
/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2016 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
* detect_data_type() function provided freely by Cosmin Truta, 2006
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -906,7 +906,7 @@ void ZLIB_INTERNAL _tr_align(s)
/* ===========================================================================
* Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * trees or store, and write out the encoded block.
*/
void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
deflate_state *s;
diff --git a/Build/source/libs/zlib/zlib-src/win32/Makefile.msc b/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
index 67b773171da..6831882de43 100644
--- a/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
+++ b/Build/source/libs/zlib/zlib-src/win32/Makefile.msc
@@ -1,5 +1,5 @@
# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
#
# Usage:
# nmake -f win32/Makefile.msc (standard build)
diff --git a/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt b/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
index 16adcca5d1b..df7ab7f4b34 100644
--- a/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
+++ b/Build/source/libs/zlib/zlib-src/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.10 is a general purpose data compression library. All the code is
+zlib 1.2.11 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
Manifest:
-The package zlib-1.2.10-win32-x86.zip will contain the following files:
+The package zlib-1.2.11-win32-x86.zip will contain the following files:
README-WIN32.txt This document
ChangeLog Changes since previous zlib packages
@@ -72,7 +72,7 @@ are too numerous to cite here.
Copyright notice:
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/Build/source/libs/zlib/zlib-src/win32/VisualC.txt b/Build/source/libs/zlib/zlib-src/win32/VisualC.txt
index 579a5fc9e0f..1005b219410 100644
--- a/Build/source/libs/zlib/zlib-src/win32/VisualC.txt
+++ b/Build/source/libs/zlib/zlib-src/win32/VisualC.txt
@@ -1,3 +1,3 @@
To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the projects/ directory.
+use the appropriate project from the contrib/vstudio/ directory.
diff --git a/Build/source/libs/zlib/zlib-src/win32/zlib1.rc b/Build/source/libs/zlib/zlib-src/win32/zlib1.rc
index 5c0feed1b44..234e641c329 100644
--- a/Build/source/libs/zlib/zlib-src/win32/zlib1.rc
+++ b/Build/source/libs/zlib/zlib-src/win32/zlib1.rc
@@ -26,7 +26,7 @@ BEGIN
VALUE "FileDescription", "zlib data compression library\0"
VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
- VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
VALUE "ProductVersion", ZLIB_VERSION "\0"
diff --git a/Build/source/libs/zlib/zlib-src/zlib.3 b/Build/source/libs/zlib/zlib-src/zlib.3
index 00dc06119b1..bda4eb07370 100644
--- a/Build/source/libs/zlib/zlib-src/zlib.3
+++ b/Build/source/libs/zlib/zlib-src/zlib.3
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "2 Jan 2017"
+.TH ZLIB 3 "15 Jan 2017"
.SH NAME
zlib \- compression/decompression library
.SH SYNOPSIS
@@ -105,7 +105,7 @@ before asking for help.
Send questions and/or comments to zlib@gzip.org,
or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
.SH AUTHORS AND LICENSE
-Version 1.2.10
+Version 1.2.11
.LP
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
.LP
diff --git a/Build/source/libs/zlib/zlib-src/zlib.3.pdf b/Build/source/libs/zlib/zlib-src/zlib.3.pdf
index 20008cd7139..6fa519c5bdf 100644
--- a/Build/source/libs/zlib/zlib-src/zlib.3.pdf
+++ b/Build/source/libs/zlib/zlib-src/zlib.3.pdf
Binary files differ
diff --git a/Build/source/libs/zlib/zlib-src/zlib.h b/Build/source/libs/zlib/zlib-src/zlib.h
index dc90dc8d22b..f09cdaf1e05 100644
--- a/Build/source/libs/zlib/zlib-src/zlib.h
+++ b/Build/source/libs/zlib/zlib-src/zlib.h
@@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.10, January 2nd, 2017
+ version 1.2.11, January 15th, 2017
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
@@ -37,11 +37,11 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.10"
-#define ZLIB_VERNUM 0x12a0
+#define ZLIB_VERSION "1.2.11"
+#define ZLIB_VERNUM 0x12b0
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 10
+#define ZLIB_VER_REVISION 11
#define ZLIB_VER_SUBREVISION 0
/*
@@ -712,10 +712,11 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
used to switch between compression and straight copy of the input data, or
to switch to a different kind of input data requiring a different strategy.
If the compression approach (which is a function of the level) or the
- strategy is changed, then the input available so far is compressed with the
- old level and strategy using deflate(strm, Z_BLOCK). There are three
- approaches for the compression levels 0, 1..3, and 4..9 respectively. The
- new level and strategy will take effect at the next call of deflate().
+ strategy is changed, and if any input has been consumed in a previous
+ deflate() call, then the input available so far is compressed with the old
+ level and strategy using deflate(strm, Z_BLOCK). There are three approaches
+ for the compression levels 0, 1..3, and 4..9 respectively. The new level
+ and strategy will take effect at the next call of deflate().
If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
not have enough output space to complete, then the parameter change will not
diff --git a/Build/source/libs/zlib/zlib-src/zutil.c b/Build/source/libs/zlib/zlib-src/zutil.c
index 56534fba0ff..a76c6b0c7e5 100644
--- a/Build/source/libs/zlib/zlib-src/zutil.c
+++ b/Build/source/libs/zlib/zlib-src/zutil.c
@@ -1,5 +1,5 @@
/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
* For conditions of distribution and use, see copyright notice in zlib.h
*/