6 files changed, 123 insertions, 2 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d2dfb4b75b4b..e184a950f92a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index aee62d50cdac..2ce5023b4d7d 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,7 +1,7 @@
 AUX libxcrypt-4.4.19-multibuild.patch 303 BLAKE2B cd342eef2a8ce3e305e544d37373370748690878b4171709028b7b894ad2c76c9188496ab089a46645ad6f9fca09fa4f89cdcb444e1400747ee358c079441661 SHA512 3cbd4bbd0827801faaaa2198eccccb285100cdfc43525b70816121aa70b32dc2c8479c53e16b9e99920926b1b11014dcc19909c4f72a09d9d19fcdb0fa6350cd
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
-DIST libxcrypt-4.4.32-autotools.tar.xz 624332 BLAKE2B fbbbfe8ac6b1e9f283621d2bf3b554ba6652c5cea94932666a5a920c74fad7b0bc265fccdacc694113ed1c273a16e064b7aba45da83499e974741039484e7064 SHA512 dab13a858ac796c51cdcf9efbb6f525397ea8c1daa9c0169893228a17c767e4442b4fb9b7a40db46da1fc4f1752c4c8dda97a7b2c644a58377a053deb16e3ed9
+DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
 EBUILD libxcrypt-4.4.28-r1.ebuild 8807 BLAKE2B 60b00d1d0d9e0f1ec66bf234d63c08703e789fd0319eadf440ca0b9433eaff11685a3906af2ddda4301f46033cd92688b0a87186de25c178523928c59c213571 SHA512 05daee208a35a70f82da2ea650aeebfb692692b9e019c18614ea436c20a8dbb355d657e9b625ca7eb6daf31ad52dd01c64afa256669d4950fb8ebc08c4625414
 EBUILD libxcrypt-4.4.28-r2.ebuild 9208 BLAKE2B 6135632aa93a142b71aa1179d76ab58b823598378e767ef8a242cdcda6d75546ca4ddff606dc74a2be225083d30b230abc0dd8f4610f975635203d7a91867ac7 SHA512 ee9ee52ad1562abd11a31b9a7b11d4ad7d83e496ff672412fbce29c1fcb3591e785e02fa8a9a1ab4eaf7b518d9417e6cbf66d65f3c3047ab0eb7c9c503e3af4f
-EBUILD libxcrypt-4.4.32.ebuild 9034 BLAKE2B e5bc1a47c3b4a598527a9496569abdb7e9c250b9b152756d118d5d48083929573faa89b4f80a66006a91c19934e2006e8b248cf07c82399c5078a20ef6de0cc6 SHA512 a3537093dfe4f0f9d031c456a71957abf635ee71ba3613471dbf5c9ca5d53a5f4327b1fd533eb03e2ebf47054fe5ba296c1ea6c35c6548fda65cccef0c28f66b
+EBUILD libxcrypt-4.4.33.ebuild 9034 BLAKE2B e5bc1a47c3b4a598527a9496569abdb7e9c250b9b152756d118d5d48083929573faa89b4f80a66006a91c19934e2006e8b248cf07c82399c5078a20ef6de0cc6 SHA512 a3537093dfe4f0f9d031c456a71957abf635ee71ba3613471dbf5c9ca5d53a5f4327b1fd533eb03e2ebf47054fe5ba296c1ea6c35c6548fda65cccef0c28f66b
 MISC metadata.xml 913 BLAKE2B c2b3f52bd72bb46b0de4eb4a5f47dcb3aacfd248b811bcdc88db88c6f9cbe3ed1af4fda3e643b350fd22131273af03f2f888d78d306f0f7274d9432eb65075a3 SHA512 0ebbc3c2aa661f1a40e7f654384a395662b1b0235f145c7778b7b86bfb65ad09d4e8900bc6ede94413f057e769397c355bfd1bcafe8540acbf7e00e5451400c9
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
index d0bd8a723065..d0bd8a723065 100644
--- a/sys-libs/libxcrypt/libxcrypt-4.4.32.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.33.ebuild
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index 4ee0d2d90768..dfd281b88071 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,5 +1,8 @@
 AUX minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch 2040 BLAKE2B 679a4c8878b06eb28352942e6b0f8285daf0f2d1cc3315071e3592f10fcfaaa11caf1b67e4a73c83201a85bf63750bbf7d3d0d4d7c2a5b2dd1b317eb5beac9f6 SHA512 b1913d03a49931b929435372b2e07d63ec13bf0513ac39549612514443efcd114d143848e6d0a6de751f1ed8499ecae4ecbfb0fce579e6e66549ea90f862417d
 AUX minizip-ng-3.0.6-test-temporary.patch 6922 BLAKE2B 65bc4803aec94e56d7d868096320bac78f425485cff9c0d8d7214e5321e136e239100c292356be69e638f34bba6104bbca95e3db7e8b9f71ccec5e60cab92510 SHA512 e52ebc658cf1bc6df0fcff481562fe61527fbae6fd4a1477ef0a9185e967d9eb0ea7678e6f330429f993fae97a639baf82df672fc1a71275c7f3d7f1c83c8596
+AUX minizip-ng-3.0.7-system-gtest.patch 733 BLAKE2B 9af012238754b34424eeb55d117fd5ae700ef971a8b58e0240d576b459bf7c1ae67e762bfd16dcbb95b206b019f9728eae8d4a1482fe85f21e884880494e9e78 SHA512 9020ef82288e9e92136a68acbc2310ff227d1e4f089f625b95224c5944c17c4c092dd7ed93345fb2cd8522e18ba0361868fd269dc545181270416009bbf6c37f
 DIST minizip-ng-3.0.6.tar.gz 642138 BLAKE2B 3faddeef035da0417671ef5578b90ad9ec9a69f376d04fb8095f93e27e3276931ef432e179613e841e754ff6e915e8c631eeaa48795aaa87773e45465bd14afa SHA512 92aaad655e7dbec60ab8075435ccdc72314f75f0516aa4a16094215df2b14b108c2b49cdf6c876e396f0f43f52ad63f52ce7db2e119efe25c55b8b873bef9d4f
+DIST minizip-ng-3.0.7.tar.gz 643065 BLAKE2B e7026a5cc54fac6eba6fd1e79f8d53474966999aec1c24c70ff2207b93314f1e1cf5360841570ace66a30d6178f0057428757c7ba9b2d4bb14feb397142dedcb SHA512 01805ec955514efca32f4beb0e1241e94591d7d1d6119036c55d898a595de038bb18b8a2ffe5dab13101a890d14485aaefdf81680a7c60aa4ab3fd9de63ee991
 EBUILD minizip-ng-3.0.6-r1.ebuild 2630 BLAKE2B 064300fb88178deb975a1d289da94d6ab8160a9abb4fe56eb6d97c9a97891b33bd87103879b23357de7f1d752fa97b0a5bb243c9fd5e423495db6e739c0e736c SHA512 2c3bcf82cf6791458fbfef030f2299a3fe1b841501b4b80666fb4f14d35eb90e1533eed8724002e04af5dc3375ced455144f639806f37ea0b828576caa304c8a
+EBUILD minizip-ng-3.0.7.ebuild 2584 BLAKE2B 2eb43757b21e6cc60d3bdd18700e86d10b2d98102780adf0d56407e899762850e0ac1113242b642b9b5a300ec848168dbff3436706030b94ff33b25486060699 SHA512 541621a23fcb02d2a58583f39193c81fd9e06079596240f6424f764d5b8f9b810c4c5b9279119019ed1f657aac575134247475957a79b59caf5021132feeeee0
 MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/files/minizip-ng-3.0.7-system-gtest.patch b/sys-libs/minizip-ng/files/minizip-ng-3.0.7-system-gtest.patch
new file mode 100644
index 000000000000..57197d0da587
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-ng-3.0.7-system-gtest.patch
@@ -0,0 +1,25 @@
+https://github.com/zlib-ng/minizip-ng/pull/657
+
+From 3aa42e0520e4e7ffeae5a3def458c7ee0fefacb9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 19 Nov 2022 03:09:34 +0000
+Subject: [PATCH] Search system for GTest before downloading. #654
+
+Distributions often do builds with no network access available
+for both security reasons and also to ensure reproducibility.
+
+This change tells CMake to query the system for a copy of gtest,
+but if it's not available, it'll fall back to downloading via
+FetchContent.
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.12)
+ 
+ include(FetchContent)
+ 
++find_package(GTest)
++
+ enable_language(CXX)
+ 
+ if(NOT TARGET GTest::GTest)
+
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild
new file mode 100644
index 000000000000..12ebd223606a
--- /dev/null
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Worth keeping an eye on 'develop' branch upstream for possible backports,
+# as they copied this practice from sys-libs/zlib upstream.
+
+inherit cmake
+
+DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
+HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
+SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat openssl test zstd"
+RESTRICT="!test? ( test )"
+
+# Automagically prefers sys-libs/zlib-ng if installed, so let's
+# just depend on it as presumably it's better tested anyway.
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib-ng
+	virtual/libiconv
+	compat? ( !sys-libs/zlib[minizip] )
+	openssl? ( dev-libs/openssl:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-system-gtest.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMZ_COMPAT=$(usex compat)
+
+		-DMZ_BUILD_TESTS=$(usex test)
+		-DMZ_BUILD_UNIT_TESTS=$(usex test)
+
+		-DMZ_FETCH_LIBS=OFF
+		-DMZ_FORCE_FETCH_LIBS=OFF
+
+		# Compression library options
+		-DMZ_ZLIB=ON
+		-DMZ_BZIP2=ON
+		-DMZ_LZMA=ON
+		-DMZ_ZSTD=$(usex zstd)
+		-DMZ_LIBCOMP=OFF
+
+		# Encryption support options
+		-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
+
+		# Character conversion options
+		-DMZ_ICONV=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# TODO: investigate
+		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
+	)
+
+	# TODO: A bunch of tests end up looping and writing over each other's files
+	# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
+	# but still hangs.
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	if use compat ; then
+		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
+		ewarn "Please be careful!"
+	fi
+}