[gentoo-commits] repo/gentoo:master commit in: media-gfx/optipng/, media-gfx/optipng/files/

[Sebastian Pipping]

commit:     5b4c7223f2a6aeb4aaf8d5e54fa312eda4f74f8d
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 15:09:36 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 15:29:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4c7223

media-gfx/optipng: Drop old

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 media-gfx/optipng/Manifest                         |  1 -
 .../optipng/files/optipng-0.7.5-estonian.patch     | 34 -------------
 .../files/optipng-0.7.6-cve-2017-1000229.patch     | 25 ---------
 .../files/optipng-0.7.6-cve-2017-16938.patch       | 22 --------
 media-gfx/optipng/optipng-0.7.6-r2.ebuild          | 59 ----------------------
 5 files changed, 141 deletions(-)

diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index d0cdec1451f..49b78797095 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,2 +1 @@
-DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280

diff --git a/media-gfx/optipng/files/optipng-0.7.5-estonian.patch b/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
deleted file mode 100644
index 37a2ca3ec68..00000000000
--- a/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2cf0d7cb7928aac9ec0e21ceaaf09053434a4947 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@×××××××.org>
-Date: Tue, 16 Sep 2014 02:58:45 +0200
-Subject: [PATCH] Fix for Estonian locale support (bug #522446)
-
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 6d2a507..17d4bc1 100755
---- a/configure
-+++ b/configure
-@@ -256,7 +256,7 @@ then
-                 $sed_preconfig_libpng
-                 s|^AR *=.*|AR = $AR|
-                 s|^ARFLAGS *=.*|ARFLAGS = $ARFLAGS|
--                s|^AR_\([A-Z]*\) *=.*|AR_\1 = $AR $ARFLAGS|
-+                s|^AR_\([[:upper:]]*\) *=.*|AR_\1 = $AR $ARFLAGS|
-             "
-         fi
-         if test "$RANLIB"
-@@ -408,7 +408,7 @@ sed_config="
-     s|@LIBPNG_DISTCLEAN_XCMD@|${LIBPNG_DISTCLEAN_XCMD-true}|g
-     s|@ZLIB_MK@|${ZLIB_MK-Makefile}|g
-     s|@ZLIB_DISTCLEAN@|${ZLIB_DISTCLEAN-distclean}|g
--    s|@[A-Z]*_MK@|Makefile|g
-+    s|@[[:upper:]]*_MK@|Makefile|g
-     s| *\$||
- "
- 
--- 
-2.1.0
-

diff --git a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch
deleted file mode 100644
index 19dc3ad0c57..00000000000
--- a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-1000229.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 77ac8e9fd9b2c1aeec3951e2bb50f7cc2c1e92d2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@×××××××.org>
-Date: Sun, 19 Nov 2017 16:04:26 +0100
-Subject: [PATCH] Prevent integer overflow (bug #65, CVE-2017-1000229)
-
----
- src/minitiff/tiffread.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/minitiff/tiffread.c b/src/minitiff/tiffread.c
-index b4910ec..5f9b376 100644
---- a/src/minitiff/tiffread.c
-+++ b/src/minitiff/tiffread.c
-@@ -350,6 +350,8 @@ minitiff_read_info(struct minitiff_info *tiff_ptr, FILE *fp)
-         count = tiff_ptr->strip_offsets_count;
-         if (count == 0 || count > tiff_ptr->height)
-             goto err_invalid;
-+        if (count > (size_t)-1 / sizeof(long))
-+            goto err_memory;
-         tiff_ptr->strip_offsets = (long *)malloc(count * sizeof(long));
-         if (tiff_ptr->strip_offsets == NULL)
-             goto err_memory;
--- 
-2.14.2
-

diff --git a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch b/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
deleted file mode 100644
index 71edf20cfef..00000000000
--- a/media-gfx/optipng/files/optipng-0.7.6-cve-2017-16938.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e05fb81a20541833a2d62ce08552b18c0920b9a1 Mon Sep 17 00:00:00 2001
-From: Cosmin Truta <ctruta@×××××.com>
-Date: Sat, 25 Nov 2017 23:17:46 -0500
-Subject: [PATCH] gifread: Detect indirect circular dependencies in LZW tables
-
----
- src/gifread/gifread.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gifread/gifread.c b/src/gifread/gifread.c
-index 0123456789abcdef..0123456789abcdef 100644
---- a/src/gifread/gifread.c
-+++ b/src/gifread/gifread.c
-@@ -499,6 +499,8 @@ static int LZWReadByte(int init_flag, int input_code_size, FILE *stream)
-             *sp++ = table[1][code];
-             if (code == table[0][code])
-                 GIFError("GIF/LZW error: circular table entry");
-+            if ((size_t)(sp - stack) >= sizeof(stack) / sizeof(stack[0]))
-+                GIFError("GIF/LZW error: circular table");
-             code = table[0][code];
-         }
- 

diff --git a/media-gfx/optipng/optipng-0.7.6-r2.ebuild b/media-gfx/optipng/optipng-0.7.6-r2.ebuild
deleted file mode 100644
index 19129f89330..00000000000
--- a/media-gfx/optipng/optipng-0.7.6-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0"
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-estonian.patch
-	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-1000229.patch  # bug 637936
-	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-16938.patch  # bug 639690
-
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
-		src/optipng/osys.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-
-	eapply_user
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}