gentoo auto-resync : 17:03:2023 - 06:26:48

3 files changed, 49 insertions, 7 deletions

diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index faac6cd0d056..162f66a304b8 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,6 +1,7 @@
+AUX minizip-3.0.9-strdup.patch 1255 BLAKE2B f2c31ba2caa656cea80b507f7b8918cb3d5eba235474822c87f3e993ae3ac0e4d9a922b8e535150f8d509c148b2c7532d33985dbdec9e8a20b625538300441ec SHA512 2887e3c56967989d4596ac48eac24ab8971b752f79c0ce5da8998d0aea67eb165e067fcc07c2584422f065bf1994673eb43d5061afd339e09e2d4cc94a158558
 AUX minizip-ng-3.0.7-system-gtest.patch 733 BLAKE2B 9af012238754b34424eeb55d117fd5ae700ef971a8b58e0240d576b459bf7c1ae67e762bfd16dcbb95b206b019f9728eae8d4a1482fe85f21e884880494e9e78 SHA512 9020ef82288e9e92136a68acbc2310ff227d1e4f089f625b95224c5944c17c4c092dd7ed93345fb2cd8522e18ba0361868fd269dc545181270416009bbf6c37f
-DIST minizip-ng-3.0.7.tar.gz 643065 BLAKE2B e7026a5cc54fac6eba6fd1e79f8d53474966999aec1c24c70ff2207b93314f1e1cf5360841570ace66a30d6178f0057428757c7ba9b2d4bb14feb397142dedcb SHA512 01805ec955514efca32f4beb0e1241e94591d7d1d6119036c55d898a595de038bb18b8a2ffe5dab13101a890d14485aaefdf81680a7c60aa4ab3fd9de63ee991
 DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1
-EBUILD minizip-ng-3.0.7.ebuild 2584 BLAKE2B 2eb43757b21e6cc60d3bdd18700e86d10b2d98102780adf0d56407e899762850e0ac1113242b642b9b5a300ec848168dbff3436706030b94ff33b25486060699 SHA512 541621a23fcb02d2a58583f39193c81fd9e06079596240f6424f764d5b8f9b810c4c5b9279119019ed1f657aac575134247475957a79b59caf5021132feeeee0
+DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
 EBUILD minizip-ng-3.0.8.ebuild 2552 BLAKE2B 7fd09980a0724edd98ddfcca947b67932893b2d9eaa350ef6907e3499a420cdfdebb17c3e8938b466db0d3a10de549c19c396b30adb5f234800ab2736cf3fa81 SHA512 bcb836b1031bd5be51be1b502f8489c12b34293a61499cc4174b68002e41b93a9607e1eb5a0f0a2530ccaf38a5e96e22d905032863393ee294de2e1229d52acf
+EBUILD minizip-ng-3.0.9.ebuild 2607 BLAKE2B a6e42fcfe2460977ac0ee506a92204559c96b0eaffc18b32417f49999b475abed5d602e8856fa495c4ab6dcb89ec03ab1a1fbf054b74ca4db914a4b1f62d71fd SHA512 bad1bd8435517449a55f363d82b08340bc9e07c8b0815b6dd6172b042c537b281ef1e2ccb1a99593ee90ee90f56f3e0c5b41313cee783c257b5436bb29af4ddb
 MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
new file mode 100644
index 000000000000..9cb1dd991b17
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-3.0.9-strdup.patch
@@ -0,0 +1,37 @@
+https://github.com/zlib-ng/minizip-ng/pull/682
+
+From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 16 Mar 2023 23:35:34 +0000
+Subject: [PATCH] CMake: set newer POSIX_C_SOURCE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Enable POSIX 2008 as it's needed for strdup(), otherwise we get:
+```
+/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In function ‘mz_dir_make’:
+/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19: error: implicit declaration of function ‘strdup’ [-Werror=implicit-function-declaration]
+  286 |     current_dir = strdup(path);
+      |                   ^~~~~~
+```
+
+The man page for strdup says:
+```
+strdup():
+	_XOPEN_SOURCE >= 500
+	|| /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
+	|| /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
+```
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -455,7 +455,7 @@ endif()
+ 
+ # Unix specific
+ if(UNIX)
+-    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
++    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
+     list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
+ 
+     if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
+
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
index 12ebd223606a..9817a6cb9ba6 100644
--- a/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="compat openssl test zstd"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.7-system-gtest.patch
+	"${FILESDIR}"/minizip-3.0.9-strdup.patch
 )
 
 src_configure() {
@@ -59,8 +59,6 @@ src_configure() {
 		-DMZ_PKCRYPT=ON
 		-DMZ_WZAES=ON
 		-DMZ_OPENSSL=$(usex openssl)
-		# TODO: Re-enable, ideally unconditionally, for arc4random
-		# Revisit when https://github.com/zlib-ng/minizip-ng/pull/648 fixed
 		-DMZ_LIBBSD=ON
 		-DMZ_SIGNING=ON
 
@@ -86,6 +84,12 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	if use test ; then
+		# Test binaries, bug #874591
+		rm "${ED}"/usr/bin/minigzip || die
+		rm "${ED}"/usr/bin/minizip-ng || die
+	fi
+
 	if use compat ; then
 		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
 		ewarn "Please be careful!"