aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMark Adler <git@madler.net>2026-02-17 02:31:51 -0800
committerMark Adler <git@madler.net>2026-02-17 04:47:06 -0800
commit9e35567064baded660f61732b247ef5abc809014 (patch)
tree79b5a06f88838dd54f90f821e8650254abfedb7e /contrib
parent890953a4e40bfb96fdfed161b1a7a8fcc1216790 (diff)
downloadzlib-9e35567064baded660f61732b247ef5abc809014.tar.gz
zlib-9e35567064baded660f61732b247ef5abc809014.tar.bz2
zlib-9e35567064baded660f61732b247ef5abc809014.zip
Version 1.3.2
Diffstat (limited to 'contrib')
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/MiniZip64_info.txt2
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/minizip/crypt.h5
-rw-r--r--contrib/minizip/ioapi.c2
-rw-r--r--contrib/minizip/ioapi.h2
-rw-r--r--contrib/minizip/iowin32.c3
-rw-r--r--contrib/minizip/iowin32.h3
-rw-r--r--contrib/minizip/miniunz.c3
-rw-r--r--contrib/minizip/minizip.c3
-rw-r--r--contrib/minizip/skipset.h2
-rw-r--r--contrib/minizip/unzip.c3
-rw-r--r--contrib/minizip/unzip.h3
-rw-r--r--contrib/minizip/zip.c3
-rw-r--r--contrib/minizip/zip.h3
-rw-r--r--contrib/nuget/nuget.csproj4
-rw-r--r--contrib/pascal/zlibpas.pas2
-rw-r--r--contrib/puff/pufftest.c3
-rw-r--r--contrib/zlib1-dll/CMakeLists.txt2
21 files changed, 24 insertions, 36 deletions
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index b167b69c..cda3b09e 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152 const OutBuf: Pointer; BufSize: Integer); 152 const OutBuf: Pointer; BufSize: Integer);
153 153
154const 154const
155 zlib_version = '1.3.1.2'; 155 zlib_version = '1.3.2';
156 156
157type 157type
158 EZlibError = class(Exception); 158 EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 6b532e25..2714a4b4 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
156 public void Info_Version() 156 public void Info_Version()
157 { 157 {
158 Info info = new Info(); 158 Info info = new Info();
159 Assert.AreEqual("1.3.1.2", Info.Version); 159 Assert.AreEqual("1.3.2", Info.Version);
160 Assert.AreEqual(32, info.SizeOfUInt); 160 Assert.AreEqual(32, info.SizeOfUInt);
161 Assert.AreEqual(32, info.SizeOfULong); 161 Assert.AreEqual(32, info.SizeOfULong);
162 Assert.AreEqual(32, info.SizeOfPointer); 162 Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 0f06e0f4..cb96cf87 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.3.1.2 Copyright 1995-2025 Mark Adler "; 12 " inflate9 1.3.2 Copyright 1995-2026 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 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,
59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, 61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62 133, 133, 133, 133, 144, 64, 204}; 62 133, 133, 133, 133, 144, 199, 75};
63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 65 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/MiniZip64_info.txt b/contrib/minizip/MiniZip64_info.txt
index 86487d18..7ca3d05b 100644
--- a/contrib/minizip/MiniZip64_info.txt
+++ b/contrib/minizip/MiniZip64_info.txt
@@ -1,4 +1,4 @@
1MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson 1MiniZip - Copyright (c) 1998-2026 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
2 2
3Introduction 3Introduction
4--------------------- 4---------------------
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 339d6dc0..b739fa0c 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
1# -*- Autoconf -*- 1# -*- Autoconf -*-
2# Process this file with autoconf to produce a configure script. 2# Process this file with autoconf to produce a configure script.
3 3
4AC_INIT([minizip], [1.3.1.2], [bugzilla.redhat.com]) 4AC_INIT([minizip], [1.3.2], [bugzilla.redhat.com])
5AC_CONFIG_SRCDIR([minizip.c]) 5AC_CONFIG_SRCDIR([minizip.c])
6AM_INIT_AUTOMAKE([foreign]) 6AM_INIT_AUTOMAKE([foreign])
7LT_INIT 7LT_INIT
diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
index d1827c31..dd548938 100644
--- a/contrib/minizip/crypt.h
+++ b/contrib/minizip/crypt.h
@@ -1,9 +1,6 @@
1/* crypt.h -- base code for crypt/uncrypt ZIPfile 1/* crypt.h -- base code for crypt/uncrypt ZIPfile
2 2
3 3 Copyright (C) 1998-2026 Gilles Vollant
4 Version 1.01e, February 12th, 2005
5
6 Copyright (C) 1998-2005 Gilles Vollant
7 4
8 This code is a modified version of crypting code in Infozip distribution 5 This code is a modified version of crypting code in Infozip distribution
9 6
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 04989887..3ee97516 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,7 +1,7 @@
1/* ioapi.h -- IO base function header for compress/uncompress .zip 1/* ioapi.h -- IO base function header for compress/uncompress .zip
2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
3 3
4 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
5 5
6 Modifications for Zip64 support 6 Modifications for Zip64 support
7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index 569857fc..a5211239 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,7 +1,7 @@
1/* ioapi.h -- IO base function header for compress/uncompress .zip 1/* ioapi.h -- IO base function header for compress/uncompress .zip
2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
3 3
4 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
5 5
6 Modifications for Zip64 support 6 Modifications for Zip64 support
7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
index abd51535..810ab2cc 100644
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -1,8 +1,7 @@
1/* iowin32.c -- IO base function header for compress/uncompress .zip 1/* iowin32.c -- IO base function header for compress/uncompress .zip
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h
index 345ac93a..65be6270 100644
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -1,8 +1,7 @@
1/* iowin32.h -- IO base function header for compress/uncompress .zip 1/* iowin32.h -- IO base function header for compress/uncompress .zip
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 8aa788f1..cd577ea0 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -1,9 +1,8 @@
1/* 1/*
2 miniunz.c 2 miniunz.c
3 Version 1.1, February 14h, 2010
4 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 3 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
5 4
6 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 5 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
7 6
8 Modifications of Unzip for Zip64 7 Modifications of Unzip for Zip64
9 Copyright (C) 2007-2008 Even Rouault 8 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index 46a6d798..f68bea1d 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -1,9 +1,8 @@
1/* 1/*
2 minizip.c 2 minizip.c
3 Version 1.1, February 14h, 2010
4 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 3 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
5 4
6 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 5 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
7 6
8 Modifications of Unzip for Zip64 7 Modifications of Unzip for Zip64
9 Copyright (C) 2007-2008 Even Rouault 8 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/skipset.h b/contrib/minizip/skipset.h
index 9bef1850..ec4d4ab4 100644
--- a/contrib/minizip/skipset.h
+++ b/contrib/minizip/skipset.h
@@ -1,5 +1,5 @@
1/* skipset.h -- set operations using a skiplist 1/* skipset.h -- set operations using a skiplist
2// Copyright (C) 2024 Mark Adler 2// Copyright (C) 2024-2026 Mark Adler
3// See MiniZip_info.txt for the license. 3// See MiniZip_info.txt for the license.
4 4
5// This implements a skiplist set, i.e. just keys, no data, with ~O(log n) time 5// This implements a skiplist set, i.e. just keys, no data, with ~O(log n) time
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 44c51bd3..d7ff21cb 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1,8 +1,7 @@
1/* unzip.c -- IO for uncompress .zip files using zlib 1/* unzip.c -- IO for uncompress .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications of Unzip for Zip64 6 Modifications of Unzip for Zip64
8 Copyright (C) 2007-2008 Even Rouault 7 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index a3f18949..9c98b608 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,8 +1,7 @@
1/* unzip.h -- IO for uncompress .zip files using zlib 1/* unzip.h -- IO for uncompress .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications of Unzip for Zip64 6 Modifications of Unzip for Zip64
8 Copyright (C) 2007-2008 Even Rouault 7 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 0ec6fe1b..31005c51 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1,8 +1,7 @@
1/* zip.c -- IO on .zip files using zlib 1/* zip.c -- IO on .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 522c6c74..99624407 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,8 +1,7 @@
1/* zip.h -- IO on .zip files using zlib 1/* zip.h -- IO on .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj
index 06391345..ead9a205 100644
--- a/contrib/nuget/nuget.csproj
+++ b/contrib/nuget/nuget.csproj
@@ -6,8 +6,8 @@
6 <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId> 6 <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId>
7 <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId> 7 <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId>
8 <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId> 8 <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId>
9 <Copyright>(C) 1995-2025 Jean-loup Gailly and Mark Adler</Copyright> 9 <Copyright>(C) 1995-2026 Jean-loup Gailly and Mark Adler</Copyright>
10 <version>1.3.1.2</version> 10 <version>1.3.2</version>
11 <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription> 11 <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription>
12 <PackageReadmeFile>README</PackageReadmeFile> 12 <PackageReadmeFile>README</PackageReadmeFile>
13 <!-- 13 <!--
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 8715da8c..603ff82e 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
10interface 10interface
11 11
12const 12const
13 ZLIB_VERSION = '1.3.1.2'; 13 ZLIB_VERSION = '1.3.2';
14 ZLIB_VERNUM = $12a0; 14 ZLIB_VERNUM = $12a0;
15 15
16type 16type
diff --git a/contrib/puff/pufftest.c b/contrib/puff/pufftest.c
index 6cad56ff..b022992a 100644
--- a/contrib/puff/pufftest.c
+++ b/contrib/puff/pufftest.c
@@ -1,8 +1,7 @@
1/* 1/*
2 * pufftest.c 2 * pufftest.c
3 * Copyright (C) 2002-2013 Mark Adler 3 * Copyright (C) 2002-2026 Mark Adler
4 * For conditions of distribution and use, see copyright notice in puff.h 4 * For conditions of distribution and use, see copyright notice in puff.h
5 * version 2.3, 21 Jan 2013
6 */ 5 */
7 6
8/* Example of how to use puff(). 7/* Example of how to use puff().
diff --git a/contrib/zlib1-dll/CMakeLists.txt b/contrib/zlib1-dll/CMakeLists.txt
index c9825aa0..86625123 100644
--- a/contrib/zlib1-dll/CMakeLists.txt
+++ b/contrib/zlib1-dll/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12...3.31)
3project( 3project(
4 zlib1-dll 4 zlib1-dll
5 LANGUAGES C 5 LANGUAGES C
6 VERSION 1.3.1.2 6 VERSION 1.3.2
7 HOMEPAGE_URL "https://zlib.net/" 7 HOMEPAGE_URL "https://zlib.net/"
8 DESCRIPTION "zlib1.dll is the legacy DLL with zlib and minizip") 8 DESCRIPTION "zlib1.dll is the legacy DLL with zlib and minizip")
9 9