about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-05-22 14:57:11 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-05-22 15:12:01 -0700
commit333e1ba4e53456a603621274177ae9393b9d5385 (patch)
tree100a03f38c2041107f494a5a25790685ec48c9f1
parent60dce8b9044155bb04eb310fb0fc5e9607b7d2e6 (diff)
downloadglibc-333e1ba4e53456a603621274177ae9393b9d5385.tar.gz
glibc-333e1ba4e53456a603621274177ae9393b9d5385.tar.xz
glibc-333e1ba4e53456a603621274177ae9393b9d5385.zip
Remove obsolete aliases that broke 'locale -a'
[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.
Change the encoding of this file from Latin-1 to ASCII to avoid
other potential problems with people grepping this file.
-rw-r--r--ChangeLog10
-rw-r--r--NEWS4
-rw-r--r--intl/locale.alias13
3 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b4a7adb8a3..f54645593f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Remove obsolete aliases that broke 'locale -a'
+	[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.
+	Change the encoding of this file from Latin-1 to ASCII to avoid
+	other potential problems with people grepping this file.
+
 2015-05-22  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* nptl/Makefile (CFLAGS-accept.c): Add -fexceptions and
diff --git a/NEWS b/NEWS
index 23fcbaa4fa..529b79b2df 100644
--- a/NEWS
+++ b/NEWS
@@ -18,8 +18,8 @@ Version 2.22
   18029, 18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046, 18047,
   18049, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18125, 18128,
   18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18220, 18221,
-  18244, 18247, 18287, 18319, 18333, 18346, 18397, 18409, 18418, 18434,
-  18444.
+  18244, 18247, 18287, 18319, 18333, 18346, 18397, 18409, 18412, 18418,
+  18434, 18444.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/intl/locale.alias b/intl/locale.alias
index ab1cb7a99f..fe19e1b863 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -24,8 +24,18 @@
 # 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 following lines:
+#	bokmaal		nb_NO.ISO-8859-1
+#	franc,ais	fr_FR.ISO-8859-1
+# except that the "aa" was actually the byte '\0xE5' (the Latin-1
+# encoding for U+00E5 LATIN SMALL LETTER A WITH RING ABOVE) and the
+# "c," was actually the byte '\xE7' (the Latin-1 encoding for U+00E7
+# LATIN SMALL LETTER C WITH CEDILLA).  These lines were removed
+# because they caused 'locale -a' to output text encoded in Latin-1,
+# which broke 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 +46,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