Add APE crash fix, bug 70754

5 files changed, 81 insertions, 12 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 76ee2caf77f4..a08e67c1bc4a 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/easytag
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.49 2004/12/04 17:58:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.50 2004/12/30 22:24:08 dsd Exp $
+
+*easytag-1.0-r1 (30 Dec 2004)
+
+  30 Dec 2004; Daniel Drake <dsd@gentoo.org> +files/easytag-ape-fix.patch,
+  +easytag-1.0-r1.ebuild:
+  Add APE crash fix, bug 70754
 
   04 Dec 2004; Tom Martin <slarti@gentoo.org> easytag-1.0.ebuild:
   Stable on amd64.
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 46d88ed10f34..0f7846a53134 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 19a0743aab02672173a1b5fd097a4284 easytag-1.0-r1.ebuild 1122
 MD5 339b5db4ce98524cca1c9f07548e3fd3 easytag-1.99.2.ebuild 1355
 MD5 838cf221d0284ac2bf87053101a326d8 easytag-1.0.ebuild 1208
 MD5 59f7db49916260858c6d8155b5cab07c easytag-0.30d.ebuild 1590
 MD5 cceab153d63f3e9fb728299fcf16b834 easytag-1.99.1.ebuild 1351
 MD5 4eb47875043bdfcfd4d6933a26a6192b easytag-0.31.ebuild 1676
-MD5 3ae61dcbf0bb93cda21eac850930d7c0 ChangeLog 8881
+MD5 b0794a94d29bc53c9d420633902a72e4 ChangeLog 9045
 MD5 79119f45cab878d56945e1c66e22550c metadata.xml 402
 MD5 48e87a785093c34f6afe264fff4a42f0 easytag-0.31-r2.ebuild 1505
 MD5 25444660393147e2d06a5f1378a89ec4 files/easytag-0.31_pre2-gcc2.patch 2763
 MD5 bed011d8cb53800acb92633c0341a526 files/digest-easytag-1.0 65
 MD5 0dc3e112a9f2e10861c7608a584f9423 files/digest-easytag-0.30d 349
+MD5 bed011d8cb53800acb92633c0341a526 files/digest-easytag-1.0-r1 65
 MD5 6adeec14f325dc4f876c9893498412ac files/digest-easytag-1.99.1 68
 MD5 0d25821074d4a2c7097aba4513b54f7b files/digest-easytag-1.99.2 68
 MD5 a767d8be7a9435927acebb4b1ca9df4c files/easytag-0.30.2-fix-configure.patch 648
 MD5 d81b9befdf36f2e2bdc8ef1e26d450cb files/digest-easytag-0.31 138
 MD5 eaf43037ba8c09b632e3dd43420700e3 files/digest-easytag-0.31-r2 154
 MD5 5630250004c7a1257a3a170ab8bb749f files/easytag-0.30.2-gcc2.patch 11999
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBsfs3CHk4+ZoBpvsRAkvzAJ92XqB14erJkNYQ0duwYjh7ea9VaACdHdic
-ExVCUiXcgKDpiCnhaZzD+8U=
-=7692
------END PGP SIGNATURE-----
+MD5 86777318233983d77338c33ab4bf266b files/easytag-ape-fix.patch 684
diff --git a/media-sound/easytag/easytag-1.0-r1.ebuild b/media-sound/easytag/easytag-1.0-r1.ebuild
new file mode 100644
index 000000000000..d0c79398e777
--- /dev/null
+++ b/media-sound/easytag/easytag-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.0-r1.ebuild,v 1.1 2004/12/30 22:24:08 dsd Exp $
+
+inherit eutils gnuconfig
+
+IUSE="nls oggvorbis flac"
+
+DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor"
+HOMEPAGE="http://easytag.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+RDEPEND=">=media-libs/id3lib-3.8.2
+	=x11-libs/gtk+-1.2*
+	flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/easytag-ape-fix.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable oggvorbis ogg) \
+		$(use_enable nls) \
+		$(use_enable flac) \
+		|| die "econf failed"
+	emake || die
+}
+
+src_install() {
+	einstall \
+		sysdir=${D}/usr/share/applets/Multimedia \
+		GNOME_SYSCONFDIR=${D}/etc \
+		|| die
+
+	dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE
+}
+
+pkg_postinst() {
+	einfo "This version of EasyTAG is GTK+ 1.2 based only. GTK+ 2.4 support is"
+	einfo "available in the easytag-1.99.x releases (to become 2.0)."
+}
diff --git a/media-sound/easytag/files/digest-easytag-1.0-r1 b/media-sound/easytag/files/digest-easytag-1.0-r1
new file mode 100644
index 000000000000..681725911a7a
--- /dev/null
+++ b/media-sound/easytag/files/digest-easytag-1.0-r1
@@ -0,0 +1 @@
+MD5 2edda10af47a52c7f74c77fa0b45cd38 easytag-1.0.tar.bz2 1068173
diff --git a/media-sound/easytag/files/easytag-ape-fix.patch b/media-sound/easytag/files/easytag-ape-fix.patch
new file mode 100644
index 000000000000..459160b9e1ae
--- /dev/null
+++ b/media-sound/easytag/files/easytag-ape-fix.patch
@@ -0,0 +1,20 @@
+For some odd APE files, monkey_stringify can be called with a profile value of 0.
+This causes us to return Names[-1] which is undefined behaviour. Here's a safe fallback
+which at least fixes the crash.
+
+Applies against easytag-1.0 and easytag-1.99.2
+
+--- easytag-1.0/src/libapetag/info_mac.c.orig	2004-12-29 00:57:23.234434264 +0000
++++ easytag-1.0/src/libapetag/info_mac.c	2004-12-29 01:03:58.440353832 +0000
+@@ -63,7 +63,10 @@
+         "Fast", "Normal", "High", "Extra-High", "Insane"
+     };
+     unsigned int profile2 = profile/1000;
+-    
++
++    if (profile2 == 0)
++        return na;
++
+     return (profile2 >= sizeof (Names) / sizeof (*Names)) ? na : Names[(profile2-1)];
+ }
+