r2368 - in glibc-package/branches/glibc-2.6/debian: . patches patches/locale
Author: madcoder
Date: 2007-06-17 13:37:13 +0000 (Sun, 17 Jun 2007)
New Revision: 2368
Added:
glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
hopefully fix locales.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-06-15 10:12:23 UTC (rev 2367)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-06-17 13:37:13 UTC (rev 2368)
@@ -1,4 +1,4 @@
-glibc (2.6-0exp2) UNRELEASED; urgency=low
+glibc (2.6-0exp2) experimental; urgency=low
[ Pierre Habouzit ]
[ Clint Adams]
@@ -87,8 +87,10 @@
* kernelchecks.sh: add some quotes to unconfuse syntax hilighting a bit.
* nscd.init: ksh is confused if you call functions start or stop.
Closes: 428884.
+ * patches/locale/LC_COLLATE-fix_tok_copy.diff: fix an issue with the "copy"
+ token when it isn't the first rule in a LC_COLLATION block (sigh).
- -- Pierre Habouzit <madcoder@debian.org> Fri, 15 Jun 2007 12:11:27 +0200
+ -- Pierre Habouzit <madcoder@debian.org> Sun, 17 Jun 2007 14:15:39 +0100
glibc (2.5-11) UNRELEASED; urgency=low
Added: glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff (rev 0)
+++ glibc-package/branches/glibc-2.6/debian/patches/locale/LC_COLLATE-fix_tok_copy.diff 2007-06-17 13:37:13 UTC (rev 2368)
@@ -0,0 +1,25 @@
+Index: glibc-2.6/locale/programs/ld-collate.c
+===================================================================
+--- glibc-2.6.orig/locale/programs/ld-collate.c
++++ glibc-2.6/locale/programs/ld-collate.c
+@@ -2808,8 +2808,18 @@
+ if (state == 1 || state == 3 || state == 5)
+ goto err_label;
+
+- load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
+- charmap, result);
++ /* Get the locale definition. */
++ copy_locale = load_locale (LC_COLLATE, now->val.str.startmb,
++ repertoire_name, charmap, NULL);
++ if ((copy_locale->avail & COLLATE_LOCALE) == 0)
++ {
++ /* Not yet loaded. So do it now. */
++ if (locfile_read (copy_locale, charmap) != 0)
++ goto skip_category;
++ }
++
++ if (copy_locale->categories[LC_COLLATE].collate == NULL)
++ return;
+
+ lr_ignore_rest (ldfile, 1);
+ break;
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-06-15 10:12:23 UTC (rev 2367)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-06-17 13:37:13 UTC (rev 2368)
@@ -8,6 +8,7 @@
locale/preprocessor-collate.diff -p0
locale/LC_IDENTIFICATION-optional-fields.diff -p0
locale/LC_COLLATE-keywords-ordering.diff -p0
+locale/LC_COLLATE-fix_tok_copy.diff
locale/locale-print-LANGUAGE.diff -p0
locale/fix-C-first_weekday.diff -p0
localedata/tl_PH-yesexpr.diff
Reply to: