Merge pull request #3454 from citrus-it/zlibr48

zlib - update from 1.3 to 1.3.1 (r151048)
omniosorg · Jan 26, 2024 · 345ae5d · 345ae5d
2 parents acb12f5 + d3666b0
commit 345ae5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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!