diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-12-14 13:46:34 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-12-14 13:48:01 +0100 |
commit | 58ae1cca4fbf078baadad5a7f3ec7896f27cad2b (patch) | |
tree | 8487f68ee7f8840df2caf2092f94cbcaf0db9f0a | |
parent | 1c3fd1077a0aa1ec441d3ae8a0e0046c484cab47 (diff) | |
parent | 3decedce640208c25323bca68c98381c640ab06f (diff) |
Merge commit 'glibc-2.11.1' into fedora/2.11/master
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | localedata/ChangeLog | 12 | ||||
-rw-r--r-- | localedata/locales/en_DK | 53 | ||||
-rw-r--r-- | localedata/locales/hsb_DE | 24 | ||||
-rw-r--r-- | localedata/locales/nl_NL | 52 | ||||
-rw-r--r-- | sunrpc/create_xid.c | 12 | ||||
-rw-r--r-- | version.h | 2 |
7 files changed, 94 insertions, 65 deletions
@@ -11,6 +11,10 @@ (__libc_csu_init): ...here. * csu/libc-start.c [!SHARED]: Call __libc_csu_irel early. +2009-11-22 Ulrich Drepper <drepper@redhat.com> + + * sunrpc/create_xid.c (_create_xid): Reinitialize state after fork. + 2009-11-18 H.J. Lu <hongjiu.lu@intel.com> [BZ #10162] diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 4ddd35d681..88284268a9 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,15 @@ +2009-11-24 Ulrich Drepper <drepper@redhat.com> + + * locales/hsb_DE: Define week, first_weekday, and first_workday. + +2009-11-23 Ulrich Drepper <drepper@redhat.com> + + * locales/en_DK: Define week, first_weekday, and first_workday. + +2009-11-22 Ulrich Drepper <drepper@redhat.com> + + * locales/nl_NL: Define week, first_weekday, and first_workday. + 2009-10-30 Ulrich Drepper <drepper@redhat.com> * locales/it_CH: Fix typos in last change. diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK index aa58763578..3ec5170558 100644 --- a/localedata/locales/en_DK +++ b/localedata/locales/en_DK @@ -85,34 +85,34 @@ END LC_NUMERIC LC_TIME abday "<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/ - "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/ - "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/ - "<U0053><U0061><U0074>" + "<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/ + "<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/ + "<U0053><U0061><U0074>" day "<U0053><U0075><U006E><U0064><U0061><U0079>";/ - "<U004D><U006F><U006E><U0064><U0061><U0079>";/ - "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/ - "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/ - "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/ - "<U0046><U0072><U0069><U0064><U0061><U0079>";/ - "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>" + "<U004D><U006F><U006E><U0064><U0061><U0079>";/ + "<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/ + "<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/ + "<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/ + "<U0046><U0072><U0069><U0064><U0061><U0079>";/ + "<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>" abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/ - "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/ - "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/ - "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/ - "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/ - "<U004E><U006F><U0076>";"<U0044><U0065><U0063>" + "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/ + "<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/ + "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/ + "<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/ + "<U004E><U006F><U0076>";"<U0044><U0065><U0063>" mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ - "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/ - "<U004D><U0061><U0072><U0063><U0068>";/ - "<U0041><U0070><U0072><U0069><U006C>";/ - "<U004D><U0061><U0079>";/ - "<U004A><U0075><U006E><U0065>";/ - "<U004A><U0075><U006C><U0079>";/ - "<U0041><U0075><U0067><U0075><U0073><U0074>";/ - "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ - "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ - "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ - "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" + "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/ + "<U004D><U0061><U0072><U0063><U0068>";/ + "<U0041><U0070><U0072><U0069><U006C>";/ + "<U004D><U0061><U0079>";/ + "<U004A><U0075><U006E><U0065>";/ + "<U004A><U0075><U006C><U0079>";/ + "<U0041><U0075><U0067><U0075><U0073><U0074>";/ + "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ + "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ + "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ + "<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" % date formats following ISO 8601-1988 d_t_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064><U0054><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>" @@ -122,6 +122,9 @@ t_fmt_ampm "" date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" +week 7;19971130;4 +first_weekday 2 +first_workday 2 END LC_TIME LC_MESSAGES diff --git a/localedata/locales/hsb_DE b/localedata/locales/hsb_DE index 50355af35a..0929897c8a 100644 --- a/localedata/locales/hsb_DE +++ b/localedata/locales/hsb_DE @@ -197,7 +197,7 @@ collating-symbol <SPECIAL> % letter;accent;case;specials order_start forward;backward/ - ;forward;position + ;forward;position % <CAPITAL> or <SMALL> letters first: @@ -2136,16 +2136,16 @@ END LC_NUMERIC LC_TIME abday "<U004E><U006A>";"<U0050><U00F3>";/ - "<U0057><U0075>";"<U0053><U0072>";/ - "<U0160><U0074>";"<U0050><U006A>";/ - "<U0053><U006F>" + "<U0057><U0075>";"<U0053><U0072>";/ + "<U0160><U0074>";"<U0050><U006A>";/ + "<U0053><U006F>" day "<U004E><U006A><U0065><U0064><U017A><U0065><U006C><U0061>";/ - "<U0050><U00F3><U006E><U0064><U017A><U0065><U006C><U0061>";/ - "<U0057><U0075><U0074><U006F><U0072><U0061>";/ - "<U0053><U0072><U006A><U0065><U0064><U0061>";/ - "<U0160><U0074><U0076><U00F3><U0072><U0074><U006B>";/ - "<U0050><U006A><U0061><U0074><U006B>";/ - "<U0053><U006F><U0062><U006F><U0074><U0061>" + "<U0050><U00F3><U006E><U0064><U017A><U0065><U006C><U0061>";/ + "<U0057><U0075><U0074><U006F><U0072><U0061>";/ + "<U0053><U0072><U006A><U0065><U0064><U0061>";/ + "<U0160><U0074><U0076><U00F3><U0072><U0074><U006B>";/ + "<U0050><U006A><U0061><U0074><U006B>";/ + "<U0053><U006F><U0062><U006F><U0074><U0061>" abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/ "<U004D><U011B><U0072>";"<U0041><U0070><U0072>";/ "<U004D><U0065><U006A>";"<U004A><U0075><U006E>";/ @@ -2172,6 +2172,10 @@ t_fmt_ampm "" date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" + +week 7;19971130;4 +first_weekday 2 +first_workday 2 END LC_TIME LC_PAPER diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL index 9719cec5f6..6f832927a3 100644 --- a/localedata/locales/nl_NL +++ b/localedata/locales/nl_NL @@ -88,33 +88,33 @@ END LC_NUMERIC LC_TIME abday "<U007A><U006F>";"<U006D><U0061>";"<U0064><U0069>";/ - "<U0077><U006F>";"<U0064><U006F>";"<U0076><U0072>";/ - "<U007A><U0061>" + "<U0077><U006F>";"<U0064><U006F>";"<U0076><U0072>";/ + "<U007A><U0061>" day "<U007A><U006F><U006E><U0064><U0061><U0067>";/ - "<U006D><U0061><U0061><U006E><U0064><U0061><U0067>";/ - "<U0064><U0069><U006E><U0073><U0064><U0061><U0067>";/ - "<U0077><U006F><U0065><U006E><U0073><U0064><U0061><U0067>";/ - "<U0064><U006F><U006E><U0064><U0065><U0072><U0064><U0061><U0067>";/ - "<U0076><U0072><U0069><U006A><U0064><U0061><U0067>";/ - "<U007A><U0061><U0074><U0065><U0072><U0064><U0061><U0067>" + "<U006D><U0061><U0061><U006E><U0064><U0061><U0067>";/ + "<U0064><U0069><U006E><U0073><U0064><U0061><U0067>";/ + "<U0077><U006F><U0065><U006E><U0073><U0064><U0061><U0067>";/ + "<U0064><U006F><U006E><U0064><U0065><U0072><U0064><U0061><U0067>";/ + "<U0076><U0072><U0069><U006A><U0064><U0061><U0067>";/ + "<U007A><U0061><U0074><U0065><U0072><U0064><U0061><U0067>" abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/ - "<U006D><U0072><U0074>";"<U0061><U0070><U0072>";/ - "<U006D><U0065><U0069>";"<U006A><U0075><U006E>";/ - "<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/ - "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/ - "<U006E><U006F><U0076>";"<U0064><U0065><U0063>" + "<U006D><U0072><U0074>";"<U0061><U0070><U0072>";/ + "<U006D><U0065><U0069>";"<U006A><U0075><U006E>";/ + "<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/ + "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/ + "<U006E><U006F><U0076>";"<U0064><U0065><U0063>" mon "<U006A><U0061><U006E><U0075><U0061><U0072><U0069>";/ - "<U0066><U0065><U0062><U0072><U0075><U0061><U0072><U0069>";/ - "<U006D><U0061><U0061><U0072><U0074>";/ - "<U0061><U0070><U0072><U0069><U006C>";/ - "<U006D><U0065><U0069>";/ - "<U006A><U0075><U006E><U0069>";/ - "<U006A><U0075><U006C><U0069>";/ - "<U0061><U0075><U0067><U0075><U0073><U0074><U0075><U0073>";/ - "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ - "<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/ - "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ - "<U0064><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" + "<U0066><U0065><U0062><U0072><U0075><U0061><U0072><U0069>";/ + "<U006D><U0061><U0061><U0072><U0074>";/ + "<U0061><U0070><U0072><U0069><U006C>";/ + "<U006D><U0065><U0069>";/ + "<U006A><U0075><U006E><U0069>";/ + "<U006A><U0075><U006C><U0069>";/ + "<U0061><U0075><U0067><U0075><U0073><U0074><U0075><U0073>";/ + "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/ + "<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/ + "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ + "<U0064><U0065><U0063><U0065><U006D><U0062><U0065><U0072>" d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0079>" t_fmt "<U0025><U0054>" @@ -123,6 +123,10 @@ t_fmt_ampm "" date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" + +week 7;19971130;4 +first_weekday 2 +first_workday 2 END LC_TIME LC_PAPER diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c index 4e76918644..c247568cee 100644 --- a/sunrpc/create_xid.c +++ b/sunrpc/create_xid.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (c) 1998, 2000, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. @@ -27,7 +27,7 @@ __libc_lock_define_initialized (static, createxid_lock) -static int is_initialized; +static pid_t is_initialized; static struct drand48_data __rpc_lrand48_data; unsigned long @@ -37,13 +37,15 @@ _create_xid (void) __libc_lock_lock (createxid_lock); - if (!is_initialized) + pid_t pid = getpid (); + if (is_initialized != pid) { struct timeval now; __gettimeofday (&now, (struct timezone *) 0); - __srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data); - is_initialized = 1; + __srand48_r (now.tv_sec ^ now.tv_usec ^ pid, + &__rpc_lrand48_data); + is_initialized = pid; } lrand48_r (&__rpc_lrand48_data, &res); @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "stable" -#define VERSION "2.11" +#define VERSION "2.11.1" |