security bump. bug #63079 : A malicious formatted mp3/2 causes mpg123 to fail header checks, this may allow arbitrary code to be executed with the privilege of the user trying to play the mp3.

5 files changed, 166 insertions, 6 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 68013249ac95..1d3ccff240ff 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,14 @@
 # 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.46 2004/07/01 10:58:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.47 2004/09/14 21:34:20 solar Exp $
+
+*mpg123-0.59s-r4 (14 Sep 2004)
+
+  14 Sep 2004; <solar@gentoo.org> +files/mpg123-0.59s-CAN-2004-0805.patch,
+  +mpg123-0.59s-r4.ebuild:
+  security bump. bug #63079 : A malicious formatted mp3/2 causes mpg123 to fail
+  header checks, this may allow arbitrary code to be executed with the privilege
+  of the user trying to play the mp3.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   mpg123-0.59s-r2.ebuild, mpg123-0.59s-r3.ebuild:
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index f3e5ea50bd5c..7039a915009a 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,11 +1,14 @@
+MD5 829702e07fe83ab34f2508638631c884 mpg123-0.59s-r3.ebuild 3409
+MD5 7e799be8dd937ef75148664c21d96d75 mpg123-0.59s-r2.ebuild 1859
 MD5 554ff9a335bcf6dbf2e47949dd80d8c6 ChangeLog 7978
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 7e799be8dd937ef75148664c21d96d75 mpg123-0.59s-r2.ebuild 1859
-MD5 829702e07fe83ab34f2508638631c884 mpg123-0.59s-r3.ebuild 3409
+MD5 45be2b9a8750dd6acc7544baa1289705 mpg123-0.59s-r4.ebuild 3495
+MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
+MD5 1cb1d88ea5199e7b4ddca1a53f9db530 files/mpg123-0.59s-Makefile.patch 952
+MD5 fd09acbf52f3f87f5901e8d74a4227b0 files/mpg123-0.59s-CAN-2004-0805.patch 465
 MD5 7c93b2634ad65c23562f86f6e0b051e2 files/0.59s-generic.patch 532
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r2 67
 MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r3 67
-MD5 1cb1d88ea5199e7b4ddca1a53f9db530 files/mpg123-0.59s-Makefile.patch 952
-MD5 7d563752464873b664d7d242e9d06bbd files/mpg123-0.59s-amd64.patch 2680
-MD5 7130077c0324ee5b3cfd58e291976a0e files/mpg123-0.59s-heapfix.diff 337
+MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r4 67
 MD5 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
+MD5 7130077c0324ee5b3cfd58e291976a0e files/mpg123-0.59s-heapfix.diff 337
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r4 b/media-sound/mpg123/files/digest-mpg123-0.59s-r4
new file mode 100644
index 000000000000..88b7f6bafc5b
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r4
@@ -0,0 +1 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch b/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch
new file mode 100644
index 000000000000..5c457af500d6
--- /dev/null
+++ b/media-sound/mpg123/files/mpg123-0.59s-CAN-2004-0805.patch
@@ -0,0 +1,15 @@
+--- mpg123/layer2.c.orig	2004-09-14 17:15:48.000000000 -0400
++++ mpg123/layer2.c	2004-09-14 17:18:49.000000000 -0400
+@@ -287,6 +287,12 @@
+   fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
+      (fr->mode_ext<<2)+4 : fr->II_sblimit;
+ 
++  /* security fix. */
++  if (fr->jsbound > fr->II_sblimit) {
++    fprintf(stderr, "Truncating stereo boundary to sideband limit.\n");
++    fr->jsbound=fr->II_sblimit;
++  }
++
+   if(stereo == 1 || single == 3)
+     single = 0;
+ 
diff --git a/media-sound/mpg123/mpg123-0.59s-r4.ebuild b/media-sound/mpg123/mpg123-0.59s-r4.ebuild
new file mode 100644
index 000000000000..b781b4979d3b
--- /dev/null
+++ b/media-sound/mpg123/mpg123-0.59s-r4.ebuild
@@ -0,0 +1,133 @@
+# 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-r4.ebuild,v 1.1 2004/09/14 21:34:20 solar Exp $
+
+inherit eutils
+
+IUSE="mmx 3dnow esd nas oss"
+
+DESCRIPTION="Real Time mp3 player"
+HOMEPAGE="http://www.mpg123.de/"
+SRC_URI="http://www.mpg123.de/mpg123/${PN}-pre${PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ia64 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips"
+
+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"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die "unpack failed"
+
+	# Apply security fixes
+	epatch ${FILESDIR}/${P}-security.diff
+	epatch ${FILESDIR}/${P}-heapfix.diff
+
+	# Security patch. Bug $63079
+	epatch ${FILESDIR}/${PN}-0.59s-CAN-2004-0805.patch
+	# Add linux-generic target
+	epatch ${FILESDIR}/${PV}-generic.patch
+
+	# Always apply this patch, even though it's particularly for
+	# amd64.  It's good to understand the distinction between int and
+	# long: ANSI says that int should be 32-bits, long should be the
+	# native size of the CPU (usually the same as a pointer).
+	epatch ${FILESDIR}/${P}-amd64.patch
+
+	# Fix Makefile missing quotes
+	epatch ${FILESDIR}/${P}-Makefile.patch
+
+	# Don't force gcc since icc/ccc might be possible
+	sed -i -e "s|CC=gcc||" Makefile
+
+	# Fix a glitch in the x86 related section of the Makefile
+	sed -i -e "s:-m486::g" Makefile
+	# Fix a glitch in the ppc-related section of the Makefile
+	sed -i -e "s:-mcpu=ppc::" Makefile
+	# Make sure we use our CFLAGS
+	sed -i -e "s:-O2::g" Makefile
+}
+
+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
+		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"
+			;;
+		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)
+			# 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
+}