Fix bash-2 initialization wrt setlocale #64266. Arch devs, please do *not* stable this package until I say so since the newer bashrc stuff needs to be synchronized with stabilization of newer baselayout versions

5 files changed, 45 insertions, 15 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index b72ac2d3d69e..d639bea7d255 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-shells/bash
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.54 2004/09/28 13:37:32 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.55 2004/09/29 20:09:22 agriffis Exp $
+
+*bash-2.05b-r11 (29 Sep 2004)
+
+  29 Sep 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/bash-2.05b-setlocale.patch, -bash-2.05b-r10.ebuild,
+  +bash-2.05b-r11.ebuild:
+  Fix bash-2 initialization wrt setlocale #64266. Arch devs, please do *not*
+  stable this package until I say so since the newer bashrc stuff needs to be
+  synchronized with stabilization of newer baselayout versions
 
   28 Sep 2004; Aron Griffis <agriffis@gentoo.org> files/bashrc:
   Enable checkwinsize in system bashrc #65623
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 2cfb26882479..f8e8a13326e9 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,23 +1,25 @@
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3fc88abbe1b798055c1e79955f1175b0 bash-3.0-r6.ebuild 3915
 MD5 ec915d66b3787fed5df5b17bc90cfe4b bash-2.05b-r9.ebuild 3508
-MD5 54b7b3acc02b9fac6a0f9f80f99d586f bash-2.05b-r10.ebuild 3645
+MD5 54b7b3acc02b9fac6a0f9f80f99d586f bash-2.05b-r11.ebuild 3645
 MD5 1273d9fc802f39eef7ab1936150d4012 bash-3.0-r5.ebuild 4989
-MD5 3fc88abbe1b798055c1e79955f1175b0 bash-3.0-r6.ebuild 3915
 MD5 2d36d06adda1ea3a5b3763675523155a ChangeLog 11205
-MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
-MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
-MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
-MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
-MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 54b7b3acc02b9fac6a0f9f80f99d586f bash-2.05b-r10.ebuild 3645
 MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
-MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
-MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
+MD5 3b905c7c9341c9009bd68f14c047815e files/bash-2.05b-rbash.patch 804
 MD5 694b8b1e47e4743e78ee5f7515f76542 files/bash-3.0-posixtrap.patch 789
 MD5 8b60985cf48da400708c055ba06888dc files/bashrc 1574
+MD5 4383b25cd54b24b9f459e338f06d096c files/bash-2.05b-parallel-build.patch 459
 MD5 582fb9ed0ca44627978ce6836a5000dc files/config-top.h.diff 487
+MD5 96238e7d942d091ca71574ba7392e847 files/bash-3.0-array-stripping.patch 294
+MD5 0392b634a7a02302d24ccc4a4b349423 files/bash-3.0-local-array.patch 275
+MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r5 128
+MD5 1fbe0324b1b5778d693d82cddcabeb9e files/digest-bash-3.0-r6 817
+MD5 28c9d7407d5332c29dddb656a4a1f1ce files/bash-3.0-invisible.patch 705
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r10 461
+MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r11 461
 MD5 1894aaae72806c410d851d046d13dd32 files/digest-bash-2.05b-r9 461
-MD5 30a9ff1b688e79f59376a47d882f3419 files/digest-bash-3.0-r5 128
-MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
+MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 MD5 ca64aff9caa582e07e0b34ed87d60d80 files/bash-2.05b-jobs.patch 876
-MD5 1fbe0324b1b5778d693d82cddcabeb9e files/digest-bash-3.0-r6 817
+MD5 90ba92c981c1d26e45d88ecd23a1fbf5 files/bash-2.05b-multibyte-locale.patch 1897
+MD5 05f32594822720a84f58197c1535fc82 files/bash-3.0-jobs.patch 1064
diff --git a/app-shells/bash/bash-2.05b-r10.ebuild b/app-shells/bash/bash-2.05b-r11.ebuild
index 07a1b709381f..cba0c78260b0 100644
--- a/app-shells/bash/bash-2.05b-r10.ebuild
+++ b/app-shells/bash/bash-2.05b-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r10.ebuild,v 1.10 2004/09/28 13:37:32 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r11.ebuild,v 1.1 2004/09/29 20:09:22 agriffis Exp $
 
 inherit gcc eutils flag-o-matic gnuconfig
 
@@ -46,6 +46,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-parallel-build.patch
 	# Fix using bash with post-20040808 glibc ebuilds (from fedora)
 	epatch ${FILESDIR}/${P}-jobs.patch
+	# Fix bash call to setlocale #64266
+	epatch ${FILESDIR}/${P}-setlocale.patch
 
 	# Enable SSH_SOURCE_BASHRC (#24762)
 	echo '#define SSH_SOURCE_BASHRC' >> config-top.h
diff --git a/app-shells/bash/files/bash-2.05b-setlocale.patch b/app-shells/bash/files/bash-2.05b-setlocale.patch
new file mode 100644
index 000000000000..db480304d59e
--- /dev/null
+++ b/app-shells/bash/files/bash-2.05b-setlocale.patch
@@ -0,0 +1,17 @@
+Use NULL instead of "" to prevent overriding locale information set in
+the environment.  See
+	http://bugs.gentoo.org/show_bug.cgi?id=64266
+	http://lists.debian.or.jp/debian-devel/200210/msg00047.html
+
+diff -urN bash-2.05b.orig/lib/readline/nls.c bash-2.05b/lib/readline/nls.c
+--- bash-2.05b.orig/lib/readline/nls.c	2001-10-15 14:32:29.000000000 -0400
++++ bash-2.05b/lib/readline/nls.c	2004-09-29 12:25:24.585683597 -0400
+@@ -87,7 +87,7 @@
+   char *t;
+ 
+   /* Set the LC_CTYPE locale category from environment variables. */
+-  t = setlocale (LC_CTYPE, "");
++  t = setlocale (LC_CTYPE, NULL);
+   if (t && *t && (t[0] != 'C' || t[1]) && (STREQ (t, "POSIX") == 0))
+     {
+       _rl_meta_flag = 1;
diff --git a/app-shells/bash/files/digest-bash-2.05b-r10 b/app-shells/bash/files/digest-bash-2.05b-r11
index cda4481c8b5e..cda4481c8b5e 100644
--- a/app-shells/bash/files/digest-bash-2.05b-r10
+++ b/app-shells/bash/files/digest-bash-2.05b-r11