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

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

commit:     a1b69c9fa8e68a8329824e2e207c3d28a2153721
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 22:50:42 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 22:52:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b69c9f

media-libs/libpng: Security bump to versions 1.2.55, 1.5.25 and 1.6.20

See also http://sourceforge.net/p/png-mng/mailman/message/34667259/

Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/libpng/Manifest             |  5 +++
 media-libs/libpng/libpng-1.2.55.ebuild | 43 ++++++++++++++++++++++++
 media-libs/libpng/libpng-1.5.25.ebuild | 60 ++++++++++++++++++++++++++++++++++
 media-libs/libpng/libpng-1.6.20.ebuild | 43 ++++++++++++++++++++++++
 4 files changed, 151 insertions(+)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 7b2ef4b..12a1ef9 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,11 +1,16 @@
 DIST libpng-1.2.51.tar.xz 562940 SHA256 c7d7b813b022afd70474f78bcc3655c7bb54edbf28dd4652e5521cbb6da56d4a SHA512 63ba0df5eff78b254d53f6cfd4075d3ea93ee9445e37678fc7d29fa116137b2a7c441eda23851638f9185166e408f42c51d0678c466c8376a1de356c7db760f2 WHIRLPOOL d829b07e950c64a8de37591ac5d40211f8e762feff8ff6f98db35714293997304b3eb063ea69a87064e6c66530a4fa2531dadcb1a0bb412066c558a5ff2f679c
 DIST libpng-1.2.52.tar.xz 566088 SHA256 d4fb0fbf14057ad6d0319034188fc2aecddb493da8e3031b7b072ed28f510ec0 SHA512 5890daec6aaf619e3eab32ee8105182f220ffce9e945a5129148ff6918d3749ddb3e9f60c25d6e8457184d5a2622b07d154640d13afb92f5ce9c48873e956a42 WHIRLPOOL dfa6870e7d5e4ca05ba74bd9cd599bcbc301046c7bde7042cd2d1ec4c706f4754dd40a10bd3d753ab169cc3365152a6c1f0f8fa33bcd0e0812019c670c49194a
 DIST libpng-1.2.54.tar.xz 571448 SHA256 cf85516482780f2bc2c5b5073902f12b1519019d47bf473326c2018bdff1d272 SHA512 3fde161bae1c61c0c099344518a59a312ac5bcd6063d7d01be156fd4e048fdaafed8a27e10bf2750d4ef678389e2782137c9e6540b7fd0859b820bb8d9443497 WHIRLPOOL fd985ebc9982e20ec37b9a8889890406a334005648f90e429e71eae02c7308c8d64ff0f34e5a31fc817521d44a45f0740bc221bf73c00ade1ef2e2974fd22b9d
+DIST libpng-1.2.55.tar.xz 655728 SHA256 5e5227345676fabbba28558f4396514bb06a239eaf69adba12f3669a1650797e SHA512 d0bc9ebbbcff1c258c333d9ca64c15074d0e01df49b1d937242509b42307aebe22169ae322aa75dc6c60c0c31d29318d184ef8b1b87ae2c9e4d3d4f4c8a4dd45 WHIRLPOOL 49c2c3dcd142c5fd377a99495d74950440f4f662af9bf246570d0e99425f2b977c5b1b6b7f407dbc2efef0f93ffb5e1d7c3c25d9ef1dfaeab8ab2f0744e5427b
 DIST libpng-1.5.21-apng.patch.gz 9511 SHA256 8a4fffa885f1a1a34a7bdcaa2d1b8f1e025f6e1cf9c5bf17224672d2a6948d94 SHA512 b3369d97b19ebeae06e1f2874c2a3cc8f42421fb4be76f913be359630c5483c31cad6643f7c0a4edd3a952406d6acbffdd4a6cbfc9a09df07094bf6c6d9fbe15 WHIRLPOOL 5403fef0c1233c2e82785690d619f0e917d98a0056058064ddba446ed9987d05a4fe608b4883196f035f4b2de2650d858906014d13e5aed4d275d9e5e42ffb3d
 DIST libpng-1.5.21.tar.xz 734356 SHA256 b5151c64bc70489997790a492e1094d106be90a22b2958c43eee25a70dffdba7 SHA512 dd27d250271b72c33b9ea6282b549ad2a7a638334f97a218a00cde3136d97faf37544e304f84b966a064f9117e4681dde4f888ad63ecab41473d176066f3f5b4 WHIRLPOOL 4768c55e4d62a32d490b29285262f2dfb160c7a35afdd0e8f8d14a70348b4020c6f57dd97a9015b912c49c3dd73b660e0905c74df3674c0549fc3add5358899e
 DIST libpng-1.5.24-apng.patch.gz 10318 SHA256 7493734793803598a57f83274258118e9a31f6ec9a20b83a4d851cf359ed966a SHA512 647bb8a780947b72c7aad1ffc2b2114ed43f22e6c3885621c83694875bcec4516e49b00856fabffd568bfed90748e96117d42e3817e83a25fcb25089e32225ea WHIRLPOOL 38e6616930865bdaf8fa1ecf35bb8af8916f8bc3a9af9e9621455e378d7913b393f8ab3dd823bcc811974021dfdc24f5da95bfb14c3249cf67dc31fe037f80af
 DIST libpng-1.5.24.tar.xz 749016 SHA256 b92e3474f3136b5d9443ba92822154ebc2573fc6feead90d364ee9ebc3741be2 SHA512 d6faaba4844de0fbb0786e141265a17128387dd73dfdb5cbd1ab2915430578cd73f3f5efadcaaab966429f1a4908568b60829db63b00aadb320bf0f4a8ff9e78 WHIRLPOOL 14631ce41756faf2ec00315d7279a39fd06b488288db24a1d81345ec484a7289d187a579823b1be471e975041d5a1b4f0fbdc763a1a64cfdc29dd4ca71cc789a
+DIST libpng-1.5.25-apng.patch.gz 10305 SHA256 32c706498b9edde98b8b55374c2188b0d1dce6b60048b167a6d99f97bef2595f SHA512 602998b5e922cf1e547c5dad79a2a4f2ae81a86f7a3f4693e09e118417508629d66b734317a842d43ac13f213f79ef24a264d6790514d3383cd32eaf40a12b9b WHIRLPOOL 8b2a24181c3c1b47a408283febf5d69cf485cd0665e26721d34873fce2bfb462383e3b40d51edcbfd62308241b1567aa5b4aa649d6343653162047bbba964116
+DIST libpng-1.5.25.tar.xz 748268 SHA256 1224db3a8df90ce1b07ee67327e6846484450d05b9315a1d56fcc9772c0a51ca SHA512 41663d277a4a0e59c0a797e34c9cbe17990333b3a93c008fbf449274053847d157ea12b2e93e941661e3921a0c202c395ba334474dd77b7f4d8dd85a76628a48 WHIRLPOOL 60afcc4f08855724f11a5ce146c40852b593f4fa3fb6eb2dcee129e59160f5e1fe572842f13434edb849d5f32f72ab02c031c66636585104c966107d57f666c5
 DIST libpng-1.6.18-apng.patch.gz 9940 SHA256 1d595b3b33c09529dddf869ca69f386528dfe1b991d2679377082e2acbca7009 SHA512 ebf8e2d11b18afc0943502be069076fbe07792e8056058551de0b1cf07987a6cf423edaa5de7aefb318115054235d984059a83aad93b06bed1a56002a0b6bd9b WHIRLPOOL d177ef6a4846956e8a2768b5beb5e18a6e9db2d03ef32e6ff21f79994f8274175b8bba01def0f85af4cd6640050173291e7a54c148076cbb8397e886257f83b8
 DIST libpng-1.6.18.tar.xz 932324 SHA256 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963 SHA512 7ae286f728844da31699c3097cfb2167d4a57f740c749f0251de86ae481824716b3edaafc1b5673116623e729396ccc720a346439d3b20c5b6a7b06e1d129f74 WHIRLPOOL 1f9662073172eb2fa11924f79efd4d7dd0979696359f48f67addf5325148d898982d361879892acaa60441dd4fe42cd38ae68affc08302fa5ffc2b6731731a88
 DIST libpng-1.6.19-apng.patch.gz 10330 SHA256 5ec713a51c35c25d5e53dd61270a6fd5313b26872b382f0fbaed41a0743768a2 SHA512 2d412a74d657d366d395d13bc301d71363011fbcafbbf815dba565baca4069629450a97dfaab0ddeec7c7f646a6eddeac559d24f6910a34b072aa4a208dc4e16 WHIRLPOOL 4e093bcddbf114dda0c33eddac70b245f91c659f378d129731d3e486db3f6d232684bde1ad8f69109c7db726b53b8317f989d8b5c5a50198ab645eb7a869e7f9
 DIST libpng-1.6.19.tar.xz 941280 SHA256 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 SHA512 166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8 WHIRLPOOL 8cdb5ffc7ecfafd064ae816b3bd1c7572799fc54c701e74d9c1f66ccac592fe460c1f22f1774329a8a1f177247f0fde8a22f8dc26892805a0bed64c0690967ae
+DIST libpng-1.6.20-apng.patch.gz 10304 SHA256 ed7bc9d03bc7390c477623e1abff42977395c75ed3e69e8308ea25bc3871774d SHA512 764bfb5a7cff395bbd6aeb6b5a53a9963f7074c41ae39dd9832d1dfd1e4eb0b6210d2cf9a1af63c8db8959ee4f0691d2fa288b0a0ecc63b61d131c7a708b38a4 WHIRLPOOL 8673db8f8b47704493d925d436f07822b3b92c0e251649670efe1f0db6cd4ecb9c38fd0c2d5153503c02f4afc677a25be835d12878ee0e0fbfa5a5027278e766
+DIST libpng-1.6.20.tar.xz 942672 SHA256 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b SHA512 bbf7d9a21a13eb1fd1fa06f9761df72c0b37bd62da7049afe20ec4e63c02c3708aca8a2c2b7f2d7332f3941469b4aca1653cc8423c7fea6de8084201cb8b5f5f WHIRLPOOL fe745030bc7d09e41b20c11f26ed4b1ba1b49cd2f3d0bbafab181fbb28aa0a87165ef10f66d734314e7a73343d6c38bfedbe176fdc7b03c1273ec13d4f3f0953

diff --git a/media-libs/libpng/libpng-1.2.55.ebuild b/media-libs/libpng/libpng-1.2.55.ebuild
new file mode 100644
index 0000000..db9ef0f
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.55.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 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.25.ebuild b/media-libs/libpng/libpng-1.5.25.ebuild
new file mode 100644
index 0000000..f0df0eb
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.25.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 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.20.ebuild b/media-libs/libpng/libpng-1.6.20.ebuild
new file mode 100644
index 0000000..55f0347
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.20.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 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
+}