gentoo auto-resync : 18:08:2023 - 15:36:15

5 files changed, 70 insertions, 5 deletions

diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 4b526a1bad4d..82a62d89d496 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,5 +1,7 @@
 AUX pigz-2.7-memcpy-ub.patch 863 BLAKE2B 33cb4879445cb296031b7579a358a8188e7d856506911c0a02cdc93b542feda0e617b53b566b005ed544ef2c4b14bf347a3bacd3822af61fa281a9e3ca369cc3 SHA512 4edb365718e6649264388e6f60be7867ae240f096f828ff3cf0ec355dcf93ca65c54453525e2103f71b8a16673d0e7908fb7f917316d3cde47113eab7eccc420
+AUX pigz-2.7-zlib-1.3.patch 740 BLAKE2B eafc2eae2bb31600c49f09cf5a9d13aebdc2c94698f1392d4252cae53167a4a34ee6c5c820436e18eea07bd2d7471f44b3faf2c39c56fe103c08f3b1a01a0b1d SHA512 467fd252b3ee1030c5bbb2642497353827036d15156a5ab27251c5c1022ca5b13628aa8a58c062785fd127bda33d2c7cf897892a6ac4637a81d7e5c7cb70f482
 DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5
-EBUILD pigz-2.7-r1.ebuild 909 BLAKE2B 38b15d02595a81aac73d31c5ff8c6a3de884973fa30578ef0f5e169f533451f59dde1edd9a23a5dbab3ae7855faf3f66bf316bc5a78bf4e71a5cb991487e4878 SHA512 a577375cc6418961cfef4eee432f3eb7d8d96aefa14f6e31b2be78bf1ac1f5b0d956bf21ce51d6415750114ec57c7409385aadeadba2cf84e100d107a68eed62
-EBUILD pigz-2.7.ebuild 860 BLAKE2B dd0d063e9bb93fc52c6e52641f63752ba164fcdea39a28944fd92f4df51d615e148dab6ccddbd4cf93bea091883e49c9edd8583bdb9dbff73d1b62e73ecc6b6a SHA512 cf3131c30b26ef04f68dfed855e54f237932ca76d75111001f9d527de9aa40444105b916a3dcd77a09426ab9b8e8660344d413b240bb1554ea20158e94e32565
+EBUILD pigz-2.7-r1.ebuild 917 BLAKE2B 40f60aa627bc4a8795efd87c84b0146dbce4227528d82d0d844d599768dc84f02a3a5eeb4ac0639ad88ccd749ff2fe1eb60212d262ca2b4479b7d2af70682285 SHA512 59bc668e396a30c8be5596be70e863f964abdc1e9446a2f09c82da480f057584a4f74b5a72b2557f21ce364a979aa3514e727c64e5358528926eed24d8773c5f
+EBUILD pigz-2.7-r2.ebuild 963 BLAKE2B 94429270ede5333b4c75ec88bfcb101b8d5439ab78571d078c2b71287e7c87d15f1194c47e9b34015aec73901932f34a7ed1d3f095a1bb86d77cf41fb4a40920 SHA512 6e8a460ed489a03632555bfb8902fb647e670f0aaa9896ff365007d64dabd3180e8e73f5333b24b64ba65149f8de8a70251d1034ea69998046d0d8a97fcf991c
+EBUILD pigz-2.7.ebuild 868 BLAKE2B 6d74bf44001679355699b496ad34d987c5336a021e45eca5646ea1d3c04d60ac134207f6e3a307771067910143983bb04651dbcca6f25d5b62c35084c06ea17c SHA512 256170660f02c10ef5bb0ed9c91426bfc29540a51345ccdd96e602d74e1b35b74cdf3969667346ba42e2403783ae9a5c79a58ca2410866b8a4b7da5740825333
 MISC metadata.xml 623 BLAKE2B d072cc2f7d8e182752cc3c4ae118ec674782f2e0cb08c4ca6b2d4d56a6e4621a837143bf782ae0f65af418f0a90c01f24b5603bfe7f75d0221be68f9d193d34f SHA512 3a7fdb19cf75dd27f1c7a30707ee23d8e4c300f5fa419820e7aaf9b75aa9c09add1dcc488e0241a75552cc91a45a37e8603285da7c631d1c7860a18c28929859
diff --git a/app-arch/pigz/files/pigz-2.7-zlib-1.3.patch b/app-arch/pigz/files/pigz-2.7-zlib-1.3.patch
new file mode 100644
index 000000000000..232dc3787ab7
--- /dev/null
+++ b/app-arch/pigz/files/pigz-2.7-zlib-1.3.patch
@@ -0,0 +1,22 @@
+https://github.com/madler/pigz/issues/111
+https://github.com/madler/pigz/commit/907ca0763be4547a9b0cce8c1057217488149744
+
+From 907ca0763be4547a9b0cce8c1057217488149744 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Fri, 18 Aug 2023 03:27:12 -0700
+Subject: [PATCH] Make pigz compatible with two-component zlib version numbers.
+
+zlib 1.3 (not 1.3.0) broke the zlib_vernum() function in pigz.
+This commit fixes that.
+--- a/pigz.c
++++ b/pigz.c
+@@ -1333,7 +1333,7 @@ local long zlib_vernum(void) {
+         }
+         ver++;
+     } while (left);
+-    return left < 2 ? num << (left << 2) : -1;
++    return left < 3 ? num << (left << 2) : -1;
+ }
+ 
+ // -- check value combination routines for parallel calculation --
+
diff --git a/app-arch/pigz/pigz-2.7-r1.ebuild b/app-arch/pigz/pigz-2.7-r1.ebuild
index 6918d7ad4f6c..c07380f70b83 100644
--- a/app-arch/pigz/pigz-2.7-r1.ebuild
+++ b/app-arch/pigz/pigz-2.7-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 IUSE="static test"
 RESTRICT="!test? ( test )"
 
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
diff --git a/app-arch/pigz/pigz-2.7-r2.ebuild b/app-arch/pigz/pigz-2.7-r2.ebuild
new file mode 100644
index 000000000000..6bbbc55c5601
--- /dev/null
+++ b/app-arch/pigz/pigz-2.7-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="https://www.zlib.net/pigz/"
+SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos"
+IUSE="static test"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memcpy-ub.patch
+	"${FILESDIR}"/${P}-zlib-1.3.patch
+)
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/un${PN}
+	dodoc README
+	doman ${PN}.1
+}
diff --git a/app-arch/pigz/pigz-2.7.ebuild b/app-arch/pigz/pigz-2.7.ebuild
index 1bef2d6920de..1c9e4f93cec3 100644
--- a/app-arch/pigz/pigz-2.7.ebuild
+++ b/app-arch/pigz/pigz-2.7.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=7
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 IUSE="static test"
 RESTRICT="!test? ( test )"
 
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )