Add sanity checks & fix a cast, based on patches by Ben Bennett <sink@limey.net> in bug #85100.

(Portage version: 2.0.51.22-r2)

6 files changed, 83 insertions, 4 deletions

diff --git a/media-sound/mp3info/ChangeLog b/media-sound/mp3info/ChangeLog
index 2f75031a0630..085e214c20f0 100644
--- a/media-sound/mp3info/ChangeLog
+++ b/media-sound/mp3info/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp3info
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.12 2004/12/17 21:32:37 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.13 2005/08/13 13:06:12 chainsaw Exp $
+
+*mp3info-0.8.4-r2 (13 Aug 2005)
+
+  13 Aug 2005; Tony Vroon <chainsaw@gentoo.org> +files/cast.patch,
+  +files/sanity-checks.patch, +mp3info-0.8.4-r2.ebuild:
+  Add sanity checks & fix a cast, based on patches by Ben Bennett
+  <sink@limey.net> in bug #85100.
 
   17 Dec 2004; Markus Rothe <corsair@gentoo.org> mp3info-0.8.4-r1.ebuild:
   Stable on ppc64
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 9595af114831..109af03323b6 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -1,5 +1,9 @@
-MD5 4e231f4022629df39c5e494c77d56f33 ChangeLog 1596
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 4e231f4022629df39c5e494c77d56f33 ChangeLog 1596
+MD5 511e7c2cf1d0c59cf11a27f5f041b74e mp3info-0.8.4-r2.ebuild 943
 MD5 29fb84e69c0e613ab909159178ea537b mp3info-0.8.4-r1.ebuild 872
-MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r1 61
+MD5 af979b2c5ed36da41c4ed98733656f6e files/sanity-checks.patch 521
 MD5 2be66b044256d5db41bb23da1d53b133 files/gcc.patch 825
+MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r2 61
+MD5 40488e8b1aeb32428d9ce6630e8dcc3b files/cast.patch 643
+MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r1 61
diff --git a/media-sound/mp3info/files/cast.patch b/media-sound/mp3info/files/cast.patch
new file mode 100644
index 000000000000..fc8564d3ba6f
--- /dev/null
+++ b/media-sound/mp3info/files/cast.patch
@@ -0,0 +1,11 @@
+--- mp3info-0.8.4/textfunc.c.orig	2005-08-13 13:54:04.000000000 +0100
++++ mp3info-0.8.4/textfunc.c	2005-08-13 13:55:44.000000000 +0100
+@@ -235,7 +235,7 @@
+ 		if(*code) {
+ 			modlen=code-percent+1;
+ 			if(modlen > 1000) {
+-				printf("Format modifier beginning at position %d too long!\n",percent-format);
++				printf("Format modifier beginning at position %d too long!\n",(int)(percent-format));
+ 				exit(5);
+ 			}
+ 			strncpy(mod,percent,modlen);
diff --git a/media-sound/mp3info/files/digest-mp3info-0.8.4-r2 b/media-sound/mp3info/files/digest-mp3info-0.8.4-r2
new file mode 100644
index 000000000000..59a50f2f672a
--- /dev/null
+++ b/media-sound/mp3info/files/digest-mp3info-0.8.4-r2
@@ -0,0 +1 @@
+MD5 879d0ced8ede5ec9fbaff4813851ea3f mp3info-0.8.4.tgz 38773
diff --git a/media-sound/mp3info/files/sanity-checks.patch b/media-sound/mp3info/files/sanity-checks.patch
new file mode 100644
index 000000000000..0ed73597434f
--- /dev/null
+++ b/media-sound/mp3info/files/sanity-checks.patch
@@ -0,0 +1,14 @@
+--- mp3info-0.8.4/mp3tech.c.orig	2005-08-13 13:56:43.000000000 +0100
++++ mp3info-0.8.4/mp3tech.c	2005-08-13 13:57:31.000000000 +0100
+@@ -244,6 +244,11 @@
+     header->original=(buffer[3] >> 2) & 0x1;
+     header->emphasis=(buffer[3]) & 0x3;
+     
++    /* Final sanity checks: bitrate can not be 1111, frequency can not be 11 */
++    if (header->bitrate == 0x0F || header->freq == 0x3) {
++      return 0;
++    }
++
+     return ((fl=frame_length(header)) >= MIN_FRAME_SIZE ? fl : 0); 
+ }
+ 
diff --git a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
new file mode 100644
index 000000000000..a1d10b3ef359
--- /dev/null
+++ b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.1 2005/08/13 13:06:12 chainsaw Exp $
+
+inherit eutils
+
+IUSE="gtk"
+
+DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
+SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
+HOMEPAGE="http://ibiblio.org/mp3info/"
+
+DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	sed -i "s:-O2:${CFLAGS}:" Makefile
+	epatch ${FILESDIR}/gcc.patch
+	epatch ${FILESDIR}/cast.patch
+	epatch ${FILESDIR}/sanity-checks.patch
+}
+
+src_compile() {
+	emake mp3info || die
+	if use gtk; then
+		emake gmp3info || die "gtk mp3info failed"
+	fi
+}
+
+src_install() {
+	dobin mp3info
+	use gtk && dobin gmp3info
+
+	dodoc ChangeLog INSTALL LICENSE README
+	doman mp3info.1
+}