6 files changed, 92 insertions, 17 deletions
diff --git a/media-sound/grip/ChangeLog b/media-sound/grip/ChangeLog
index 09771a556287..1a352002d879 100644
--- a/media-sound/grip/ChangeLog
+++ b/media-sound/grip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/grip
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.50 2005/03/02 20:27:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.51 2005/03/13 01:04:44 luckyduck Exp $
+
+*grip-3.3.0 (13 Mar 2005)
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/3.3.0-crashfix.patch, +grip-3.3.0.ebuild:
+  new upstream version, fixes #84223. added a patch to fix a buffer overflow,
+  see #84704
 
 *grip-3.2.0-r1 (02 Mar 2005)
 
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 97ccb60a000a..984919d6e21c 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
-MD5 7f7bff6c046acb0b61bae83f53358638 ChangeLog 7462
-MD5 2d1bee99af4545c43a871dbf864aa3b1 grip-3.2.0-r1.ebuild 1200
 MD5 cae67f2a2c182bd02b37eb070808f7ba grip-3.2.0.ebuild 1147
+MD5 2d1bee99af4545c43a871dbf864aa3b1 grip-3.3.0.ebuild 1200
+MD5 2d1bee99af4545c43a871dbf864aa3b1 grip-3.2.0-r1.ebuild 1200
+MD5 7f7bff6c046acb0b61bae83f53358638 ChangeLog 7462
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 MD5 994c1c45aa0d6d352db1b5dbd94b9248 files/grip-3.2.0-proxy.patch 1291
-MD5 a96f76d77127d40bf0b43ba550a6f441 files/digest-grip-3.2.0-r1 62
 MD5 a96f76d77127d40bf0b43ba550a6f441 files/digest-grip-3.2.0 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCJiI2p5vW4rUFj5oRAvRGAJ0UsIoex5kAqcOH8LLKIPoK0hNmZwCffCi1
-I9gMeEHn7FtoFU2XOC+aC/E=
-=dC85
------END PGP SIGNATURE-----
+MD5 2ec6b15aa9b163f9c0a79e80038f987e files/digest-grip-3.3.0 62
+MD5 a96f76d77127d40bf0b43ba550a6f441 files/digest-grip-3.2.0-r1 62
diff --git a/media-sound/grip/files/3.3.0-crashfix.patch b/media-sound/grip/files/3.3.0-crashfix.patch
new file mode 100644
index 000000000000..49ebac953a0f
--- /dev/null
+++ b/media-sound/grip/files/3.3.0-crashfix.patch
@@ -0,0 +1,20 @@
+--- grip-3.3.0/src/discdb.c.orig	2005-03-09 00:02:00.230558368 -0500
++++ grip-3.3.0/src/discdb.c	2005-03-09 00:24:28.317617984 -0500
+@@ -319,7 +319,7 @@
+     query->query_match=MATCH_EXACT;
+     query->query_matches=0;
+ 
+-    while((inbuffer=DiscDBReadLine(&dataptr))) {
++    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
+       query->query_list[query->query_matches].list_genre=
+ 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
+       
+@@ -339,7 +339,7 @@
+     query->query_match=MATCH_INEXACT;
+     query->query_matches=0;
+ 
+-    while((inbuffer=DiscDBReadLine(&dataptr))) {
++    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
+       query->query_list[query->query_matches].list_genre=
+ 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
+       
diff --git a/media-sound/grip/files/digest-grip-3.3.0 b/media-sound/grip/files/digest-grip-3.3.0
new file mode 100644
index 000000000000..abb72d5694d4
--- /dev/null
+++ b/media-sound/grip/files/digest-grip-3.3.0
@@ -0,0 +1 @@
+MD5 a1113ee5462363f94616c0c936653811 grip-3.3.0.tar.gz 795570
diff --git a/media-sound/grip/grip-3.2.0.ebuild b/media-sound/grip/grip-3.2.0.ebuild
index 1625f30c8bf0..967212d48c11 100644
--- a/media-sound/grip/grip-3.2.0.ebuild
+++ b/media-sound/grip/grip-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.2.0.ebuild,v 1.14 2004/12/16 09:18:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.2.0.ebuild,v 1.15 2005/03/13 01:04:44 luckyduck Exp $
 
 inherit gnuconfig flag-o-matic
 
diff --git a/media-sound/grip/grip-3.3.0.ebuild b/media-sound/grip/grip-3.3.0.ebuild
new file mode 100644
index 000000000000..7c162b40bf21
--- /dev/null
+++ b/media-sound/grip/grip-3.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.3.0.ebuild,v 1.1 2005/03/13 01:04:44 luckyduck Exp $
+
+inherit gnuconfig flag-o-matic eutils
+
+IUSE="nls oggvorbis"
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper."
+HOMEPAGE="http://www.nostatic.org/grip"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~ppc64"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	x11-libs/vte
+	=sys-libs/db-1*
+	media-sound/lame
+	media-sound/cdparanoia
+	>=media-libs/id3lib-3.8.3
+	>=gnome-base/libgnomeui-2.2.0
+	>=gnome-base/orbit-2
+	gnome-base/libghttp
+	net-misc/curl
+	oggvorbis? ( media-sound/vorbis-tools )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# see #84704
+	epatch ${FILESDIR}/${PV}-crashfix.patch
+
+	gnuconfig_update
+}
+
+src_compile() {
+	# Bug #69536
+	use x86 && append-flags "-mno-sse"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS CREDITS ChangeLog README TODO
+}