[glibc] 01/01: debian/patches/submitted-ldconfig-c-collation.diff: New patch to process include directives in ldconfig using the C/POSIX collation. Closes: #882255.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 514c3f235e480ed7aaf80025b7e026170d704774
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri Dec 1 19:59:41 2017 +0100
debian/patches/submitted-ldconfig-c-collation.diff: New patch to process include directives in ldconfig using the C/POSIX collation. Closes: #882255.
---
debian/changelog | 3 +++
debian/patches/any/submitted-ldconfig-c-collation.diff | 17 +++++++++++++++++
debian/patches/series | 1 +
3 files changed, 21 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c46e191..966ca2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ glibc (2.25-3) UNRELEASED; urgency=medium
#883186.
* debian/patches/any/local-dlfptr.diff: remove, it's not used anymore by
HPPA and causes issues on IA64. Closes: #882874.
+ * debian/patches/submitted-ldconfig-c-collation.diff: New patch to process
+ include directives in ldconfig using the C/POSIX collation. Closes:
+ #882255.
[ Samuel Thibault ]
* libc0.3.symbols.hurd-i386: Update against newer hurd definitions.
diff --git a/debian/patches/any/submitted-ldconfig-c-collation.diff b/debian/patches/any/submitted-ldconfig-c-collation.diff
new file mode 100644
index 0000000..5db19fd
--- /dev/null
+++ b/debian/patches/any/submitted-ldconfig-c-collation.diff
@@ -0,0 +1,17 @@
+Submitted upstream, won't be backported in upstream stable branches.
+
+diff --git a/elf/ldconfig.c b/elf/ldconfig.c
+index 89042351f8..2c01ab567b 100644
+--- a/elf/ldconfig.c
++++ b/elf/ldconfig.c
+@@ -1259,6 +1259,10 @@ main (int argc, char **argv)
+ /* Set locale via LC_ALL. */
+ setlocale (LC_ALL, "");
+
++ /* But keep the C collation. That way `include' directives using
++ globbing patterns are processed in a locale-independent order. */
++ setlocale (LC_COLLATE, "C");
++
+ /* Set the text message domain. */
+ textdomain (_libc_intl_domainname);
+
diff --git a/debian/patches/series b/debian/patches/series
index f027c37..bdbf764 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -210,3 +210,4 @@ any/cvs-malloc-hardening.diff
any/local-bits-sigstack.diff
any/submitted-resolv-unaligned.diff
any/submitted-intl-tstgettext.diff
+any/submitted-ldconfig-c-collation.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: