From dd625a9dfb8f4a6787f8efdb227f7bd860480d7c Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Tue, 17 Feb 2026 14:07:56 -0800 Subject: Change version number on develop branch to 1.3.2.1. --- CMakeLists.txt | 2 +- ChangeLog | 3 +++ Makefile.in | 2 +- README | 4 ++-- contrib/delphi/ZLib.pas | 2 +- contrib/dotzlib/DotZLib/UnitTests.cs | 2 +- contrib/infback9/inftree9.c | 4 ++-- contrib/minizip/configure.ac | 2 +- contrib/nuget/nuget.csproj | 2 +- contrib/pascal/zlibpas.pas | 4 ++-- contrib/zlib1-dll/CMakeLists.txt | 2 +- deflate.c | 2 +- inftrees.c | 4 ++-- os400/README400 | 2 +- os400/zlibfixed.rpgle | 8 ++++---- os400/zlibfree.rpgle | 8 ++++---- qnx/package.qpg | 10 +++++----- treebuild.xml | 4 ++-- win32/README-WIN32.txt | 4 ++-- zlib.3 | 4 ++-- zlib.h | 8 ++++---- 21 files changed, 43 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e103c409..eef01a89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12...3.31) project( zlib LANGUAGES C - VERSION 1.3.2 + VERSION 1.3.2.1 HOMEPAGE_URL "https://zlib.net/" DESCRIPTION "a general-purpose lossless data-compression library") diff --git a/ChangeLog b/ChangeLog index 312753ed..4e86c268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ChangeLog file for zlib +Changes in 1.3.2.1 (xx Feb 2026) +- + Changes in 1.3.2 (17 Feb 2026) - Continued rewrite of CMake build [Vollstrecker] - Various portability improvements diff --git a/Makefile.in b/Makefile.in index bee83edf..ccb3c4f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,7 +31,7 @@ VGFMAFLAG= STATICLIB=libz.a SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.3.2 +SHAREDLIBV=libz.so.1.3.2.1 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) diff --git a/README b/README index 2b1e6f36..e28388bf 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.3.2 is a general purpose data compression library. All the code is +zlib 1.3.2.1 is a general purpose data compression library. All the code is thread safe (though see the FAQ for caveats). The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 at https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate @@ -31,7 +31,7 @@ Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at https://zlib.net/nelson/ . -The changes made in version 1.3.2 are documented in the file ChangeLog. +The changes made in version 1.3.2.1 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index cda3b09e..ef9047eb 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.2'; + zlib_version = '1.3.2.1'; type EZlibError = class(Exception); diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 2714a4b4..2de5cbeb 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.2", Info.Version); + Assert.AreEqual("1.3.2.1", 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 cb96cf87..bfe71889 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.3.2 Copyright 1995-2026 Mark Adler "; + " inflate9 1.3.2.1 Copyright 1995-2026 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, 199, 75}; + 133, 133, 133, 133, 144, 68, 193}; 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 b739fa0c..9be42628 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.2], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.3.2.1], [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 ead9a205..e8972282 100644 --- a/contrib/nuget/nuget.csproj +++ b/contrib/nuget/nuget.csproj @@ -7,7 +7,7 @@ $(PackageId).linux $(PackageId).osx (C) 1995-2026 Jean-loup Gailly and Mark Adler - 1.3.2 + 1.3.2.1 NuGet Package for consuming native builds of zlib into .NET without complexity. README