From 98d543f4fd5cc6b4c14d6ea77c4e5ef44bf347c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 21 Feb 2026 16:21:08 +0100
Subject: [PATCH] zlib: bump to version 1.3.2

The configure patch was upstreamed.

Add a small patch for gcc 2 to allow the use of vsnprintf.
---
 sys-libs/zlib/patches/zlib-1.3.1.patchset     | 44 ------------------
 sys-libs/zlib/patches/zlib-1.3.2.patchset     | 46 +++++++++++++++++++
 .../{zlib-1.3.1.recipe => zlib-1.3.2.recipe}  |  6 +--
 3 files changed, 49 insertions(+), 47 deletions(-)
 delete mode 100644 sys-libs/zlib/patches/zlib-1.3.1.patchset
 create mode 100644 sys-libs/zlib/patches/zlib-1.3.2.patchset
 rename sys-libs/zlib/{zlib-1.3.1.recipe => zlib-1.3.2.recipe} (93%)

diff --git a/sys-libs/zlib/patches/zlib-1.3.1.patchset b/sys-libs/zlib/patches/zlib-1.3.1.patchset
deleted file mode 100644
index 223c36c27..000000000
--- a/sys-libs/zlib/patches/zlib-1.3.1.patchset
+++ /dev/null
@@ -1,44 +0,0 @@
-From 68e1b55219447e7738cf5b9221b0a2bc04618f97 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 28 Aug 2016 18:33:07 +0200
-Subject: zlib: export Haiku shared object symbols
-
-
-diff --git a/zlib.map b/zlib.map
-index 31544f2..de41ad6 100644
---- a/zlib.map
-+++ b/zlib.map
-@@ -6,6 +6,7 @@ ZLIB_1.2.0 {
-     inflateBackEnd;
-     inflateBackInit_;
-     inflateCopy;
-+    _gSharedObjectHaiku*;
-   local:
-     deflate_copyright;
-     inflate_copyright;
--- 
-2.45.2
-
-
-From 7a74bb80187956c623282963b9950b8ae6d717f6 Mon Sep 17 00:00:00 2001
-From: Oscar Lesta <oscar.lesta@gmail.com>
-Date: Wed, 25 Sep 2024 18:48:21 -0300
-Subject: configure: make sure Haiku gets the correct LDSHARED flags.
-
-
-diff --git a/configure b/configure
-index c55098a..250d1b0 100755
---- a/configure
-+++ b/configure
-@@ -227,7 +227,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
-     uname=`(uname -s || echo unknown) 2>/dev/null`
-   fi
-   case "$uname" in
--  Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
-+  Linux* | linux* | *-linux* | GNU | GNU/* | solaris* | Haiku)
-         case "$mname" in
-         *sparc*)
-             LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
--- 
-2.45.2
-
diff --git a/sys-libs/zlib/patches/zlib-1.3.2.patchset b/sys-libs/zlib/patches/zlib-1.3.2.patchset
new file mode 100644
index 000000000..a4c7f4ecd
--- /dev/null
+++ b/sys-libs/zlib/patches/zlib-1.3.2.patchset
@@ -0,0 +1,46 @@
+From 127ef0a1eef25a54b251f56e89502a4ed6422b04 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 28 Aug 2016 18:33:07 +0200
+Subject: zlib: export Haiku shared object symbols
+
+
+diff --git a/zlib.map b/zlib.map
+index 7a9100f..4182423 100644
+--- a/zlib.map
++++ b/zlib.map
+@@ -6,6 +6,7 @@ ZLIB_1.2.0 {
+     inflateBackEnd;
+     inflateBackInit_;
+     inflateCopy;
++    _gSharedObjectHaiku*;
+   local:
+     deflate_copyright;
+     inflate_copyright;
+-- 
+2.52.0
+
+
+From ef48b2ca09ec634dee7ae4fb05374695dcf80dc4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
+Date: Sat, 21 Feb 2026 16:18:01 +0100
+Subject: use vsnprintf also in C89 mode (i.e. with gcc2)
+
+
+diff --git a/gzguts.h b/gzguts.h
+index 266305d..023dab6 100644
+--- a/gzguts.h
++++ b/gzguts.h
+@@ -92,8 +92,8 @@
+ #        define vsnprintf _vsnprintf
+ #      endif
+ #    endif
+-#  elif !defined(__STDC_VERSION__) || __STDC_VERSION__-0 < 199901L
+-/* Otherwise if C89/90, assume no C99 snprintf() or vsnprintf() */
++#  elif !defined(__HAIKU__) && (!defined(__STDC_VERSION__) || __STDC_VERSION__-0 < 199901L)
++/* Otherwise if C89/90, assume no C99 snprintf() or vsnprintf(), except Haiku, which always has them */
+ #    ifndef NO_snprintf
+ #      define NO_snprintf
+ #    endif
+-- 
+2.52.0
+
diff --git a/sys-libs/zlib/zlib-1.3.1.recipe b/sys-libs/zlib/zlib-1.3.2.recipe
similarity index 93%
rename from sys-libs/zlib/zlib-1.3.1.recipe
rename to sys-libs/zlib/zlib-1.3.2.recipe
index 21787988f..0a5c856a5 100644
--- a/sys-libs/zlib/zlib-1.3.1.recipe
+++ b/sys-libs/zlib/zlib-1.3.2.recipe
@@ -10,14 +10,14 @@ expands the data. (LZW can double or triple the file size in extreme cases.) \
 zlib's memory footprint is also independent of the input data and can be \
 reduced, if necessary, at some cost in compression."
 HOMEPAGE="http://www.zlib.net/"
-COPYRIGHT="1995-2017 Jean-loup Gailly and Mark Adler"
+COPYRIGHT="1995-2026 Jean-loup Gailly and Mark Adler"
 LICENSE="Zlib"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="
 	https://zlib.net/fossils/zlib-$portVersion.tar.gz
 	https://github.com/madler/zlib/releases/download/v$portVersion/zlib-$portVersion.tar.gz
 	"
-CHECKSUM_SHA256="9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23"
+CHECKSUM_SHA256="bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16"
 PATCHES="zlib-$portVersion.patchset"
 
 ARCHITECTURES="all"