* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/
@ 2020-07-11 2:56 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2020-07-11 2:56 UTC (permalink / raw
To: gentoo-commits
commit: ae92c516deaa14eb6adb444e6523f09389d48daf
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 02:54:35 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 02:54:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae92c516
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 <AT> gentoo.org>
app-arch/pigz/files/2.4-trailing-junk.patch | 27 ++++++++++++++++++++++
.../pigz/{pigz-2.4.ebuild => pigz-2.4-r1.ebuild} | 2 ++
2 files changed, 29 insertions(+)
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 00000000000..eb5585b7d36
--- /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
similarity index 94%
rename from app-arch/pigz/pigz-2.4.ebuild
rename to app-arch/pigz/pigz-2.4-r1.ebuild
index fe1190bc3a3..29c9951c6bf 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}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/
@ 2021-07-17 1:11 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2021-07-17 1:11 UTC (permalink / raw
To: gentoo-commits
commit: b7837ed3853bbb446c0d10b851b0c9c70ebac988
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 01:10:39 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 01:10:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7837ed3
app-arch/pigz: drop 2.4-r1, 2.5
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
app-arch/pigz/Manifest | 2 --
app-arch/pigz/files/2.4-trailing-junk.patch | 27 -------------------
app-arch/pigz/pigz-2.4-r1.ebuild | 41 -----------------------------
app-arch/pigz/pigz-2.5.ebuild | 39 ---------------------------
4 files changed, 109 deletions(-)
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 084fee7e73b..33a88c53276 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1 @@
-DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
deleted file mode 100644
index eb5585b7d36..00000000000
--- a/app-arch/pigz/files/2.4-trailing-junk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index f23df83523a..00000000000
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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.5.ebuild b/app-arch/pigz/pigz-2.5.ebuild
deleted file mode 100644
index 3e1f3a17235..00000000000
--- a/app-arch/pigz/pigz-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/
@ 2023-01-07 23:03 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-01-07 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 8a1a91aa281cd0c6f2d3c2054ed9c866a04d594d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 23:00:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 23:00:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1a91aa
app-arch/pigz: backport memcpy UB fix
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-arch/pigz/files/pigz-2.7-memcpy-ub.patch | 26 +++++++++++++++++++
app-arch/pigz/pigz-2.7-r1.ebuild | 38 ++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch b/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch
new file mode 100644
index 000000000000..db53660748b4
--- /dev/null
+++ b/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch
@@ -0,0 +1,26 @@
+https://github.com/madler/pigz/commit/e1ed230a1599a3cb64c8f5c003cced60e10e3314
+https://github.com/madler/pigz/issues/107
+
+From e1ed230a1599a3cb64c8f5c003cced60e10e3314 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sat, 31 Dec 2022 21:28:26 -0800
+Subject: [PATCH] Avoid calling memcpy() with a NULL pointer.
+
+This is not permitted by the C99 standard even when the length is
+zero. Go figure.
+--- a/pigz.c
++++ b/pigz.c
+@@ -3414,8 +3414,10 @@ local int outb(void *desc, unsigned char *buf, unsigned len) {
+
+ // copy the output and alert the worker bees
+ out_len = len;
+- g.out_tot += len;
+- memcpy(out_copy, buf, len);
++ if (len) {
++ g.out_tot += len;
++ memcpy(out_copy, buf, len);
++ }
+ twist(outb_write_more, TO, 1);
+ twist(outb_check_more, TO, 1);
+
+
diff --git a/app-arch/pigz/pigz-2.7-r1.ebuild b/app-arch/pigz/pigz-2.7-r1.ebuild
new file mode 100644
index 000000000000..f0a9d1f4540f
--- /dev/null
+++ b/app-arch/pigz/pigz-2.7-r1.ebuild
@@ -0,0 +1,38 @@
+# 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 ~sparc64-solaris"
+IUSE="static 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}"/${P}-memcpy-ub.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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/
@ 2023-08-18 10:37 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-08-18 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 1dc5bd0a25acd202393010f3c0ff396b06793e12
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 10:36:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 10:36:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc5bd0a
app-arch/pigz: fix compat w/ zlib-1.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-arch/pigz/files/pigz-2.7-zlib-1.3.patch | 22 ++++++++++++++++
app-arch/pigz/pigz-2.7-r2.ebuild | 41 +++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
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-r2.ebuild b/app-arch/pigz/pigz-2.7-r2.ebuild
new file mode 100644
index 000000000000..8f054ba7cec4
--- /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[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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-18 10:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-18 10:37 [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-07 23:03 Sam James
2021-07-17 1:11 Georgy Yakovlev
2020-07-11 2:56 Georgy Yakovlev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox