gentoo resync : 05.02.2020

5 files changed, 15 insertions, 99 deletions

diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index a578b2423b8e..05325db9d814 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,8 +1,4 @@
-AUX optipng-0.7.5-estonian.patch 1014 BLAKE2B 3c973120185be858a89c02b1f452e47da5f51866ec9ad59653d2f27cea9ea2b7d318d33b00c3eb14b6e87e629f63062d63f2ffd523e62b9927b0b75e4d781af1 SHA512 535e869c42df6181f0bd30287adb9175c18e8a9730c997a6466e64870b968d9575e6952889353be5ac4232b2087b004cde953e151da4c75b8048b3cdccb8f27d
-AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b478838633e43536caa6bca54a7b48ad4290af3aa452b37d3bacbb194bec11aeed47e84b60cab4fd71281d554e72309e376ceb4 SHA512 2bf259c59121e735a6c65137d5819c07057b3b1e43e14793cc4f739b607f6ea4e4788ddf1dee521bd8b623796c901f974e7c925f36ff13adec669dfc6fbf449e
-AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
-DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.6-r2.ebuild 1421 BLAKE2B 70322d5447186354a43c2a0efe46fae53b6fae7ab0a7e47436d179c745857d9792c392a39a7a391319dcb83b26fd2e3a49ef746d7bfff4b412f0468e80b93a9d SHA512 f1805005c8dce16e50786721b84ff80609917edb0167423c253f608b250fa06540f4f524a41d2558ddb4f6a3f5791dac24d0b21d5e1b523fbc6f7fc8ba04aab8
+EBUILD optipng-0.7.7-r1.ebuild 1287 BLAKE2B da5138c4d24c9df741fc0ccec37d1e52fa5e810c10b6f4a0e0ef9242e7d877b4f0f915da260cc6bb4283a14df968fa4862da9432ea0264da17039c59f22f890a SHA512 09fb255b4e69d02dab80cde99591d27c60cb5270100565c333de5ab75be33db2e236823f49a75852ae7693be3abb4b32b371fd964ab1c91bb36b41f8e4035dbc
 EBUILD optipng-0.7.7.ebuild 1289 BLAKE2B 056adeff112c68820bb1bed10ba3f9705b5ce3bc5aed2510c393333d16ab6e83ae59f02f1aa1ec20d1435c7098a9578eb73bf322ae2d853dd5ea0d168d65eb24 SHA512 701d10e6ac8bd6bf0cba74421dc592718ca9de3cc9acc5cc8911cd98cdefa0a8e904a90379cd396969c0a0d53f05b244ab62e7eb7980def90792b550d411db82
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
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 37a2ca3ec688..000000000000
--- 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@pipping.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 19dc3ad0c57b..000000000000
--- 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@pipping.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 71edf20cfefe..000000000000
--- 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@gmail.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.7-r1.ebuild
index 19129f893305..11a75013d0aa 100644
--- a/media-gfx/optipng/optipng-0.7.6-r2.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Compress PNG files without affecting image quality"
 HOMEPAGE="http://optipng.sourceforge.net/"
@@ -11,27 +11,25 @@ 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"
+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"
+	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
+DOCS=( AUTHORS.txt README.txt )
 
+src_prepare() {
 	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
+		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
+		src/optipng/ioutil.c || die
 
 	tc-export CC AR RANLIB
 	export LD=$(tc-getCC)
@@ -51,8 +49,11 @@ src_compile() {
 }
 
 src_install() {
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
+	einstalldocs
+
+	dodoc doc/*.txt
+	docinto html
+	dodoc doc/*.html
 	doman src/${PN}/man/${PN}.1
 
 	dobin src/${PN}/${PN}