Re-added symlinks and upgrade libpng for security bug #155278

(Portage version: 2.1.1-r2)
 (Signed Manifest commit)

3 files changed, 16 insertions, 45 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index edab103a8efc..b6dcb425d4db 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -5,9 +5,9 @@ AUX 75emul-linux-x86-base 51 RMD160 1c52b6d125a8ee61fb909a085a8c935096e2bcb4 SHA
 MD5 3ac141b3a5850345c246b5c4ce924ccc files/75emul-linux-x86-base 51
 RMD160 1c52b6d125a8ee61fb909a085a8c935096e2bcb4 files/75emul-linux-x86-base 51
 SHA256 6d5b1311705d20d551fd993fcacef7237e818dcb39a757e00a0943c0a4b4dc24 files/75emul-linux-x86-base 51
-DIST emul-linux-x86-baselibs-2.5.1.tar.bz2 4992737 RMD160 2631aa686d874c9d3fdf65245bc3bab849527fe7 SHA1 46307497057eea66c60ab3f317736939f4af710a SHA256 636876594091a8beb2531ba5834ae83f6e6fc8c39a2a43806b82c63e5927a288
+DIST emul-linux-x86-baselibs-2.5.1.tar.bz2 4992737 RMD160 2631aa686d874c9d3fdf65245bc3bab849527fe7 SHA256 636876594091a8beb2531ba5834ae83f6e6fc8c39a2a43806b82c63e5927a288
 DIST emul-linux-x86-baselibs-2.5.2.tar.bz2 5588388 RMD160 e765243320ad9b3b36aa642a0d3db89efbccbe63 SHA1 ea121156676c10d0f9ccb82961bf7404f6746326 SHA256 4899db3a780494dd293ee1bbfab9d5a0f7313c2d055c4900bb0d205e071e4322
-DIST emul-linux-x86-baselibs-2.5.3.tar.bz2 5716962 RMD160 7555c4b90d942117286295732a2a04f365540f5d SHA1 67af1ab25ef7fb638250063a3e3f829000766deb SHA256 74949d60f4f793f9244621bddf7c2d0e9b35f8c8c383141aa945f434475821b9
+DIST emul-linux-x86-baselibs-2.5.4.tar.bz2 5688110 RMD160 23a928780ee7fd571a56db035acf66607f47ae06 SHA1 b975efe51bf34d978e54d000a492dea4f920627c SHA256 7fe23a4aee8bedd0e4950a7fc6e8bd6cae458bf1b4d9d1fd6109b2e8dd032872
 EBUILD emul-linux-x86-baselibs-2.5.1.ebuild 693 RMD160 79a14cb1f5dbc6f0aedb07f0c03964276382ae17 SHA1 ebf94bba568bcee7a90a3b399b5e2a2fb5ae6cc0 SHA256 c4539b1dd968c0e748364ef2b2c1e5729ba65b564e3ce58a2af300dc59c4f9da
 MD5 9a4f8be0444e048e6b7306d6e846a738 emul-linux-x86-baselibs-2.5.1.ebuild 693
 RMD160 79a14cb1f5dbc6f0aedb07f0c03964276382ae17 emul-linux-x86-baselibs-2.5.1.ebuild 693
@@ -16,14 +16,14 @@ EBUILD emul-linux-x86-baselibs-2.5.2.ebuild 679 RMD160 333e3abf834c9c0d8a37f0728
 MD5 4b4e5fbd3abcbd0a1a74412b754af179 emul-linux-x86-baselibs-2.5.2.ebuild 679
 RMD160 333e3abf834c9c0d8a37f07282e2932c7ff474e5 emul-linux-x86-baselibs-2.5.2.ebuild 679
 SHA256 8c242c2a68475a1aff2c680f5b88623d6478df11260d998935e96a943dfc78ac emul-linux-x86-baselibs-2.5.2.ebuild 679
-EBUILD emul-linux-x86-baselibs-2.5.3.ebuild 692 RMD160 8b505bab707eb8d570876ecfd859eedcdafaebf1 SHA1 3e2caaacc48ee2ed5326765f96db44f63f08d9d7 SHA256 d66505df185781dfa204bd89a8fba9476c75fd1fa96b207eef615bdb607197ed
-MD5 151d48b2be3e3aee5681666c9b9d3338 emul-linux-x86-baselibs-2.5.3.ebuild 692
-RMD160 8b505bab707eb8d570876ecfd859eedcdafaebf1 emul-linux-x86-baselibs-2.5.3.ebuild 692
-SHA256 d66505df185781dfa204bd89a8fba9476c75fd1fa96b207eef615bdb607197ed emul-linux-x86-baselibs-2.5.3.ebuild 692
-MISC ChangeLog 9873 RMD160 7bf134b8c726e770f6d18458c85c22d138989e77 SHA1 94acdc379bb7749bd9a4d705456a56e200ec62e2 SHA256 cb88b7cc5030a1a068991371e95d3e4e4c66b9de3ff01a69f7b797a7be31230b
-MD5 2305c26ecc1d7af342825a11a64b2d8f ChangeLog 9873
-RMD160 7bf134b8c726e770f6d18458c85c22d138989e77 ChangeLog 9873
-SHA256 cb88b7cc5030a1a068991371e95d3e4e4c66b9de3ff01a69f7b797a7be31230b ChangeLog 9873
+EBUILD emul-linux-x86-baselibs-2.5.4.ebuild 692 RMD160 6f0d44267156cc190a0022388f2996bb58e29345 SHA1 9418b0905e4ad46960206dbbe1d86b221afe7c28 SHA256 33313345b2c8154c0e9eeff6c8c184da845ff568476884f96a57a2bab6268b8a
+MD5 1736a4525c9d5b5ef71627aff778b8b0 emul-linux-x86-baselibs-2.5.4.ebuild 692
+RMD160 6f0d44267156cc190a0022388f2996bb58e29345 emul-linux-x86-baselibs-2.5.4.ebuild 692
+SHA256 33313345b2c8154c0e9eeff6c8c184da845ff568476884f96a57a2bab6268b8a emul-linux-x86-baselibs-2.5.4.ebuild 692
+MISC ChangeLog 10116 RMD160 f7c06d8b24632a183e02d206e74048d57dcac558 SHA1 7c970177bdaf9ff3b360962ff2f1913aa3ced345 SHA256 7fa43e2a598dc4b186c73ab1fa759d86d8ea5d730c28e22a61ba70110c4608fe
+MD5 825485da14223e5c81e7504c7e0de91d ChangeLog 10116
+RMD160 f7c06d8b24632a183e02d206e74048d57dcac558 ChangeLog 10116
+SHA256 7fa43e2a598dc4b186c73ab1fa759d86d8ea5d730c28e22a61ba70110c4608fe ChangeLog 10116
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -34,13 +34,13 @@ SHA256 a9329090c9886142f507466f9bc64a16668abcdcb2d36ac04412e0c30aaf5ad6 files/di
 MD5 0f928883ef42c4494748f2ec167509a1 files/digest-emul-linux-x86-baselibs-2.5.2 295
 RMD160 20266e56e7562c0df09832e0d85a39b46f8a709a files/digest-emul-linux-x86-baselibs-2.5.2 295
 SHA256 c16204a8de206998a9b8dee1742878e358eaf549540892636baf9a79305b60f9 files/digest-emul-linux-x86-baselibs-2.5.2 295
-MD5 9901569cf4dbbbc69824e15341f5a423 files/digest-emul-linux-x86-baselibs-2.5.3 295
-RMD160 4c130f9cf2c93955ab8d54745900df14d33f5c58 files/digest-emul-linux-x86-baselibs-2.5.3 295
-SHA256 82ab2bf22dc436820ad1e3f614e438b5fa20ad5a382de1cb0f4c3d7fb057f554 files/digest-emul-linux-x86-baselibs-2.5.3 295
+MD5 6d4b98bac626a36a1491e448fa6b78e4 files/digest-emul-linux-x86-baselibs-2.5.4 295
+RMD160 04f2c8984458efcb371c84544c8d235738d60284 files/digest-emul-linux-x86-baselibs-2.5.4 295
+SHA256 59d7b62a61400599f849f8208f2fcf44f073bfefd463f4abf02f82cdcb07a81d files/digest-emul-linux-x86-baselibs-2.5.4 295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVYdFmOfEJZHYOKcRAsEEAJ0Tx4hrTeN5QvVZ4vxDrcFPPZG9yQCZAZQI
-bwJFcGB/1n5lKxnNoSK7NlU=
-=u24U
+iD8DBQFFZRi9mOfEJZHYOKcRAvLuAJ9E6PSpACW9qRCOA0FAsn44Xj8zAQCdHt8m
+h43IBhtjWwa4RIf5Eb6rEHg=
+=Lre9
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.3.ebuild
deleted file mode 100644
index 98d55fa3a74d..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.3.ebuild,v 1.1 2006/11/11 08:17:51 tester Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~tester/dist/emul/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND="app-emulation/emul-linux-x86-compat"
-
-RESTRICT="nostrip"
-
-src_install() {
-	cd ${WORKDIR}
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	doenvd ${FILESDIR}/75emul-linux-x86-base
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.5.3 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.5.3
deleted file mode 100644
index b911a23a78f4..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8961ba6470fed721eef3c25e6a41357 emul-linux-x86-baselibs-2.5.3.tar.bz2 5716962
-RMD160 7555c4b90d942117286295732a2a04f365540f5d emul-linux-x86-baselibs-2.5.3.tar.bz2 5716962
-SHA256 74949d60f4f793f9244621bddf7c2d0e9b35f8c8c383141aa945f434475821b9 emul-linux-x86-baselibs-2.5.3.tar.bz2 5716962