Security fix for bug #74692.

4 files changed, 135 insertions, 5 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 6d5179737a22..b67d5f4ae678 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.72 2004/11/23 11:02:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.73 2004/12/19 02:01:14 eradicator Exp $
+
+*mpg123-0.59s-r8 (18 Dec 2004)
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +mpg123-0.59s-r8.ebuild:
+  Security fix for bug #74692.
 
   23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mpg123-0.59s-r7.ebuild:
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index fd73721bf48a..c0d9787a1b4b 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e88eaf4fb75fdfa054e73579c74bedc ChangeLog 11462
+MD5 e2bf5b2de8f4176e1b873c011faa50ab ChangeLog 11610
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 14be74134249c6913685c964bcb38265 mpg123-0.59s-r7.ebuild 2882
 MD5 dbf789b6af2a514be860a64a64ee1667 mpg123-0.59s-r6.ebuild 2871
+MD5 b846db05d1d8e3b883b72fb81528fb1d mpg123-0.59s-r8.ebuild 2883
 MD5 3a48e002f75bdd43f080f34013db8517 files/digest-mpg123-0.59s-r7 141
+MD5 12a16d9aafab05a0ad9eace12cf3596a files/digest-mpg123-0.59s-r8 141
 MD5 792c4eea53fd8d57facf635a93c11d5d files/digest-mpg123-0.59s-r6 141
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBoxivArHZZzCEUG0RAg53AJ9Toz/6v8L4f6u8tIa0AjFVUuR6RQCfcYi2
-ue78k3Alwt+7PjV/rCLwErQ=
-=n4Uz
+iD8DBQFBxOD1ArHZZzCEUG0RAiIKAJ0QXLqnY+pBGsVAlYm54bow015KpwCbBJ4M
+cnmK2MWy/e3JtWDLVbMGDYU=
+=No7B
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r8 b/media-sound/mpg123/files/digest-mpg123-0.59s-r8
new file mode 100644
index 000000000000..f3f5f0ccbc03
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r8
@@ -0,0 +1,2 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+MD5 ad67f7782c1735b8c3ce1e48175eaf2d mpg123-0.59s-gentoo-1.3.tar.bz2 6986
diff --git a/media-sound/mpg123/mpg123-0.59s-r8.ebuild b/media-sound/mpg123/mpg123-0.59s-r8.ebuild
new file mode 100644
index 000000000000..52ace4bcb04e
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59s-r8.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r8.ebuild,v 1.1 2004/12/19 02:01:14 eradicator Exp $
+
+inherit eutils
+
+PATCH_VER=1.3
+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
+	 http://dev.gentoo.org/~eradicator/${PN}/${P}-gentoo-${PATCH_VER}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+IUSE="mmx 3dnow esd nas oss"
+
+RDEPEND="virtual/libc
+	 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}
+	>=sys-apps/sed-4"
+
+PROVIDE="virtual/mpg123"
+
+PATCHDIR="${WORKDIR}/patches"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	sed -i "s:${PV}-mh4:${PVR}:" version.h
+}
+
+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"
+
+	case $ARCH in
+		ppc64)
+			use esd && styles="${styles} -ppc64-esd"
+			use oss && styles="${styles} -ppc64"
+
+			[ -z "${styles}" ] && styles="-ppc64"
+			;;
+		ppc)
+			use esd && styles="${styles} -ppc-esd"
+			use oss && styles="${styles} -ppc"
+
+			[ -z "${styles}" ] && styles="-ppc"
+			;;
+		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
+		make clean linux${style} CFLAGS="${CFLAGS}" || 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 -dR gentoo-bin ${D}/usr/bin
+	doman mpg123.1
+	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
+}