diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-arch/pigz | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'app-arch/pigz')
| -rw-r--r-- | app-arch/pigz/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/pigz/files/2.4-trailing-junk.patch | 27 | ||||
| -rw-r--r-- | app-arch/pigz/pigz-2.4-r1.ebuild (renamed from app-arch/pigz/pigz-2.4.ebuild) | 2 |
3 files changed, 31 insertions, 1 deletions
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest index 0432a7c1198f..28c3994fb4b9 100644 --- a/app-arch/pigz/Manifest +++ b/app-arch/pigz/Manifest @@ -1,3 +1,4 @@ +AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba -EBUILD pigz-2.4.ebuild 959 BLAKE2B ee8e0f81c1ec39d88cd57cc514f563e844ecaa59e7edad334faac77a160b7ceba3632b9c62e631085a2f4a3da1b7aba38542874feecc67d096a43031a083db58 SHA512 91e673c6cdcab6f888fa0321a5914f5767c273dd234b8c748b9e691a79a3a541dfa54eede8869a298f52e31ed4265823084d6ab12d8d02a73f68f7e09bff1d2b +EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B 7266a3fd4be5134e3876ce16ff1149e4ed3edfef522344dd00911375da5fe68d0b5461e358d94d1454de6267360ca27b0f04392d18e00dc1075fccbbdb0b9996 SHA512 1bb48dfa233655425306a5bc5399279c0934e59fe2402775965253682d56df4d753553878504563bdd008063218f6f030cba6db16527ea5c575a10799a2b096a MISC metadata.xml 688 BLAKE2B 4dc6a54347303d0af5b2d77712a6bcbf4f02e81ebf2daf070f7820d0ea4e99896a5ca7e8134d4ecd6e14cf55d2fb178e9d4e95f6db15bf884d9a68d9c0f5b15a SHA512 f9f5fb0cb1f972ba85a2d80642eee5b061b7d81e4e20a4e2cd1abf958aa5702905b06dca8db65f7ed906ac08c0576e89f01e8a8630f8bd97fda6b5f6b0bb718d 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.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild index fe1190bc3a3f..29c9951c6bfa 100644 --- a/app-arch/pigz/pigz-2.4.ebuild +++ b/app-arch/pigz/pigz-2.4-r1.ebuild @@ -21,6 +21,8 @@ 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}" |