Don't return an error exit status when decompressing zero-padded files (bug #417657).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 108 insertions, 15 deletions

diff --git a/app-arch/pigz/ChangeLog b/app-arch/pigz/ChangeLog
index 717a152c16bc..37253f0d96ff 100644
--- a/app-arch/pigz/ChangeLog
+++ b/app-arch/pigz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/pigz
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.36 2014/01/18 01:43:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.37 2014/01/23 00:16:23 radhermit Exp $
+
+*pigz-2.3.1-r1 (23 Jan 2014)
+
+  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +pigz-2.3.1-r1.ebuild,
+  +files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch:
+  Don't return an error exit status when decompressing zero-padded files (bug
+  #417657).
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> pigz-2.3.1.ebuild:
   Add arm64 love.
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 316b3fce3dfa..68ca2d961531 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch 1469 SHA256 ad8e11adf49ca5c3e00aeafb4abcbf9a6be1d2abc4af1bf5e1f21a4785487703 SHA512 e473dd3a3fc069e991c9c430b995c2eef50d99295440b14c7eefde7eb4b914da3f2d107ed264b18795e244fa361896ff5eb6b830ae0aaf1ec7f898cdc7f36919 WHIRLPOOL d124280e67390bab31d0a6c56c8e3af74915e5f53e3341d0742cfd74cf9a474209cadf8937fa167fca58df49d596228fa7c718abe944ca55837b105239aa81e3
 AUX pigz-2.3-make.patch 763 SHA256 7f6a60c47ccccaa2bef5f47d01102c8ed1ec99cfd7f619b7b365b8ef2b104de3 SHA512 a4af741e750910f08ca0cc56e2680af6cd05d3b4480976ec736fd9d019ae6962bc8049e7607e75da2a420f9e7b8e831ca556134c21a8d69192ab78f64032ce85 WHIRLPOOL 2968f438d457786ab4e417eaec3fc32cc60b9289f42831d4547a20de27b9a4f3a8179ff0ad979c4d68cc0a41f3c56b00134cb1c68f354e27bb5b62b46ba90854
 DIST pigz-2.2.5.tar.gz 49717 SHA256 e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759 SHA512 b399dee20c3484b5425490ee06404f8c6e3335a1c8eda8f625b62025dba99d2ebdd398a6acd7dd9c44cdb5370ccf66e0a6334bb5aace0a5dee30351cfd3abd4c WHIRLPOOL 178efcb07a79fd7667029c837a19291a73c089cac6dc4c2c8dceeef0ff5e836e26bdfc39d04888ed4896c36c4b52b3d96d344dbf73165acc1f320e1abea83077
 DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7
 DIST pigz-2.3.tar.gz 83636 SHA256 74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21 SHA512 58080cb3b68d3329c3e9554b7f41b7ffe961c27cce0732e00d200f84bd4910452026cc90b026a4130dc4fef6eeaf9f6340d039521f32474ca45566f8e985301d WHIRLPOOL 808e05bfa337b421d4c18da0982d12cf880b78885ad2da37c6f84960d2102a9fc34ce078700a3ececca5805014b385e544ef17912b83444d726315af2616ffc5
 EBUILD pigz-2.2.5.ebuild 1007 SHA256 f3c12d9602d9ac89a3d7e10c6bc1cecc1f9aad6e2fd4afb6f9d2d7fbe000d75f SHA512 5fbdf07b7054174b786a0589181896615d6ca88f9738fe00b26b0b0fd4ac567da3f7c8a42765b6ec043af91414c8f2f1d15b03a6f0f1293e54133aaf9eda488d WHIRLPOOL 6d29c7dcc82d27bbdb9a7ba6590abb172e2517a504f89c31b3c819b56a1c7a7a159e6bfb3861087d0b4c0155a0245b27de938d25428f7fa5d4ac6b3efd43e31a
+EBUILD pigz-2.3.1-r1.ebuild 1108 SHA256 b627bc88e054d22f0218e2f5d8e6e474848f87cd817863d3a3b2d959151e1e7a SHA512 9e3a1365a759b327a2b81752723a0bbea9389efc8bf9f1f256513429eb2e3e350b686dc161f9cbc12d23a7e2ac1bc27d2fb91feb75029a6af9e8f33f1dc58cf0 WHIRLPOOL d713fa37e70606c4b5748a731a6238406fe4afdd9ea19b8017e31dc2e1d6f802d88cf18b4df33027d50b6d65a58264bdfacf785aa88c9c31875e28d45e3dc7fb
 EBUILD pigz-2.3.1.ebuild 987 SHA256 d0b86edab3dc90c870abe5adf8dbb9eac7ba7c5227a2a19196933bcb5d1a6774 SHA512 ef3afc567e6dd2f9c78bc26fe0f565d77ed1e828f946d3a4614a2f7d48a9859f7a918366c8bbeb293807f5b7f46bb8ef965c75070ce77debda9df597056f25f7 WHIRLPOOL eba8c44c6945e7be18296a65c6a67154eed77d0d3424aa4f6669920722b0fb813267e9a070a185604787a8bf931b6a4446e61214d77fbf1f7cd20c2a7e8e2a1a
 EBUILD pigz-2.3.ebuild 1058 SHA256 32efae1d41489e30bf63aa99e4c1dbe73b8851418975d2edec336ba2efb744ab SHA512 1b3537c3abdd16c015afe1c7a46c1494f686ae4b04b26fb78efa9aa7895fb6bcb9fde04b8421ed927e12d385dafd879754f7700a2579a15d9956857776f35126 WHIRLPOOL 426edb1f461a1d67e4fd3dbf70aba2e96c287fdd690ed713bb4e420c6c8ec2bf008ed85a5901d831b4dd116fb82a8e27a001330430f02481d8f17fe1d6269750
-MISC ChangeLog 4965 SHA256 95267d03ed3e1de892d47be4900fa097b55271e846bbfa58d698aeb5189746e5 SHA512 ac07d0c09628c8eb1ab1857d2e987b79a0128cf4a3951829121ed4348013009781381582ff782f1afebcca6ac318d113bcd3d62aa534429008e03ec2180d3e47 WHIRLPOOL 95229a01a97f773cf2803236384fc23354b640ce7ae2fa778f4abcdfb453767ee426fdc8b39db1b503a789659d9e58f6b2ba152c09b8b24a6daa5af6daf30982
+MISC ChangeLog 5235 SHA256 5754164cc9114f47e66e69652974b58b41196c24100da0ef614fb519992255b7 SHA512 ba6ad334bfc12381983b9b421d580c477c5e5941d824d49b2681cc674464f340a5217b3f5a38b8dc837e32e9671df646c56cbe1448964d1a9e4afc19ca6bd6d9 WHIRLPOOL acffbd0a7660f37cd8af4cc359ad3ad04b2f6d8e1567c55f52b4fb953a29e65faea64031512f1217556c146178b23cadf4ad751ad49a297d8ea34e7a666c8353
 MISC metadata.xml 368 SHA256 35fbb74d8a54360b4158ace6c7a06829a218039516c3d7d5891a43ee573f823c SHA512 e4aa1549a9484506494ee973dc43453ea862ea13ed306f47901075fa871a87d3e7c233488046b51aa5b28a12a527dd7d32d523c6a3d9df5d182b041a4d5d49b9 WHIRLPOOL 48cac1374b94c4afa8d349f48c8db11d12ab4a61a679e1f561635b3e0af7525d946afa023a38d4731b8d52ae56009ada1d3f2ddbb199f8ddee39d6fa42cb92fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2dxNAAoJEPGu1DbS6WIAtXEP/3o/KRJrRN5YJ/d7xmmCbj/o
-LJJP8bo56EWDSI62Um6zkpcZSjvHzu/9ZqstmIIbhXH7a+T6kN5i2Okzn7wgrSZQ
-8ks1NxqDX1vj9oJCYTxJ+Ih89l72o/uKYe5FAPoIyp6eoyK7HyiBaz/yIxcUY2jR
-jLCIPTaUsd8/ttz2kE0q+9j/cONYo1zQJ4+IenLBZMzgJuBCPTuOObHXTQDwyqcs
-yqDlNdM8TmK2z0wCNHaRueH+E6HFI3DPvVrmwrow+huCvZI+a0UhETDsROMbnAep
-1hNgA0meYE8kb7oGZHOGJKD8lJU64QT8417Q41okrrnayEltnKsNdkAG43R2iIsq
-P9ot22gAII1uRMJhLu/sBSOgW2yl9W1E3NljSDFQ+EvfXHMO4NCBF1fRVbAYO6th
-xOCAXbQQJehC5Q+e1qkAoWXeizURURTR4aO0BuwIhi2U4+8lARh7C49dJl0eK9d8
-VxZ9Bu3yayKRcnNG/Yk7EM6dlTaRMlHcyOP0z8jtseHhAZNVyiBdf9I+9gAKinG6
-SnzJS9hXY4Y8cjoVkbdFebI6PJk7tW+6WlL6osDL8xAy5CMPmu2jvOcwlc6Ov4RE
-a+RLBpdXbzOh9xFAFXvbanhP4NSlyVpsaOeoiBuMtOrsr3L0UvWOakqEUWPBayhO
-jCC6+/DywBk+DOYaTjcL
-=4n6u
+iQEcBAEBCAAGBQJS4F9bAAoJEEqz6FtPBkyjbroH+wc+9tZOIGQCW3hRTI7SkNAE
+gnBJ195jpypL8BlMYlMbZi+iKPtqAzjP660moYxQHwc2dWqwPY+KP6NTYgtet9FM
+Ju/kb1EgAmtR8vmaUdnvKr48m+TcLcOi/Ml148/cBtbQZC3g1Dqv+CqT3aCcG1lP
+HfbBKq4/CftdQbTIgJsnoL/hjTMZEbukZM33Gh7gn4ZdlMH7R6DyF/ytiucOsMol
+D3M6u9JnnfIfosIIlJ4kmmfdSivu3ULYZU5vL/aH+t3P2hWX/IhSULHI5U6rgWeN
+GNgD3NCSqGBoI7dEYrj9klTWX5NOzY/qevm+IQkOm6hpj5tnCCh/ll2XVzQffvA=
+=Gs47
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch b/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch
new file mode 100644
index 000000000000..9d2512e055a4
--- /dev/null
+++ b/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch
@@ -0,0 +1,47 @@
+From 0c967f989d2f1afe1829cf7cf2f6d36846a625ec Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 19 Jan 2014 23:21:58 -0800
+Subject: [PATCH] Do not return non-zero exit code when warnings issued.
+
+---
+ pigz.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/pigz.c b/pigz.c
+index 4fefe40..4a16799 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -478,7 +478,6 @@ local struct {
+     int procs;              /* maximum number of compression threads (>= 1) */
+     int setdict;            /* true to initialize dictionary in each thread */
+     size_t block;           /* uncompressed input size per thread (>= 32K) */
+-    int warned;             /* true if a warning has been given */
+ 
+     /* saved gzip/zip header data for decompression, testing, and listing */
+     time_t stamp;               /* time stamp from gzip header */
+@@ -519,7 +518,6 @@ local int complain(char *fmt, ...)
+         va_end(ap);
+         putc('\n', stderr);
+         fflush(stderr);
+-        g.warned = 1;
+     }
+     return 0;
+ }
+@@ -3929,7 +3927,6 @@ int main(int argc, char **argv)
+     /* initialize globals */
+     g.outf = NULL;
+     g.first = 1;
+-    g.warned = 0;
+     g.hname = NULL;
+ 
+     /* save pointer to program name for error messages */
+@@ -4020,5 +4017,5 @@ int main(int argc, char **argv)
+     /* done -- release resources, show log */
+     new_opts();
+     log_dump();
+-    return g.warned ? 2 : 0;
++    return 0;
+ }
+-- 
+1.8.5.3
+
diff --git a/app-arch/pigz/pigz-2.3.1-r1.ebuild b/app-arch/pigz/pigz-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..e383b59e281c
--- /dev/null
+++ b/app-arch/pigz/pigz-2.3.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.3.1-r1.ebuild,v 1.1 2014/01/23 00:16:23 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="http://www.zlib.net/pigz/"
+SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
+IUSE="static symlink test"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+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
+}