rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolves: #1184168

Browse Source 
Make locale -a output ASCII-only.
This commit is contained in:
Florian Weimer 2016-02-05 12:18:03 +01:00
parent 427e039240
commit c797a16748
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
glibc-rh1184168.patch Normal file
View File

@ -0,0 +1,45 @@
commit 333e1ba4e53456a603621274177ae9393b9d5385
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri May 22 14:57:11 2015 -0700
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.
diff --git a/intl/locale.alias b/intl/locale.alias
index ab1cb7a..fe19e1b 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

8
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.21
%define glibcversion 2.21
%define glibcrelease 9%{?dist}
%define glibcrelease 10%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -223,6 +223,8 @@ Patch1001: glibc-rh1191059.patch
# BZ #18643 - Missing IPV6_* defines
Patch1002: glibc-rh1241061.patch
Patch1003: glibc-rh1184168.patch
##############################################################################
#
# Patches submitted, but not yet approved upstream.
@ -594,6 +596,7 @@ package or when debugging this package.
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
##############################################################################
# %%prep - Additional prep required...
@ -1766,6 +1769,9 @@ rm -f *.filelist*
%endif
%changelog
* Fri Feb 5 2016 Florian Weimer <fweimer@redhat.com> - 2.21-10
- Make locale -a output ASCII-only (#1184168).
* Wed Oct 28 2015 Florian Weimer <fweimer@redhat.com> - 2.21-9
- Prevent malloc arena free list from becoming cyclic. (#1276112)