Fix hanging in mpg123 input when id3tag is corrupt. See bug #66596.

4 files changed, 14 insertions, 15 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 3284905c85ef..87d459053012 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.141 2004/10/04 05:08:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.142 2004/10/08 21:55:33 eradicator Exp $
+
+*xmms-1.2.10-r7 (08 Oct 2004)
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -xmms-1.2.10-r6.ebuild, +xmms-1.2.10-r7.ebuild:
+  Fix hanging in mpg123 input when id3tag is corrupt.  See bug #66596.
 
   03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   xmms-1.2.10-r6.ebuild:
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index c042f27255b1..41c160f45b28 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b13ac759f46b7261925a3b878129bd1 ChangeLog 25742
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
+MD5 6b13ac759f46b7261925a3b878129bd1 ChangeLog 25742
 MD5 4fe6356a3676f885fdfa1210dac84978 xmms-1.2.10-r6.ebuild 6512
 MD5 33180edc5b30f54debff69322fae465a xmms-1.2.8-r4.ebuild 5271
+MD5 2fc81f85af320890f3688491b695bde1 xmms-1.2.10-r7.ebuild 6560
 MD5 e8f74b9f98c9a742f9d9e7559227ef84 xmms-1.2.10-r5.ebuild 5386
+MD5 ca3b76022df666be460464f500138ff8 files/digest-xmms-1.2.10-r7 219
 MD5 0836e00898c09ebadeb438392c650e82 files/digest-xmms-1.2.10-r6 219
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
 MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYNr/ArHZZzCEUG0RAlYLAJ4gwYdqivBkhUT1UZ8tDfZDiA+OEQCfch3h
-halJLkPFBN6uZeNp54pxHz0=
-=+DHF
------END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r6 b/media-sound/xmms/files/digest-xmms-1.2.10-r7
index 139c1738c54e..a88097175e63 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r6
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r7
@@ -1,3 +1,3 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
-MD5 038021146a5c4bd1724a0e0eafc7642e xmms-1.2.10-gentoo-patches-1.2.tar.bz2 164093
+MD5 aafd8255d1a03035452039d72a759a09 xmms-1.2.10-gentoo-patches-1.3.tar.bz2 164200
diff --git a/media-sound/xmms/xmms-1.2.10-r6.ebuild b/media-sound/xmms/xmms-1.2.10-r7.ebuild
index b7cd6b35ea98..00327edd21fc 100644
--- a/media-sound/xmms/xmms-1.2.10-r6.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r6.ebuild,v 1.6 2004/10/04 05:08:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r7.ebuild,v 1.1 2004/10/08 21:55:33 eradicator Exp $
 
 IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa oss arts jack sndfile lirc flac"
 
 inherit flag-o-matic eutils libtool gnuconfig
 
-PATCHVER="1.2"
+PATCHVER="1.3"
 
 MY_P=${P/_pre/-pre}
 S=${WORKDIR}/${MY_P}
@@ -84,6 +84,7 @@ src_unpack() {
 #	elif use unicode; then
 	else
 		epatch ${PATCHDIR}/${P}-unicode.patch
+		epatch ${PATCHDIR}/${P}-unicode-sizefix.patch
 #	else
 #		# id3v2 editing support in mpg123 plugin
 #		epatch ${PATCHDIR}/${P}-id3v2edit.patch