Fix for security #217603.

(Portage version: 2.1.5_rc3)

3 files changed, 64 insertions, 1 deletions

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 5771f8b14e1f..0371abb3f334 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.72 2008/04/08 17:11:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.73 2008/04/14 13:53:58 drac Exp $
+
+*vorbis-tools-1.2.0-r1 (14 Apr 2008)
+
+  14 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/vorbis-tools-1.2.0-sec.patch, +vorbis-tools-1.2.0-r1.ebuild:
+  Fix for security #217603.
 
   08 Apr 2008; Raúl Porcel <armin76@gentoo.org> vorbis-tools-1.2.0.ebuild:
   ia64/sparc stable wrt #215022
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-sec.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-sec.patch
new file mode 100644
index 000000000000..75aecfcdfc04
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-sec.patch
@@ -0,0 +1,12 @@
+diff -ur vorbis-tools-1.2.0.orig/ogg123/speex_format.c vorbis-tools-1.2.0/ogg123/speex_format.c
+--- vorbis-tools-1.2.0.orig/ogg123/speex_format.c	2008-03-03 07:37:26.000000000 +0200
++++ vorbis-tools-1.2.0/ogg123/speex_format.c	2008-04-14 16:47:22.000000000 +0300
+@@ -475,7 +475,7 @@
+            cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
+      return NULL;
+    }
+-   if ((*header)->mode >= SPEEX_NB_MODES) {
++   if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
+      cb->printf_error(callback_arg, ERROR, 
+ 		      _("Mode number %d does not (any longer) exist in this version"),
+ 	      (*header)->mode);
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..da9e13a77517
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild,v 1.1 2008/04/14 13:53:58 drac Exp $
+
+EAPI=1
+
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="flac nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.1
+	flac? ( media-libs/flac )
+	ogg123? ( media-libs/libao net-misc/curl )
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-with-args.patch \
+		"${FILESDIR}"/${P}-sec.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf --docdir=/usr/share/doc/${PF} --enable-vcut \
+		$(use_enable nls) $(use_enable ogg123) \
+		$(use_with flac) $(use_with speex)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS CHANGES README
+	prepalldocs
+}