From c02fa54041a68c12107ec577770ff81329af3bef Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 31 Oct 2008 21:34:01 +0000 Subject: Updated to fedora-glibc-20081031T2102 --- ChangeLog | 66 +++++++++++++ debug/getgroups_chk.c | 8 +- elf/Makefile | 10 +- elf/dl-tls.c | 5 +- elf/tst-tls18.c | 37 ++++++++ elf/tst-tlsmod18a.c | 21 +++++ fedora/branch.mk | 4 +- fedora/glibc.spec.in | 13 ++- grp/initgroups.c | 11 +-- iconvdata/gconv-modules | 3 +- localedata/ChangeLog | 141 ++++++++++++++++++++++++++++ localedata/Makefile | 7 +- localedata/locales/af_ZA | 4 +- localedata/locales/ar_SA | 2 +- localedata/locales/be_BY | 2 +- localedata/locales/bs_BA | 2 +- localedata/locales/ca_AD | 2 +- localedata/locales/ca_ES | 2 +- localedata/locales/crh_UA | 2 +- localedata/locales/cs_CZ | 2 +- localedata/locales/da_DK | 2 +- localedata/locales/de_AT | 2 +- localedata/locales/de_BE | 2 +- localedata/locales/de_CH | 2 +- localedata/locales/de_DE | 2 +- localedata/locales/de_LU | 2 +- localedata/locales/el_CY | 2 +- localedata/locales/el_GR | 2 +- localedata/locales/en_AU | 2 +- localedata/locales/en_BW | 2 +- localedata/locales/en_CA | 2 +- localedata/locales/en_DK | 2 +- localedata/locales/en_GB | 2 +- localedata/locales/en_IE | 2 +- localedata/locales/en_NG | 4 +- localedata/locales/en_NZ | 2 +- localedata/locales/en_ZA | 4 +- localedata/locales/en_ZW | 2 +- localedata/locales/es_AR | 2 +- localedata/locales/es_BO | 2 +- localedata/locales/es_CL | 2 +- localedata/locales/es_CO | 2 +- localedata/locales/es_CR | 2 +- localedata/locales/es_DO | 2 +- localedata/locales/es_EC | 2 +- localedata/locales/es_ES | 2 +- localedata/locales/es_GT | 2 +- localedata/locales/es_HN | 2 +- localedata/locales/es_MX | 2 +- localedata/locales/es_NI | 2 +- localedata/locales/es_PA | 2 +- localedata/locales/es_PE | 2 +- localedata/locales/es_PR | 2 +- localedata/locales/es_PY | 2 +- localedata/locales/es_SV | 2 +- localedata/locales/es_UY | 2 +- localedata/locales/es_VE | 2 +- localedata/locales/eu_ES | 2 +- localedata/locales/fa_IR | 2 +- localedata/locales/fi_FI | 2 +- localedata/locales/fo_FO | 2 +- localedata/locales/fr_BE | 2 +- localedata/locales/fr_CA | 2 +- localedata/locales/fr_CH | 2 +- localedata/locales/fr_FR | 2 +- localedata/locales/fr_LU | 2 +- localedata/locales/fy_DE | 2 +- localedata/locales/fy_NL | 2 +- localedata/locales/ga_IE | 2 +- localedata/locales/gd_GB | 2 +- localedata/locales/gl_ES | 2 +- localedata/locales/gv_GB | 2 +- localedata/locales/ha_NG | 4 +- localedata/locales/he_IL | 2 +- localedata/locales/hr_HR | 2 +- localedata/locales/hsb_DE | 2 +- localedata/locales/hu_HU | 2 +- localedata/locales/id_ID | 2 +- localedata/locales/ig_NG | 4 +- localedata/locales/ik_CA | 2 +- localedata/locales/is_IS | 2 +- localedata/locales/iso14651_t1_common | 84 +++++++++++++++++ localedata/locales/it_CH | 2 +- localedata/locales/it_IT | 2 +- localedata/locales/iu_CA | 2 +- localedata/locales/iw_IL | 2 +- localedata/locales/kk_KZ | 2 +- localedata/locales/kl_GL | 2 +- localedata/locales/ko_KR | 2 +- localedata/locales/ku_TR | 2 +- localedata/locales/kw_GB | 2 +- localedata/locales/ky_KG | 2 +- localedata/locales/lg_UG | 4 +- localedata/locales/li_BE | 2 +- localedata/locales/li_NL | 2 +- localedata/locales/lt_LT | 2 +- localedata/locales/lv_LV | 2 +- localedata/locales/mg_MG | 4 +- localedata/locales/mk_MK | 2 +- localedata/locales/mn_MN | 2 +- localedata/locales/nb_NO | 2 +- localedata/locales/nds_DE | 2 +- localedata/locales/nds_NL | 2 +- localedata/locales/nl_BE | 2 +- localedata/locales/nl_NL | 2 +- localedata/locales/nr_ZA | 4 +- localedata/locales/nso_ZA | 4 +- localedata/locales/pa_PK | 2 +- localedata/locales/pl_PL | 2 +- localedata/locales/pt_BR | 2 +- localedata/locales/pt_PT | 2 +- localedata/locales/ru_RU | 2 +- localedata/locales/ru_UA | 2 +- localedata/locales/rw_RW | 2 +- localedata/locales/se_NO | 2 +- localedata/locales/shs_CA | 2 +- localedata/locales/sk_SK | 2 +- localedata/locales/sl_SI | 2 +- localedata/locales/sr_ME | 2 +- localedata/locales/sr_RS | 2 +- localedata/locales/sr_RS@latin | 2 +- localedata/locales/ss_ZA | 4 +- localedata/locales/st_ZA | 4 +- localedata/locales/sv_FI | 2 +- localedata/locales/sv_SE | 2 +- localedata/locales/tg_TJ | 2 +- localedata/locales/tk_TM | 2 +- localedata/locales/tl_PH | 2 +- localedata/locales/tn_ZA | 4 +- localedata/locales/tr_CY | 2 +- localedata/locales/tr_TR | 2 +- localedata/locales/ts_ZA | 4 +- localedata/locales/tt_RU@iqtelif | 2 +- localedata/locales/ur_PK | 2 +- localedata/locales/ve_ZA | 4 +- localedata/locales/wa_BE | 2 +- localedata/locales/wo_SN | 4 +- localedata/locales/xh_ZA | 4 +- localedata/locales/yo_NG | 4 +- localedata/locales/zu_ZA | 4 +- localedata/si_LK.in | 101 ++++++++++++++++++++ localedata/tests-mbwc/dat_mbtowc.c | 8 +- posix/bits/unistd.h | 4 +- posix/spawnattr_getschedparam.c | 4 +- resolv/res_send.c | 12 ++- resource/Makefile | 5 +- resource/bug-ulimit1.c | 21 +++++ sysdeps/powerpc/elf/rtld-global-offsets.sym | 4 +- sysdeps/powerpc/powerpc32/dl-machine.c | 4 +- sysdeps/unix/sysv/linux/eventfd.c | 4 +- sysdeps/unix/sysv/linux/ulimit.c | 11 ++- 151 files changed, 693 insertions(+), 185 deletions(-) create mode 100644 elf/tst-tls18.c create mode 100644 elf/tst-tlsmod18a.c create mode 100644 localedata/si_LK.in create mode 100644 resource/bug-ulimit1.c diff --git a/ChangeLog b/ChangeLog index 06da1adb93..1b93c676be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,69 @@ +2008-10-31 Jakub Jelinek + + * elf/dl-tls.c (__tls_get_addr): After calling _dl_update_slotinfo + refetch dtv, as it might have changed. + * elf/Makefile: Add rules to build and run tst-tls18. + * elf/tst-tls18.c: New test. + * elf/tst-tlsmod18a.c: New file. + +2008-09-09 Aurelien Jarno + + [BZ #6875] + * iconvdata/gconv-modules: Add LATIN9 as an alias to ISO-8859-15. + +2008-10-31 Ulrich Drepper + + [BZ #6867] + * sysdeps/powerpc/elf/rtld-global-offsets.sym: Fix typo. + + [BZ #6919] + * posix/spawnattr_getschedparam.c (posix_spawnattr_getschedparam): + Fix length of copy operation. + +2008-10-02 Pierre Habouzit + + * sysdeps/unix/sysv/linux/eventfd.c (eventfd): Use the eventfd2 syscall + and fix its calling convention. + +2008-10-07 Andreas Schwab + + [BZ #6942] + * resolv/res_send.c (send_vc): Fix last change. + (send_dg): Align here as well. + +2008-10-31 Ulrich Drepper + + * sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Handle UL_GETFSIZE + return value in case rlimit is RLIM_INFINITY. + + [BZ #6947] + * sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Fix return value + for UL_SETFSIZE. + * resource/Makefile (tests): Add bug-ulimit1. + * resource/bug-ulimit1.c: New file. + + [BZ #6974] + * sunrpc/rpc_main.c (mkfile_output): Properly handle filename + without dot. Properly terminate the string with a null byte. + Based on a patch by Aurelien Jarno . + + [BZ #6980] + * debug/getgroups_chk.c (__getgroups_chk): Return EINVAL error for + negative sizees. + * posix/bits/unistd.h (getgroups): Call __getgroups_chk for + negative __size. + + [BZ #6995] + * sysdeps/powerpc/powerpc32/dl-machine.c: Fix typo in message. + +2008-10-30 Ulrich Drepper + + * grp/initgroups.c (internal_getgrouplist): Don't prematurely + abort if there is no initgroups_dyn function. + + * resolv/res_send.c (send_dg): On timeout, only return nonzero + result if any of the queries really provided an answer. + 2008-10-28 Ulrich Drepper * po/lt.po: Update from translation team. diff --git a/debug/getgroups_chk.c b/debug/getgroups_chk.c index c877ddb9ca..8c3d99da7e 100644 --- a/debug/getgroups_chk.c +++ b/debug/getgroups_chk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,6 +23,12 @@ int __getgroups_chk (int size, __gid_t list[], size_t listlen) { + if (__builtin_expect (size < 0, 0)) + { + __set_errno (EINVAL); + return -1; + } + if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0)) __chk_fail (); diff --git a/elf/Makefile b/elf/Makefile index df3170c626..8079fe9f96 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -166,7 +166,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \ circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \ tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-tls15 \ - tst-tls16 tst-tls17 tst-tls-dlinfo \ + tst-tls16 tst-tls17 tst-tls18 tst-tls-dlinfo \ tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ @@ -182,6 +182,7 @@ tests: $(objpfx)tst-pie1.out endif tests: $(objpfx)tst-leaks1-mem tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 +tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ testobj1_1 failobj constload2 constload3 unloadmod \ dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \ @@ -203,6 +204,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-tlsmod15a tst-tlsmod15b tst-tlsmod16a tst-tlsmod16b \ $(patsubst %,tst-tlsmod17a%,$(tlsmod17a-suffixes)) \ tst-tlsmod17b \ + $(patsubst %,tst-tlsmod18a%,$(tlsmod18a-suffixes)) \ circlemod1 circlemod1a circlemod2 circlemod2a \ circlemod3 circlemod3a \ reldep8mod1 reldep8mod2 reldep8mod3 \ @@ -724,6 +726,12 @@ $(patsubst %,$(objpfx)tst-tlsmod17a%.os,$(tlsmod17a-suffixes)): $(objpfx)tst-tls $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes)): $(objpfx)tst-tlsmod17a%.so: $(objpfx)ld.so $(objpfx)tst-tlsmod17b.so: $(patsubst %,$(objpfx)tst-tlsmod17a%.so,$(tlsmod17a-suffixes)) +$(objpfx)tst-tls18: $(libdl) +$(objpfx)tst-tls18.out: $(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes)) +$(patsubst %,$(objpfx)tst-tlsmod18a%.os,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.os : tst-tlsmod18a.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ -DN=$* -DNOT_IN_libc=1 $< +$(patsubst %,$(objpfx)tst-tlsmod18a%.so,$(tlsmod18a-suffixes)): $(objpfx)tst-tlsmod18a%.so: $(objpfx)ld.so + CFLAGS-tst-align.c = $(stack-align-test-flags) CFLAGS-tst-align2.c = $(stack-align-test-flags) CFLAGS-tst-alignmod.c = $(stack-align-test-flags) diff --git a/elf/dl-tls.c b/elf/dl-tls.c index e234a0a82a..824adc196d 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -756,7 +756,10 @@ __tls_get_addr (GET_ADDR_ARGS) void *p; if (__builtin_expect (dtv[0].counter != GL(dl_tls_generation), 0)) - the_map = _dl_update_slotinfo (GET_ADDR_MODULE); + { + the_map = _dl_update_slotinfo (GET_ADDR_MODULE); + dtv = THREAD_DTV (); + } p = dtv[GET_ADDR_MODULE].pointer.val; diff --git a/elf/tst-tls18.c b/elf/tst-tls18.c new file mode 100644 index 0000000000..96b8e6bf7b --- /dev/null +++ b/elf/tst-tls18.c @@ -0,0 +1,37 @@ +#include +#include + +static int +do_test (void) +{ + char modname[sizeof "tst-tlsmod18aXX.so"]; + void *h[20]; + for (int i = 0; i < 20; i++) + { + snprintf (modname, sizeof modname, "tst-tlsmod18a%d.so", i); + h[i] = dlopen (modname, RTLD_LAZY); + if (h[i] == NULL) + { + printf ("unexpectedly failed to open %s", modname); + exit (1); + } + } + + for (int i = 0; i < 20; i++) + { + int (*fp) (void) = (int (*) (void)) dlsym (h[i], "test"); + if (fp == NULL) + { + printf ("cannot find test in tst-tlsmod18a%d.so", i); + exit (1); + } + + if (fp ()) + exit (1); + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/elf/tst-tlsmod18a.c b/elf/tst-tlsmod18a.c new file mode 100644 index 0000000000..1d728daa05 --- /dev/null +++ b/elf/tst-tlsmod18a.c @@ -0,0 +1,21 @@ +#include + +#ifndef N +# define N 0 +#endif + +static __thread int var = 4; + +int +test (void) +{ + int *p = &var; + /* GCC assumes &var is never NULL, add optimization barrier. */ + asm volatile ("" : "+r" (p)); + if (p == NULL || *p != 4) + { + printf ("fail %d %p\n", N, p); + return 1; + } + return 0; +} diff --git a/fedora/branch.mk b/fedora/branch.mk index 3f1a1d2d24..b4292956c9 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2008-10-28 15:33 UTC -fedora-sync-tag := fedora-glibc-20081028T1533 +fedora-sync-date := 2008-10-31 21:02 UTC +fedora-sync-tag := fedora-glibc-20081031T2102 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 65423181cd..acf2578217 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -19,7 +19,7 @@ Summary: The GNU libc libraries Name: glibc Version: @glibcversion@ -Release: 15 +Release: 16 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -984,11 +984,18 @@ rm -f *.filelist* %endif %changelog +* Fri Oct 31 2008 Jakub Jelinek 2.8.90-16 +- update from trunk + - further resolver fixes + - another dynamic TLS handling fix (#469263) + - misc fixes (BZ#6867, BZ#6875, BZ#6919, BZ#6920, BZ#6942, BZ#6947, + BZ#6968, BZ#6974, BZ#6980, BZ#6995) +- rebuild with newer rpm to avoid stripping + shared libraries when they shouldn't be (#468129) + * Tue Oct 28 2008 Jakub Jelinek 2.8.90-15 - update from trunk - __libc_res_nquery fixes (#466786) -- try to workaround recent rpm changes which now strip glibc - shared libraries when they shouldn't (#468129) * Sun Oct 19 2008 Jakub Jelinek 2.8.90-14 - update from trunk diff --git a/grp/initgroups.c b/grp/initgroups.c index 2e489463df..cab63e52bf 100644 --- a/grp/initgroups.c +++ b/grp/initgroups.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1989,91,93,1996-2005,2006 Free Software Foundation, Inc. +/* Copyright (C) 1989,91,93,1996-2005,2006,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -94,13 +94,8 @@ internal_getgrouplist (const char *user, gid_t group, long int *size, fct = __nss_lookup_function (nip, "initgroups_dyn"); if (fct == NULL) - { - status = compat_call (nip, user, group, &start, size, groupsp, - limit, &errno); - - if (nss_next_action (nip, NSS_STATUS_UNAVAIL) != NSS_ACTION_CONTINUE) - break; - } + status = compat_call (nip, user, group, &start, size, groupsp, + limit, &errno); else status = DL_CALL_FCT (fct, (user, group, &start, size, groupsp, limit, &errno)); diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index a14dbbe9d6..e70432fcaa 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 1997-2004, 2005, 2007, 2008 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -395,6 +395,7 @@ alias ISO885915// ISO-8859-15// alias ISO-IR-203// ISO-8859-15// alias ISO_8859-15// ISO-8859-15// alias LATIN-9// ISO-8859-15// +alias LATIN9// ISO-8859-15// alias ISO_8859-15:1998// ISO-8859-15// module ISO-8859-15// INTERNAL ISO8859-15 1 module INTERNAL ISO-8859-15// ISO8859-15 1 diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 9e09641efe..bc339ff17a 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,144 @@ +2008-10-31 Ulrich Drepper + + [BZ #6920] + * locales/af_ZA: Fix %%z and %%T and postal_fmts. + * locales/ar_SA: Likewise. + * locales/be_BY: Likewise. + * locales/bs_BA: Likewise. + * locales/ca_AD: Likewise. + * locales/ca_ES: Likewise. + * locales/crh_UA: Likewise. + * locales/cs_CZ: Likewise. + * locales/da_DK: Likewise. + * locales/de_AT: Likewise. + * locales/de_BE: Likewise. + * locales/de_CH: Likewise. + * locales/de_DE: Likewise. + * locales/de_LU: Likewise. + * locales/el_CY: Likewise. + * locales/el_GR: Likewise. + * locales/en_AU: Likewise. + * locales/en_BW: Likewise. + * locales/en_CA: Likewise. + * locales/en_DK: Likewise. + * locales/en_GB: Likewise. + * locales/en_IE: Likewise. + * locales/en_NG: Likewise. + * locales/en_NZ: Likewise. + * locales/en_ZA: Likewise. + * locales/en_ZW: Likewise. + * locales/es_AR: Likewise. + * locales/es_BO: Likewise. + * locales/es_CL: Likewise. + * locales/es_CO: Likewise. + * locales/es_CR: Likewise. + * locales/es_DO: Likewise. + * locales/es_EC: Likewise. + * locales/es_ES: Likewise. + * locales/es_GT: Likewise. + * locales/es_HN: Likewise. + * locales/es_MX: Likewise. + * locales/es_NI: Likewise. + * locales/es_PA: Likewise. + * locales/es_PE: Likewise. + * locales/es_PR: Likewise. + * locales/es_PY: Likewise. + * locales/es_SV: Likewise. + * locales/es_UY: Likewise. + * locales/es_VE: Likewise. + * locales/eu_ES: Likewise. + * locales/fa_IR: Likewise. + * locales/fi_FI: Likewise. + * locales/fo_FO: Likewise. + * locales/fr_BE: Likewise. + * locales/fr_CA: Likewise. + * locales/fr_CH: Likewise. + * locales/fr_FR: Likewise. + * locales/fr_LU: Likewise. + * locales/fy_DE: Likewise. + * locales/fy_NL: Likewise. + * locales/ga_IE: Likewise. + * locales/gd_GB: Likewise. + * locales/gl_ES: Likewise. + * locales/gv_GB: Likewise. + * locales/ha_NG: Likewise. + * locales/he_IL: Likewise. + * locales/hr_HR: Likewise. + * locales/hsb_DE: Likewise. + * locales/hu_HU: Likewise. + * locales/id_ID: Likewise. + * locales/ig_NG: Likewise. + * locales/ik_CA: Likewise. + * locales/is_IS: Likewise. + * locales/it_CH: Likewise. + * locales/it_IT: Likewise. + * locales/iu_CA: Likewise. + * locales/iw_IL: Likewise. + * locales/kk_KZ: Likewise. + * locales/kl_GL: Likewise. + * locales/ko_KR: Likewise. + * locales/ku_TR: Likewise. + * locales/kw_GB: Likewise. + * locales/ky_KG: Likewise. + * locales/lg_UG: Likewise. + * locales/li_BE: Likewise. + * locales/li_NL: Likewise. + * locales/lt_LT: Likewise. + * locales/lv_LV: Likewise. + * locales/mg_MG: Likewise. + * locales/mk_MK: Likewise. + * locales/mn_MN: Likewise. + * locales/nb_NO: Likewise. + * locales/nds_DE: Likewise. + * locales/nds_NL: Likewise. + * locales/nl_BE: Likewise. + * locales/nl_NL: Likewise. + * locales/nr_ZA: Likewise. + * locales/nso_ZA: Likewise. + * locales/pa_PK: Likewise. + * locales/pl_PL: Likewise. + * locales/pt_BR: Likewise. + * locales/pt_PT: Likewise. + * locales/ru_RU: Likewise. + * locales/ru_UA: Likewise. + * locales/rw_RW: Likewise. + * locales/se_NO: Likewise. + * locales/shs_CA: Likewise. + * locales/sk_SK: Likewise. + * locales/sl_SI: Likewise. + * locales/sr_ME: Likewise. + * locales/sr_RS: Likewise. + * locales/sr_RS@latin: Likewise. + * locales/ss_ZA: Likewise. + * locales/st_ZA: Likewise. + * locales/sv_FI: Likewise. + * locales/sv_SE: Likewise. + * locales/tg_TJ: Likewise. + * locales/tk_TM: Likewise. + * locales/tl_PH: Likewise. + * locales/tn_ZA: Likewise. + * locales/tr_CY: Likewise. + * locales/tr_TR: Likewise. + * locales/ts_ZA: Likewise. + * locales/tt_RU@iqtelif: Likewise. + * locales/ur_PK: Likewise. + * locales/ve_ZA: Likewise. + * locales/wa_BE: Likewise. + * locales/wo_SN: Likewise. + * locales/xh_ZA: Likewise. + * locales/yo_NG: Likewise. + * locales/zu_ZA: Likewise. + Patch by Pekka Vuorela . + + * tests-mbwc/dat_mbtowc.c (tst_mbtowc_loc): Avoid some warnings. + + [BZ #6968] + * locales/iso14651_t1_common: Add support for Sinhala. + * localedata/si_LK.in: New file. + Patch by harshula@gmail.com. + * Makefile (test-input): Add si_LK.UTF-8. + (LOCALES): Likewise. + 2008-09-17 Ulrich Drepper * locales/en_GB: Set first weekday and workday to 2. diff --git a/localedata/Makefile b/localedata/Makefile index d3c5e7e9b0..f84b3dc588 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2002, 2003, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -41,7 +41,8 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \ tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \ tst-ctype tst-wctype tst-langinfo tst-numeric test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \ - hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 + hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \ + si_LK.UTF-8 test-input-data = $(addsuffix .in, $(basename $(test-input))) test-output := $(foreach s, .out .xout, \ $(addsuffix $s, $(basename $(test-input)))) @@ -134,7 +135,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \ tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \ - ja_JP.UTF-8 + ja_JP.UTF-8 si_LK.UTF-8 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) diff --git a/localedata/locales/af_ZA b/localedata/locales/af_ZA index 2a85acfe9e..ec588605eb 100644 --- a/localedata/locales/af_ZA +++ b/localedata/locales/af_ZA @@ -226,7 +226,7 @@ END LC_NAME LC_ADDRESS % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -252,7 +252,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Country name in Afrikaans - "Suid-Afrika" diff --git a/localedata/locales/ar_SA b/localedata/locales/ar_SA index 81d8cbf020..e9a3aa4f5a 100644 --- a/localedata/locales/ar_SA +++ b/localedata/locales/ar_SA @@ -381,7 +381,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/be_BY b/localedata/locales/be_BY index 0e02ac4dea..111b3b12b1 100644 --- a/localedata/locales/be_BY +++ b/localedata/locales/be_BY @@ -175,7 +175,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA index 9d0a0e6376..fa5877e8b2 100644 --- a/localedata/locales/bs_BA +++ b/localedata/locales/bs_BA @@ -229,7 +229,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ca_AD b/localedata/locales/ca_AD index 01b87a6b75..a1eebbb02d 100644 --- a/localedata/locales/ca_AD +++ b/localedata/locales/ca_AD @@ -86,7 +86,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES index db002cfd74..cd83bcca44 100644 --- a/localedata/locales/ca_ES +++ b/localedata/locales/ca_ES @@ -167,7 +167,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/crh_UA b/localedata/locales/crh_UA index c95da02380..5dfab24d90 100644 --- a/localedata/locales/crh_UA +++ b/localedata/locales/crh_UA @@ -219,7 +219,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ index cb2323123c..640c8f836d 100644 --- a/localedata/locales/cs_CZ +++ b/localedata/locales/cs_CZ @@ -2488,7 +2488,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_post "" diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK index ce77e72071..2c8a41a963 100644 --- a/localedata/locales/da_DK +++ b/localedata/locales/da_DK @@ -247,7 +247,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT index 435363e397..4ec42f470e 100644 --- a/localedata/locales/de_AT +++ b/localedata/locales/de_AT @@ -149,7 +149,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE index 140b407f07..3e7f11d088 100644 --- a/localedata/locales/de_BE +++ b/localedata/locales/de_BE @@ -142,7 +142,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH index 170a797d3d..1ba6585b9a 100644 --- a/localedata/locales/de_CH +++ b/localedata/locales/de_CH @@ -149,7 +149,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE index a40facc850..b040923ead 100644 --- a/localedata/locales/de_DE +++ b/localedata/locales/de_DE @@ -184,7 +184,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "/ " diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU index 51ecf37750..66baf3fb6d 100644 --- a/localedata/locales/de_LU +++ b/localedata/locales/de_LU @@ -148,7 +148,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY index 6620a3aac7..66acb12508 100644 --- a/localedata/locales/el_CY +++ b/localedata/locales/el_CY @@ -96,7 +96,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/el_GR b/localedata/locales/el_GR index 676d31253e..ce608a801e 100644 --- a/localedata/locales/el_GR +++ b/localedata/locales/el_GR @@ -169,7 +169,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU index 91c656fe23..39aa7e25c3 100644 --- a/localedata/locales/en_AU +++ b/localedata/locales/en_AU @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW index ea8cf7ecb6..bb8102fee3 100644 --- a/localedata/locales/en_BW +++ b/localedata/locales/en_BW @@ -109,7 +109,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA index f48a2fb813..5e0ef2c320 100644 --- a/localedata/locales/en_CA +++ b/localedata/locales/en_CA @@ -165,7 +165,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK index e3d5eca0ba..aa58763578 100644 --- a/localedata/locales/en_DK +++ b/localedata/locales/en_DK @@ -150,7 +150,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB index e12f887548..cefa08b6c4 100644 --- a/localedata/locales/en_GB +++ b/localedata/locales/en_GB @@ -156,7 +156,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE index d799cc71e0..171e3b16b7 100644 --- a/localedata/locales/en_IE +++ b/localedata/locales/en_IE @@ -148,7 +148,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_NG b/localedata/locales/en_NG index 569283b906..31bb4fb2d8 100644 --- a/localedata/locales/en_NG +++ b/localedata/locales/en_NG @@ -222,7 +222,7 @@ END LC_NAME LC_ADDRESS % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -248,7 +248,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Country name in English - "Nigeria" diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ index 82470f57c3..815134f714 100644 --- a/localedata/locales/en_NZ +++ b/localedata/locales/en_NZ @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/en_ZA b/localedata/locales/en_ZA index f5476da6e6..86201714b3 100644 --- a/localedata/locales/en_ZA +++ b/localedata/locales/en_ZA @@ -289,7 +289,7 @@ END LC_NAME LC_ADDRESS % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -315,7 +315,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Country name in English - "South Africa" diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW index 7a31abb0a1..710c42ea09 100644 --- a/localedata/locales/en_ZW +++ b/localedata/locales/en_ZW @@ -108,7 +108,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR index 48a0bb0b51..c757638f7f 100644 --- a/localedata/locales/es_AR +++ b/localedata/locales/es_AR @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO index 07688e875a..c77bb1d5d5 100644 --- a/localedata/locales/es_BO +++ b/localedata/locales/es_BO @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL index a509848a1f..2f44845862 100644 --- a/localedata/locales/es_CL +++ b/localedata/locales/es_CL @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO index 8b58492d4e..630ee75d4b 100644 --- a/localedata/locales/es_CO +++ b/localedata/locales/es_CO @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR index d582a20d9b..038517973a 100644 --- a/localedata/locales/es_CR +++ b/localedata/locales/es_CR @@ -145,7 +145,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO index 639a033b6a..fcd0f9e5af 100644 --- a/localedata/locales/es_DO +++ b/localedata/locales/es_DO @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC index 8bd1375ff1..b8d4c8ff32 100644 --- a/localedata/locales/es_EC +++ b/localedata/locales/es_EC @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES index 01e13dfc75..fba4125368 100644 --- a/localedata/locales/es_ES +++ b/localedata/locales/es_ES @@ -157,7 +157,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT index 42a1819346..2d06fa51f1 100644 --- a/localedata/locales/es_GT +++ b/localedata/locales/es_GT @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN index 39faf709c3..53892b4c5e 100644 --- a/localedata/locales/es_HN +++ b/localedata/locales/es_HN @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX index df400d9ff8..0149865018 100644 --- a/localedata/locales/es_MX +++ b/localedata/locales/es_MX @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_NI b/localedata/locales/es_NI index d75c68b6c7..ec984a74c6 100644 --- a/localedata/locales/es_NI +++ b/localedata/locales/es_NI @@ -143,7 +143,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA index d3dce8e218..ac969a677f 100644 --- a/localedata/locales/es_PA +++ b/localedata/locales/es_PA @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE index 27390ab764..634c9272d7 100644 --- a/localedata/locales/es_PE +++ b/localedata/locales/es_PE @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_PR b/localedata/locales/es_PR index 0f9947a89d..546b6c20e9 100644 --- a/localedata/locales/es_PR +++ b/localedata/locales/es_PR @@ -139,7 +139,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY index f7823a11df..2c31b2f250 100644 --- a/localedata/locales/es_PY +++ b/localedata/locales/es_PY @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV index 42c36d4e35..7b173046dc 100644 --- a/localedata/locales/es_SV +++ b/localedata/locales/es_SV @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY index 99848a74a9..8b7ed0da45 100644 --- a/localedata/locales/es_UY +++ b/localedata/locales/es_UY @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE index 97bbd216e2..c9e916a286 100644 --- a/localedata/locales/es_VE +++ b/localedata/locales/es_VE @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES index 4ebaa7eb62..f433aed75f 100644 --- a/localedata/locales/eu_ES +++ b/localedata/locales/eu_ES @@ -160,7 +160,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index 23e5dbd93b..242978774f 100644 --- a/localedata/locales/fa_IR +++ b/localedata/locales/fa_IR @@ -465,7 +465,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_ab2 "" diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI index a7920acb13..c3604871f6 100644 --- a/localedata/locales/fi_FI +++ b/localedata/locales/fi_FI @@ -236,7 +236,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO index dc34e9b859..c19c2ea49c 100644 --- a/localedata/locales/fo_FO +++ b/localedata/locales/fo_FO @@ -137,7 +137,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE index af8f1b30c9..8a96d3c7ba 100644 --- a/localedata/locales/fr_BE +++ b/localedata/locales/fr_BE @@ -150,7 +150,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA index b7e61453c9..992a4b1333 100644 --- a/localedata/locales/fr_CA +++ b/localedata/locales/fr_CA @@ -144,7 +144,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH index e2508e64ce..7cb62822b6 100644 --- a/localedata/locales/fr_CH +++ b/localedata/locales/fr_CH @@ -136,7 +136,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR index 92c3bde1b7..ffa6513e6a 100644 --- a/localedata/locales/fr_FR +++ b/localedata/locales/fr_FR @@ -172,7 +172,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU index 286ad5b7e4..80b29b645d 100644 --- a/localedata/locales/fr_LU +++ b/localedata/locales/fr_LU @@ -149,7 +149,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/fy_DE b/localedata/locales/fy_DE index cad33aa515..dc4757f63d 100644 --- a/localedata/locales/fy_DE +++ b/localedata/locales/fy_DE @@ -40,7 +40,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_post "" country_ab2 "" diff --git a/localedata/locales/fy_NL b/localedata/locales/fy_NL index d247e50d0c..a787e78f7a 100644 --- a/localedata/locales/fy_NL +++ b/localedata/locales/fy_NL @@ -122,7 +122,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE index 6e9526035a..a8086a605f 100644 --- a/localedata/locales/ga_IE +++ b/localedata/locales/ga_IE @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/gd_GB b/localedata/locales/gd_GB index 5c6df072c4..a83839c56d 100644 --- a/localedata/locales/gd_GB +++ b/localedata/locales/gd_GB @@ -36,7 +36,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES index 6822d64c98..4efe5c1829 100644 --- a/localedata/locales/gl_ES +++ b/localedata/locales/gl_ES @@ -150,7 +150,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB index 34a9771710..16efd8d27e 100644 --- a/localedata/locales/gv_GB +++ b/localedata/locales/gv_GB @@ -165,7 +165,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ha_NG b/localedata/locales/ha_NG index 1a7640dfde..d74d324dca 100644 --- a/localedata/locales/ha_NG +++ b/localedata/locales/ha_NG @@ -239,7 +239,7 @@ END LC_NAME LC_ADDRESS % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -265,7 +265,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Country name in Hausa - "Nigeria" diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL index 7f6426fb89..e744d47fe9 100644 --- a/localedata/locales/he_IL +++ b/localedata/locales/he_IL @@ -157,7 +157,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR index 04a80e2c12..f4f1cc474a 100644 --- a/localedata/locales/hr_HR +++ b/localedata/locales/hr_HR @@ -2242,7 +2242,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE index aba925475c..50355af35a 100644 --- a/localedata/locales/hsb_DE +++ b/localedata/locales/hsb_DE @@ -2199,7 +2199,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_post "" diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU index 97e544df6a..6948df4bf5 100644 --- a/localedata/locales/hu_HU +++ b/localedata/locales/hu_HU @@ -551,7 +551,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/id_ID b/localedata/locales/id_ID index 7584fbc47d..fceb891014 100644 --- a/localedata/locales/id_ID +++ b/localedata/locales/id_ID @@ -154,7 +154,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG index 308182bfad..c808828b4a 100644 --- a/localedata/locales/ig_NG +++ b/localedata/locales/ig_NG @@ -436,7 +436,7 @@ END LC_NAME LC_ADDRESS % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -462,7 +462,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Country name in Igbo - "Nigeria" diff --git a/localedata/locales/ik_CA b/localedata/locales/ik_CA index d442edae00..fdcb8afe16 100644 --- a/localedata/locales/ik_CA +++ b/localedata/locales/ik_CA @@ -228,7 +228,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS index cddceeed39..b4e3919e61 100644 --- a/localedata/locales/is_IS +++ b/localedata/locales/is_IS @@ -2258,7 +2258,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common index cbca3eb863..795ce323a9 100644 --- a/localedata/locales/iso14651_t1_common +++ b/localedata/locales/iso14651_t1_common @@ -65,6 +65,7 @@ script script script script +script # Déclaration des symboles internes / Declaration of internal symbols # @@ -3968,6 +3969,89 @@ order_start ;forward;forward;forward;forward,position ;;;IGNORE IGNORE;;;IGNORE +order_start ;forward;forward;forward;forward,position +# SCCII Part 1 : Collation Sequence (SLS1134) + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + order_end END LC_COLLATE diff --git a/localedata/locales/it_CH b/localedata/locales/it_CH index 62344c4e27..4fdc50a4b8 100644 --- a/localedata/locales/it_CH +++ b/localedata/locales/it_CH @@ -129,7 +129,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT index 57121e1470..105f40c9f4 100644 --- a/localedata/locales/it_IT +++ b/localedata/locales/it_IT @@ -153,7 +153,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/iu_CA b/localedata/locales/iu_CA index 57eded7df2..da08366ddb 100644 --- a/localedata/locales/iu_CA +++ b/localedata/locales/iu_CA @@ -34,7 +34,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % FIXME country_name "Canada" in inuktitut ? % FIXME country_post "CA" for Canada ? diff --git a/localedata/locales/iw_IL b/localedata/locales/iw_IL index 192ffc98d0..7ab893a99b 100644 --- a/localedata/locales/iw_IL +++ b/localedata/locales/iw_IL @@ -156,7 +156,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/kk_KZ b/localedata/locales/kk_KZ index e60be415bc..cec3891f68 100644 --- a/localedata/locales/kk_KZ +++ b/localedata/locales/kk_KZ @@ -259,6 +259,6 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " END LC_ADDRESS diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL index ae62a698fb..788950c612 100644 --- a/localedata/locales/kl_GL +++ b/localedata/locales/kl_GL @@ -138,7 +138,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ko_KR b/localedata/locales/ko_KR index f8407fd2d1..43915c2a82 100644 --- a/localedata/locales/ko_KR +++ b/localedata/locales/ko_KR @@ -6240,7 +6240,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR index b1486f9b12..9639e2634c 100644 --- a/localedata/locales/ku_TR +++ b/localedata/locales/ku_TR @@ -197,7 +197,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % TODO country_name "" diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB index fb3d8c7cbf..35d7c83b25 100644 --- a/localedata/locales/kw_GB +++ b/localedata/locales/kw_GB @@ -157,7 +157,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ky_KG b/localedata/locales/ky_KG index ee49f8689c..b656d1ad24 100644 --- a/localedata/locales/ky_KG +++ b/localedata/locales/ky_KG @@ -199,7 +199,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/lg_UG b/localedata/locales/lg_UG index ac4c39da24..edb9a77aa7 100644 --- a/localedata/locales/lg_UG +++ b/localedata/locales/lg_UG @@ -302,10 +302,10 @@ country_ab2 "" postal_fmt "/ / / -/ +/ " % Representation of postal addresses (minus the addressee's name) in Uganda. -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/li_BE b/localedata/locales/li_BE index f0a6fc19ff..eea6bdbab8 100644 --- a/localedata/locales/li_BE +++ b/localedata/locales/li_BE @@ -39,7 +39,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " %FIXME country_name "Belgie" country_post "" diff --git a/localedata/locales/li_NL b/localedata/locales/li_NL index 3f4d021f47..21c5044904 100644 --- a/localedata/locales/li_NL +++ b/localedata/locales/li_NL @@ -39,7 +39,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " %FIXME country_name "Nederland" country_post "" diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT index 0240cc96cf..b709d83f9e 100644 --- a/localedata/locales/lt_LT +++ b/localedata/locales/lt_LT @@ -2225,7 +2225,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV index 99c8b6c25e..fdf0f372a6 100644 --- a/localedata/locales/lv_LV +++ b/localedata/locales/lv_LV @@ -2217,7 +2217,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/mg_MG b/localedata/locales/mg_MG index 1490e5deac..996f2c53e3 100644 --- a/localedata/locales/mg_MG +++ b/localedata/locales/mg_MG @@ -169,11 +169,11 @@ name_fmt "/ END LC_NAME LC_ADDRESS -% %f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N +% %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK index 85f972c6e5..3157b4940d 100644 --- a/localedata/locales/mk_MK +++ b/localedata/locales/mk_MK @@ -143,7 +143,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "/ " diff --git a/localedata/locales/mn_MN b/localedata/locales/mn_MN index 82c1d2a12c..8da3878209 100644 --- a/localedata/locales/mn_MN +++ b/localedata/locales/mn_MN @@ -246,7 +246,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_post "" diff --git a/localedata/locales/nb_NO b/localedata/locales/nb_NO index 6638272c90..2604676739 100644 --- a/localedata/locales/nb_NO +++ b/localedata/locales/nb_NO @@ -236,7 +236,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/nds_DE b/localedata/locales/nds_DE index 10310cf071..5c37f317b5 100644 --- a/localedata/locales/nds_DE +++ b/localedata/locales/nds_DE @@ -39,7 +39,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_post "" country_ab2 "" diff --git a/localedata/locales/nds_NL b/localedata/locales/nds_NL index 54792ca658..51ac58329d 100644 --- a/localedata/locales/nds_NL +++ b/localedata/locales/nds_NL @@ -39,7 +39,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE index 273801d375..33f3e1cdb8 100644 --- a/localedata/locales/nl_BE +++ b/localedata/locales/nl_BE @@ -127,7 +127,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL index b917d00720..9719cec5f6 100644 --- a/localedata/locales/nl_NL +++ b/localedata/locales/nl_NL @@ -152,7 +152,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/nr_ZA b/localedata/locales/nr_ZA index d819bddfd1..698b9d1b15 100644 --- a/localedata/locales/nr_ZA +++ b/localedata/locales/nr_ZA @@ -248,9 +248,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/nso_ZA b/localedata/locales/nso_ZA index f80b8431f9..c3351ee8b9 100644 --- a/localedata/locales/nso_ZA +++ b/localedata/locales/nso_ZA @@ -244,9 +244,9 @@ lang_lib "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/pa_PK b/localedata/locales/pa_PK index fcc78a0c5a..8b7cd08619 100644 --- a/localedata/locales/pa_PK +++ b/localedata/locales/pa_PK @@ -171,7 +171,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL index 0527eee519..37f9e5c5cd 100644 --- a/localedata/locales/pl_PL +++ b/localedata/locales/pl_PL @@ -2228,7 +2228,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR index 4640ff54bb..8dbc14ea64 100644 --- a/localedata/locales/pt_BR +++ b/localedata/locales/pt_BR @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT index 39ec101bd9..f11be1c0ee 100644 --- a/localedata/locales/pt_PT +++ b/localedata/locales/pt_PT @@ -151,7 +151,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index f290f21285..c4f8158343 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -181,7 +181,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ru_UA b/localedata/locales/ru_UA index 305c83b68f..c2ca7b17a7 100644 --- a/localedata/locales/ru_UA +++ b/localedata/locales/ru_UA @@ -170,7 +170,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/rw_RW b/localedata/locales/rw_RW index 165624784a..437df4bb2c 100644 --- a/localedata/locales/rw_RW +++ b/localedata/locales/rw_RW @@ -130,7 +130,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_ab2 "" diff --git a/localedata/locales/se_NO b/localedata/locales/se_NO index d83721f147..0504ec08c6 100644 --- a/localedata/locales/se_NO +++ b/localedata/locales/se_NO @@ -309,7 +309,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/shs_CA b/localedata/locales/shs_CA index c93710dc37..e6c52c7672 100644 --- a/localedata/locales/shs_CA +++ b/localedata/locales/shs_CA @@ -149,7 +149,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK index 57e832751a..45d7da87eb 100644 --- a/localedata/locales/sk_SK +++ b/localedata/locales/sk_SK @@ -219,7 +219,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI index b7e119443f..78c83c4939 100644 --- a/localedata/locales/sl_SI +++ b/localedata/locales/sl_SI @@ -2216,7 +2216,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME index 5c0961f60c..ed12002e54 100644 --- a/localedata/locales/sr_ME +++ b/localedata/locales/sr_ME @@ -141,7 +141,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS index b818592c0e..90d54aa2e7 100644 --- a/localedata/locales/sr_RS +++ b/localedata/locales/sr_RS @@ -330,7 +330,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin index d9b9133268..207f515180 100644 --- a/localedata/locales/sr_RS@latin +++ b/localedata/locales/sr_RS@latin @@ -149,7 +149,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ss_ZA b/localedata/locales/ss_ZA index 405e403597..c30060e454 100644 --- a/localedata/locales/ss_ZA +++ b/localedata/locales/ss_ZA @@ -252,9 +252,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/st_ZA b/localedata/locales/st_ZA index 17a740bff0..67e356cf7e 100644 --- a/localedata/locales/st_ZA +++ b/localedata/locales/st_ZA @@ -249,9 +249,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI index e3cbc39cbf..bdda16d44b 100644 --- a/localedata/locales/sv_FI +++ b/localedata/locales/sv_FI @@ -131,7 +131,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE index 8daded3d38..f558e24712 100644 --- a/localedata/locales/sv_SE +++ b/localedata/locales/sv_SE @@ -212,7 +212,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ index fbed4e35fe..51023c2677 100644 --- a/localedata/locales/tg_TJ +++ b/localedata/locales/tg_TJ @@ -219,7 +219,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" diff --git a/localedata/locales/tk_TM b/localedata/locales/tk_TM index cc41e65ecf..04cc844380 100644 --- a/localedata/locales/tk_TM +++ b/localedata/locales/tk_TM @@ -425,7 +425,7 @@ LC_ADDRESS postal_fmt "/ / -/ +/ " country_name "/ diff --git a/localedata/locales/tl_PH b/localedata/locales/tl_PH index 14b1ca603b..250f276298 100644 --- a/localedata/locales/tl_PH +++ b/localedata/locales/tl_PH @@ -162,7 +162,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" diff --git a/localedata/locales/tn_ZA b/localedata/locales/tn_ZA index c5f3bb845b..c717d1e8d1 100644 --- a/localedata/locales/tn_ZA +++ b/localedata/locales/tn_ZA @@ -255,9 +255,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/tr_CY b/localedata/locales/tr_CY index a1057e5fbc..bc63829a4a 100644 --- a/localedata/locales/tr_CY +++ b/localedata/locales/tr_CY @@ -88,7 +88,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Northern Cyprus country_name "/ diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR index 64b726e2d3..fa44fb0582 100644 --- a/localedata/locales/tr_TR +++ b/localedata/locales/tr_TR @@ -3575,7 +3575,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % Turkey country_name "" diff --git a/localedata/locales/ts_ZA b/localedata/locales/ts_ZA index 95aff1953e..010cba2d3e 100644 --- a/localedata/locales/ts_ZA +++ b/localedata/locales/ts_ZA @@ -249,9 +249,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/tt_RU@iqtelif b/localedata/locales/tt_RU@iqtelif index 043f458513..0564783e47 100644 --- a/localedata/locales/tt_RU@iqtelif +++ b/localedata/locales/tt_RU@iqtelif @@ -168,7 +168,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/ur_PK b/localedata/locales/ur_PK index 71aa261c4d..fc9cfb8073 100644 --- a/localedata/locales/ur_PK +++ b/localedata/locales/ur_PK @@ -189,7 +189,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_ab2 "" diff --git a/localedata/locales/ve_ZA b/localedata/locales/ve_ZA index 5996810e73..f715cf5c82 100644 --- a/localedata/locales/ve_ZA +++ b/localedata/locales/ve_ZA @@ -255,9 +255,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/wa_BE b/localedata/locales/wa_BE index 63537b0d1a..f02e527bf6 100644 --- a/localedata/locales/wa_BE +++ b/localedata/locales/wa_BE @@ -35,7 +35,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " country_name "" country_post "B" diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN index ac4e917e3c..ee91dbc81a 100644 --- a/localedata/locales/wo_SN +++ b/localedata/locales/wo_SN @@ -167,11 +167,11 @@ name_fmt "/ END LC_NAME LC_ADDRESS -% %f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N +% %f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N postal_fmt "/ / / -/ +/ " country_ab2 "" country_ab3 "" diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA index 218cdb1fb5..f0f56ed4ff 100644 --- a/localedata/locales/xh_ZA +++ b/localedata/locales/xh_ZA @@ -241,9 +241,9 @@ lang_term "" postal_fmt "/ / / -/ +/ " -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/locales/yo_NG b/localedata/locales/yo_NG index e43054a452..1a5dc78f1f 100644 --- a/localedata/locales/yo_NG +++ b/localedata/locales/yo_NG @@ -442,7 +442,7 @@ LC_ADDRESS % FIXME % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % % "firm name", % "end of line", @@ -468,7 +468,7 @@ LC_ADDRESS postal_fmt "/ / / -/ +/ " % FIXME diff --git a/localedata/locales/zu_ZA b/localedata/locales/zu_ZA index 2ad94130a6..b74e6e82b8 100644 --- a/localedata/locales/zu_ZA +++ b/localedata/locales/zu_ZA @@ -247,11 +247,11 @@ lang_lib "" postal_fmt "/ / / -/ +/ " % Representation of postal addresses (minus the addressee's name) in South % Africa. (Ignored for now) -% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N", which gives - +% "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N", which gives - % "firm name", % "end of line", % "C/O address", diff --git a/localedata/si_LK.in b/localedata/si_LK.in new file mode 100644 index 0000000000..dc6b22bcb7 --- /dev/null +++ b/localedata/si_LK.in @@ -0,0 +1,101 @@ +෴ +අ +ආ +ඇ +ඈ +ඉ +ඊ +උ +ඌ +ඍ +ඎ +ඏ +ඐ +එ +ඒ +ඓ +ඔ +ඕ +ඖ +ං +ඃ +ක +කා +කැ +කෑ +කි +කී +කු +කූ +කෘ +කෲ +කෟ +කෳ +කෙ +කේ +කෛ +කො +කෝ +කෞ +ක් +ඛ +ග +ඝ +ඞ +ඟ +ච +ඡ +ජ +ඣ +ඥ +ඤ +ඦ +ට +ඨ +ඩ +ඪ +ණ +ඬ +ත +ථ +ද +ධ +න +ඳ +ප +ඵ +බ +භ +ම +ඹ +ය +ර +ර්‍ +ල +ව +ශ +ෂ +ස +හ +ළ +ෆ +ා +ැ +ෑ +ි +ී +ු +ූ +ෘ +ෲ +ෟ +ෳ +ෙ +ේ +ෛ +ො +ෝ +ෞ +් +්‍ය +්‍ර diff --git a/localedata/tests-mbwc/dat_mbtowc.c b/localedata/tests-mbwc/dat_mbtowc.c index 5168ed184d..95edb684d3 100644 --- a/localedata/tests-mbwc/dat_mbtowc.c +++ b/localedata/tests-mbwc/dat_mbtowc.c @@ -135,7 +135,7 @@ TST_MBTOWC tst_mbtowc_loc [] = { { { 0, 1, "\xfc\xe4\xf6", MB_LEN_MAX }, { 0, 1, "\177", MB_LEN_MAX }, - { 0, 0, (char)NULL, MB_LEN_MAX }, + { 0, 0, NULL, MB_LEN_MAX }, } }, { @@ -221,7 +221,7 @@ TST_MBTOWC tst_mbtowc_loc [] = { { { 0, 1, "ABC", MB_LEN_MAX }, { 0, 1, "\177", MB_LEN_MAX }, - { 0, 0, (char)NULL, MB_LEN_MAX }, + { 0, 0, NULL, MB_LEN_MAX }, } }, { @@ -305,7 +305,7 @@ TST_MBTOWC tst_mbtowc_loc [] = { { { 0, 1, "\244\242A", MB_LEN_MAX }, { 0, 1, "\177\244\242", MB_LEN_MAX }, - { 0, 1, "", MB_LEN_MAX }, + { 0, 1, "", MB_LEN_MAX }, } }, { @@ -321,7 +321,7 @@ TST_MBTOWC tst_mbtowc_loc [] = { { { 0, 1, "\244\242A", MB_LEN_MAX }, { 0, 1, "\177\244\242", MB_LEN_MAX }, - { 0, 0, (char)NULL, MB_LEN_MAX }, + { 0, 0, NULL, MB_LEN_MAX }, } }, { diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h index efd7f75a50..e29b4cca46 100644 --- a/posix/bits/unistd.h +++ b/posix/bits/unistd.h @@ -1,5 +1,5 @@ /* Checking macros for unistd functions. - Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -267,7 +267,7 @@ __NTH (getgroups (int __size, __gid_t __list[])) { if (__bos (__list) != (size_t) -1) { - if (!__builtin_constant_p (__size)) + if (!__builtin_constant_p (__size) || __size < 0) return __getgroups_chk (__size, __list, __bos (__list)); if (__size * sizeof (__gid_t) > __bos (__list)) diff --git a/posix/spawnattr_getschedparam.c b/posix/spawnattr_getschedparam.c index f33b622b2b..f714b2cfb1 100644 --- a/posix/spawnattr_getschedparam.c +++ b/posix/spawnattr_getschedparam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ posix_spawnattr_getschedparam (const posix_spawnattr_t *attr, struct sched_param *schedparam) { /* Copy the scheduling parameters. */ - memcpy (schedparam, &attr->__sp, sizeof (*attr)); + memcpy (schedparam, &attr->__sp, sizeof (attr->__sp)); return 0; } diff --git a/resolv/res_send.c b/resolv/res_send.c index 59cdc214e2..ac5cc0b4fe 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -784,7 +784,7 @@ send_vc(res_state statp, #else int aligned_resplen = ((resplen + __alignof__ (HEADER) - 1) - & (__alignof__ (HEADER) - 1)); + & ~(__alignof__ (HEADER) - 1)); *anssizp2 = orig_anssizp - aligned_resplen; *ansp2 = *ansp + aligned_resplen; #endif @@ -1008,7 +1008,7 @@ send_dg(res_state statp, } if (n == 0) { Dprint(statp->options & RES_DEBUG, (stdout, ";; timeout\n")); - if (recvresp1 || (buf2 != NULL && recvresp2)) + if (resplen > 1 && (recvresp1 || (buf2 != NULL && recvresp2))) { *resplen2 = 1; return resplen; @@ -1058,8 +1058,16 @@ send_dg(res_state statp, /* No buffer allocated for the first reply. We can try to use the rest of the user-provided buffer. */ +#ifdef _STRING_ARCH_unaligned *anssizp2 = orig_anssizp - resplen; *ansp2 = *ansp + resplen; +#else + int aligned_resplen + = ((resplen + __alignof__ (HEADER) - 1) + & ~(__alignof__ (HEADER) - 1)); + *anssizp2 = orig_anssizp - aligned_resplen; + *ansp2 = *ansp + aligned_resplen; +#endif } else { /* The first reply did not fit into the user-provided buffer. Maybe the second diff --git a/resource/Makefile b/resource/Makefile index 68f9ff65a3..705c73608c 100644 --- a/resource/Makefile +++ b/resource/Makefile @@ -1,4 +1,5 @@ -# Copyright (C) 1991,1992,1994,1995,1997,2005 Free Software Foundation, Inc. +# Copyright (C) 1991,1992,1994,1995,1997,2005,2008 +# Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -24,6 +25,6 @@ headers := sys/resource.h bits/resource.h sys/vlimit.h sys/vtimes.h \ routines := getrlimit setrlimit getrlimit64 setrlimit64 getrusage ulimit \ vlimit vtimes getpriority setpriority nice -tests = tst-getrlimit +tests = tst-getrlimit bug-ulimit1 include ../Rules diff --git a/resource/bug-ulimit1.c b/resource/bug-ulimit1.c new file mode 100644 index 0000000000..334d7fff04 --- /dev/null +++ b/resource/bug-ulimit1.c @@ -0,0 +1,21 @@ +#include +#include + +int +main (void) +{ + int retval = 0; + long int res; + + res = ulimit (UL_SETFSIZE, 10000); + printf ("Result of ulimit (UL_SETFSIZE, 10000): %ld\n", res); + if (res != 10000) + retval = 1; + + res = ulimit (UL_GETFSIZE); + printf ("Result of ulimit(UL_GETFSIZE): %ld\n", res); + if (res != 10000) + retval = 1; + + return retval; +} diff --git a/sysdeps/powerpc/elf/rtld-global-offsets.sym b/sysdeps/powerpc/elf/rtld-global-offsets.sym index 830106ba21..ff4e97f2a6 100644 --- a/sysdeps/powerpc/elf/rtld-global-offsets.sym +++ b/sysdeps/powerpc/elf/rtld-global-offsets.sym @@ -2,6 +2,6 @@ #include -#define rtdl_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) +#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) -RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtdl_global_ro_offsetof (_dl_hwcap) +RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtld_global_ro_offsetof (_dl_hwcap) diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c index 731d23956d..71540bd185 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.c +++ b/sysdeps/powerpc/powerpc32/dl-machine.c @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation functions. PowerPC version. - Copyright (C) 1995-2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1995-2006, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -501,7 +501,7 @@ __process_machine_rela (struct link_map *map, strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); _dl_error_printf ("\ -%s: Symbol `%s' has different size in shared object, onsider re-linking\n", +%s: Symbol `%s' has different size in shared object, consider re-linking\n", rtld_progname ?: "", strtab + refsym->st_name); } diff --git a/sysdeps/unix/sysv/linux/eventfd.c b/sysdeps/unix/sysv/linux/eventfd.c index 6ebfed86f1..4cd557983e 100644 --- a/sysdeps/unix/sysv/linux/eventfd.c +++ b/sysdeps/unix/sysv/linux/eventfd.c @@ -24,8 +24,8 @@ int eventfd (int count, int flags) { -#ifdef __NR_eventfd1 - return INLINE_SYSCALL (eventfd1, 1, flags); +#ifdef __NR_eventfd2 + return INLINE_SYSCALL (eventfd2, 2, count, flags); #else /* The old system call has no flag parameter which is bad. So we have to wait until we have to support to pass additional values to the diff --git a/sysdeps/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c index 9c309c371d..0b87599fea 100644 --- a/sysdeps/unix/sysv/linux/ulimit.c +++ b/sysdeps/unix/sysv/linux/ulimit.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,92,1994-1998,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,1994-1998,2000,2001,2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,26 +48,32 @@ __ulimit (int cmd, ...) /* Get limit on file size. */ if (__getrlimit (RLIMIT_FSIZE, &limit) == 0) /* Convert from bytes to 512 byte units. */ - result = limit.rlim_cur / 512; + result = (limit.rlim_cur == RLIM_INFINITY + ? LONG_MAX : limit.rlim_cur / 512); break; case UL_SETFSIZE: /* Set limit on file size. */ { long int newlimit = va_arg (va, long int); + long int newlen; if ((rlim_t) newlimit > RLIM_INFINITY / 512) { limit.rlim_cur = RLIM_INFINITY; limit.rlim_max = RLIM_INFINITY; + newlen = LONG_MAX; } else { limit.rlim_cur = newlimit * 512; limit.rlim_max = newlimit * 512; + newlen = newlimit; } result = __setrlimit (RLIMIT_FSIZE, &limit); + if (result != -1) + result = newlen; } break; -- cgit v1.2.3