From 117800d6bcd3181df43e30835b790759737f287a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 25 Oct 2004 21:34:22 +0000 Subject: [PATCH] More security bugfixes. See bug #68343. --- media-sound/mpg123/ChangeLog | 8 +- media-sound/mpg123/Manifest | 14 ++- .../mpg123/files/digest-mpg123-0.59s-r6 | 2 + media-sound/mpg123/mpg123-0.59s-r6.ebuild | 115 ++++++++++++++++++ 4 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 media-sound/mpg123/files/digest-mpg123-0.59s-r6 create mode 100644 media-sound/mpg123/mpg123-0.59s-r6.ebuild diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 6e68e9a610d5..abde2591ad03 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.59 2004/10/22 21:34:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.60 2004/10/25 21:34:22 eradicator Exp $ + +*mpg123-0.59s-r6 (25 Oct 2004) + + 25 Oct 2004; Jeremy Huddleston + +mpg123-0.59s-r6.ebuild: + More security bugfixes. See bug #68343. 24 Oct 2004; Aron Griffis mpg123-0.59s-r5.ebuild: stable on ia64 diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index a4ba974f9642..dfee5d5ad02b 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,9 +1,14 @@ -MD5 9a9b91ac4fb0b8c7cadbe1631a3446a5 ChangeLog 9718 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 3d8e0af436ec19f2b073d1766904bf43 ChangeLog 9880 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 466182e88b369194edd30bc1609d56fa mpg123-0.59s-r5.ebuild 2689 +MD5 34d5abf71fbed3ad75f26f391d59af21 mpg123-0.59s-r6.ebuild 2736 MD5 752aab82c466fe5ae4e5b897cf6f02de mpg123-0.59s-r4.ebuild 3570 MD5 7c93b2634ad65c23562f86f6e0b051e2 files/0.59s-generic.patch 532 MD5 54a7083fb4a8d262a812a4828f6142c0 files/digest-mpg123-0.59s-r5 141 +MD5 a45142d16be06a375bc698cc13c42099 files/digest-mpg123-0.59s-r6 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 @@ -11,3 +16,10 @@ 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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBfXGSArHZZzCEUG0RAmEQAJ9F70DlsYchRI8hLDZHL1U6ENp6rACcCYDN +NoX1xzkqlF5v+3azPfMomyk= +=DbD/ +-----END PGP SIGNATURE----- diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r6 b/media-sound/mpg123/files/digest-mpg123-0.59s-r6 new file mode 100644 index 000000000000..69879600b421 --- /dev/null +++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r6 @@ -0,0 +1,2 @@ +MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 +MD5 b98bd5505e0acbba17acb5dd1ef5d351 mpg123-0.59s-gentoo-1.1.tar.bz2 6525 diff --git a/media-sound/mpg123/mpg123-0.59s-r6.ebuild b/media-sound/mpg123/mpg123-0.59s-r6.ebuild new file mode 100644 index 000000000000..f3cccb7def4e --- /dev/null +++ b/media-sound/mpg123/mpg123-0.59s-r6.ebuild @@ -0,0 +1,115 @@ +# 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-r6.ebuild,v 1.1 2004/10/25 21:34:22 eradicator Exp $ + +IUSE="mmx 3dnow esd nas oss" + +inherit eutils + +PATCH_VER=1.1 +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" + +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 + 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|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 +} -- 2.26.2