public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/files/, app-arch/pigz/
@ 2016-01-11  4:11 Tim Harder
  0 siblings, 0 replies; 2+ messages in thread
From: Tim Harder @ 2016-01-11  4:11 UTC (permalink / raw
  To: gentoo-commits

commit:     9e5256f6b53530d1dab5a327ee436a10fb6eb9c7
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 04:10:45 2016 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 04:11:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5256f6

app-arch/pigz: remove old

 app-arch/pigz/Manifest                             |  1 -
 ...rn-non-zero-exit-code-when-warnings-issue.patch | 47 ----------------------
 app-arch/pigz/files/pigz-2.3-make.patch            | 25 ------------
 app-arch/pigz/pigz-2.3.1-r1.ebuild                 | 43 --------------------
 4 files changed, 116 deletions(-)

diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 756d069..34a52c8 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,2 +1 @@
-DIST pigz-2.3.1.tar.gz 86651 SHA256 629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54 SHA512 7cb00ab87802352c817d9b2f745948199a7e571181aec3ef161305c1d8b828790bc2fb0083d6068ba5aead5d8b8c7f53ec25ab641ae2e98eda9adf14f195dbc6 WHIRLPOOL 242e38d05215269c3c9b6602191cc6e02fd9e781b0425738c3907ccf60da9a4a36ebcda866c9c0e949ad5988dad6b468f97102352d2ed13adb7e890688c221f7
 DIST pigz-2.3.3.tar.gz 92787 SHA256 4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c SHA512 6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c WHIRLPOOL 1eb3ea11a0bbb0bd837a1ed12a63b3d57d8ae9c127e8407f9b82b1aad8a41820abf1d429c513f4df3f56fdc3c842caab07a5c904207b2244e4215a6654ef5392

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
deleted file mode 100644
index 9d2512e..0000000
--- a/app-arch/pigz/files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/files/pigz-2.3-make.patch b/app-arch/pigz/files/pigz-2.3-make.patch
deleted file mode 100644
index f014c7b..0000000
--- a/app-arch/pigz/files/pigz-2.3-make.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 545a9350f8026f6c9826dd4fa7ab6000d8826d78 Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gmail.com>
-Date: Wed, 6 Mar 2013 15:51:27 -0800
-Subject: [PATCH] Respect LDFLAGS and explicitly link to math library
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 3cc231d..48d1f26 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra
- 
- 
- pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o
--	$(CC) -o pigz $^ -lpthread -lz
-+	$(CC) $(LDFLAGS) -o pigz $^ -lpthread -lz -lm
- 	ln -f pigz unpigz
- 
- pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
--- 
-1.8.1.5
-

diff --git a/app-arch/pigz/pigz-2.3.1-r1.ebuild b/app-arch/pigz/pigz-2.3.1-r1.ebuild
deleted file mode 100644
index f5cf094..0000000
--- a/app-arch/pigz/pigz-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/files/, app-arch/pigz/
@ 2023-10-12 23:32 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-10-12 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     26b63ca65cd33d9cd6e6abda3e0a4d1b8641383a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 12:19:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 23:20:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b63ca6

app-arch/pigz: drop 2.7, 2.7-r1, 2.7-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/pigz/Manifest                       |  1 -
 app-arch/pigz/files/pigz-2.7-memcpy-ub.patch | 26 ------------------
 app-arch/pigz/files/pigz-2.7-zlib-1.3.patch  | 22 ---------------
 app-arch/pigz/pigz-2.7-r1.ebuild             | 38 --------------------------
 app-arch/pigz/pigz-2.7-r2.ebuild             | 41 ----------------------------
 app-arch/pigz/pigz-2.7.ebuild                | 34 -----------------------
 6 files changed, 162 deletions(-)

diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 4b2303ab8543..4fddcc524d11 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,2 @@
-DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5
 DIST pigz-2.8.tar.gz 121304 BLAKE2B 9f1ae8b5e0dd9d9b1f17bcdbc41d8a9d50fd9b9ba7c50eb0bc1b738105d05cc396d9ce8e01f58f6b2fa7247a7c7e9926c602a613b1bb3e3a117c8f5c919ce640 SHA512 ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f
 DIST pigz-2.8.tar.gz.asc 235 BLAKE2B eb204079597d3e958da3672ba7f92481848bb7824da12b9306ff180add107175bed7bdd435dbc270170769a489c34a033d6ff547e8203cf1d71df6564381b43d SHA512 cb1dbca21d8fed25049693de02abf7489f61407d85f9a52d566c14e0194c6c393aed3edd2fd716d0ecedf7eeead6ae89d0cecc236caacd98740d14bd71e078db

diff --git a/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch b/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch
deleted file mode 100644
index db53660748b4..000000000000
--- a/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/pigz-2.7-zlib-1.3.patch b/app-arch/pigz/files/pigz-2.7-zlib-1.3.patch
deleted file mode 100644
index 232dc3787ab7..000000000000
--- a/app-arch/pigz/files/pigz-2.7-zlib-1.3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index c07380f70b83..000000000000
--- a/app-arch/pigz/pigz-2.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
-)
-
-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-r2.ebuild b/app-arch/pigz/pigz-2.7-r2.ebuild
deleted file mode 100644
index 6bbbc55c5601..000000000000
--- a/app-arch/pigz/pigz-2.7-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
deleted file mode 100644
index 1c9e4f93cec3..000000000000
--- a/app-arch/pigz/pigz-2.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 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 ~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 )"
-
-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] 2+ messages in thread

end of thread, other threads:[~2023-10-12 23:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-12 23:32 [gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/files/, app-arch/pigz/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2016-01-11  4:11 Tim Harder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox