Revbump for security bug #133988. Stable amd64, sparc.

(Portage version: 2.1_rc4-r2)
 (Signed Manifest commit)

3 files changed, 23 insertions, 167 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d8c7ac9f933e..291359bea26c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,50 +1,51 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.59s-set-terminal-line-settings-once.patch 767 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa SHA1 c53183f5581e20cb267b77fe0e2f9da9db495051 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412 size 767
+AUX 0.59s-set-terminal-line-settings-once.patch 767 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa SHA1 c53183f5581e20cb267b77fe0e2f9da9db495051 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412
 MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767
 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa files/0.59s-set-terminal-line-settings-once.patch 767
 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412 files/0.59s-set-terminal-line-settings-once.patch 767
-AUX mpg123-0.59s-gmake-3.81.patch 7489 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 SHA1 e3e6604a85202bf572d317332ad8c3f8071d064d SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438 size 7489
+AUX mpg123-0.59s-gmake-3.81.patch 7489 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 SHA1 e3e6604a85202bf572d317332ad8c3f8071d064d SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438
 MD5 1afa21b956e382825339b141255014eb files/mpg123-0.59s-gmake-3.81.patch 7489
 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 files/mpg123-0.59s-gmake-3.81.patch 7489
 SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438 files/mpg123-0.59s-gmake-3.81.patch 7489
-AUX mpg123-osx.diff 11227 RMD160 572614f922a288d68f56b66a20d3a9264c92c895 SHA1 11d7c7df1624f35bb17a7d044c21f4924eb316e7 SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8 size 11227
+AUX mpg123-osx.diff 11227 RMD160 572614f922a288d68f56b66a20d3a9264c92c895 SHA1 11d7c7df1624f35bb17a7d044c21f4924eb316e7 SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8
 MD5 154058014fa42867a57faa57b857521a files/mpg123-osx.diff 11227
 RMD160 572614f922a288d68f56b66a20d3a9264c92c895 files/mpg123-osx.diff 11227
 SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8 files/mpg123-osx.diff 11227
-AUX mpg123-respectusercflags.patch 854 RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 SHA1 d9edc5cafcd27b81b110d958881666ab5e8f5b8c SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd size 854
+AUX mpg123-respectusercflags.patch 854 RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 SHA1 d9edc5cafcd27b81b110d958881666ab5e8f5b8c SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd
 MD5 083de56193d644c972c2cf5034aaa100 files/mpg123-respectusercflags.patch 854
 RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 files/mpg123-respectusercflags.patch 854
 SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd files/mpg123-respectusercflags.patch 854
-DIST mpg123-0.59s-gentoo-1.5.tar.bz2 7207 RMD160 75bc91d354e665c424afa1a3beab202f7a60441c SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 size 7207
-DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a size 244899
-EBUILD mpg123-0.59s-r10.ebuild 3408 RMD160 d5d5e10ca30b2ca204d5ea12b2794f6144bbb753 SHA1 2c1746232dd156979deea107566393f8eaa62a97 SHA256 1fc09ee792d335ba266b559288ba4d3ddcedb8521cb85c1baaa30a75812d9e67 size 3408
-MD5 021b53f3a169597cb551aee8531ba66f mpg123-0.59s-r10.ebuild 3408
-RMD160 d5d5e10ca30b2ca204d5ea12b2794f6144bbb753 mpg123-0.59s-r10.ebuild 3408
-SHA256 1fc09ee792d335ba266b559288ba4d3ddcedb8521cb85c1baaa30a75812d9e67 mpg123-0.59s-r10.ebuild 3408
-EBUILD mpg123-0.59s-r9.ebuild 3048 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 SHA1 3ff99127488fa3fbf4283d0d86d0651698d8c915 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 size 3048
+DIST mpg123-0.59s-gentoo-1.5.tar.bz2 7207 RMD160 75bc91d354e665c424afa1a3beab202f7a60441c SHA1 9631911b2a8c6331e494a1e26d03516b19634c62 SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116
+DIST mpg123-0.59s-gentoo-1.6.tar.bz2 7311 RMD160 393f10020bb15a813cc53570926be279d0e9b798 SHA1 9c74d4fac54be92c74faddcc7a8c52c9a8818291 SHA256 5ecbe31774b6fc83c3a73c06da8e75d419486b57339f41ac8e7848c5ede268e5
+DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA1 7e521785dc3a9015f4228f0a118bf36856884b67 SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a
+EBUILD mpg123-0.59s-r11.ebuild 3468 RMD160 0956781f1c62aeff919b0b4272d3c33daa9c4f8f SHA1 a38c19cd87f569c5e7b5f40649d8ffbd93065ddd SHA256 0ad7e28b17471a69bdab5333c9f09fd950ba77a264c9461d8477f67ee559419b
+MD5 fce7a81b39071f195c50ddf395c1d7f0 mpg123-0.59s-r11.ebuild 3468
+RMD160 0956781f1c62aeff919b0b4272d3c33daa9c4f8f mpg123-0.59s-r11.ebuild 3468
+SHA256 0ad7e28b17471a69bdab5333c9f09fd950ba77a264c9461d8477f67ee559419b mpg123-0.59s-r11.ebuild 3468
+EBUILD mpg123-0.59s-r9.ebuild 3048 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 SHA1 3ff99127488fa3fbf4283d0d86d0651698d8c915 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8
 MD5 15087675c7f8776c29b28cd3b42a9ed7 mpg123-0.59s-r9.ebuild 3048
 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 mpg123-0.59s-r9.ebuild 3048
 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 mpg123-0.59s-r9.ebuild 3048
-MISC ChangeLog 14677 RMD160 eadd4d04649e86aeff88559a67ecd41e6e885569 SHA1 712372dd48bb3a2fecd9595e4f185e59036bc070 SHA256 afb33fe3768cf111ab9e0f2e9d6aa104115e8073b9e257b099ce8ad2a3e7c838 size 14677
-MD5 ca44a53f4dcbc8881b4a478a5950853d ChangeLog 14677
-RMD160 eadd4d04649e86aeff88559a67ecd41e6e885569 ChangeLog 14677
-SHA256 afb33fe3768cf111ab9e0f2e9d6aa104115e8073b9e257b099ce8ad2a3e7c838 ChangeLog 14677
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b size 158
+MISC ChangeLog 14881 RMD160 81612b24c99b0acc31c202855642d59f63e8ca35 SHA1 dac1b7a3931a1184ad408cc829b7f59064f8edeb SHA256 beadbe87e80900bd064bf01d76982f1d8f3a1148e7a5bbc0cc0e0495c0657acc
+MD5 8f1a1def9f814d07f5994e0aca42fff4 ChangeLog 14881
+RMD160 81612b24c99b0acc31c202855642d59f63e8ca35 ChangeLog 14881
+SHA256 beadbe87e80900bd064bf01d76982f1d8f3a1148e7a5bbc0cc0e0495c0657acc ChangeLog 14881
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 c220bf3c48aa40e0d5fb9d34736446cf files/digest-mpg123-0.59s-r10 515
-RMD160 7019be2a37f82fb900d0590729b9004b555aef74 files/digest-mpg123-0.59s-r10 515
-SHA256 1d2ba827a81e29b4a69c92e515b3e963829396119a8239da7e194204efb849ae files/digest-mpg123-0.59s-r10 515
+MD5 02676129b8df4789a5ee6ed00ec5613e files/digest-mpg123-0.59s-r11 515
+RMD160 200d2168c630bda1f01f15c40287df2b0bc5cb09 files/digest-mpg123-0.59s-r11 515
+SHA256 cfd0bce1616a7d0382e3beda20702609a1d2de4dc5d9293ebd8c7ad2c614be26 files/digest-mpg123-0.59s-r11 515
 MD5 c220bf3c48aa40e0d5fb9d34736446cf files/digest-mpg123-0.59s-r9 515
 RMD160 7019be2a37f82fb900d0590729b9004b555aef74 files/digest-mpg123-0.59s-r9 515
 SHA256 1d2ba827a81e29b4a69c92e515b3e963829396119a8239da7e194204efb849ae files/digest-mpg123-0.59s-r9 515
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEYy5vAiZjviIA2XgRApACAJ9D6c/rVQ5I+DI2YzwNb97Pvv5/UgCbBI0g
-S1fMbgCt0S1m3bKocajy/CQ=
-=kA/J
+iD4DBQFEha/kOpjtAl+gMRURAm+oAJipk2Htb4l16pE88zF8FBS4uer3AJwKx6M+
+U1i9TN//2Mms85VwBdSLKw==
+=KVHo
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r10 b/media-sound/mpg123/files/digest-mpg123-0.59s-r10
deleted file mode 100644
index 98b641bcd984..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
-RMD160 75bc91d354e665c424afa1a3beab202f7a60441c mpg123-0.59s-gentoo-1.5.tar.bz2 7207
-SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 mpg123-0.59s-gentoo-1.5.tar.bz2 7207
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
-RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f mpg123-pre0.59s.tar.gz 244899
-SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild
deleted file mode 100644
index d6023d8a010c..000000000000
--- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.5 2006/05/11 12:30:33 flameeyes Exp $
-
-inherit eutils toolchain-funcs
-
-PATCH_VER=1.5
-S="${WORKDIR}/${PN}"
-
-DESCRIPTION="Real Time mp3 player"
-HOMEPAGE="http://www.mpg123.de/"
-SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="mmx 3dnow esd nas oss"
-
-RDEPEND="esd? ( media-sound/esound )
-	nas? ( media-libs/nas )"
-
-# alsa-1 b0rks and it's not a simple fix
-#	 alsa? ( media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}"
-
-PROVIDE="virtual/mpg123"
-
-PATCHDIR="${WORKDIR}/patches"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	EPATCH_SUFFIX="patch"
-	epatch ${PATCHDIR}
-
-	# Bug #70592; terminal line settings should only be set once; not everytime a new song starts
-	epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch
-
-	# Bug #87539; user CFLAGS are not respected on amd64
-	epatch ${FILESDIR}/${PN}-respectusercflags.patch
-
-	if use ppc-macos;
-	then
-		einfo "Patching for OSX build"
-		epatch ${FILESDIR}/${PN}-osx.diff
-	fi
-
-	sed -i "s:${PV}-mh4:${PVR}:" version.h
-
-	epatch "${FILESDIR}/${P}-gmake-3.81.patch"
-}
-
-src_compile() {
-	mkdir gentoo-bin
-
-	# The last one in $styles is the default
-	local styles
-
-	use nas && styles="${styles} -nas"
-	use oss && styles="${styles} -generic"
-	atype="linux"
-
-	case $ARCH in
-		ppc64)
-			use esd && styles="${styles} -ppc64-esd"
-			use oss && styles="${styles} -ppc64"
-
-			[[ -z "${styles}" ]] && styles="-ppc64"
-			;;
-		ppc)
-			if use ppc-macos; then
-				[[ -z "${styles}" ]] && styles="macos"
-				atype=""
-			else
-				use esd && styles="${styles} -ppc-esd"
-				use oss && styles="${styles} -ppc"
-
-				[[ -z "${styles}" ]] && styles="-ppc"
-			fi
-			;;
-		x86)
-			use esd && styles="${styles} -esd"
-			use esd && use 3dnow && styles="${styles} -3dnow-esd"
-			use oss && styles="${styles} -i486"
-			use oss && use mmx && styles="${styles} -mmx"
-			use oss && use 3dnow && styles="${styles} -3dnow"
-			# use alsa && styles="${styles} -alsa"
-			# use alsa && use 3dnow && styles="${styles} -3dnow-alsa"
-
-			[[ -z "${styles}" ]] && styles="-generic"
-			;;
-		sparc*)
-			use esd && styles="${styles} -sparc-esd"
-			styles="${styles} -sparc -generic"
-			;;
-		amd64)
-			use esd && styles="${styles} -x86_64-esd"
-			use oss && styles="${styles} -x86_64"
-			# use alsa && styles="${styles} -x86_64-alsa"
-
-			[[ -z "${styles}" ]] && styles="-x86_64"
-			;;
-		alpha)
-			use esd && styles="${styles} -alpha-esd"
-			use oss && styles="${styles} -alpha"
-			# use alsa && styles="${styles} -alpha-alsa"
-
-			[[ -z "${styles}" ]] && styles="-generic"
-			;;
-		mips|hppa|ia64)
-			# use alsa && styles="${styles} -mips-alsa"
-
-			[[ -z "${styles}" ]] && styles="-generic"
-			;;
-		*)
-			eerror "No support has been added for your architecture."
-			exit 1
-			;;
-	esac
-
-	for style in ${styles};
-	do
-		emake -j1 clean ${atype}${style} CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-		mv mpg123 gentoo-bin/mpg123${style}
-		[[ -L "gentoo-bin/mpg123" ]] && rm gentoo-bin/mpg123
-		ln -s mpg123${style} gentoo-bin/mpg123
-	done
-}
-
-src_install() {
-	dodir /usr
-	cp -R gentoo-bin ${D}/usr/bin
-	doman mpg123.1
-	dodoc BENCHMARKING BUGS CHANGES JUKEBOX README* TODO
-}