This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Remove obsolete aliases that broke 'locale -a'


I'm attaching the proposed patch, as it contains a mixture of UTF-8 and Latin-1 (which is part of the bug!) and there may be issues decoding it. (Extract it as binary and then inspect the bytes carefully using your loupe. :-)
>From 30f91a08a481c1f5f263429544abfeee1285904a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 May 2015 18:33:45 -0700
Subject: [PATCH] Remove obsolete aliases that broke 'locale -a'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[BZ #18412]
* intl/locale.alias: Remove obsolete aliases "bokmål" and "français"
which caused 'locale -a' to output Latin-1 data in UTF-8 locales,
breaking some applications that use 'locale -a' output.
---
 ChangeLog         | 7 +++++++
 intl/locale.alias | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d96ce2..5b96578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	[BZ #18412]
+	* intl/locale.alias: Remove obsolete aliases "bokmål" and "français"
+	which caused 'locale -a' to output Latin-1 data in UTF-8 locales,
+	breaking some applications that use 'locale -a' output.
+
 2015-05-13  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/nacl/fdopendir.c: New file.
diff --git a/intl/locale.alias b/intl/locale.alias
index ab1cb7a..4053df6 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -24,8 +24,14 @@
 # backward compatibility.  Nobody should rely on the names defined here.
 # Locales should always be specified by their full name.
 
+# Note: This file used to contain the lines:
+#	bokmål		nb_NO.ISO-8859-1
+#	français	fr_FR.ISO-8859-1
+# but these have been commented out since they cause 'locale -a' to output
+# text encoded in Latin-1, which breaks applications in UTF-8 locales.  See:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=18412
+
 bokmal		nb_NO.ISO-8859-1
-bokmål		nb_NO.ISO-8859-1
 catalan		ca_ES.ISO-8859-1
 croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
@@ -36,7 +42,6 @@ dutch		nl_NL.ISO-8859-1
 eesti		et_EE.ISO-8859-1
 estonian	et_EE.ISO-8859-1
 finnish         fi_FI.ISO-8859-1
-français	fr_FR.ISO-8859-1
 french		fr_FR.ISO-8859-1
 galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
-- 
2.1.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]