Fix patch for bug #203777 for an off by one. Straight-to-stable commit.

Package-Manager: portage-2.1.4_rc14
RepoMan-Options: --force

5 files changed, 36 insertions, 19 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 51b71492babc..246135cba550 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,13 @@
 # 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.83 2008/01/01 17:59:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.84 2008/01/04 23:16:45 flameeyes Exp $
+
+*libcdio-0.78.2-r3 (04 Jan 2008)
+
+  04 Jan 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/libcdio-0.78.2-bug203777.patch, -libcdio-0.78.2-r2.ebuild,
+  +libcdio-0.78.2-r3.ebuild:
+  Fix patch for bug #203777 for an off by one. Straight-to-stable commit.
 
   01 Jan 2008; Brent Baude <ranger@gentoo.org> libcdio-0.78.2-r2.ebuild:
   Marking libcdio-0.78.2-r2 ppc64 for bug 203777
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index da2226dbe900..2740e02c6e45 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libcdio-0.77-nocxx.patch 2227 RMD160 e3bc0928587c9f8752d5f7bb434847fafb8ff6fa SHA1 78cde269835c581889ccf4ef431e2bc32173816e SHA256 d016a0e4d2cc19993382d0c74e4875249d6e514c4927f20a6afca95438c9c531
 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.patch 1446 RMD160 a78acb09368496d25baecc017b402e08203a0844 SHA1 0850a745399e62ec95d35dd080e97027913911b2 SHA256 dc86e02a797485961e8f2dcaec2a8ae4da2182336787c5ba4e412a2f55cdd386
-MD5 7f084805f5ebd61f305f955bd538581d files/libcdio-0.78.2-bug203777.patch 1446
-RMD160 a78acb09368496d25baecc017b402e08203a0844 files/libcdio-0.78.2-bug203777.patch 1446
-SHA256 dc86e02a797485961e8f2dcaec2a8ae4da2182336787c5ba4e412a2f55cdd386 files/libcdio-0.78.2-bug203777.patch 1446
+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
+SHA256 357ebdc069f1a6ae186d014ba2b41dc5dc06242c7e4dd336d457c6d10740d927 files/libcdio-0.78.2-bug203777.patch 1446
 AUX libcdio-0.78.2-gcc-4.3-includes.patch 451 RMD160 eab677d9d19437f67d9cbe94a3ee4ef247b04fb4 SHA1 66449ca1e381845e7fc4c033caa5802b1175b498 SHA256 2b977e8ee7a706ae3d97c1f3d332a51f4bfa536654d4fee49703ab7a748ca434
 MD5 deb279cab031cd4ec681e2ca291f5ef1 files/libcdio-0.78.2-gcc-4.3-includes.patch 451
 RMD160 eab677d9d19437f67d9cbe94a3ee4ef247b04fb4 files/libcdio-0.78.2-gcc-4.3-includes.patch 451
@@ -17,10 +20,10 @@ EBUILD libcdio-0.73.ebuild 1550 RMD160 65b9a393734eacf4496b6d562b2bf29bcadc2b4a
 MD5 2306eef70d9db2154bb8b5d294818856 libcdio-0.73.ebuild 1550
 RMD160 65b9a393734eacf4496b6d562b2bf29bcadc2b4a libcdio-0.73.ebuild 1550
 SHA256 648722455842ce262c885728bcae8c8aac0da9d12ae6f6ff2c9851d6ed8ea12a libcdio-0.73.ebuild 1550
-EBUILD libcdio-0.78.2-r2.ebuild 1839 RMD160 5fc20a066f5f6921005edcd362ea17ec14a86321 SHA1 a06d46f7102163f46bdde60feb8435b19511e2f0 SHA256 d1779d1db9fbd5f31be1b89bfe177f4c398b6a8e363737af786cdcdef50d2ea6
-MD5 38702a7383706ef6e807d58fe4794538 libcdio-0.78.2-r2.ebuild 1839
-RMD160 5fc20a066f5f6921005edcd362ea17ec14a86321 libcdio-0.78.2-r2.ebuild 1839
-SHA256 d1779d1db9fbd5f31be1b89bfe177f4c398b6a8e363737af786cdcdef50d2ea6 libcdio-0.78.2-r2.ebuild 1839
+EBUILD libcdio-0.78.2-r3.ebuild 1842 RMD160 c29839c100f5f7f943895538f53586b96e853b27 SHA1 f0203bb8680f55ab6338e2bcbf89ed2c507dab50 SHA256 3ca3680cf3f95502c63a824d88a0ccd183fdf79204a1aa3b85924710baf9ab9f
+MD5 1f55ed2fa60ba37cd05f1b367879e4cc libcdio-0.78.2-r3.ebuild 1842
+RMD160 c29839c100f5f7f943895538f53586b96e853b27 libcdio-0.78.2-r3.ebuild 1842
+SHA256 3ca3680cf3f95502c63a824d88a0ccd183fdf79204a1aa3b85924710baf9ab9f libcdio-0.78.2-r3.ebuild 1842
 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
@@ -29,10 +32,10 @@ EBUILD libcdio-0.79.ebuild 1816 RMD160 d0b4d4bd73e73c03aae5d4c85dd2822fc656b8a1
 MD5 f40567c7e137429fc6b7e2c50242ae13 libcdio-0.79.ebuild 1816
 RMD160 d0b4d4bd73e73c03aae5d4c85dd2822fc656b8a1 libcdio-0.79.ebuild 1816
 SHA256 e15a3e0dcf545099e365de2410827d3cea06a77665d1f02d6d2f6d2d95870405 libcdio-0.79.ebuild 1816
-MISC ChangeLog 11315 RMD160 7ad14cfebd86b68871634eaeb1b3941784ae4ad9 SHA1 ee2d9de04efe856a12a960e40a3714890ace9157 SHA256 07dbc8c33ac2ea69bc5532d1537884b336a5e505e4e0149718ecca17dbdbbdd1
-MD5 af55869aae9713248465fec059d1aeef ChangeLog 11315
-RMD160 7ad14cfebd86b68871634eaeb1b3941784ae4ad9 ChangeLog 11315
-SHA256 07dbc8c33ac2ea69bc5532d1537884b336a5e505e4e0149718ecca17dbdbbdd1 ChangeLog 11315
+MISC ChangeLog 11576 RMD160 2890ab1c2dd7cff754e55ecb45ba9e73632125ce SHA1 e36eea67024b45a4e1e3881100488f49683da886 SHA256 cd943349522f4d55f473f76266781f0186abdde5a81fd5fac43afe53d0f11d57
+MD5 4295a03851320c17e80262673d029c19 ChangeLog 11576
+RMD160 2890ab1c2dd7cff754e55ecb45ba9e73632125ce ChangeLog 11576
+SHA256 cd943349522f4d55f473f76266781f0186abdde5a81fd5fac43afe53d0f11d57 ChangeLog 11576
 MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
 MD5 06c8fc63e6e590a92af90b1d04b417fb metadata.xml 485
 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab metadata.xml 485
@@ -43,9 +46,16 @@ SHA256 503df5f023bb271ed1a770a8ceffa155bb33f7f479a5ee54d385e0c0af2c6ad3 files/di
 MD5 d1ab21bbb24383421b1355f477cb7fa1 files/digest-libcdio-0.78.2 247
 RMD160 09c4c26bc0b226cdf714ea84a3ce216092cadb09 files/digest-libcdio-0.78.2 247
 SHA256 06766b3ee428d2e71158a938669bddf7d9ff89252e0cc1e362fe72c5c6223b9b files/digest-libcdio-0.78.2 247
-MD5 d1ab21bbb24383421b1355f477cb7fa1 files/digest-libcdio-0.78.2-r2 247
-RMD160 09c4c26bc0b226cdf714ea84a3ce216092cadb09 files/digest-libcdio-0.78.2-r2 247
-SHA256 06766b3ee428d2e71158a938669bddf7d9ff89252e0cc1e362fe72c5c6223b9b files/digest-libcdio-0.78.2-r2 247
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd+vmsACgkQAiZjviIA2XifUACgwG+NJM4qqxS2LK0DPpXHA9Dv
+5jgAoPN0GM20rm+SWzqBZJyHQHbfyzXR
+=A4g+
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/files/digest-libcdio-0.78.2-r2 b/dev-libs/libcdio/files/digest-libcdio-0.78.2-r3
index 6fcd9e480dcb..6fcd9e480dcb 100644
--- a/dev-libs/libcdio/files/digest-libcdio-0.78.2-r2
+++ b/dev-libs/libcdio/files/digest-libcdio-0.78.2-r3
diff --git a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch
index 18b12c9d1618..9458eb4d3029 100644
--- a/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch
+++ b/dev-libs/libcdio/files/libcdio-0.78.2-bug203777.patch
@@ -6,7 +6,7 @@ diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/cd-info.c libcdio-0.78.2/
        char *psz_iso_name = p_statbuf->filename;
        char _fullname[4096] = { 0, };
 -      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name+1));
++      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
  
        if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
  	iso9660_name_translate_ext(psz_iso_name, translated_name, 
@@ -18,7 +18,7 @@ diff -Naur libcdio-0.78.2-orig/work/libcdio-0.78.2/src/iso-info.c libcdio-0.78.2
        char *psz_iso_name = p_statbuf->filename;
        char _fullname[4096] = { 0, };
 -      char translated_name[MAX_ISONAME+1];
-+      char *translated_name = (char *) alloca(strlen(psz_iso_name+1));
++      char *translated_name = (char *) alloca(strlen(psz_iso_name)+1);
 +
  
        if (yep != p_statbuf->rr.b3_rock || 1 == opts.no_rock_ridge) {
diff --git a/dev-libs/libcdio/libcdio-0.78.2-r2.ebuild b/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild
index c8a9dbe07e8b..6906603cb156 100644
--- a/dev-libs/libcdio/libcdio-0.78.2-r2.ebuild
+++ b/dev-libs/libcdio/libcdio-0.78.2-r3.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.78.2-r2.ebuild,v 1.6 2008/01/01 17:59:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.78.2-r3.ebuild,v 1.1 2008/01/04 23:16:45 flameeyes Exp $
 
 inherit eutils libtool multilib