Fix for Bug #103071 (breaks with LC_ALL/LANG set).

Package-Manager: portage-2.1_pre5-r4

5 files changed, 53 insertions, 18 deletions

diff --git a/games-misc/fortune-mod/ChangeLog b/games-misc/fortune-mod/ChangeLog
index b43e86af8e20..ca98fe49a6e9 100644
--- a/games-misc/fortune-mod/ChangeLog
+++ b/games-misc/fortune-mod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/fortune-mod
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.19 2005/10/13 00:30:47 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/ChangeLog,v 1.20 2006/03/11 15:17:56 tupone Exp $
+
+  11 Mar 2006; <Tupone@gentoo.org> +files/01_all_fortune_all-fix.patch,
+  fortune-mod-1.99.1-r2.ebuild:
+  Fix for Bug #103071 (breaks with LC_ALL/LANG set). Thanks to Jordan for report
 
 *fortune-mod-1.99.1-r2 (13 Oct 2005)
 
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index cba917ac912f..d9af3fbc028e 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,17 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93f27593bdaa6eca5cd1847f895076da ChangeLog 4736
+MD5 0883d510e0b6f09402197883dc208bd6 ChangeLog 4922
+RMD160 05cfc36086c579f4795c30c74dbb6dc52c11760f ChangeLog 4922
+SHA256 8c8c667c88d0322f590b585bcb905bebead4079751b9c5afc52dd07ff74ca8d0 ChangeLog 4922
+MD5 e85b073f16dc6f0e8f0ed90044797aa3 files/01_all_fortune_all-fix.patch 783
+RMD160 b9e0958d5f2ac3a6cd6404dfb70513077266ae0f files/01_all_fortune_all-fix.patch 783
+SHA256 2208361d950999f14d59eda8f7b07e1fbef500d1424dd54bee7ad2082dee62c1 files/01_all_fortune_all-fix.patch 783
 MD5 5ff47d4205e2b0ea5e0a538115a58237 files/digest-fortune-mod-1.99.1-r1 71
-MD5 5ff47d4205e2b0ea5e0a538115a58237 files/digest-fortune-mod-1.99.1-r2 71
+RMD160 a7dcbb99f1e097bd45d6d16a3f70513be762dfcf files/digest-fortune-mod-1.99.1-r1 71
+SHA256 3dfe94a0d3779227b8f32a718c86c3da92b0c7073063695b8acc2d86503bd75d files/digest-fortune-mod-1.99.1-r1 71
+MD5 3be5e813234e7aa9b79c243a23391461 files/digest-fortune-mod-1.99.1-r2 259
+RMD160 52a6698c67bb1469a42813b3560994862f8ceadf files/digest-fortune-mod-1.99.1-r2 259
+SHA256 6ff616a1e74857afd6bee810aad1c1cdddf28e1c6f8652de66fb0a8980394fee files/digest-fortune-mod-1.99.1-r2 259
 MD5 dfeb667d0b8e224327bc2adfe359f9af files/fortune-mod-1.99.1-gentoo.patch 2699
+RMD160 01c0e6a534933841dd5529cb36bcc24874861275 files/fortune-mod-1.99.1-gentoo.patch 2699
+SHA256 840c56ee0128d118a861dd33c3aa04e635d20af5febc626864cdc22943223490 files/fortune-mod-1.99.1-gentoo.patch 2699
 MD5 d962711282e74285afccfbe293c27bfe fortune-mod-1.99.1-r1.ebuild 1641
-MD5 8163bf6e09f06a09452b09d6965a26e4 fortune-mod-1.99.1-r2.ebuild 1041
+RMD160 a3fce8c36f84fb1aedb1b8f3a8a47bdac4e16809 fortune-mod-1.99.1-r1.ebuild 1641
+SHA256 a26947d1741e9c3910787c5369ad719e70379fdeaf84772486651c080268c7ed fortune-mod-1.99.1-r1.ebuild 1641
+MD5 73544b68c043214b9c2152c9200af5f8 fortune-mod-1.99.1-r2.ebuild 1088
+RMD160 ec0f7b4a1788ad36c3478b6b0c1b83cc6d1448d3 fortune-mod-1.99.1-r2.ebuild 1088
+SHA256 f80c7eb9ceb8865f97b1249a831df3c71cf0d2d344a5e0c5d982b08754a64a90 fortune-mod-1.99.1-r2.ebuild 1088
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDWdZZgIKl8Uu19MoRAsJhAJ0f39/o7+hn1gCwJKVL+OYSPoDnewCfTIsn
-8BJwg2zEn/7jqvoP1dlw7Rk=
-=EXyU
------END PGP SIGNATURE-----
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
new file mode 100644
index 000000000000..b4175ac81bfc
--- /dev/null
+++ b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
@@ -0,0 +1,21 @@
+--- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
++++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
+@@ -974,7 +974,7 @@
+ 	  if (!ret)
+ 	    ret=add_file(percent, fullpathname, NULL, &File_list,
+ 			 &File_tail, NULL);
+-	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
++	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
+ 	    ret=add_file(percent, locpathname, NULL, &File_list,
+ 		         &File_tail, NULL);
+ 	  
+@@ -985,7 +985,8 @@
+ 	  }
+ 	  if (!ret)
+ 	    return FALSE;
+-	  
++	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
++	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
+ 	}
+ 	else
+ 	  if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1-r2 b/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1-r2
index 3cc07d26a029..13204c0a26d8 100644
--- a/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1-r2
+++ b/games-misc/fortune-mod/files/digest-fortune-mod-1.99.1-r2
@@ -1 +1,3 @@
 MD5 f208805b3b712e32997d7667e0ec52d8 fortune-mod-1.99.1.tar.gz 1812089
+RMD160 020e597bde43ebd58ea82171d0e69222dc26b566 fortune-mod-1.99.1.tar.gz 1812089
+SHA256 fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace fortune-mod-1.99.1.tar.gz 1812089
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
index 3d81fdfc924f..0d4055244ec6 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.1 2005/10/13 00:30:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild,v 1.2 2006/03/11 15:17:56 tupone Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,7 +19,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/01_all_fortune_all-fix.patch
 
 	sed -i \
 		-e 's:/games::' \