From a9a561553fc86dc139b8687d07ca4f14bb369c51 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 5 Apr 2005 22:14:00 +0000 Subject: [PATCH] auto-import glibc-2.3.4-21 on branch devel from glibc-2.3.4-21.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 491 ++++++++++++++++++++------------------------- glibc.spec | 9 +- sources | 4 +- 4 files changed, 230 insertions(+), 278 deletions(-) diff --git a/.cvsignore b/.cvsignore index 007b46e..4fe2777 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050401T1444.tar.bz2 -glibc-fedora-20050401T1444.tar.bz2 +glibc-20050405T2114.tar.bz2 +glibc-fedora-20050405T2114.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index b24805c..6909e05 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20050401T1444/ChangeLog 1 Apr 2005 09:53:28 -0000 1.9308 -+++ glibc-20050401T1444-fedora/ChangeLog 1 Apr 2005 16:11:36 -0000 1.8782.2.91 -@@ -210,17 +210,6 @@ +--- glibc-20050405T2114/ChangeLog 4 Apr 2005 22:37:38 -0000 1.9310 ++++ glibc-20050405T2114-fedora/ChangeLog 5 Apr 2005 21:39:42 -0000 1.8782.2.92 +@@ -266,17 +266,6 @@ 2005-03-28 Roland McGrath @@ -18,7 +18,7 @@ * locale/langinfo.h (_NL_LOCALE_NAME): New macro. [__USE_GNU] (NL_LOCALE_NAME): New macro. * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, -@@ -1279,6 +1268,18 @@ +@@ -1335,6 +1324,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -37,8 +37,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050401T1444/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050401T1444-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050405T2114/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050405T2114-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -88,8 +88,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050401T1444/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050401T1444-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050405T2114/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050405T2114-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -116,8 +116,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050401T1444/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050401T1444-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050405T2114/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050405T2114-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -198,8 +198,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050401T1444/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 -+++ glibc-20050401T1444-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 +--- glibc-20050405T2114/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 ++++ glibc-20050405T2114-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 @@ -20,7 +20,6 @@ libc { GLIBC_2.3.2 GLIBC_2.3.3 @@ -216,16 +216,16 @@ } libnsl { GLIBC_2.0 ---- glibc-20050401T1444/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050401T1444-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 +--- glibc-20050405T2114/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050405T2114-fedora/version.h 6 Jan 2005 15:21:51 -0000 1.65.2.3 @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.4" ---- glibc-20050401T1444/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050401T1444-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050405T2114/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050405T2114-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -251,8 +251,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050401T1444/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050401T1444-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 +--- glibc-20050405T2114/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 ++++ glibc-20050405T2114-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 @@ -18,10 +18,4 @@ libc { __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; __gets_chk; @@ -264,8 +264,8 @@ - __recv_chk; __recvfrom_chk; - } } ---- glibc-20050401T1444/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050401T1444-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050405T2114/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050405T2114-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -279,8 +279,8 @@ return result; } +#endif ---- glibc-20050401T1444/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050401T1444-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050405T2114/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050405T2114-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -294,8 +294,8 @@ return result; } +#endif ---- glibc-20050401T1444/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050401T1444-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 +--- glibc-20050405T2114/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 ++++ glibc-20050405T2114-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 @@ -20,7 +20,7 @@ #include #include @@ -310,8 +310,8 @@ return __getcwd (buf, size); } +#endif ---- glibc-20050401T1444/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050401T1444-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050405T2114/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050405T2114-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -20,7 +20,7 @@ #include #include @@ -326,8 +326,8 @@ link_warning (getwd, "the `getwd' function is dangerous and should not be used.") +#endif ---- glibc-20050401T1444/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 -+++ glibc-20050401T1444-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050405T2114/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 ++++ glibc-20050405T2114-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -342,8 +342,8 @@ return __pread64 (fd, buf, nbytes, offset); } +#endif ---- glibc-20050401T1444/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 -+++ glibc-20050401T1444-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050405T2114/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 ++++ glibc-20050405T2114-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -358,8 +358,8 @@ return __pread (fd, buf, nbytes, offset); } +#endif ---- glibc-20050401T1444/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050401T1444-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 +--- glibc-20050405T2114/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 ++++ glibc-20050405T2114-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -374,8 +374,8 @@ #endif } +#endif ---- glibc-20050401T1444/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050401T1444-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050405T2114/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 ++++ glibc-20050405T2114-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -390,8 +390,8 @@ #endif } +#endif ---- glibc-20050401T1444/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 -+++ glibc-20050401T1444-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050405T2114/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 ++++ glibc-20050405T2114-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -406,8 +406,8 @@ return __recv (fd, buf, n, flags); } +#endif ---- glibc-20050401T1444/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 -+++ glibc-20050401T1444-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050405T2114/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 ++++ glibc-20050405T2114-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -422,8 +422,8 @@ return __recvfrom (fd, buf, n, flags, addr, addr_len); } +#endif ---- glibc-20050401T1444/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050401T1444-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +--- glibc-20050405T2114/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050405T2114-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -461,8 +461,8 @@ CHK_FAIL_START if (getwd (getcwdbuf + 2) != getcwdbuf + 2) FAIL (); ---- glibc-20050401T1444/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 -+++ glibc-20050401T1444-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 +--- glibc-20050405T2114/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 ++++ glibc-20050405T2114-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -475,8 +475,8 @@ /* Scan for a program header telling us the stack is nonexecutable. */ if (_dl_phdr != NULL) for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20050401T1444/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 -+++ glibc-20050401T1444-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 +--- glibc-20050405T2114/elf/ldconfig.c 12 Jan 2005 23:39:52 -0000 1.48 ++++ glibc-20050405T2114-fedora/elf/ldconfig.c 8 Feb 2005 10:04:03 -0000 1.47.2.2 @@ -944,17 +944,19 @@ search_dirs (void) @@ -558,8 +558,8 @@ } search_dirs (); ---- glibc-20050401T1444/elf/rtld.c 20 Mar 2005 22:08:09 -0000 1.350 -+++ glibc-20050401T1444-fedora/elf/rtld.c 24 Mar 2005 08:18:54 -0000 1.330.2.16 +--- glibc-20050405T2114/elf/rtld.c 20 Mar 2005 22:08:09 -0000 1.350 ++++ glibc-20050405T2114-fedora/elf/rtld.c 24 Mar 2005 08:18:54 -0000 1.330.2.16 @@ -1252,6 +1252,53 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -672,8 +672,8 @@ if (__builtin_expect (GL(dl_rtld_map).l_next != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050401T1444/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050401T1444-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050405T2114/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050405T2114-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -685,8 +685,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050401T1444/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050401T1444-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050405T2114/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050405T2114-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -763,8 +763,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050401T1444/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050401T1444-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050405T2114/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050405T2114-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -789,8 +789,8 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050401T1444/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050401T1444-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050405T2114/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050405T2114-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -800,8 +800,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050401T1444/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050401T1444-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050405T2114/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050405T2114-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -815,8 +815,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050401T1444/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050401T1444-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 +--- glibc-20050405T2114/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050405T2114-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -887,8 +887,8 @@ return __fgets_unlocked_alias (__s, __n, __stream); } #endif ---- glibc-20050401T1444/linuxthreads/ChangeLog 31 Mar 2005 10:02:53 -0000 1.844 -+++ glibc-20050401T1444-fedora/linuxthreads/ChangeLog 1 Apr 2005 15:13:15 -0000 1.817.2.21 +--- glibc-20050405T2114/linuxthreads/ChangeLog 31 Mar 2005 10:02:53 -0000 1.844 ++++ glibc-20050405T2114-fedora/linuxthreads/ChangeLog 1 Apr 2005 15:13:15 -0000 1.817.2.21 @@ -801,6 +801,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -937,8 +937,8 @@ * descr.h (struct _pthread_descr_struct): Provide p_res member even if USE_TLS && HAVE___THREAD. * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050401T1444/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050401T1444-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050405T2114/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050405T2114-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -960,8 +960,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050401T1444/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050401T1444-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050405T2114/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050405T2114-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur } @@ -969,8 +969,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050401T1444/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050401T1444-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050405T2114/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050405T2114-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 @@ -74,7 +74,11 @@ __fresetlockfiles (void) __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -984,8 +984,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050401T1444/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050401T1444-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050405T2114/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050405T2114-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -994,8 +994,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050401T1444/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050401T1444-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050405T2114/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050405T2114-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1005,8 +1005,8 @@ struct tls_obj { ---- glibc-20050401T1444/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1096,8 +1096,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050401T1444/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050405T2114/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1114,8 +1114,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1132,8 +1132,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -1156,8 +1156,8 @@ TCB + 0x7000 (per the ABI). This implies that TCB address is TP - 0x7000. As we define TLS_DTV_AT_TP we can assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050401T1444/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050405T2114/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 @@ -12,3 +12,15 @@ endif ifeq ($(subdir),posix) CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" @@ -1174,8 +1174,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050401T1444/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050405T2114/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 @@ -0,0 +1,13 @@ +#ifdef HAVE_TLS_SUPPORT +# ifndef HAVE_FORCED_UNWIND @@ -1190,8 +1190,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050401T1444/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1208,8 +1208,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1226,8 +1226,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1244,8 +1244,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050401T1444-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050405T2114/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050405T2114-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1262,8 +1262,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050401T1444/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050401T1444-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050405T2114/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050405T2114-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1355,8 +1355,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050401T1444/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050401T1444-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050405T2114/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050405T2114-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1400,8 +1400,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050401T1444/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050401T1444-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050405T2114/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050405T2114-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1410,8 +1410,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050401T1444/localedata/SUPPORTED 20 Mar 2005 04:16:36 -0000 1.74 -+++ glibc-20050401T1444-fedora/localedata/SUPPORTED 24 Mar 2005 08:19:04 -0000 1.71.2.4 +--- glibc-20050405T2114/localedata/SUPPORTED 20 Mar 2005 04:16:36 -0000 1.74 ++++ glibc-20050405T2114-fedora/localedata/SUPPORTED 24 Mar 2005 08:19:04 -0000 1.71.2.4 @@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1453,8 +1453,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ/KOI8-T \ ---- glibc-20050401T1444/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050401T1444-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050405T2114/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050405T2114-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1469,8 +1469,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050401T1444/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050401T1444-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050405T2114/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050405T2114-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1482,8 +1482,8 @@ date_fmt "/ / " ---- glibc-20050401T1444/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050401T1444-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050405T2114/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050405T2114-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1492,8 +1492,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050401T1444/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050405T2114/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1564,8 +1564,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050401T1444/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050401T1444-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050405T2114/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050405T2114-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1593,8 +1593,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050401T1444/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 -+++ glibc-20050401T1444-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 +--- glibc-20050405T2114/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 ++++ glibc-20050405T2114-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 @@ -94,7 +94,7 @@ libm { } GLIBC_2.1 { @@ -1616,9 +1616,19 @@ - exp2l; - } } ---- glibc-20050401T1444/nptl/ChangeLog 31 Mar 2005 10:01:49 -0000 1.769 -+++ glibc-20050401T1444-fedora/nptl/ChangeLog 1 Apr 2005 15:13:17 -0000 1.706.2.39 -@@ -581,6 +581,11 @@ +--- glibc-20050405T2114/nptl/ChangeLog 31 Mar 2005 10:01:49 -0000 1.769 ++++ glibc-20050405T2114-fedora/nptl/ChangeLog 5 Apr 2005 21:26:39 -0000 1.706.2.40 +@@ -1,3 +1,9 @@ ++2005-04-05 Jakub Jelinek ++ ++ * sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use ++ __inline instead of inline. ++ * sysdeps/pthread/bits/libc-lock.h (__libc_cleanup_routine): Likewise. ++ + 2005-03-31 Jakub Jelinek + + * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S: Use +@@ -581,6 +587,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1630,7 +1640,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2655,6 +2660,11 @@ +@@ -2655,6 +2666,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1642,8 +1652,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050401T1444/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 -+++ glibc-20050401T1444-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 +--- glibc-20050405T2114/nptl/Makefile 22 Dec 2004 20:07:09 -0000 1.166 ++++ glibc-20050405T2114-fedora/nptl/Makefile 6 Jan 2005 14:57:04 -0000 1.157.2.9 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1666,8 +1676,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050401T1444/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050401T1444-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050405T2114/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050405T2114-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1682,8 +1692,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050401T1444/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050401T1444-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050405T2114/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050405T2114-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1725,8 +1735,37 @@ } return 0; ---- glibc-20050401T1444/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050405T2114/nptl/sysdeps/pthread/pthread.h 8 Feb 2005 08:59:03 -0000 1.31 ++++ glibc-20050405T2114-fedora/nptl/sysdeps/pthread/pthread.h 5 Apr 2005 21:26:41 -0000 1.29.2.3 +@@ -527,7 +527,7 @@ class __pthread_cleanup_class + function the compiler is free to decide inlining the change when + needed or fall back on the copy which must exist somewhere + else. */ +-extern inline void ++extern __inline void + __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) + { + if (__frame->__do_it) +--- glibc-20050405T2114/nptl/sysdeps/pthread/bits/libc-lock.h 26 Feb 2005 01:33:56 -0000 1.18 ++++ glibc-20050405T2114-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 5 Apr 2005 21:26:42 -0000 1.17.2.2 +@@ -1,5 +1,5 @@ + /* libc-internal interface for mutex locks. NPTL version. +- Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. ++ Copyright (C) 1996-2001, 2002, 2003, 2005 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 +@@ -408,7 +408,7 @@ extern void _pthread_cleanup_pop_restore + + + /* Normal cleanup handling, based on C cleanup attribute. */ +-extern inline void ++extern __inline void + __libc_cleanup_routine (struct __pthread_cleanup_frame *f) + { + if (f->__do_it) +--- glibc-20050405T2114/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1734,8 +1773,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050401T1444/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 -+++ glibc-20050401T1444-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 +--- glibc-20050405T2114/nscd/connections.c 22 Feb 2005 22:52:32 -0000 1.66 ++++ glibc-20050405T2114-fedora/nscd/connections.c 3 Mar 2005 13:34:09 -0000 1.55.2.7 @@ -21,6 +21,7 @@ #include #include @@ -1826,8 +1865,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050401T1444/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050401T1444-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050405T2114/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050405T2114-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1853,8 +1892,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050401T1444/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050401T1444-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050405T2114/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050405T2114-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1866,8 +1905,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050401T1444/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050401T1444-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050405T2114/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050405T2114-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru if (strcmp (arg2, "no") == 0) dbs[cnt].shared = 0; @@ -1880,8 +1919,8 @@ break; } if (cnt == lastdb) ---- glibc-20050401T1444/posix/Makefile 23 Feb 2005 02:45:27 -0000 1.183 -+++ glibc-20050401T1444-fedora/posix/Makefile 3 Mar 2005 13:34:10 -0000 1.171.2.11 +--- glibc-20050405T2114/posix/Makefile 23 Feb 2005 02:45:27 -0000 1.183 ++++ glibc-20050405T2114-fedora/posix/Makefile 3 Mar 2005 13:34:10 -0000 1.171.2.11 @@ -105,7 +105,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1915,8 +1954,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050401T1444/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050405T2114/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1933,8 +1972,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050401T1444/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 -+++ glibc-20050401T1444-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 +--- glibc-20050405T2114/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 ++++ glibc-20050405T2114-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 @@ -21,25 +21,19 @@ # error "Never include directly; use instead." #endif @@ -2052,8 +2091,8 @@ - return __getwd_alias (__buf); -} -#endif ---- glibc-20050401T1444/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 -+++ glibc-20050401T1444-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 +--- glibc-20050405T2114/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 ++++ glibc-20050405T2114-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 @@ -21,24 +21,18 @@ # error "Never include directly; use instead." #endif @@ -2094,8 +2133,8 @@ + __chk_fail (); return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); } ---- glibc-20050401T1444/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050401T1444-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050405T2114/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050405T2114-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2111,8 +2150,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050401T1444/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050401T1444-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 +--- glibc-20050405T2114/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050405T2114-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 @@ -31,6 +31,6 @@ __exp2 (double x) /* wrapper exp2 */ } weak_alias (__exp2, exp2) @@ -2122,8 +2161,8 @@ +strong_alias (__exp2, __expl2) +weak_alias (__exp2, expl2) #endif ---- glibc-20050401T1444/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 -+++ glibc-20050401T1444-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 +--- glibc-20050405T2114/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 ++++ glibc-20050405T2114-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 @@ -20,10 +20,3 @@ libc { __strspn_cg; __strspn_g; __strstr_cg; __strstr_g; } @@ -2135,8 +2174,8 @@ - exp2l; - } -} ---- glibc-20050401T1444/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050405T2114/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2548,8 +2587,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050401T1444/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050401T1444-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050405T2114/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050405T2114-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2561,8 +2600,8 @@ endif endif ---- glibc-20050401T1444/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 -+++ glibc-20050401T1444-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 +--- glibc-20050405T2114/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 ++++ glibc-20050405T2114-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 @@ -12,10 +12,3 @@ libc { __multi3; } @@ -2574,8 +2613,8 @@ - exp2l; - } -} ---- glibc-20050401T1444/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050401T1444-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050405T2114/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050405T2114-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2927,8 +2966,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050401T1444/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050405T2114/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3014,8 +3053,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050401T1444/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050401T1444-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 +--- glibc-20050405T2114/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050405T2114-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 @@ -4,10 +4,3 @@ libc { __divdi3; __moddi3; __udivdi3; __umoddi3; } @@ -3027,8 +3066,8 @@ - exp2l; - } -} ---- glibc-20050401T1444/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 -+++ glibc-20050401T1444-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050405T2114/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 ++++ glibc-20050405T2114-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { @@ -3037,8 +3076,8 @@ - exp2l; - } -} ---- glibc-20050401T1444/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050401T1444-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 +--- glibc-20050405T2114/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050405T2114-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 @@ -5,10 +5,3 @@ libc { __align_cpy_8; __align_cpy_16; } @@ -3050,8 +3089,8 @@ - exp2l; - } -} ---- glibc-20050401T1444/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050401T1444-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050405T2114/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050405T2114-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -3066,8 +3105,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -3077,8 +3116,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -3091,8 +3130,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -3138,8 +3177,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -3200,8 +3239,8 @@ + } while (0) + +#include_next ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -3234,29 +3273,29 @@ + } while (0) + #include_next ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050401T1444/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050401T1444-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050405T2114/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050405T2114-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20050401T1444/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050401T1444-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050405T2114/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050405T2114-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { @@ -3265,95 +3304,3 @@ - exp2l; - } -} ---- libc/fedora/glibc_post_upgrade.c 2004-12-20 08:56:38.000000000 +0100 -+++ libc/fedora/glibc_post_upgrade.c 2005-04-04 21:47:19.000000000 +0200 -@@ -30,10 +30,8 @@ __attribute__((noinline)) int check_elf - int - main (void) - { -- int rerun_ldconfig = 0, rerun_cnt = 0; - char initpath[256]; - --#ifdef __i386__ - char buffer[4096]; - struct pref { - char *p; -@@ -44,10 +42,10 @@ main (void) - int i, j, fd; - off_t base; - ssize_t ret; --#ifdef ARCH_386 -- const char *remove_dirs[] = { "/lib/i686", "/lib/tls" }; -+#ifdef __i386__ -+ const char *remove_dirs[] = { "/lib/tls", "/lib/i686", "/lib/tls/i486", "/lib/tls/i586", "/lib/tls/i686" }; - #else -- const char *remove_dirs[] = { "/lib/tls/i686" }; -+ const char *remove_dirs[] = { "/lib/tls" }; - #endif - for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j) - { -@@ -83,7 +81,6 @@ main (void) - close (fd); - } - } --#endif - - int ldsocfd = open (LD_SO_CONF, O_RDONLY); - struct stat ldsocst; -@@ -111,51 +108,11 @@ main (void) - close (ldsocfd); - } - -- do -- { -- char linkbuf[64], *linkp; -- int linklen; -- -- /* If installing bi-arch glibc, rpm sometimes doesn't unpack all files -- before running one of the lib's %post scriptlet. /sbin/ldconfig will -- then be run by the other arch's %post. */ -- if (access ("/sbin/ldconfig", X_OK)) -- break; -- -- verbose_exec (110, "/sbin/ldconfig", "/sbin/ldconfig"); -- -- rerun_ldconfig = 0; --#ifdef LIBTLS -- linkp = linkbuf + strlen (LIBTLS); -- linklen = readlink (LIBTLS "librt.so.1", linkp, -- sizeof (linkbuf) - 1 - strlen (LIBTLS)); -- if (linklen == strlen ("librtkaio-2.3.X.so") -- && memcmp (linkp, "librtkaio-2.3.", 14) == 0 -- && strchr ("23", linkp[14]) -- && memcmp (linkp + 15, ".so", 4) == 0) -- { -- memcpy (linkbuf, LIBTLS, strlen (LIBTLS)); -- unlink (linkbuf); -- rerun_ldconfig = 1; -- } --#endif -- --#ifdef __i386__ -- linkp = linkbuf + strlen ("/lib/i686/"); -- linklen = readlink ("/lib/i686/librt.so.1", linkp, -- sizeof (linkbuf) - 1 - strlen ("/lib/i686/")); -- if (linklen == strlen ("librtkaio-2.3.X.so") -- && memcmp (linkp, "librtkaio-2.3.", 14) == 0 -- && strchr ("23", linkp[14]) -- && memcmp (linkp + 15, ".so", 4) == 0) -- { -- memcpy (linkbuf, "/lib/i686/", strlen ("/lib/i686/")); -- unlink (linkbuf); -- rerun_ldconfig = 1; -- } --#endif -- } -- while (rerun_ldconfig && ++rerun_cnt < 2); -+ /* If installing bi-arch glibc, rpm sometimes doesn't unpack all files -+ before running one of the lib's %post scriptlet. /sbin/ldconfig will -+ then be run by the other arch's %post. */ -+ if (! access ("/sbin/ldconfig", X_OK)) -+ verbose_exec (110, "/sbin/ldconfig", "/sbin/ldconfig"); - - if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL)) - { diff --git a/glibc.spec b/glibc.spec index 19e5abc..4e0a0eb 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,7 +1,7 @@ -%define glibcdate 20050401T1444 +%define glibcdate 20050405T2114 %define glibcname glibc %define glibcversion 2.3.4 -%define glibcrelease 20 +%define glibcrelease 21 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -1263,6 +1263,11 @@ rm -f *.filelist* %endif %changelog +* Tue Apr 4 2005 Jakub Jelinek 2.3.4-21 +- update from CVS + - fix xdr_rmtcall_args on 64-bit arches (#151686) +- fix and with -std=c89 -fexceptions (#153774) + * Mon Apr 4 2005 Jakub Jelinek 2.3.4-20 - move LinuxThreads libraries to /%{_lib}/obsolete/linuxthreads/ and NPTL libraries to /%{_lib}. To run a program against LinuxThreads, diff --git a/sources b/sources index a49c134..4f06374 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b43979bdc91acec1956664297cc5c5dc glibc-20050401T1444.tar.bz2 -7f70b8a6872da64642ab710d76142fbd glibc-fedora-20050401T1444.tar.bz2 +b6968b15f433f861645960b295ded8e5 glibc-20050405T2114.tar.bz2 +225dba1992f732deb9fd9222312a4c36 glibc-fedora-20050405T2114.tar.bz2