From 362532356c3c132b62d78159a13073e0ccb59bc3 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <illumos@fiddaman.net>
Date: Thu, 25 Jan 2024 17:33:08 +0000
Subject: [PATCH] zlib - update from 1.3 to 1.3.1

---
 build/zlib/build.sh      | 8 ++++++--
 build/zlib/testsuite.log | 6 +++---
 doc/packages.md          | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/zlib/build.sh b/build/zlib/build.sh
index fc0de56eb1..82beaef996 100755
--- a/build/zlib/build.sh
+++ b/build/zlib/build.sh
@@ -13,12 +13,12 @@
 # }}}
 
 # Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=zlib
-VER=1.3
+VER=1.3.1
 PKG=library/zlib
 SUMMARY="$PROG compression library"
 DESC="A patent-free compression library"
@@ -36,6 +36,10 @@ CONFIGURE_OPTS[amd64]="--libdir=$PREFIX/lib/amd64"
 CONFIGURE_OPTS[aarch64]="--libdir=$PREFIX/lib"
 LDFLAGS[i386]+=" -lssp_ns"
 
+TESTSUITE_SED="
+    s/version [0-9\.]* = 0x[0-9a-z]*/VERSION/g
+"
+
 pre_configure() {
     export cc=$CC
 
diff --git a/build/zlib/testsuite.log b/build/zlib/testsuite.log
index 319fd44113..92a47389e3 100644
--- a/build/zlib/testsuite.log
+++ b/build/zlib/testsuite.log
@@ -1,5 +1,5 @@
 hello world
-zlib version 1.3 = 0x1300, compile flags = 0xa9
+zlib VERSION, compile flags = 0xa9
 uncompress(): hello, hello!
 gzread(): hello, hello!
 gzgets() after gzseek:  hello!
@@ -9,7 +9,7 @@ after inflateSync(): hello, hello!
 inflate with dictionary: hello, hello!
 		*** zlib test OK ***
 hello world
-zlib version 1.3 = 0x1300, compile flags = 0xa9
+zlib VERSION, compile flags = 0xa9
 uncompress(): hello, hello!
 gzread(): hello, hello!
 gzgets() after gzseek:  hello!
@@ -19,7 +19,7 @@ after inflateSync(): hello, hello!
 inflate with dictionary: hello, hello!
 		*** zlib shared test OK ***
 hello world
-zlib version 1.3 = 0x1300, compile flags = 0xa9
+zlib VERSION, compile flags = 0xa9
 uncompress(): hello, hello!
 gzread(): hello, hello!
 gzgets() after gzseek:  hello!
diff --git a/doc/packages.md b/doc/packages.md
index 272c232bf8..1465f080c9 100644
--- a/doc/packages.md
+++ b/doc/packages.md
@@ -65,7 +65,7 @@
 | library/security/openssl-3		| 3.1.4			| https://www.openssl.org/source/
 | library/unixodbc			| 2.3.12		| http://www.unixodbc.org/download.html
 | library/xxhash			| 0.8.2			| https://github.com/Cyan4973/xxHash/releases | Currently used solely by rsync
-| library/zlib				| 1.3			| https://www.zlib.net/
+| library/zlib				| 1.3.1			| https://www.zlib.net/
 | meta/data/microcode/amd		| 20231205		| https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/amd-ucode
 | meta/data/microcode/intel		| 20231114		| https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases
 | network/dns/bind			| 9.18.21		| https://ftp.isc.org/isc/bind9/ https://www.isc.org/downloads/