[patch] update zlib to the 1.2.10 release.

[patch] update zlib to the 1.2.10 release.

[Matthias Klose]

[-- Attachment #1: Type: text/plain, Size: 2288 bytes --]

These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
building without a system zlib.  The new release includes fixes for security
issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.

Checked with a build with disabled system-zlib. Ok for the trunk?

Matthias


Changes in 1.2.10 (2 Jan 2017)
- Avoid warnings on snprintf() return value
- Fix bug in deflate_stored() for zero-length input
- Fix bug in gzwrite.c that produced corrupt gzip files
- Remove files to be installed before copying them in Makefile.in
- Add warnings when compiling with assembler code

Changes in 1.2.9 (31 Dec 2016)
- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
- Improve contrib/blast to return unused bytes
- Assure that gzoffset() is correct when appending
- Improve compress() and uncompress() to support large lengths
- Fix bug in test/example.c where error code not saved
- Remedy Coverity warning [Randers-Pehrson]
- Improve speed of gzprintf() in transparent mode
- Fix inflateInit2() bug when windowBits is 16 or 32
- Change DEBUG macro to ZLIB_DEBUG
- Avoid uninitialized access by gzclose_w()
- Allow building zlib outside of the source directory
- Fix bug that accepted invalid zlib header when windowBits is zero
- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
- Loop on write() calls in gzwrite.c in case of non-blocking I/O
- Add --warn (-w) option to ./configure for more compiler warnings
- Reject a window size of 256 bytes if not using the zlib wrapper
- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
- Fix bugs in creating a very large gzip header
- Add uncompress2() function, which returns the input size used
- Assure that deflateParams() will not switch functions mid-block
- Dramatically speed up deflation for level 0 (storing)
- Add gzfread(), duplicating the interface of fread()
- Add gzfwrite(), duplicating the interface of fwrite()
- Add deflateGetDictionary() function
- Use snprintf() for later versions of Microsoft C
- Fix *Init macros to use z_ prefix when requested
- Replace as400 with os400 for OS/400 support [Monnerat]
- Add crc32_z() and adler32_z() functions with size_t lengths
- Update Visual Studio project files [AraHaan]

[-- Attachment #2: zlib-1.2.10.diff.gz --]
[-- Type: application/gzip, Size: 94895 bytes --]

Re: [patch] update zlib to the 1.2.10 release.

[Jeff Law]

On 01/05/2017 07:45 AM, Matthias Klose wrote:
> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
> building without a system zlib.  The new release includes fixes for security
> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>
> Checked with a build with disabled system-zlib. Ok for the trunk?
Were there any changes that we needed to carry forward or any changes 
you needed to make to the upstream sources?

Jeff

Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose]

On 12.01.2017 22:17, Jeff Law wrote:
> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>> building without a system zlib.  The new release includes fixes for security
>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>
>> Checked with a build with disabled system-zlib. Ok for the trunk?
> Were there any changes that we needed to carry forward or any changes you needed
> to make to the upstream sources?

I backed out the changes to the configure* and Makefile* changes (and only
these), which are completely different to zlib upstream. There are no
additions/deletions to zlib source files, so these build changes still work with
the updated zlib.

Matthias

Re: [patch] update zlib to the 1.2.10 release.

[Jeff Law]

On 01/12/2017 02:26 PM, Matthias Klose wrote:
> On 12.01.2017 22:17, Jeff Law wrote:
>> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>>> building without a system zlib.  The new release includes fixes for security
>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>>
>>> Checked with a build with disabled system-zlib. Ok for the trunk?
>> Were there any changes that we needed to carry forward or any changes you needed
>> to make to the upstream sources?
>
> I backed out the changes to the configure* and Makefile* changes (and only
> these), which are completely different to zlib upstream. There are no
> additions/deletions to zlib source files, so these build changes still work with
> the updated zlib.
OK.  I'm a little concerned that we may be losing local changes -- 
though it looks like you've done this process a couple times already, so 
I'll assume you're aware of potential pitfalls.

Go ahead and install on the trunk.  If it causes problems we can't 
address quickly and safely we may have to rethink.

jeff

Re: [patch] update zlib to the 1.2.10 release.

[Jeff Law]

On 01/12/2017 02:26 PM, Matthias Klose wrote:
> On 12.01.2017 22:17, Jeff Law wrote:
>> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>>> building without a system zlib.  The new release includes fixes for security
>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>>
>>> Checked with a build with disabled system-zlib. Ok for the trunk?
>> Were there any changes that we needed to carry forward or any changes you needed
>> to make to the upstream sources?
>
> I backed out the changes to the configure* and Makefile* changes (and only
> these), which are completely different to zlib upstream. There are no
> additions/deletions to zlib source files, so these build changes still work with
> the updated zlib.
One more note.  I think that, in general, backing out local changes 
which don't have a strong need to be carried forward is absolutely the 
right thing to do.  The less hacking we do on these libraries we pull 
from other sources, the better, IMHO.

jeff

Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose]

On 12.01.2017 22:39, Jeff Law wrote:
> On 01/12/2017 02:26 PM, Matthias Klose wrote:
>> On 12.01.2017 22:17, Jeff Law wrote:
>>> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>>>> building without a system zlib.  The new release includes fixes for security
>>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>>>
>>>> Checked with a build with disabled system-zlib. Ok for the trunk?
>>> Were there any changes that we needed to carry forward or any changes you needed
>>> to make to the upstream sources?
>>
>> I backed out the changes to the configure* and Makefile* changes (and only
>> these), which are completely different to zlib upstream. There are no
>> additions/deletions to zlib source files, so these build changes still work with
>> the updated zlib.
> One more note.  I think that, in general, backing out local changes which don't
> have a strong need to be carried forward is absolutely the right thing to do. 
> The less hacking we do on these libraries we pull from other sources, the
> better, IMHO.

agreed, except for the build system (and a locally fixed typo in zlib's
ChangeLog), everything applied cleanly.

Please import it into the binutils-gdb repository.

Matthias

Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose]

[-- Attachment #1: Type: text/plain, Size: 1727 bytes --]

On 12.01.2017 22:39, Jeff Law wrote:
> On 01/12/2017 02:26 PM, Matthias Klose wrote:
>> On 12.01.2017 22:17, Jeff Law wrote:
>>> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>>>> building without a system zlib.  The new release includes fixes for security
>>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>>>
>>>> Checked with a build with disabled system-zlib. Ok for the trunk?
>>> Were there any changes that we needed to carry forward or any changes you needed
>>> to make to the upstream sources?
>>
>> I backed out the changes to the configure* and Makefile* changes (and only
>> these), which are completely different to zlib upstream. There are no
>> additions/deletions to zlib source files, so these build changes still work with
>> the updated zlib.
> One more note.  I think that, in general, backing out local changes which don't
> have a strong need to be carried forward is absolutely the right thing to do. 
> The less hacking we do on these libraries we pull from other sources, the
> better, IMHO.

Committed the 1.2.10 changes on Jan 13.  1.2.11 was released a few days ago.
Updating the trunk with the new version, checked with a build without using a
system zlib.

NightStrike proposed to revert to the 1.2.8 release until zlib stabilizes again;
I'm open for that, but didn't want to stay with the 1.2.10 release.

Matthias

2017-01-22  Matthias Klose  <doko@ubuntu.com>

        * Import zlib 1.2.11.
        * configure: Regenerate.

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



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: zlib-1.2.11.diff --]
[-- Type: text/x-diff; name="zlib-1.2.11.diff", Size: 29167 bytes --]

Index: zlib/CMakeLists.txt
===================================================================
--- zlib/CMakeLists.txt	(revision 244761)
+++ zlib/CMakeLists.txt	(working copy)
@@ -3,7 +3,7 @@
 
 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")
Index: zlib/ChangeLog
===================================================================
--- zlib/ChangeLog	(revision 244761)
+++ zlib/ChangeLog	(working copy)
@@ -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
Index: zlib/ChangeLog.gcj
===================================================================
--- zlib/ChangeLog.gcj	(revision 244761)
+++ zlib/ChangeLog.gcj	(working copy)
@@ -1,3 +1,8 @@
+2017-01-22  Matthias Klose  <doko@ubuntu.com>
+
+	* Import zlib 1.2.11.
+	* configure: Regenerate.
+
 2017-01-13  Matthias Klose  <doko@ubuntu.com>
 
 	* Import zlib 1.2.10.
Index: zlib/README
===================================================================
--- zlib/README	(revision 244761)
+++ zlib/README	(working copy)
@@ -3,7 +3,7 @@
 
 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
@@ -34,7 +34,7 @@
 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/ .
 
Index: zlib/contrib/delphi/ZLib.pas
===================================================================
--- zlib/contrib/delphi/ZLib.pas	(revision 244761)
+++ zlib/contrib/delphi/ZLib.pas	(working copy)
@@ -152,7 +152,7 @@
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.2.10';
+  zlib_version = '1.2.11';
 
 type
   EZlibError = class(Exception);
Index: zlib/contrib/dotzlib/DotZLib/UnitTests.cs
===================================================================
--- zlib/contrib/dotzlib/DotZLib/UnitTests.cs	(revision 244761)
+++ zlib/contrib/dotzlib/DotZLib/UnitTests.cs	(working copy)
@@ -156,7 +156,7 @@
         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);
Index: zlib/contrib/infback9/inftree9.c
===================================================================
--- zlib/contrib/infback9/inftree9.c	(revision 244761)
+++ zlib/contrib/infback9/inftree9.c	(working copy)
@@ -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 @@
     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,
Index: zlib/contrib/minizip/configure.ac
===================================================================
--- zlib/contrib/minizip/configure.ac	(revision 244761)
+++ zlib/contrib/minizip/configure.ac	(working copy)
@@ -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
Index: zlib/contrib/pascal/zlibpas.pas
===================================================================
--- zlib/contrib/pascal/zlibpas.pas	(revision 244761)
+++ zlib/contrib/pascal/zlibpas.pas	(working copy)
@@ -10,7 +10,7 @@
 interface
 
 const
-  ZLIB_VERSION = '1.2.10';
+  ZLIB_VERSION = '1.2.11';
   ZLIB_VERNUM  = $12a0;
 
 type
Index: zlib/contrib/vstudio/readme.txt
===================================================================
--- zlib/contrib/vstudio/readme.txt	(revision 244761)
+++ zlib/contrib/vstudio/readme.txt	(working copy)
@@ -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
Index: zlib/contrib/vstudio/vc10/zlib.rc
===================================================================
--- zlib/contrib/vstudio/vc10/zlib.rc	(revision 244761)
+++ zlib/contrib/vstudio/vc10/zlib.rc	(working copy)
@@ -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
       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"
Index: zlib/contrib/vstudio/vc11/zlib.rc
===================================================================
--- zlib/contrib/vstudio/vc11/zlib.rc	(revision 244761)
+++ zlib/contrib/vstudio/vc11/zlib.rc	(working copy)
@@ -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
       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"
Index: zlib/contrib/vstudio/vc12/zlib.rc
===================================================================
--- zlib/contrib/vstudio/vc12/zlib.rc	(revision 244761)
+++ zlib/contrib/vstudio/vc12/zlib.rc	(working copy)
@@ -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
       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"
Index: zlib/contrib/vstudio/vc14/miniunz.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/miniunz.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/miniunz.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc14/minizip.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/minizip.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/minizip.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc14/testzlib.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/testzlib.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/testzlib.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc14/zlib.rc
===================================================================
--- zlib/contrib/vstudio/vc14/zlib.rc	(revision 244761)
+++ zlib/contrib/vstudio/vc14/zlib.rc	(working copy)
@@ -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
       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"
Index: zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
===================================================================
--- zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user	(revision 244761)
+++ zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user	(nonexistent)
@@ -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
Index: zlib/contrib/vstudio/vc9/zlib.rc
===================================================================
--- zlib/contrib/vstudio/vc9/zlib.rc	(revision 244761)
+++ zlib/contrib/vstudio/vc9/zlib.rc	(working copy)
@@ -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
       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"
Index: zlib/deflate.c
===================================================================
--- zlib/deflate.c	(revision 244761)
+++ zlib/deflate.c	(working copy)
@@ -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 @@
     }
     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 @@
             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 @@
          */
         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,8 +1698,8 @@
         /* Write the stored block header bytes. */
         flush_pending(s->strm);
 
+#ifdef ZLIB_DEBUG
         /* Update debugging counts for the data about to be copied. */
-#ifdef ZLIB_DEBUG
         s->compressed_len += len << 3;
         s->bits_sent += len << 3;
 #endif
@@ -1707,6 +1706,8 @@
 
         /* 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 @@
         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 @@
         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
Index: zlib/gzlib.c
===================================================================
--- zlib/gzlib.c	(revision 244761)
+++ zlib/gzlib.c	(working copy)
@@ -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
  */
 
Index: zlib/gzwrite.c
===================================================================
--- zlib/gzwrite.c	(revision 244761)
+++ zlib/gzwrite.c	(working copy)
@@ -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
  */
 
Index: zlib/inffast.c
===================================================================
--- zlib/inffast.c	(revision 244761)
+++ zlib/inffast.c	(working copy)
@@ -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
  */
 
Index: zlib/inftrees.c
===================================================================
--- zlib/inftrees.c	(revision 244761)
+++ zlib/inftrees.c	(working copy)
@@ -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 @@
         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,
Index: zlib/os400/README400
===================================================================
--- zlib/os400/README400	(revision 244761)
+++ zlib/os400/README400	(working copy)
@@ -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)
Index: zlib/os400/make.sh
===================================================================
--- zlib/os400/make.sh	(revision 244761)
+++ zlib/os400/make.sh	(working copy)
@@ -260,7 +260,7 @@
 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=
Index: zlib/os400/zlib.inc
===================================================================
--- zlib/os400/zlib.inc	(revision 244761)
+++ zlib/os400/zlib.inc	(working copy)
@@ -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
       *
Index: zlib/qnx/package.qpg
===================================================================
--- zlib/qnx/package.qpg	(revision 244761)
+++ zlib/qnx/package.qpg	(working copy)
@@ -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>
Index: zlib/treebuild.xml
===================================================================
--- zlib/treebuild.xml	(revision 244761)
+++ zlib/treebuild.xml	(working copy)
@@ -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)" />
 
Index: zlib/trees.c
===================================================================
--- zlib/trees.c	(revision 244761)
+++ zlib/trees.c	(working copy)
@@ -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 @@
 
 /* ===========================================================================
  * 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;
Index: zlib/win32/Makefile.msc
===================================================================
--- zlib/win32/Makefile.msc	(revision 244761)
+++ zlib/win32/Makefile.msc	(working copy)
@@ -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)
Index: zlib/win32/README-WIN32.txt
===================================================================
--- zlib/win32/README-WIN32.txt	(revision 244761)
+++ zlib/win32/README-WIN32.txt	(working copy)
@@ -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 @@
 
 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 @@
 
 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
Index: zlib/win32/VisualC.txt
===================================================================
--- zlib/win32/VisualC.txt	(revision 244761)
+++ zlib/win32/VisualC.txt	(working copy)
@@ -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.
Index: zlib/win32/zlib1.rc
===================================================================
--- zlib/win32/zlib1.rc	(revision 244761)
+++ zlib/win32/zlib1.rc	(working copy)
@@ -26,7 +26,7 @@
       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"
Index: zlib/zlib.3
===================================================================
--- zlib/zlib.3	(revision 244761)
+++ zlib/zlib.3	(working copy)
@@ -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 @@
 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
Index: zlib/zlib.h
===================================================================
--- zlib/zlib.h	(revision 244761)
+++ zlib/zlib.h	(working copy)
@@ -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 @@
    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
Index: zlib/zutil.c
===================================================================
--- zlib/zutil.c	(revision 244761)
+++ zlib/zutil.c	(working copy)
@@ -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
  */
 

Re: [patch] update zlib to the 1.2.10 release.

[NightStrike]

On Sun, Jan 22, 2017 at 1:00 PM, Matthias Klose <doko@ubuntu.com> wrote:
> NightStrike proposed to revert to the 1.2.8 release until zlib stabilizes again;
> I'm open for that, but didn't want to stay with the 1.2.10 release.

I don't recall making that proposal.  I thought I just suggested that
since modern zlib now supports having a separate build and source
directory (at least according to the December changelog: "Allow
building zlib outside of the source directory"), you should check to
see if the gcc build system had any hacks to accomplish the same thing
that could now be removed.

Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose]

On 22.01.2017 19:12, NightStrike wrote:
> On Sun, Jan 22, 2017 at 1:00 PM, Matthias Klose <doko@ubuntu.com> wrote:
>> NightStrike proposed to revert to the 1.2.8 release until zlib stabilizes again;
>> I'm open for that, but didn't want to stay with the 1.2.10 release.
> 
> I don't recall making that proposal.  I thought I just suggested that
> since modern zlib now supports having a separate build and source
> directory (at least according to the December changelog: "Allow
> building zlib outside of the source directory"), you should check to
> see if the gcc build system had any hacks to accomplish the same thing
> that could now be removed.

sorry for wrongly citing you.  Please could you make the removal of zlib a goal
for GCC 8?  I may be a bit biased trying to keep the "ongoing" d/gdc merge alive
(libgphobos requiring a target zlib).

Matthias

Re: [patch] update zlib to the 1.2.10 release.

[Iain Buclaw]

On 22 January 2017 at 19:42, Matthias Klose <doko@ubuntu.com> wrote:
> On 22.01.2017 19:12, NightStrike wrote:
>> On Sun, Jan 22, 2017 at 1:00 PM, Matthias Klose <doko@ubuntu.com> wrote:
>>> NightStrike proposed to revert to the 1.2.8 release until zlib stabilizes again;
>>> I'm open for that, but didn't want to stay with the 1.2.10 release.
>>
>> I don't recall making that proposal.  I thought I just suggested that
>> since modern zlib now supports having a separate build and source
>> directory (at least according to the December changelog: "Allow
>> building zlib outside of the source directory"), you should check to
>> see if the gcc build system had any hacks to accomplish the same thing
>> that could now be removed.
>
> sorry for wrongly citing you.  Please could you make the removal of zlib a goal
> for GCC 8?  I may be a bit biased trying to keep the "ongoing" d/gdc merge alive
> (libgphobos requiring a target zlib).
>
> Matthias
>

I'd certainly have no problem having zlib as external-only.  The
phobos library also has a dependency on curl in much the same way, but
we don't bundle such in as a convenience library.

But I'm sure I'm not the only user of zlib, doesn't the LTO frontend
support compression?

Iain.

Re: [patch] update zlib to the 1.2.10 release.

[Joel Brobecker]

> On 12.01.2017 22:17, Jeff Law wrote:
> > On 01/05/2017 07:45 AM, Matthias Klose wrote:
> >> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
> >> building without a system zlib.  The new release includes fixes for security
> >> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
> >>
> >> Checked with a build with disabled system-zlib. Ok for the trunk?
> > Were there any changes that we needed to carry forward or any changes you needed
> > to make to the upstream sources?
> 
> I backed out the changes to the configure* and Makefile* changes (and
> only these), which are completely different to zlib upstream. There
> are no additions/deletions to zlib source files, so these build
> changes still work with the updated zlib.

Can you tell us what these changes are? Currently nightly source
packaging is broken while configuring zlib.

Here is what I am seeing:

    $ cd /path/to/gdb/sources
    $ ./configure --target=i386-pc-linux-gnu
    $ make configure-host configure-target
    [...]
    checking for strerror... yes
    checking for unistd.h... (cached) yes
    configure: updating cache ./config.cache
    configure: creating ./config.status
    config.status: creating Makefile
    config.status: executing default-1 commands
    ./config.status: line 1191: ./../../config-ml.in: No such file or directory
    Makefile:10001: recipe for target 'configure-zlib' failed
    make: *** [configure-zlib] Error 1

Thanks,
-- 
Joel

Re: [patch] update zlib to the 1.2.10 release.

[Matthias Klose]

On 23.01.2017 05:09, Joel Brobecker wrote:
>> On 12.01.2017 22:17, Jeff Law wrote:
>>> On 01/05/2017 07:45 AM, Matthias Klose wrote:
>>>> These are the changes updating zlib from 1.2.8 to 1.2.10. It is only used when
>>>> building without a system zlib.  The new release includes fixes for security
>>>> issues CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843.
>>>>
>>>> Checked with a build with disabled system-zlib. Ok for the trunk?
>>> Were there any changes that we needed to carry forward or any changes you needed
>>> to make to the upstream sources?
>>
>> I backed out the changes to the configure* and Makefile* changes (and
>> only these), which are completely different to zlib upstream. There
>> are no additions/deletions to zlib source files, so these build
>> changes still work with the updated zlib.
> 
> Can you tell us what these changes are? Currently nightly source
> packaging is broken while configuring zlib.
> 
> Here is what I am seeing:
> 
>     $ cd /path/to/gdb/sources
>     $ ./configure --target=i386-pc-linux-gnu
>     $ make configure-host configure-target
>     [...]
>     checking for strerror... yes
>     checking for unistd.h... (cached) yes
>     configure: updating cache ./config.cache
>     configure: creating ./config.status
>     config.status: creating Makefile
>     config.status: executing default-1 commands
>     ./config.status: line 1191: ./../../config-ml.in: No such file or directory
>     Makefile:10001: recipe for target 'configure-zlib' failed
>     make: *** [configure-zlib] Error 1

I didn't change the configure and Makefile files at all. I see that Nick synced
the configure.ac from the GCC tree, and that introduced one extra change:

--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -4,9 +4,7 @@ AC_PREREQ(2.64)
 AC_INIT
 AC_CONFIG_SRCDIR([zlib.h])

-if test -n "${with_target_subdir}"; then
-  AM_ENABLE_MULTILIB(, ..)
-fi
+AM_ENABLE_MULTILIB(, ..)

 AC_CANONICAL_SYSTEM


Builds with srcdir != builddir still work.

Matthias

Re: [patch] update zlib to the 1.2.10 release.

[Nick Clifton]

Hi Joel,

> Can you tell us what these changes are? Currently nightly source
> packaging is broken while configuring zlib.

>     ./config.status: line 1191: ./../../config-ml.in: No such file or directory
>     Makefile:10001: recipe for target 'configure-zlib' failed

I have checked in a patch to restore the old behaviour to zlib's Makefile
and allow building with srcdir == builddir.  At least for now.  If we do 
decide to ban this behaviour then this patch can be reverted, or a top level
check and warning added.

Cheers
  Nick

zlib/ChangeLog.bin-gdb
2017-01-23  Nick Clifton  <nickc@redhat.com>

	* configure.ac: Restore old behaviour of only enabling multilibs
	when a target subdirectory is defined.  This allows building with
	srcdir == builddir.
	* configure: Regenerate.