zlib/minizip, bump version (#7394)

app-arch/minizip/minizip-1.2.13.recipe

@@ -6,9 +6,9 @@ the features of the zip program."
 HOMEPAGE="http://www.zlib.net/"
 COPYRIGHT="1998-2010 Gilles Vollant and Mathias Svensson"
 LICENSE="Zlib"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://zlib.net/fossils/zlib-$portVersion.tar.gz"
-CHECKSUM_SHA256="c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+CHECKSUM_SHA256="b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
 SOURCE_DIR="zlib-$portVersion"
 PATCHES="minizip-$portVersion.patchset"
 

app-arch/minizip/patches/minizip-1.2.13.patchset

@@ -5,7 +5,7 @@ Subject: Platform fix
 
 
 diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
-index 7f5c191..649255c 100644
+index 814a6fd..04ad9cf 100644
 --- a/contrib/minizip/ioapi.c
 +++ b/contrib/minizip/ioapi.c
 @@ -14,7 +14,7 @@
@@ -18,20 +18,20 @@ index 7f5c191..649255c 100644
  #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
  #define FTELLO_FUNC(stream) ftello(stream)
 diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
-index 8dcbdb0..1655288 100644
+index ae9ca7e..548dafb 100644
 --- a/contrib/minizip/ioapi.h
 +++ b/contrib/minizip/ioapi.h
 @@ -50,7 +50,7 @@
  #define ftello64 ftell
  #define fseeko64 fseek
  #else
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined (__HAIKU__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
  #define fopen64 fopen
  #define ftello64 ftello
  #define fseeko64 fseeko
 diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
-index 3d65401..a6caacf 100644
+index 0dc9b50..f776d22 100644
 --- a/contrib/minizip/miniunz.c
 +++ b/contrib/minizip/miniunz.c
 @@ -27,7 +27,7 @@
@@ -44,7 +44,7 @@ index 3d65401..a6caacf 100644
  #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
  #define FTELLO_FUNC(stream) ftello(stream)
 diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
-index 4288962..e3ec8e1 100644
+index e8561b1..65aca64 100644
 --- a/contrib/minizip/minizip.c
 +++ b/contrib/minizip/minizip.c
 @@ -28,7 +28,7 @@
@@ -57,5 +57,5 @@ index 4288962..e3ec8e1 100644
  #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
  #define FTELLO_FUNC(stream) ftello(stream)
 -- 
-2.14.1
+2.37.3
 

sys-libs/zlib/patches/zlib-1.2.12.patchset

@@ -1,76 +0,0 @@
-From 537ab038d530752fbdb34302f35ee71be07e701b 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
-
-zlib by default hides all symbols starting with _ from its ABI, which
-also hides symbols used for ABI versionning on Haiku. This makes
-runtime_loader complain that it can't identify the version used.
-
-diff --git a/zlib.map b/zlib.map
-index b330b60..eb6470f 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.30.2
-
-
-From b9e2b0c41fe70dea8b2d5f697bcce21b4391f70f Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 30 Mar 2022 11:14:53 -0700
-Subject: Correct incorrect inputs provided to the CRC functions.
-
-The previous releases of zlib were not sensitive to incorrect CRC
-inputs with bits set above the low 32. This commit restores that
-behavior, so that applications with such bugs will continue to
-operate as before.
-
-diff --git a/crc32.c b/crc32.c
-index a1bdce5..451887b 100644
---- a/crc32.c
-+++ b/crc32.c
-@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
- 
-     /* Pre-condition the CRC */
--    crc ^= 0xffffffff;
-+    crc = (~crc) & 0xffffffff;
- 
-     /* Compute the CRC up to a word boundary. */
-     while (len && ((z_size_t)buf & 7) != 0) {
-@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
- 
-     /* Pre-condition the CRC */
--    crc ^= 0xffffffff;
-+    crc = (~crc) & 0xffffffff;
- 
- #ifdef W
- 
-@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- #ifdef DYNAMIC_CRC_TABLE
-     once(&made, make_crc_table);
- #endif /* DYNAMIC_CRC_TABLE */
--    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
-+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
- }
- 
- /* ========================================================================= */
-@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
-     uLong crc2;
-     uLong op;
- {
--    return multmodp(op, crc1) ^ crc2;
-+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
- }
--- 
-2.30.2
-

sys-libs/zlib/patches/zlib-1.2.13.patchset

@@ -0,0 +1,23 @@
+From 537ab038d530752fbdb34302f35ee71be07e701b 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 b330b60..27a40f6 100644
+--- a/zlib.map
++++ b/zlib.map
+@@ -5,7 +5,8 @@ ZLIB_1.2.0 {
+     inflateBack;
+     inflateBackEnd;
+     inflateBackInit_;
+-    inflateCopy;
++    inflateCopy;
++    _gSharedObjectHaiku*;
+   local:
+     deflate_copyright;
+     inflate_copyright;
+-- 
+2.37.3
+

sys-libs/zlib/zlib-1.2.13.recipe

@@ -13,16 +13,19 @@ HOMEPAGE="http://www.zlib.net/"
 COPYRIGHT="1995-2017 Jean-loup Gailly and Mark Adler"
 LICENSE="Zlib"
 REVISION="1"
-SOURCE_URI="http://zlib.net/zlib-$portVersion.tar.gz"
-CHECKSUM_SHA256="91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"
+SOURCE_URI="http://zlib.net/zlib-$portVersion.tar.xz"
+CHECKSUM_SHA256="d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"
 PATCHES="zlib-$portVersion.patchset"
 
 ARCHITECTURES="all ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	zlib$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libz$secondaryArchSuffix = $portVersion compat >= 1
+	zlib$secondaryArchSuffix = $libVersionCompat
+	lib:libz$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,8 +33,8 @@ REQUIRES="
 
 SUMMARY_devel="The zlib development files"
 PROVIDES_devel="
-	zlib${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libz$secondaryArchSuffix = $portVersion compat >= 1
+	zlib${secondaryArchSuffix}_devel = $libVersionCompat
+	devel:libz$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	zlib$secondaryArchSuffix == $portVersion base
@@ -64,7 +67,7 @@ BUILD()
 	cmake -S. -Bbuild \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX:PATH=$prefix
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
@@ -78,3 +81,8 @@ INSTALL()
 		$developDir \
 		$documentationDir
 }
+
+TEST()
+{
+	make -C build test
+}