r2595 - in glibc-package/branches/glibc-2.7/debian: . debhelper.in patches patches/locale patches/localedata
Author: schizo
Date: 2007-10-26 01:01:50 +0000 (Fri, 26 Oct 2007)
New Revision: 2595
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/debhelper.in/libc.NEWS
glibc-package/branches/glibc-2.7/debian/patches/locale/check-unknown-symbols.diff
glibc-package/branches/glibc-2.7/debian/patches/locale/fix-LC_COLLATE-rules.diff
glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff
glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
locale regressions
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-26 01:01:50 UTC (rev 2595)
@@ -1,6 +1,7 @@
-glibc (2.7~0exp1-0exp1) experimental; urgency=low
+glibc (2.7~0exp2-0exp1) experimental; urgency=low
- * New upstream release with ports snapshot and linuxthreads snapshot.
+ * New upstream release with linuxthreads snapshot.
+ | *** Disable most locale/ and localedata/ patches *** |
- Remove localedata/locale-de_CH.diff (merged).
- Update locale/fix-LC_COLLATE-rules.diff.
- Update locale/LC_COLLATE-keywords-ordering.diff.
@@ -51,6 +52,7 @@
- Remove any/local-version-sanity.diff (merged).
- Remove any/submitted-strtok.diff (merged).
- Remove any/submitted-regex-collate.diff (merged).
+ - Remove localedata/locale-no_NO.diff (obsolete).
* Bump shlib version to 2.7-1.
-- Clint Adams <schizo@debian.org> Sun, 21 Oct 2007 18:51:47 -0400
Modified: glibc-package/branches/glibc-2.7/debian/debhelper.in/libc.NEWS
===================================================================
--- glibc-package/branches/glibc-2.7/debian/debhelper.in/libc.NEWS 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/debhelper.in/libc.NEWS 2007-10-26 01:01:50 UTC (rev 2595)
@@ -1,27 +1,27 @@
glibc (2.6.1-2) unstable; urgency=low
- Starting with version 2.6.1, glibc ships a /etc/ld.so.conf.d/libc.conf that
- enforces /usr/local/lib to take precedence over /usr/lib. This is the
- intended behaviour (it works like the $PATH where /usr/local/bin takes
- precedence over /usr/bin).
+ Starting with version 2.6.1, glibc ships a /etc/ld.so.conf.d/libc.conf that
+ enforces /usr/local/lib to take precedence over /usr/lib. This is the
+ intended behaviour (it works like the $PATH where /usr/local/bin takes
+ precedence over /usr/bin).
- To revert that (though doing so is discouraged) you can add /usr/lib to the
- beginning of /etc/ld.so.conf.d/libc.conf. (see bug#440394).
+ To revert that (though doing so is discouraged) you can add /usr/lib to the
+ beginning of /etc/ld.so.conf.d/libc.conf. (see bug#440394).
-- Pierre Habouzit <madcoder@debian.org> Sat, 01 Sep 2007 16:58:15 +0200
glibc (2.5-1) unstable; urgency=low
- Starting with version 2.5-1, the glibc requires a 2.6.1 or later
- kernel. If you use a 2.4 kernel, please upgrade it *before*
- installing glibc.
+ Starting with version 2.5-1, the glibc requires a 2.6.1 or later
+ kernel. If you use a 2.4 kernel, please upgrade it *before*
+ installing glibc.
- This also means that it is not possible to use LD_ASSUME_KERNEL with a
- version lower than 2.6.1. If you have set such a thing in /etc/profile,
- ~/.bashrc or any other initialization file (something you should have
- never done!!!), please remove that *before* installing glibc.
+ This also means that it is not possible to use LD_ASSUME_KERNEL with a
+ version lower than 2.6.1. If you have set such a thing in /etc/profile,
+ ~/.bashrc or any other initialization file (something you should have
+ never done!!!), please remove that *before* installing glibc.
- Note: This does not apply to the m68k architecture and to non-Linux
- kernels.
+ Note: This does not apply to the m68k architecture and to non-Linux
+ kernels.
-- Aurelien Jarno <aurel32@debian.org> Tue, 24 Apr 2007 00:26:48 +0200
Modified: glibc-package/branches/glibc-2.7/debian/patches/locale/check-unknown-symbols.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/locale/check-unknown-symbols.diff 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/patches/locale/check-unknown-symbols.diff 2007-10-26 01:01:50 UTC (rev 2595)
@@ -10,8 +10,8 @@
Index: glibc-2.7/locale/programs/ld-collate.c
===================================================================
---- glibc-2.7.orig/locale/programs/ld-collate.c 2007-10-23 08:46:19.000000000 -0400
-+++ glibc-2.7/locale/programs/ld-collate.c 2007-10-23 08:46:51.000000000 -0400
+--- glibc-2.7.orig/locale/programs/ld-collate.c 2007-10-23 22:23:27.000000000 -0400
++++ glibc-2.7/locale/programs/ld-collate.c 2007-10-23 22:23:28.000000000 -0400
@@ -3642,8 +3642,20 @@
}
else if (arg != NULL)
Modified: glibc-package/branches/glibc-2.7/debian/patches/locale/fix-LC_COLLATE-rules.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/locale/fix-LC_COLLATE-rules.diff 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/patches/locale/fix-LC_COLLATE-rules.diff 2007-10-26 01:01:50 UTC (rev 2595)
@@ -1,20 +1,7 @@
-Fix rules definitions in LC_COLLATE. Backward/forward rules were
-sometimes affected to a wrong section, some rules could wrongly be
-declared as identical, and localedef segfaults are also fixed.
-Special French collation now works as described in ISO-14651.
-
-Submitted upstream: BZ645
-
-# DP: Dpatch author: Denis Barbier
-# DP: Patch author: Denis Barbier
-# DP: Upstream status: BZ645
-# DP: Status Details: depends on #310635
-# DP: Date: 2006-01-08
-
Index: locale/programs/ld-collate.c
===================================================================
---- locale/programs/ld-collate.c.orig 2007-10-23 08:46:51.000000000 -0400
-+++ locale/programs/ld-collate.c 2007-10-23 08:46:55.000000000 -0400
+--- locale/programs/ld-collate.c.orig 2007-10-24 20:13:39.000000000 -0400
++++ locale/programs/ld-collate.c 2007-10-24 20:28:06.000000000 -0400
@@ -1546,6 +1546,7 @@
int i;
int need_undefined = 0;
@@ -23,17 +10,17 @@
int ruleidx;
int nr_wide_elems = 0;
-@@ -1558,17 +1559,28 @@
+@@ -1557,18 +1558,28 @@
+ "LC_COLLATE"));
return;
}
-
+ if (nrules == 0)
+ {
+ /* An error message has already been printed:
+ empty category description not allowed. */
+ return;
+ }
-+
+
/* If this assertion is hit change the type in `element_t'. */
assert (nrules <= sizeof (runp->used_in_level) * 8);
@@ -53,13 +40,13 @@
{
WITH_CUR_LOCALE (error (0, 0, _("\
%s: `position' must be used for a specific level in all sections or none"),
-@@ -3503,6 +3515,9 @@
+@@ -3503,6 +3514,9 @@
no_error = 0;
}
}
+ /* Update current section. */
+ if (collate->cursor != NULL)
-+ collate->current_section = collate->cursor->section;
++ collate->current_section = collate->cursor->section;
lr_ignore_rest (ldfile, no_error);
}
Modified: glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/patches/locale/preprocessor-collate.diff 2007-10-26 01:01:50 UTC (rev 2595)
@@ -10,11 +10,9 @@
# DP: Upstream status: BZ686
# DP: Date: 2006-01-08
-Index: locale/programs/ld-collate.c
-===================================================================
---- locale/programs/ld-collate.c.orig 2007-10-23 12:03:48.000000000 -0400
-+++ locale/programs/ld-collate.c 2007-10-23 12:03:49.000000000 -0400
-@@ -160,6 +160,24 @@
+--- locale/programs/ld-collate.c.orig
++++ locale/programs/ld-collate.c
+@@ -159,6 +159,24 @@
size_t line;
};
@@ -39,7 +37,7 @@
/* Sparse table of struct element_t *. */
#define TABLE wchead_table
#define ELEMENT struct element_t *
-@@ -221,6 +239,9 @@
+@@ -212,6 +230,9 @@
/* This value is used when handling ellipsis. */
struct element_t ellipsis_weight;
@@ -49,7 +47,7 @@
/* Known collating elements. */
hash_table elem_table;
-@@ -1478,6 +1499,56 @@
+@@ -1455,6 +1476,56 @@
}
@@ -106,7 +104,7 @@
static void
collate_startup (struct linereader *ldfile, struct localedef_t *locale,
struct localedef_t *copy_locale, int ignore_content)
-@@ -2717,6 +2788,8 @@
+@@ -2630,6 +2701,8 @@
*/
int state = 0;
@@ -115,9 +113,9 @@
/* Get the repertoire we have to use. */
if (repertoire_name != NULL)
repertoire = repertoire_read (repertoire_name);
-@@ -2758,6 +2831,82 @@
- }
+@@ -2644,6 +2717,82 @@
}
+ while (nowtok == tok_eol);
+ while (nowtok == tok_define || nowtok == tok_undef)
+ {
@@ -197,8 +195,134 @@
+
if (nowtok == tok_copy)
{
- now = lr_token (ldfile, charmap, result, NULL, verbose);
-@@ -3941,6 +4090,13 @@
+ state = 2;
+@@ -3796,6 +3945,125 @@
+ repertoire, result, nowtok);
+ break;
+
++ case tok_ifdef:
++ /* Ignore the rest of the line if we don't need the input of
++ this line. */
++ if (ignore_content)
++ {
++ lr_ignore_rest (ldfile, 0);
++ break;
++ }
++
++ arg = lr_token (ldfile, charmap, result, NULL, verbose);
++ if (arg->tok != tok_ident)
++ goto err_label;
++ else
++ {
++ struct toggle_list_t *runp = defined_keywords;
++ struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp));
++ flow->name = "ifdef";
++ flow->file = ldfile->fname;
++ flow->line = ldfile->lineno;
++ flow->last = collate->flow_control;
++ collate->flow_control = flow;
++
++ while (runp != NULL)
++ if (strncmp (runp->name, arg->val.str.startmb,
++ arg->val.str.lenmb) == 0
++ && runp->name[arg->val.str.lenmb] == '\0')
++ break;
++ else
++ runp = runp->last;
++
++ if (runp == NULL)
++ {
++ now = flow_skip(ldfile, charmap, collate);
++ if (now->tok == tok_eof)
++ WITH_CUR_LOCALE (error (0, 0, _("\
++%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
++ }
++ }
++ lr_ignore_rest (ldfile, 1);
++ break;
++
++ case tok_ifndef:
++ /* Ignore the rest of the line if we don't need the input of
++ this line. */
++ if (ignore_content)
++ {
++ lr_ignore_rest (ldfile, 0);
++ break;
++ }
++
++ arg = lr_token (ldfile, charmap, result, NULL, verbose);
++ if (arg->tok != tok_ident)
++ goto err_label;
++ else
++ {
++ struct toggle_list_t *runp = defined_keywords;
++ struct toggle_list_t *flow = (struct toggle_list_t *) xcalloc (1, sizeof (*runp));
++ flow->name = "ifndef";
++ flow->file = ldfile->fname;
++ flow->line = ldfile->lineno;
++ flow->last = collate->flow_control;
++ collate->flow_control = flow;
++
++ while (runp != NULL)
++ if (strncmp (runp->name, arg->val.str.startmb,
++ arg->val.str.lenmb) == 0
++ && runp->name[arg->val.str.lenmb] == '\0')
++ break;
++ else
++ runp = runp->last;
++
++ if (runp != NULL)
++ {
++ now = flow_skip(ldfile, charmap, collate);
++ if (now->tok == tok_eof)
++ WITH_CUR_LOCALE (error (0, 0, _("\
++%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
++ }
++ }
++ lr_ignore_rest (ldfile, 1);
++ break;
++
++ case tok_else:
++ /* Ignore the rest of the line if we don't need the input of
++ this line. */
++ if (ignore_content)
++ {
++ lr_ignore_rest (ldfile, 0);
++ break;
++ }
++
++ if (strcmp (collate->flow_control->name, "else") == 0)
++ lr_error (ldfile,
++ _("%s: `else' statement at `%s:%Zu' cannot be followed by another `else' statement"),
++ "LC_COLLATE", collate->flow_control->name, collate->flow_control->line);
++ collate->flow_control->name = "else";
++ collate->flow_control->file = ldfile->fname;
++ collate->flow_control->line = ldfile->lineno;
++ now = flow_skip(ldfile, charmap, collate);
++ if (now->tok == tok_eof)
++ WITH_CUR_LOCALE (error (0, 0, _("\
++%s: unterminated `%s' flow control"), "LC_COLLATE", collate->flow_control->name));
++ break;
++
++ case tok_endif:
++ /* Ignore the rest of the line if we don't need the input of
++ this line. */
++ if (ignore_content)
++ {
++ lr_ignore_rest (ldfile, 0);
++ break;
++ }
++
++ if (collate->flow_control == NULL)
++ goto err_label;
++ else
++ collate->flow_control = collate->flow_control->last;
++ break;
++
+ case tok_end:
+ /* Next we assume `LC_COLLATE'. */
+ if (!ignore_content)
+@@ -3825,6 +4093,13 @@
else if (state == 5)
WITH_CUR_LOCALE (error (0, 0, _("\
%s: missing `reorder-sections-end' keyword"), "LC_COLLATE"));
Modified: glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/patches/localedata/sort-UTF8-first.diff 2007-10-26 01:01:50 UTC (rev 2595)
@@ -1,8 +1,8 @@
Index: localedata/SUPPORTED
===================================================================
---- localedata/SUPPORTED.orig 2007-10-23 11:54:23.000000000 -0400
-+++ localedata/SUPPORTED 2007-10-23 11:57:25.000000000 -0400
-@@ -232,8 +232,8 @@
+--- localedata/SUPPORTED.orig 2007-10-01 22:22:09.000000000 -0400
++++ localedata/SUPPORTED 2007-10-24 18:40:12.000000000 -0400
+@@ -221,8 +221,8 @@
hi_IN/UTF-8 \
hr_HR.UTF-8/UTF-8 \
hr_HR/ISO-8859-2 \
@@ -12,7 +12,7 @@
hu_HU.UTF-8/UTF-8 \
hu_HU/ISO-8859-2 \
hy_AM/UTF-8 \
-@@ -253,8 +253,8 @@
+@@ -241,8 +241,8 @@
iu_CA/UTF-8 \
iw_IL.UTF-8/UTF-8 \
iw_IL/ISO-8859-8 \
@@ -22,7 +22,7 @@
ka_GE.UTF-8/UTF-8 \
ka_GE/GEORGIAN-PS \
kk_KZ.UTF-8/UTF-8 \
-@@ -263,8 +263,8 @@
+@@ -251,8 +251,8 @@
kl_GL/ISO-8859-1 \
km_KH/UTF-8 \
kn_IN/UTF-8 \
@@ -32,17 +32,17 @@
ku_TR.UTF-8/UTF-8 \
ku_TR/ISO-8859-9 \
kw_GB.UTF-8/UTF-8 \
-@@ -328,8 +328,8 @@
+@@ -314,8 +314,8 @@
pt_PT@euro/ISO-8859-15 \
ro_RO.UTF-8/UTF-8 \
ro_RO/ISO-8859-2 \
-ru_RU.KOI8-R/KOI8-R \
ru_RU.UTF-8/UTF-8 \
+ru_RU.KOI8-R/KOI8-R \
- ru_RU.CP1251/CP1251 \
ru_RU/ISO-8859-5 \
ru_UA.UTF-8/UTF-8 \
-@@ -393,28 +393,28 @@
+ ru_UA/KOI8-U \
+@@ -376,28 +376,28 @@
uz_UZ/ISO-8859-1 \
uz_UZ@cyrillic/UTF-8 \
ve_ZA/UTF-8 \
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-23 21:28:59 UTC (rev 2594)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-26 01:01:50 UTC (rev 2595)
@@ -1,50 +1,49 @@
-localedata/locale-eo_EO.diff -p0
-localedata/locale-no_NO.diff -p0
-localedata/locale-eu_FR.diff -p0
-localedata/locale-ku_TR.diff -p0
locale/check-unknown-symbols.diff
locale/fix-LC_COLLATE-rules.diff -p0
-locale/preprocessor-collate.diff -p0
-locale/LC_IDENTIFICATION-optional-fields.diff -p0
-locale/LC_COLLATE-keywords-ordering.diff -p0
+#locale/preprocessor-collate.diff -p0
locale/locale-print-LANGUAGE.diff -p0
-locale/fix-C-first_weekday.diff -p0
-localedata/tl_PH-yesexpr.diff
-localedata/fo_FO-date_fmt.diff
-localedata/locales_CH.diff
-localedata/locales-fr.diff
-localedata/locales_GB.diff -p0
-localedata/supported.diff -p0
-localedata/locale-en_DK.diff -p0
-localedata/locale-csb_PL.diff
-localedata/dz_BT-collation.diff -p0
-localedata/locale-ia.diff -p0
-localedata/locale-zh_TW.diff -p0
-localedata/new-valencian-locale.diff -p0
-localedata/locale-se_NO.diff -p0
-localedata/tailor-iso14651_t1.diff -p0
-localedata/tailor-iso14651_t1-common.diff
-localedata/fix-lang.diff -p0
-localedata/cs_CZ-first_weekday.diff
-localedata/da_DK-first_weekday.diff
-localedata/pl_PL-first_weekday.diff
-localedata/de_DE-first_weekday.diff
-localedata/en_GB-first_weekday.diff
-localedata/en_US-first_weekday.diff
-localedata/et_EE-first_weekday.diff
-localedata/fr_BE-first_weekday.diff
-localedata/fr_CA-first_weekday.diff
-localedata/fr_CH-first_weekday.diff
-localedata/fr_FR-first_weekday.diff
-localedata/fr_LU-first_weekday.diff
-localedata/hu_HU-first_weekday.diff
-localedata/nb_NO-first_weekday.diff
-localedata/nn_NO-first_weekday.diff
-localedata/sk_SK-first_weekday.diff
-localedata/first_weekday.diff -p0
localedata/sort-UTF8-first.diff -p0
-localedata/local-all-no-archive.diff -p0
-localedata/fix-am_ET.diff
+#localedata/locale-eo_EO.diff -p0
+#localedata/locale-eu_FR.diff -p0
+#localedata/locale-ku_TR.diff -p0
+#locale/LC_IDENTIFICATION-optional-fields.diff -p0
+#locale/LC_COLLATE-keywords-ordering.diff -p0
+#locale/fix-C-first_weekday.diff -p0
+#localedata/tl_PH-yesexpr.diff
+#localedata/fo_FO-date_fmt.diff
+#localedata/locales_CH.diff
+#localedata/locales-fr.diff
+#localedata/locales_GB.diff -p0
+#localedata/supported.diff -p0
+#localedata/locale-en_DK.diff -p0
+#localedata/locale-csb_PL.diff
+#localedata/dz_BT-collation.diff -p0
+#localedata/locale-ia.diff -p0
+#localedata/locale-zh_TW.diff -p0
+#localedata/new-valencian-locale.diff -p0
+#localedata/locale-se_NO.diff -p0
+#localedata/tailor-iso14651_t1.diff -p0
+#localedata/tailor-iso14651_t1-common.diff
+#localedata/fix-lang.diff -p0
+#localedata/cs_CZ-first_weekday.diff
+#localedata/da_DK-first_weekday.diff
+#localedata/pl_PL-first_weekday.diff
+#localedata/de_DE-first_weekday.diff
+#localedata/en_GB-first_weekday.diff
+#localedata/en_US-first_weekday.diff
+#localedata/et_EE-first_weekday.diff
+#localedata/fr_BE-first_weekday.diff
+#localedata/fr_CA-first_weekday.diff
+#localedata/fr_CH-first_weekday.diff
+#localedata/fr_FR-first_weekday.diff
+#localedata/fr_LU-first_weekday.diff
+#localedata/hu_HU-first_weekday.diff
+#localedata/nb_NO-first_weekday.diff
+#localedata/nn_NO-first_weekday.diff
+#localedata/sk_SK-first_weekday.diff
+#localedata/first_weekday.diff -p0
+#localedata/local-all-no-archive.diff -p0
+#localedata/fix-am_ET.diff
alpha/local-gcc4.1.diff -p0
alpha/submitted-xstat.diff -p0
Reply to: