From 8c83540ddd8faa8c6c4a14ed6cd3bee703cc81bf Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 6 Jun 2006 16:39:45 +0000 Subject: [PATCH] Revbump for security bug #133988. Stable amd64, sparc. Package-Manager: portage-2.1_rc4-r2 --- media-sound/mpg123/ChangeLog | 8 +- .../mpg123/files/digest-mpg123-0.59s-r11 | 6 + media-sound/mpg123/mpg123-0.59s-r11.ebuild | 141 ++++++++++++++++++ 3 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 media-sound/mpg123/files/digest-mpg123-0.59s-r11 create mode 100644 media-sound/mpg123/mpg123-0.59s-r11.ebuild diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 2d3ca1725c2a..be92cd32941e 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.94 2006/05/11 12:30:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.95 2006/06/06 16:39:45 eradicator Exp $ + +*mpg123-0.59s-r11 (06 Jun 2006) + + 06 Jun 2006; Jeremy Huddleston + -mpg123-0.59s-r10.ebuild, +mpg123-0.59s-r11.ebuild: + Revbump for security bug #133988. Stable amd64, sparc. 11 May 2006; Diego Pettenò +files/mpg123-0.59s-gmake-3.81.patch, mpg123-0.59s-r10.ebuild: diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r11 b/media-sound/mpg123/files/digest-mpg123-0.59s-r11 new file mode 100644 index 000000000000..a1455da8b788 --- /dev/null +++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r11 @@ -0,0 +1,6 @@ +MD5 029251008ab263acdcca58f90ea4d02e mpg123-0.59s-gentoo-1.6.tar.bz2 7311 +RMD160 393f10020bb15a813cc53570926be279d0e9b798 mpg123-0.59s-gentoo-1.6.tar.bz2 7311 +SHA256 5ecbe31774b6fc83c3a73c06da8e75d419486b57339f41ac8e7848c5ede268e5 mpg123-0.59s-gentoo-1.6.tar.bz2 7311 +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-r11.ebuild b/media-sound/mpg123/mpg123-0.59s-r11.ebuild new file mode 100644 index 000000000000..6fd7f2132228 --- /dev/null +++ b/media-sound/mpg123/mpg123-0.59s-r11.ebuild @@ -0,0 +1,141 @@ +# 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-r11.ebuild,v 1.1 2006/06/06 16:39:45 eradicator Exp $ + +inherit eutils toolchain-funcs + +PATCH_VER="1.6" +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="-*" # Waiting for patch tarball to hit mirrors +#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 +} -- 2.26.2