zlib 1.3.1.2HEADv1.3.1.2develop

Interim version for an audit.

19 files changed, 40 insertions, 40 deletions

diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index a64b1a3..b167b69 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   const OutBuf: Pointer; BufSize: Integer);
 
 const
-  zlib_version = '1.3.1.1';
+  zlib_version = '1.3.1.2';
 
 type
   EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 730494a..ef2043f 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
         public void Info_Version()

         {

             Info info = new Info();

-            Assert.AreEqual("1.3.1.1", Info.Version);

+            Assert.AreEqual("1.3.1.2", Info.Version);

             Assert.AreEqual(32, info.SizeOfUInt);

             Assert.AreEqual(32, info.SizeOfULong);

             Assert.AreEqual(32, info.SizeOfPointer);

diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index cbbdd2a..0f06e0f 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
 /* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2024 Mark Adler
+ * Copyright (C) 1995-2025 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate9_copyright[] =
-   " inflate9 1.3.1.1 Copyright 1995-2024 Mark Adler ";
+   " inflate9 1.3.1.2 Copyright 1995-2025 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
@@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes,
     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, 73, 200};
+        133, 133, 133, 133, 144, 64, 204};
     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/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 860c6ba..339d6dc 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.3.1.1], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.3.1.2], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj
index 852e450..9dd2453 100644
--- a/contrib/nuget/nuget.csproj
+++ b/contrib/nuget/nuget.csproj
@@ -6,8 +6,8 @@
     <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId>
     <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId>
     <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId>
-    <Copyright>(C) 1995-2024 Jean-loup Gailly and Mark Adler</Copyright>
-    <version>1.3.1.1</version>
+    <Copyright>(C) 1995-2025 Jean-loup Gailly and Mark Adler</Copyright>
+    <version>1.3.1.2</version>
     <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription>
     <!--
         Warns about not having any lib or ref assemblies (.NET Assemblies) in those directories.
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index d3ef310..8715da8 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
 interface
 
 const
-  ZLIB_VERSION = '1.3.1.1';
+  ZLIB_VERSION = '1.3.1.2';
   ZLIB_VERNUM  = $12a0;
 
 type
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index bc5cfeb..6d6223c 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.3.1.1
+Building instructions for the DLL versions of Zlib 1.3.1.2
 ========================================================
 
 This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index ee4b1fc..acbcf65 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1, 3, 1, 1

-  PRODUCTVERSION 1, 3, 1, 1

+  FILEVERSION    1, 3, 1, 2

+  PRODUCTVERSION 1, 3, 1, 2

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",      "1.3.1.1\0"

+      VALUE "FileVersion",      "1.3.1.2\0"

       VALUE "InternalName",     "zlib\0"

       VALUE "OriginalFilename", "zlibwapi.dll\0"

       VALUE "ProductName",      "ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179

diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index ee4b1fc..acbcf65 100644
--- a/contrib/vstudio/vc11/zlib.rc
+++ b/contrib/vstudio/vc11/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1, 3, 1, 1

-  PRODUCTVERSION 1, 3, 1, 1

+  FILEVERSION    1, 3, 1, 2

+  PRODUCTVERSION 1, 3, 1, 2

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",      "1.3.1.1\0"

+      VALUE "FileVersion",      "1.3.1.2\0"

       VALUE "InternalName",     "zlib\0"

       VALUE "OriginalFilename", "zlibwapi.dll\0"

       VALUE "ProductName",      "ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc11/zlibvc.def
+++ b/contrib/vstudio/vc11/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179

diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index fdfb124..2ae381c 100644
--- a/contrib/vstudio/vc12/zlib.rc
+++ b/contrib/vstudio/vc12/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 3, 1, 1
-  PRODUCTVERSION 1, 3, 1, 1
+  FILEVERSION    1, 3, 1, 2
+  PRODUCTVERSION 1, 3, 1, 2
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
   FILEOS        VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.3.1.1\0"
+      VALUE "FileVersion",      "1.3.1.2\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179

diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index fdfb124..2ae381c 100644
--- a/contrib/vstudio/vc14/zlib.rc
+++ b/contrib/vstudio/vc14/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 3, 1, 1
-  PRODUCTVERSION 1, 3, 1, 1
+  FILEVERSION    1, 3, 1, 2
+  PRODUCTVERSION 1, 3, 1, 2
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
   FILEOS        VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.3.1.1\0"
+      VALUE "FileVersion",      "1.3.1.2\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc14/zlibvc.def
+++ b/contrib/vstudio/vc14/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179

diff --git a/contrib/vstudio/vc17/zlib.rc b/contrib/vstudio/vc17/zlib.rc
index fdfb124..2ae381c 100644
--- a/contrib/vstudio/vc17/zlib.rc
+++ b/contrib/vstudio/vc17/zlib.rc
@@ -2,8 +2,8 @@
 
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1, 3, 1, 1
-  PRODUCTVERSION 1, 3, 1, 1
+  FILEVERSION    1, 3, 1, 2
+  PRODUCTVERSION 1, 3, 1, 2
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
   FILEOS        VOS_DOS_WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
 
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.3.1.1\0"
+      VALUE "FileVersion",      "1.3.1.2\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlibwapi.dll\0"
       VALUE "ProductName",      "ZLib.DLL\0"
       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc17/zlibvc.def b/contrib/vstudio/vc17/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc17/zlibvc.def
+++ b/contrib/vstudio/vc17/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179

diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index ee4b1fc..acbcf65 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 

 #define IDR_VERSION1  1

 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE

-  FILEVERSION    1, 3, 1, 1

-  PRODUCTVERSION 1, 3, 1, 1

+  FILEVERSION    1, 3, 1, 2

+  PRODUCTVERSION 1, 3, 1, 2

   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

   FILEFLAGS     0

   FILEOS        VOS_DOS_WINDOWS32

@@ -17,12 +17,12 @@ BEGIN
 

     BEGIN

       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"

-      VALUE "FileVersion",      "1.3.1.1\0"

+      VALUE "FileVersion",      "1.3.1.2\0"

       VALUE "InternalName",     "zlib\0"

       VALUE "OriginalFilename", "zlibwapi.dll\0"

       VALUE "ProductName",      "ZLib.DLL\0"

       VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"

-      VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"

+      VALUE "LegalCopyright", "(C) 1995-2025 Jean-loup Gailly & Mark Adler\0"

     END

   END

   BLOCK "VarFileInfo"

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 61b2d3f..d567456 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -157,5 +157,5 @@ EXPORTS
         crc32_combine_gen64                     @177

         crc32_combine_op                        @178

 

-; zlib1 v1.3.2 added:

+; zlib1 v1.3.1.2 added:

         deflateUsed                             @179