Fix (again) the patch for bug #203777.

Package-Manager: portage-2.1.4

7 files changed, 182 insertions, 18 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 246135cba550..0d6eccd53388 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libcdio
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.84 2008/01/04 23:16:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.85 2008/01/13 16:17:58 flameeyes Exp $
+
+*libcdio-0.79-r1 (13 Jan 2008)
+*libcdio-0.78.2-r4 (13 Jan 2008)
+
+  13 Jan 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libcdio-0.78.2-bug203777-ter.patch, +libcdio-0.78.2-r4.ebuild,
+  -libcdio-0.79.ebuild, +libcdio-0.79-r1.ebuild:
+  Fix (again) the patch for bug #203777.
 
 *libcdio-0.78.2-r3 (04 Jan 2008)
 
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 5cecedc0e0a6..6bbdc5251d44 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -5,6 +5,10 @@ AUX libcdio-0.77-nocxx.patch 2227 RMD160 e3bc0928587c9f8752d5f7bb434847fafb8ff6f
 MD5 e1b0099368be7be3a1cbabbfbdf0f886 files/libcdio-0.77-nocxx.patch 2227
 RMD160 e3bc0928587c9f8752d5f7bb434847fafb8ff6fa files/libcdio-0.77-nocxx.patch 2227
 SHA256 d016a0e4d2cc19993382d0c74e4875249d6e514c4927f20a6afca95438c9c531 files/libcdio-0.77-nocxx.patch 2227
+AUX libcdio-0.78.2-bug203777-ter.patch 2879 RMD160 cb0b2d1a21adcb99f81be0be0132c6add5867c57 SHA1 ef17c76887505fc38d1bd0acc0f5896e5e2b6346 SHA256 ae2635faefbdac0c01975628c3a7bd7d4bee0c4fa9d29825f988d356a10090f8
+MD5 b1d29057400975a9b8ed2c5732f34604 files/libcdio-0.78.2-bug203777-ter.patch 2879
+RMD160 cb0b2d1a21adcb99f81be0be0132c6add5867c57 files/libcdio-0.78.2-bug203777-ter.patch 2879
+SHA256 ae2635faefbdac0c01975628c3a7bd7d4bee0c4fa9d29825f988d356a10090f8 files/libcdio-0.78.2-bug203777-ter.patch 2879
 AUX libcdio-0.78.2-bug203777.patch 1446 RMD160 ce464bbb39f0e3ee88166df8baf42e0517373ab2 SHA1 85a782e07d8b39c464ea5bec7ab425d09e73074d SHA256 357ebdc069f1a6ae186d014ba2b41dc5dc06242c7e4dd336d457c6d10740d927
 MD5 d73b0b55a152a021bae1d7585310a6eb files/libcdio-0.78.2-bug203777.patch 1446
 RMD160 ce464bbb39f0e3ee88166df8baf42e0517373ab2 files/libcdio-0.78.2-bug203777.patch 1446
@@ -24,18 +28,22 @@ EBUILD libcdio-0.78.2-r3.ebuild 1837 RMD160 f892472df974db3ddd36483ab609cff57c09
 MD5 937b0508cae9a1fd7a7890035780657b libcdio-0.78.2-r3.ebuild 1837
 RMD160 f892472df974db3ddd36483ab609cff57c09a496 libcdio-0.78.2-r3.ebuild 1837
 SHA256 ff32f816a01a4434805694532d9538318932138aecea961f558bd26e6b9a27d4 libcdio-0.78.2-r3.ebuild 1837
+EBUILD libcdio-0.78.2-r4.ebuild 1854 RMD160 72ce87a444c17f390f39dbab42cdf0e759028e1d SHA1 92897007cf491268f5ef04df938369c66f990b8d SHA256 672e8ecbe961b40b532a6162f18bf34c8c69d36fb3a11a797cab923e3e07ee24
+MD5 0efd32f0f5c25a63979f84464631eb14 libcdio-0.78.2-r4.ebuild 1854
+RMD160 72ce87a444c17f390f39dbab42cdf0e759028e1d libcdio-0.78.2-r4.ebuild 1854
+SHA256 672e8ecbe961b40b532a6162f18bf34c8c69d36fb3a11a797cab923e3e07ee24 libcdio-0.78.2-r4.ebuild 1854
 EBUILD libcdio-0.78.2.ebuild 1574 RMD160 2403c7b5bddf299137a3c39bbe7d0623d2b56138 SHA1 ec608729ed4fa40128a5ba13b2dbf9b56c4a054a SHA256 78bff79511de8b09190731f96d81864fa407dbb1b5a3639d6df0755f150f5cf0
 MD5 84090c2e85091f7fe5579e12c1e1b352 libcdio-0.78.2.ebuild 1574
 RMD160 2403c7b5bddf299137a3c39bbe7d0623d2b56138 libcdio-0.78.2.ebuild 1574
 SHA256 78bff79511de8b09190731f96d81864fa407dbb1b5a3639d6df0755f150f5cf0 libcdio-0.78.2.ebuild 1574
-EBUILD libcdio-0.79.ebuild 1816 RMD160 d0b4d4bd73e73c03aae5d4c85dd2822fc656b8a1 SHA1 f64ed465171979f24e062c0af90650393ed8d53f SHA256 e15a3e0dcf545099e365de2410827d3cea06a77665d1f02d6d2f6d2d95870405
-MD5 f40567c7e137429fc6b7e2c50242ae13 libcdio-0.79.ebuild 1816
-RMD160 d0b4d4bd73e73c03aae5d4c85dd2822fc656b8a1 libcdio-0.79.ebuild 1816
-SHA256 e15a3e0dcf545099e365de2410827d3cea06a77665d1f02d6d2f6d2d95870405 libcdio-0.79.ebuild 1816
-MISC ChangeLog 11576 RMD160 2890ab1c2dd7cff754e55ecb45ba9e73632125ce SHA1 e36eea67024b45a4e1e3881100488f49683da886 SHA256 cd943349522f4d55f473f76266781f0186abdde5a81fd5fac43afe53d0f11d57
-MD5 4295a03851320c17e80262673d029c19 ChangeLog 11576
-RMD160 2890ab1c2dd7cff754e55ecb45ba9e73632125ce ChangeLog 11576
-SHA256 cd943349522f4d55f473f76266781f0186abdde5a81fd5fac43afe53d0f11d57 ChangeLog 11576
+EBUILD libcdio-0.79-r1.ebuild 1823 RMD160 5192a5dbccefaf95d837496c2342847576f7c572 SHA1 b25ff4ade83d260e0de3301f7022ef61cedac1c8 SHA256 603f4b1b33f2639c2aa95bbe46c6ab2abefa5dd43af66976485935d7b1db66bb
+MD5 83d6cd7feb724686519d45316bd62eb1 libcdio-0.79-r1.ebuild 1823
+RMD160 5192a5dbccefaf95d837496c2342847576f7c572 libcdio-0.79-r1.ebuild 1823
+SHA256 603f4b1b33f2639c2aa95bbe46c6ab2abefa5dd43af66976485935d7b1db66bb libcdio-0.79-r1.ebuild 1823
+MISC ChangeLog 11857 RMD160 3951bc3b80f1b875e13f5f639815e9913ba5bcc0 SHA1 6d8b0d45b19afc4341594df3e7ce1004f40596a7 SHA256 b254bdbb15c1c33371cbc8fdfef0a47d991599e622ef20bb5bcb1fbe35206de7
+MD5 9802f2e51ee12156154582da22f4aa28 ChangeLog 11857
+RMD160 3951bc3b80f1b875e13f5f639815e9913ba5bcc0 ChangeLog 11857
+SHA256 b254bdbb15c1c33371cbc8fdfef0a47d991599e622ef20bb5bcb1fbe35206de7 ChangeLog 11857
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
 MD5 06c8fc63e6e590a92af90b1d04b417fb metadata.xml 485
 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab metadata.xml 485
@@ -49,13 +57,16 @@ SHA256 06766b3ee428d2e71158a938669bddf7d9ff89252e0cc1e362fe72c5c6223b9b files/di
 MD5 d1ab21bbb24383421b1355f477cb7fa1 files/digest-libcdio-0.78.2-r3 247
 RMD160 09c4c26bc0b226cdf714ea84a3ce216092cadb09 files/digest-libcdio-0.78.2-r3 247
 SHA256 06766b3ee428d2e71158a938669bddf7d9ff89252e0cc1e362fe72c5c6223b9b files/digest-libcdio-0.78.2-r3 247
-MD5 395060a2167518ccf33b992ac5cb1c93 files/digest-libcdio-0.79 241
-RMD160 e9a294ff47d542a81f8c6459b97b51638d86f939 files/digest-libcdio-0.79 241
-SHA256 0bfd53a6bfbba4f642a723af0e7008bbcd1e14a0235a2eb2cba219bb6a790b65 files/digest-libcdio-0.79 241
+MD5 d1ab21bbb24383421b1355f477cb7fa1 files/digest-libcdio-0.78.2-r4 247
+RMD160 09c4c26bc0b226cdf714ea84a3ce216092cadb09 files/digest-libcdio-0.78.2-r4 247
+SHA256 06766b3ee428d2e71158a938669bddf7d9ff89252e0cc1e362fe72c5c6223b9b files/digest-libcdio-0.78.2-r4 247
+MD5 395060a2167518ccf33b992ac5cb1c93 files/digest-libcdio-0.79-r1 241
+RMD160 e9a294ff47d542a81f8c6459b97b51638d86f939 files/digest-libcdio-0.79-r1 241
+SHA256 0bfd53a6bfbba4f642a723af0e7008bbcd1e14a0235a2eb2cba219bb6a790b65 files/digest-libcdio-0.79-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeF3qUACgkQj9hvisErhMJtOQCdFEb5wElWZswmRvMLlRQIr0Vr
-isIAnRI97yu+z6W06i+uoeg1jALkOCwf
-=+cv8
+iD8DBQFHijnGAiZjviIA2XgRArZJAKCpV4Uk3N0HVvep9XQ3j7pjDIdK4wCg339/
+sV+YBczJ0OlOU/ETwY3Z8o0=
+=Nr55
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.78.2-r4 b/dev-libs/libcdio/files/digest-libcdio-0.78.2-r4
new file mode 100644
index 000000000000..6fcd9e480dcb
--- /dev/null
+++ b/dev-libs/libcdio/files/digest-libcdio-0.78.2-r4
@@ -0,0 +1,3 @@
+MD5 a6b73300d1247012a1b1246d935ac0d3 libcdio-0.78.2.tar.gz 2024218
+RMD160 4e32dd9bb4bd19b6604ce3d3c4716b6481b6956a libcdio-0.78.2.tar.gz 2024218
+SHA256 2792e4133a89b254644ffe526c8eab785e1de3078d3a9c1ec03653247700ebde libcdio-0.78.2.tar.gz 2024218
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.79 b/dev-libs/libcdio/files/digest-libcdio-0.79-r1
index 547b1f0c41c5..547b1f0c41c5 100644
--- a/dev-libs/libcdio/files/digest-libcdio-0.79
+++ b/dev-libs/libcdio/files/digest-libcdio-0.79-r1
diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch
new file mode 100644
index 000000000000..2134789b1c5d
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777-ter.patch
@@ -0,0 +1,78 @@
+Index: libcdio-0.78.2/src/cd-info.c
+===================================================================
+--- libcdio-0.78.2.orig/src/cd-info.c
++++ libcdio-0.78.2/src/cd-info.c
+@@ -518,6 +518,8 @@ print_iso9660_recurse (CdIo_t *p_cdio, c
+   CdioList_t *p_dirlist =  _cdio_list_new ();
+   CdioListNode_t *entnode;
+   uint8_t i_joliet_level;
++  char *translated_name = (char *) malloc(4096);
++  size_t translated_name_size = 4096;
+ 
+   i_joliet_level = (opts.no_joliet) 
+     ? 0
+@@ -539,7 +541,15 @@ print_iso9660_recurse (CdIo_t *p_cdio, c
+       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
+       char *psz_iso_name = p_statbuf->filename;
+       char _fullname[4096] = { 0, };
+-      char translated_name[MAX_ISONAME+1];
++       if (strlen(psz_iso_name) >= translated_name_size) {
++         translated_name_size = strlen(psz_iso_name)+1;
++         free(translated_name);
++         translated_name = (char *) malloc(translated_name_size);
++         if (!translated_name) {
++           report( stderr, "Error allocating memory\n" );
++           return;
++         }
++       }
+ 
+       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
+ 	iso9660_name_translate_ext(psz_iso_name, translated_name, 
+@@ -564,6 +574,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, c
+ 	p_statbuf->rr.i_symlink = 0;
+       }
+     }
++    free (translated_name);
+ 
+   _cdio_list_free (p_entlist, true);
+ 
+Index: libcdio-0.78.2/src/iso-info.c
+===================================================================
+--- libcdio-0.78.2.orig/src/iso-info.c
++++ libcdio-0.78.2/src/iso-info.c
+@@ -205,7 +205,8 @@ print_iso9660_recurse (iso9660_t *p_iso,
+   CdioList_t *dirlist =  _cdio_list_new ();
+   CdioListNode_t *entnode;
+   uint8_t i_joliet_level = iso9660_ifs_get_joliet_level(p_iso);
+-
++  char *translated_name = (char *) malloc(4096);
++  size_t translated_name_size = 4096;
+   entlist = iso9660_ifs_readdir (p_iso, psz_path);
+     
+   if (opts.print_iso9660) {
+@@ -224,7 +225,16 @@ print_iso9660_recurse (iso9660_t *p_iso,
+       iso9660_stat_t *p_statbuf = _cdio_list_node_data (entnode);
+       char *psz_iso_name = p_statbuf->filename;
+       char _fullname[4096] = { 0, };
+-      char translated_name[MAX_ISONAME+1];
++       if (strlen(psz_iso_name) >= translated_name_size) {
++         translated_name_size = strlen(psz_iso_name)+1;
++         free(translated_name);
++         translated_name = (char *) malloc(translated_name_size);
++         if (!translated_name) {
++           report( stderr, "Error allocating memory\n" );
++           return;
++         }
++       }
++
+ 
+       if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
+ 	iso9660_name_translate_ext(psz_iso_name, translated_name, 
+@@ -258,6 +268,7 @@ print_iso9660_recurse (iso9660_t *p_iso,
+ 	p_statbuf->rr.i_symlink = 0;
+       }
+     }
++    free (translated_name);
+ 
+   _cdio_list_free (entlist, true);
+ 
diff --git a/dev-libs/libcdio/libcdio-0.78.2-r4.ebuild b/dev-libs/libcdio/libcdio-0.78.2-r4.ebuild
new file mode 100644
index 000000000000..69a0d2bebe6f
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.78.2-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.78.2-r4.ebuild,v 1.1 2008/01/13 16:17:58 flameeyes Exp $
+
+inherit eutils libtool multilib
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="http://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cddb minimal nls nocxx"
+
+RDEPEND="cddb? ( >=media-libs/libcddb-1.0.1 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-gcc-4.3-includes.patch"
+	epatch "${FILESDIR}/${P}-bug203777-ter.patch"
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable cddb) \
+		$(use_with !minimal cd-drive) \
+		$(use_with !minimal cd-info) \
+		$(use_with !minimal cd-paranoia) \
+		$(use_with !minimal cdda-player) \
+		$(use_with !minimal cd-read) \
+		$(use_with !minimal iso-info) \
+		$(use_with !minimal iso-read) \
+		$(use_enable !nocxx cxx) \
+		--with-cd-paranoia-name=libcdio-paranoia \
+		--disable-vcd-info \
+		--disable-dependency-tracking || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+
+	# maybe next version is fixed
+	if use minimal; then
+		rm -f "${D}/usr/$(get_libdir)/pkgconfig/libcdio_cdda.pc"
+		rm -f "${D}/usr/include/cdio/cdda.h"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If you've upgraded from a previous version of ${PN}, you may need to re-emerge"
+	ewarn "packages that linked against ${PN} (vlc, vcdimager and more) by running:"
+	ewarn "\trevdep-rebuild"
+}
diff --git a/dev-libs/libcdio/libcdio-0.79.ebuild b/dev-libs/libcdio/libcdio-0.79-r1.ebuild
index ae58fbc7d1e7..53403ffde948 100644
--- a/dev-libs/libcdio/libcdio-0.79.ebuild
+++ b/dev-libs/libcdio/libcdio-0.79-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.79.ebuild,v 1.1 2008/01/01 02:56:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.79-r1.ebuild,v 1.1 2008/01/13 16:17:58 flameeyes Exp $
 
 inherit eutils libtool multilib
 
@@ -25,7 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PN}-0.78.2-bug203777.patch"
+	epatch "${FILESDIR}/${PN}-0.78.2-bug203777-ter.patch"
 	elibtoolize
 }