[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     5d4b89c11bfa3bc098648152c2e08c3d574b08ce
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 16:20:40 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 16:23:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d4b89c1

media-libs/libpng: Security cleanup (bug #604082).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/libpng/Manifest             |  5 ---
 media-libs/libpng/libpng-1.2.56.ebuild | 43 ------------------------
 media-libs/libpng/libpng-1.5.26.ebuild | 60 ----------------------------------
 media-libs/libpng/libpng-1.6.25.ebuild | 43 ------------------------
 4 files changed, 151 deletions(-)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index f55b6cd..b7cf8e5 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,11 +1,6 @@
-DIST libpng-1.2.56.tar.xz 654688 SHA256 24ce54581468b937734a6ecc86f7e121bc46a90d76a0d948dca08f32ee000dbe SHA512 b50cd58246590267fb123d8618387897d438cdc9514e69ca346bd09c5013845d2ca35933b236b31af9d81ae738afa7b01e9a332bcf099f4fa0e3b85048a4ac5f WHIRLPOOL 436209348dde13751e8c326b8a9bceacca281e3d59e548af7eb9246fb14ee2f657e3c10437f04148a0c244f2d3bc231260fb57a2cd145d87b5d07ef5e49a8b1d
 DIST libpng-1.2.57.tar.xz 656784 SHA256 0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8 SHA512 51338d900690fc2d28ea1b5b364d311d73ce7ad498d000985e0c3926b5df0df97fcd7bb079fc954c6caa532fc6e6cbbc266e671d62fc67eca30e79a5f0e26f31 WHIRLPOOL d9d9e5affba0a40458080e59418f7f888fe2ba7ff910774f336a883a035be1c03a9a1b6b1f516c9f6ed036265c98650eebfd3bb15b6df6544be2eaf06be50dcd
-DIST libpng-1.5.26-apng.patch.gz 10318 SHA256 bcc0d7f1154a5004610a9102f25ce6f35985a6033cfb52887f3f2b11017fcd45 SHA512 f7e5228fab036e63be3de58f2f85041d834e2292d04682f0b20930d5cd58c078796a8c3d6742cd28c7dc808ac641aa5d5bfe6f8daee5fb2b0b75bfb856170861 WHIRLPOOL 449212c403b6e8c5724e402655b42d23ed3e27d3902b219767b663fab08dedc19e684497a1be4326a99ef4b8cc26eb6acdd1ed1b0ccc0c282f19a50b1c831d28
-DIST libpng-1.5.26.tar.xz 748164 SHA256 7ba4d85efb79e60d7a8a84bca6a0b925e043bfb5c8a47a1b878ab4d3bcd6714d SHA512 87214671af84665277f0ac3226e6feb41a3e1deb0d7d61e62c99e77d1386fcf928b21f9863c4166a7391230166190bad00e57c3fc42902b3a0a53ba68d4db1f5 WHIRLPOOL e2eda0792fc5f6b41d4f5d878fdf4c8bde0cac2591647a092fed0e6f362fd9c532d265ca7dcdcd8ade9bc23fa385bfa71bd8b532e3d1091202583230a9306724
 DIST libpng-1.5.28-apng.patch.gz 10330 SHA256 a3f419370f69bbedb2b0023bcc2a58345a936c525330ae96f57b9e05d3bb71ca SHA512 f99dd6ccd08083a3328841c40fbc94347a42326b29948ec0260497e18da937f1fcccccc4a3636e86a8e0c6b3a094ad8b8ab411af58f56df820b4cf78db25cd96 WHIRLPOOL fb9542f8f128cbe21273afb5ada62a97c66b62142df9d8e845703299da61c177b1510b635d1ede3fdcca20fbee6db07c5ad692cac517713266c4dd53e9f6fd5e
 DIST libpng-1.5.28.tar.xz 755724 SHA256 1c3a2d939b6729de493ebc0b14aeaa1bdc4ffa80a75d2506bb2c75a0ff3ac8e9 SHA512 25adcff4429e7c691a6336a70f3c3d212aa27da6c9d6393325d9866b4c7e1f5fd40b9fe23b1efbe5629753a6051ab52365688ac14913584faf40e84e0b9f514c WHIRLPOOL 5092dc258d10cc8927d19d2904a8b384144567c392dddb99b05d21f3eb191b48eb3f70f015f28a9bb6c5a4fcac9d3d7dccbc58284c5a09f575b66e529f597ffc
-DIST libpng-1.6.25-apng.patch.gz 10342 SHA256 e264d917d84872f01af3acf9666471a9bf64b75558b4b35236fef1e23c2a094f SHA512 3ecc7d49a001de7c47f7ca1169b8eb6bdf4221bf0de4f896afb52c526ea45027246c947a62a02adb2172d98085f6f07814de9c2ce222a5570c3eb67828733374 WHIRLPOOL a8021b1321a83023ffdb0c082d8fd3bb9a1ded2935da3f71098bac2bc070293212e4c2702855334e3db68ca66ddcb1891a4b82220b94dc2e0391585b9075c0cb
-DIST libpng-1.6.25.tar.xz 982204 SHA256 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811 SHA512 74de15b1146d479660e2b1fd6b192388857955f502b249f00b69e37b594af4d53117704cb77b5ae07ffd84510cc801695be2121adbedfaf65dc4e3b521259f5d WHIRLPOOL 31234463c2cd07b0dd8e98449ec20c902562b3d4c958811180d09cde0fda6643da14928d7fb852afe3d553e873982aa0423adf14811985dc55fca56aefb1e26b
 DIST libpng-1.6.27-apng.patch.gz 10343 SHA256 650ca925dae8565ac8882854682ed13954d8832542406269214e3a4d593ac675 SHA512 0052f7cd76847094f64e3533be7510e8c5d673e927eced76a80480709897626eca2a12981540de533e74de49e7b00b128a4914d82b62bbcb3950bd1182bd409d WHIRLPOOL b48697984ea92572dfe37da228fbf877bcf0188c1059adf1d9bdb2e6529ad84ed506acd4940b4f72173018ea40cb53645c31d250d19ecc70030e897ff22d38d1
 DIST libpng-1.6.27.tar.xz 984316 SHA256 fca2ffd97336356cdab9bfa8936b9d6dfd580a70205e5dfead3ac42cb054b57b SHA512 9dcf54147fa2637a72364246e8565c0a6d25e4313f26150689b166eabd4358177e1caf38ff622b04c71f3b7cfd550f7fd6ca87892c50203a63b92f365fc7c8d7 WHIRLPOOL 6f68c929ac7aa28d41bea26843f0028b447144e2c0c7a8958f44a7d3c62c9d17fa22d4e5ce709b0dbf5234f80829fb554023fc229a5397a97deb0fff17bf5895
 DIST libpng-1.6.28-apng.patch.gz 10316 SHA256 85cfa524a95b0d1a31012b8ad90536911ea66beb5821459ae92a1d6a68f1ac88 SHA512 bcc67e0cc0c6ef39f642ea4682c9510cb3528f39748b71b3c9fb7bf270d982260933e99062949381b54ab79ea418a121848dfd014faf394d53c12d1fa5c04717 WHIRLPOOL ebb08d4cb637ea582b63a745ec1cde2137a410f59699fabd39324fc65d102ba8ca87b25596ce9eeb4d964099bf45336a3cb6011bfdd3782c99009f07fae424b6

diff --git a/media-libs/libpng/libpng-1.2.56.ebuild b/media-libs/libpng/libpng-1.2.56.ebuild
deleted file mode 100644
index 354bed5..00000000
--- a/media-libs/libpng/libpng-1.2.56.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="libpng"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
-}
-
-multilib_src_compile() {
-	emake libpng12.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng12.so.0.* libpng12.so.0
-}

diff --git a/media-libs/libpng/libpng-1.5.26.ebuild b/media-libs/libpng/libpng-1.5.26.ebuild
deleted file mode 100644
index 288b529..00000000
--- a/media-libs/libpng/libpng-1.5.26.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon"
-
-RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.5*:0
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-pkg_setup() {
-	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
-	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
-}
-
-src_prepare() {
-	if use apng; then
-		# fix windows path in patch file. Please check for each release if this can be removed again.
-		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
-			-i "${WORKDIR}"/${PN}-*-apng.patch || die
-		epatch "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--enable-arm-neon=$(usex neon)
-}
-
-multilib_src_compile() {
-	emake libpng15.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng15.so.15.* libpng15.so.15
-}

diff --git a/media-libs/libpng/libpng-1.6.25.ebuild b/media-libs/libpng/libpng-1.6.25.ebuild
deleted file mode 100644
index dd372af..00000000
--- a/media-libs/libpng/libpng-1.6.25.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	if use apng; then
-		epatch "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-arm-neon=$(usex neon)
-}
-
-multilib_src_install_all() {
-	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
-	prune_libtool_files --all
-}