Revbump for security bug #68343. Moved patches out of files and onto mirrors. Cleaned up patches.

7 files changed, 28 insertions, 116 deletions

diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index e46808f98afb..f14b66d1d7b8 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,13 @@
 # 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.54 2004/10/19 03:06:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.55 2004/10/21 20:35:57 eradicator Exp $
+
+*mpg123-0.59s-r5 (21 Oct 2004)
+
+  21 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -mpg123-0.59s-r2.ebuild, -mpg123-0.59s-r3.ebuild, +mpg123-0.59s-r5.ebuild:
+  Revbump for security bug #68343. Moved patches out of files and onto
+  mirrors. Cleaned up patches.
 
   18 Oct 2004; Tom Gall <tgall@gentoo.org> mpg123-0.59s-r4.ebuild,
   +files/mpg123-0.59s-ppc64.patch:
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index ad580e4c13af..792277af8eb0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,15 +1,13 @@
 MD5 9ed88107fc101a9e1d50da5d5ef6f952 ChangeLog 9034
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 7e799be8dd937ef75148664c21d96d75 mpg123-0.59s-r2.ebuild 1859
-MD5 829702e07fe83ab34f2508638631c884 mpg123-0.59s-r3.ebuild 3409
 MD5 752aab82c466fe5ae4e5b897cf6f02de mpg123-0.59s-r4.ebuild 3570
+MD5 0443199c8f1ad4ba78c0882ae410f8e1 mpg123-0.59s-r5.ebuild 2739
 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 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r4 67
-MD5 fd09acbf52f3f87f5901e8d74a4227b0 files/mpg123-0.59s-CAN-2004-0805.patch 465
+MD5 dc35926c696e03f484c17155e1bd5bc0 files/digest-mpg123-0.59s-r5 141
 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 a80297615f6515bb5631c177511c989a files/mpg123-0.59s-security.diff 1075
+MD5 78e5e78b54876dbecebb45acec8fb449 files/digest-mpg123-0.59s-r4 67
+MD5 fd09acbf52f3f87f5901e8d74a4227b0 files/mpg123-0.59s-CAN-2004-0805.patch 465
 MD5 d403232cad9d481f51c07e34bcc9b4b6 files/mpg123-0.59s-ppc64.patch 1441
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r2 b/media-sound/mpg123/files/digest-mpg123-0.59s-r2
deleted file mode 100644
index 88b7f6bafc5b..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r3 b/media-sound/mpg123/files/digest-mpg123-0.59s-r3
deleted file mode 100644
index 88b7f6bafc5b..000000000000
--- a/media-sound/mpg123/files/digest-mpg123-0.59s-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r5 b/media-sound/mpg123/files/digest-mpg123-0.59s-r5
new file mode 100644
index 000000000000..18e821bead06
--- /dev/null
+++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r5
@@ -0,0 +1,2 @@
+MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899
+MD5 28de2ea373747d2770d8192261dde485 mpg123-0.59s-gentoo-1.0.tar.bz2 4701
diff --git a/media-sound/mpg123/mpg123-0.59s-r2.ebuild b/media-sound/mpg123/mpg123-0.59s-r2.ebuild
deleted file mode 100644
index 71be13a12260..000000000000
--- a/media-sound/mpg123/mpg123-0.59s-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-r2.ebuild,v 1.9 2004/07/01 10:58:52 eradicator Exp $
-
-inherit eutils
-
-IUSE="mmx"
-
-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"
-
-DEPEND="virtual/libc
-	>=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
-
-	# 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}/mpg123-0.59s-amd64.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() {
-	local style=""
-
-	case $ARCH in
-		ppc)
-			style="-ppc";;
-		x86)
-			use mmx && style="-mmx" || style="-i486";;
-		sparc*)
-			style="-sparc";;
-		amd64|x86_64)
-			style="-x86_64";;
-		alpha)
-			style="-alpha";;
-		arm|hppa|ia64)
-			style="-generic";;
-	esac
-
-	make linux${style} CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	into /usr
-	dobin mpg123
-	doman mpg123.1
-	dodoc BENCHMARKING BUGS CHANGES COPYING JUKEBOX README* TODO
-}
diff --git a/media-sound/mpg123/mpg123-0.59s-r3.ebuild b/media-sound/mpg123/mpg123-0.59s-r5.ebuild
index 7b041c345eb3..3e7137601c87 100644
--- a/media-sound/mpg123/mpg123-0.59s-r3.ebuild
+++ b/media-sound/mpg123/mpg123-0.59s-r5.ebuild
@@ -1,18 +1,22 @@
 # 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-r3.ebuild,v 1.12 2004/09/02 18:13:04 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r5.ebuild,v 1.1 2004/10/21 20:35:57 eradicator Exp $
+
+IUSE="mmx 3dnow esd nas oss"
 
 inherit eutils
 
-IUSE="mmx 3dnow esd nas oss"
+PATCH_VER=1.0
+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"
+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="x86 ~ia64 ~amd64 ppc sparc ~alpha hppa ~mips"
+KEYWORDS="x86 ~ia64 amd64 ~ppc sparc ~alpha ~hppa ~mips ~ppc64"
 
 RDEPEND="virtual/libc
 	 esd? ( media-sound/esound )
@@ -26,36 +30,15 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/mpg123"
 
-S=${WORKDIR}/${PN}
+PATCHDIR="${WORKDIR}/patches"
+#PATCHDIR="/home/jeremy/gentoo/mpg123/patches"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die "unpack failed"
-
-	# Apply security fixes
-	epatch ${FILESDIR}/${P}-security.diff
-	epatch ${FILESDIR}/${P}-heapfix.diff
-
-	# 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
+	unpack ${A}
 
-	# 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
+	cd ${S}
+        EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
 }
 
 src_compile() {