From ae92c516deaa14eb6adb444e6523f09389d48daf Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Fri, 10 Jul 2020 19:54:35 -0700
Subject: app-arch/pigz: revbump, ignore trailing junk.

Closes: https://bugs.gentoo.org/645438
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---
 app-arch/pigz/files/2.4-trailing-junk.patch | 27 +++++++++++++++++++
 app-arch/pigz/pigz-2.4-r1.ebuild            | 41 +++++++++++++++++++++++++++++
 app-arch/pigz/pigz-2.4.ebuild               | 39 ---------------------------
 3 files changed, 68 insertions(+), 39 deletions(-)
 create mode 100644 app-arch/pigz/files/2.4-trailing-junk.patch
 create mode 100644 app-arch/pigz/pigz-2.4-r1.ebuild
 delete mode 100644 app-arch/pigz/pigz-2.4.ebuild

(limited to 'app-arch/pigz')

diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
new file mode 100644
index 000000000000..eb5585b7d362
--- /dev/null
+++ b/app-arch/pigz/files/2.4-trailing-junk.patch
@@ -0,0 +1,27 @@
+From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 10 Jul 2020 19:46:10 -0700
+Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
+
+backport of
+https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
+---
+ pigz.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pigz.c b/pigz.c
+index bbbfd2c..f2e79d7 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -3368,7 +3368,7 @@ local void infchk(void) {
+         cat();
+     else if (was > 1 && get_header(0) != -5)
+         complain("warning: %s: entries after the first were ignored", g.inf);
+-    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
++    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
+         complain("warning: %s: trailing junk was ignored", g.inf);
+ }
+ 
+-- 
+2.27.0
+
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
new file mode 100644
index 000000000000..29c9951c6bfa
--- /dev/null
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+IUSE="static symlink test"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )"
+
+PATCHES=( "${FILESDIR}/${PV}-trailing-junk.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
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/gzip
+		dosym un${PN} /usr/bin/gunzip
+	fi
+}
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
deleted file mode 100644
index fe1190bc3a3f..000000000000
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-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
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
-- 
cgit v1.2.3-65-gdbad