diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 5 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/locales/iso14651_t1_common | 3 | ||||
| -rw-r--r-- | string/strcasestr.c | 2 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 5 |
7 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 097f3173f0..abca0a60d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-05-16 Ulrich Drepper <drepper@redhat.com> + + * string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp. + + * sysdeps/posix/getaddrinfo.c (gaih_inet): After gethostbyname4_r + lookup, don't assign canon unconditionally. + 2008-05-14 Ulrich Drepper <drepper@redhat.com> * string/Makefile (distribute): Add str-two-way.h. diff --git a/fedora/branch.mk b/fedora/branch.mk index 8c74d1611e..ba57c390b3 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-05-15 07:35 UTC -fedora-sync-tag := fedora-glibc-20080515T0735 +fedora-sync-date := 2008-05-16 21:52 UTC +fedora-sync-tag := fedora-glibc-20080516T2152 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 4512939d61..b46ffdb70d 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: 1 +Release: 2 # 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 @@ -976,6 +976,9 @@ rm -f *.filelist* %endif %changelog +* Fri May 16 2008 Jakub Jelinek <jakub@redhat.com> 2.8.90-2 +- fix getaddrinfo (#446801, #446808) + * Thu May 15 2008 Jakub Jelinek <jakub@redhat.com> 2.8.90-1 - update to trunk - O(n) memmem/strstr/strcasestr diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 95bbd7c832..86f9d763d0 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2008-05-16 Ulrich Drepper <drepper@redhat.com> + + * locales/iso14651_t1_common: Remove duplicate U0C7B definition. + 2008-05-14 Ulrich Drepper <drepper@redhat.com> [BZ #6438] diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common index ca3a8144cb..e9721fd078 100644 --- a/localedata/locales/iso14651_t1_common +++ b/localedata/locales/iso14651_t1_common @@ -3416,7 +3416,8 @@ order_start <TELUGU>;forward;forward;forward;forward,position <U0C15> <t-ka>;<BAS>;<MIN>;IGNORE <U0C16> <t-kha>;<BAS>;<MIN>;IGNORE <U0C17> <t-ga>;<BAS>;<MIN>;IGNORE -<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE +#XXX This is wrong since there is already a definition for U0C7B. +#<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE <U0C18> <t-gha>;<BAS>;<MIN>;IGNORE <U0C19> <t-nga>;<BAS>;<MIN>;IGNORE <U0C1A> <t-ca>;<BAS>;<MIN>;IGNORE diff --git a/string/strcasestr.c b/string/strcasestr.c index 9de19aafa8..92f2eac7c8 100644 --- a/string/strcasestr.c +++ b/string/strcasestr.c @@ -46,7 +46,7 @@ && ((h_l) = (j) + (n_l))) #define CANON_ELEMENT(c) TOLOWER (c) #define CMP_FUNC(p1, p2, l) \ - strncasecmp ((const char *) (p1), (const char *) (p2), l) + __strncasecmp ((const char *) (p1), (const char *) (p2), l) #include "str-two-way.h" #undef strcasestr diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 8908fc10c3..2515d23c26 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -729,7 +729,8 @@ gaih_inet (const char *name, const struct gaih_service *service, if (status == NSS_STATUS_SUCCESS) { - canon = (*pat)->name; + if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL) + canon = (*pat)->name; while (*pat != NULL) pat = &((*pat)->next); @@ -953,7 +954,7 @@ gaih_inet (const char *name, const struct gaih_service *service, return -EAI_IDN_ENCODE; } /* In case the output string is the same as the input - string no new string has been allocated. Otherwise + string no new string has been allocated and we make a copy. */ if (out == canon) goto make_copy; |