metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

auto-import glibc-2.3.4-3 on branch devel from glibc-2.3.4-3.src.rpm

Browse Source
This commit is contained in:
Jakub Jelinek 2004-12-21 09:22:01 +00:00
parent 83613a0af1
commit cae8344de5
4 changed files with 218 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
glibc-20041218T2312.tar.bz2 glibc-20041219T2331.tar.bz2
glibc-fedora-20041218T2312.tar.bz2 glibc-fedora-20041219T2331.tar.bz2

372
glibc-fedora.patch
View File

@ -1,6 +1,6 @@
--- glibc-20041218T2312/ChangeLog 17 Dec 2004 19:26:16 -0000 1.9080 --- glibc-20041219T2331/ChangeLog 19 Dec 2004 23:23:55 -0000 1.9084
+++ glibc-20041218T2312-fedora/ChangeLog 18 Dec 2004 11:45:58 -0000 1.8782.2.66 +++ glibc-20041219T2331-fedora/ChangeLog 19 Dec 2004 23:44:45 -0000 1.8782.2.67
@@ -474,6 +474,14 @@ @@ -502,6 +502,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com> 2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -15,7 +15,7 @@
* posix/Makefile (install-others): Add $(inst_libexecdir)/getconf. * posix/Makefile (install-others): Add $(inst_libexecdir)/getconf.
(CFLAGS-sysconf.c): Add -D_GETCONF_DIR. (CFLAGS-sysconf.c): Add -D_GETCONF_DIR.
(CFLAGS-getconf.c): New. (CFLAGS-getconf.c): New.
@@ -1065,6 +1073,16 @@ @@ -1093,6 +1101,16 @@
* sysdeps/generic/tempname.c (__path_search): Add missing argument * sysdeps/generic/tempname.c (__path_search): Add missing argument
TRY_TMPDIR. TRY_TMPDIR.
@ -32,7 +32,7 @@
2004-10-31 Mariusz Mazur <mmazur@kernel.pl> 2004-10-31 Mariusz Mazur <mmazur@kernel.pl>
* sysdeps/unix/sysv/linux/alpha/setregid.c: New file. * sysdeps/unix/sysv/linux/alpha/setregid.c: New file.
@@ -1360,6 +1378,11 @@ @@ -1388,6 +1406,11 @@
* posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno * posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno
values. values.
@ -44,7 +44,7 @@
2004-10-20 Roland McGrath <roland@redhat.com> 2004-10-20 Roland McGrath <roland@redhat.com>
* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also * Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also
@@ -1432,6 +1455,11 @@ @@ -1460,6 +1483,11 @@
* debug/catchsegv.sh: Update copyright year. * debug/catchsegv.sh: Update copyright year.
Use mktemp to create segv_output file. Use mktemp to create segv_output file.
@ -56,7 +56,7 @@
2004-10-18 Jakub Jelinek <jakub@redhat.com> 2004-10-18 Jakub Jelinek <jakub@redhat.com>
* elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook): * elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook):
@@ -2415,6 +2443,22 @@ @@ -2443,6 +2471,22 @@
* string/string.h: Add __nonnull annotations. * string/string.h: Add __nonnull annotations.
* stdlib/stdlib.h: Likewise. * stdlib/stdlib.h: Likewise.
@ -79,7 +79,7 @@
2004-09-20 H.J. Lu <hongjiu.lu@intel.com> 2004-09-20 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL): * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL):
@@ -3144,6 +3188,23 @@ @@ -3172,6 +3216,23 @@
before return type. before return type.
* locale/localename.c (__current_locale_name): Likewise. * locale/localename.c (__current_locale_name): Likewise.
@ -103,7 +103,7 @@
2004-08-30 Roland McGrath <roland@frob.com> 2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit * scripts/extract-abilist.awk: If `lastversion' variable defined, omit
@@ -3300,6 +3361,22 @@ @@ -3328,6 +3389,22 @@
* resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize
status to NSS_STATUS_UNAVAIL. status to NSS_STATUS_UNAVAIL.
@ -126,7 +126,7 @@
2004-08-19 Ulrich Drepper <drepper@redhat.com> 2004-08-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the * sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the
@@ -3604,6 +3681,12 @@ @@ -3632,6 +3709,12 @@
* iconvdata/testdata/ISO-2022-JP-3: Regenerated. * iconvdata/testdata/ISO-2022-JP-3: Regenerated.
@ -139,8 +139,8 @@
2004-08-10 Alfred M. Szmidt <ams@kemisten.nu> 2004-08-10 Alfred M. Szmidt <ams@kemisten.nu>
* sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition. * sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition.
--- glibc-20041218T2312/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 --- glibc-20041219T2331/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1
+++ glibc-20041218T2312-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +++ glibc-20041219T2331-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1
@@ -1352,6 +1352,11 @@ @@ -1352,6 +1352,11 @@
* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
end of inline assembler code. end of inline assembler code.
@ -190,8 +190,8 @@
* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
__extension__ to hexadecimal floating constant notation. __extension__ to hexadecimal floating constant notation.
* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
--- glibc-20041218T2312/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 --- glibc-20041219T2331/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1
+++ glibc-20041218T2312-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +++ glibc-20041219T2331-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1
@@ -7729,6 +7729,13 @@ @@ -7729,6 +7729,13 @@
* Versions.def [ld]: Add GLIBC_2.2.1. * Versions.def [ld]: Add GLIBC_2.2.1.
@ -218,8 +218,8 @@
2001-01-02 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> 2001-01-02 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
--- glibc-20041218T2312/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3 --- glibc-20041219T2331/csu/elf-init.c 16 Aug 2004 04:51:00 -0000 1.3
+++ glibc-20041218T2312-fedora/csu/elf-init.c 22 Sep 2004 21:20:47 -0000 1.3.2.1 +++ glibc-20041219T2331-fedora/csu/elf-init.c 22 Sep 2004 21:20:47 -0000 1.3.2.1
@@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo
extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__init_array_end []) (void) attribute_hidden;
extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden;
@ -245,8 +245,8 @@
#endif #endif
/* These function symbols are provided for the .init/.fini section entry /* These function symbols are provided for the .init/.fini section entry
--- glibc-20041218T2312/debug/tst-chk1.c 18 Nov 2004 23:23:17 -0000 1.5 --- glibc-20041219T2331/debug/tst-chk1.c 18 Nov 2004 23:23:17 -0000 1.5
+++ glibc-20041218T2312-fedora/debug/tst-chk1.c 19 Nov 2004 00:18:08 -0000 1.1.2.7 +++ glibc-20041219T2331-fedora/debug/tst-chk1.c 19 Nov 2004 00:18:08 -0000 1.1.2.7
@@ -213,7 +213,7 @@ do_test (void) @@ -213,7 +213,7 @@ do_test (void)
if (memcmp (a.buf1, "aabcdabcjj", 10)) if (memcmp (a.buf1, "aabcdabcjj", 10))
FAIL (); FAIL ();
@ -265,8 +265,8 @@
# define O 0 # define O 0
#else #else
# define O 1 # define O 1
--- glibc-20041218T2312/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87 --- glibc-20041219T2331/elf/dl-support.c 6 Nov 2004 00:24:49 -0000 1.87
+++ glibc-20041218T2312-fedora/elf/dl-support.c 10 Nov 2004 09:02:46 -0000 1.84.2.4 +++ glibc-20041219T2331-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) @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void)
if (_dl_platform != NULL) if (_dl_platform != NULL)
_dl_platformlen = strlen (_dl_platform); _dl_platformlen = strlen (_dl_platform);
@ -279,8 +279,8 @@
/* Scan for a program header telling us the stack is nonexecutable. */ /* Scan for a program header telling us the stack is nonexecutable. */
if (_dl_phdr != NULL) if (_dl_phdr != NULL)
for (uint_fast16_t i = 0; i < _dl_phnum; ++i) for (uint_fast16_t i = 0; i < _dl_phnum; ++i)
--- glibc-20041218T2312/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47 --- glibc-20041219T2331/elf/ldconfig.c 10 Aug 2004 04:04:32 -0000 1.47
+++ glibc-20041218T2312-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1 +++ glibc-20041219T2331-fedora/elf/ldconfig.c 22 Sep 2004 21:20:48 -0000 1.47.2.1
@@ -944,17 +944,19 @@ search_dirs (void) @@ -944,17 +944,19 @@ search_dirs (void)
@ -362,8 +362,8 @@
} }
search_dirs (); search_dirs ();
--- glibc-20041218T2312/elf/rtld.c 8 Dec 2004 22:08:47 -0000 1.339 --- glibc-20041219T2331/elf/rtld.c 8 Dec 2004 22:08:47 -0000 1.339
+++ glibc-20041218T2312-fedora/elf/rtld.c 8 Dec 2004 10:57:20 -0000 1.330.2.10 +++ glibc-20041219T2331-fedora/elf/rtld.c 8 Dec 2004 10:57:20 -0000 1.330.2.10
@@ -1087,6 +1087,53 @@ of this helper program; chances are you @@ -1087,6 +1087,53 @@ of this helper program; chances are you
++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
++GL(dl_load_adds); ++GL(dl_load_adds);
@ -486,8 +486,8 @@
if (__builtin_expect (npreloads, 0) != 0) if (__builtin_expect (npreloads, 0) != 0)
{ {
/* Set up PRELOADS with a vector of the preloaded libraries. */ /* Set up PRELOADS with a vector of the preloaded libraries. */
--- glibc-20041218T2312/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 --- glibc-20041219T2331/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1
+++ glibc-20041218T2312-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
#include <tls.h> #include <tls.h>
#include <stdlib.h> #include <stdlib.h>
@ -499,9 +499,9 @@
# define USE_TLS__THREAD # define USE_TLS__THREAD
struct A struct A
--- glibc-20041218T2312/iconv/iconvconfig.c 24 Sep 2004 17:09:04 -0000 1.20 --- glibc-20041219T2331/iconv/iconvconfig.c 19 Dec 2004 23:23:42 -0000 1.21
+++ glibc-20041218T2312-fedora/iconv/iconvconfig.c 22 Sep 2004 21:20:51 -0000 1.19.2.1 +++ glibc-20041219T2331-fedora/iconv/iconvconfig.c 19 Dec 2004 23:44:48 -0000 1.19.2.2
@@ -989,6 +989,34 @@ next_prime (uint32_t seed) @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed)
module name offset module name offset
(following last entry with step count 0) (following last entry with step count 0)
*/ */
@ -536,7 +536,7 @@
static int static int
write_output (void) write_output (void)
{ {
@@ -996,8 +1024,6 @@ write_output (void) @@ -1020,8 +1048,6 @@ write_output (void)
char *string_table; char *string_table;
size_t string_table_size; size_t string_table_size;
struct gconvcache_header header; struct gconvcache_header header;
@ -545,9 +545,9 @@
struct module_entry *module_table; struct module_entry *module_table;
char *extra_table; char *extra_table;
char *cur_extra_table; char *cur_extra_table;
@@ -1010,31 +1036,6 @@ write_output (void) @@ -1034,31 +1060,6 @@ write_output (void)
char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)
+ strlen (".XXXXXX")]; + strlen (".XXXXXX")];
char finalname[prefix_len + sizeof (GCONV_MODULES_CACHE)];
- /* Function to insert the names. */ - /* Function to insert the names. */
- auto void - auto void
@ -575,10 +575,10 @@
- } - }
- -
/* Open the output file. */ /* Open the output file. */
assert (GCONV_MODULES_CACHE[0] == '/'); if (output_file == NULL)
strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len), GCONV_MODULES_CACHE), {
--- glibc-20041218T2312/include/features.h 18 Oct 2004 04:17:16 -0000 1.36 --- glibc-20041219T2331/include/features.h 18 Oct 2004 04:17:16 -0000 1.36
+++ glibc-20041218T2312-fedora/include/features.h 2 Nov 2004 13:30:19 -0000 1.35.2.4 +++ glibc-20041219T2331-fedora/include/features.h 2 Nov 2004 13:30:19 -0000 1.35.2.4
@@ -181,8 +181,8 @@ @@ -181,8 +181,8 @@
/* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2 /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2
@ -605,8 +605,8 @@
# if _FORTIFY_SOURCE == 1 # if _FORTIFY_SOURCE == 1
# define __USE_FORTIFY_LEVEL 1 # define __USE_FORTIFY_LEVEL 1
# elif _FORTIFY_SOURCE > 1 # elif _FORTIFY_SOURCE > 1
--- glibc-20041218T2312/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 --- glibc-20041219T2331/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23
+++ glibc-20041218T2312-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +++ glibc-20041219T2331-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1
@@ -58,8 +58,6 @@ korean ko_KR.eucKR @@ -58,8 +58,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR ko_KR ko_KR.eucKR
@ -616,8 +616,8 @@
norwegian nb_NO.ISO-8859-1 norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2 polish pl_PL.ISO-8859-2
--- glibc-20041218T2312/libio/stdio.h 18 Oct 2004 04:17:15 -0000 1.79 --- glibc-20041219T2331/libio/stdio.h 18 Oct 2004 04:17:15 -0000 1.79
+++ glibc-20041218T2312-fedora/libio/stdio.h 18 Oct 2004 09:58:44 -0000 1.78.2.2 +++ glibc-20041219T2331-fedora/libio/stdio.h 18 Oct 2004 09:58:44 -0000 1.78.2.2
@@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdin; /* Standard input stream. */
extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */
@ -631,8 +631,8 @@
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
--- glibc-20041218T2312/libio/bits/stdio2.h 18 Oct 2004 04:17:14 -0000 1.1 --- glibc-20041219T2331/libio/bits/stdio2.h 18 Oct 2004 04:17:14 -0000 1.1
+++ glibc-20041218T2312-fedora/libio/bits/stdio2.h 2 Nov 2004 13:30:19 -0000 1.1.2.2 +++ glibc-20041219T2331-fedora/libio/bits/stdio2.h 2 Nov 2004 13:30:19 -0000 1.1.2.2
@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
extern int __vprintf_chk (int __flag, __const char *__restrict __format, extern int __vprintf_chk (int __flag, __const char *__restrict __format,
_G_va_list __ap); _G_va_list __ap);
@ -663,8 +663,8 @@
#endif #endif
--- glibc-20041218T2312/linuxthreads/ChangeLog 12 Dec 2004 21:06:37 -0000 1.833 --- glibc-20041219T2331/linuxthreads/ChangeLog 12 Dec 2004 21:06:37 -0000 1.833
+++ glibc-20041218T2312-fedora/linuxthreads/ChangeLog 13 Dec 2004 23:32:35 -0000 1.817.2.14 +++ glibc-20041219T2331-fedora/linuxthreads/ChangeLog 13 Dec 2004 23:32:35 -0000 1.817.2.14
@@ -731,6 +731,12 @@ @@ -731,6 +731,12 @@
(pthread_barrierattr_setpshared): Return EINVAL if pshared (pthread_barrierattr_setpshared): Return EINVAL if pshared
is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED.
@ -713,8 +713,8 @@
* descr.h (struct _pthread_descr_struct): Provide p_res member * descr.h (struct _pthread_descr_struct): Provide p_res member
even if USE_TLS && HAVE___THREAD. even if USE_TLS && HAVE___THREAD.
* sysdeps/pthread/res-state.c (__res_state): Return __resp * sysdeps/pthread/res-state.c (__res_state): Return __resp
--- glibc-20041218T2312/linuxthreads/Makefile 2 Dec 2004 22:55:00 -0000 1.96 --- glibc-20041219T2331/linuxthreads/Makefile 2 Dec 2004 22:55:00 -0000 1.96
+++ glibc-20041218T2312-fedora/linuxthreads/Makefile 3 Dec 2004 10:17:05 -0000 1.94.2.3 +++ glibc-20041219T2331-fedora/linuxthreads/Makefile 3 Dec 2004 10:17:05 -0000 1.94.2.3
@@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \
$(filter-out $(tests-static) $(tests-reverse) unload, \ $(filter-out $(tests-static) $(tests-reverse) unload, \
$(tests) $(test-srcs))): $(objpfx)libpthread.so \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \
@ -736,8 +736,8 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
$(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a
--- glibc-20041218T2312/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 --- glibc-20041219T2331/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23
+++ glibc-20041218T2312-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +++ glibc-20041219T2331-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 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur
} }
@ -745,8 +745,8 @@
+ THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE);
__libc_thread_freeres (); __libc_thread_freeres ();
} }
--- glibc-20041218T2312/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 --- glibc-20041219T2331/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10
+++ glibc-20041218T2312-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1
@@ -74,7 +74,11 @@ __fresetlockfiles (void) @@ -74,7 +74,11 @@ __fresetlockfiles (void)
__pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
@ -760,8 +760,8 @@
__pthread_mutexattr_destroy (&attr); __pthread_mutexattr_destroy (&attr);
--- glibc-20041218T2312/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 --- glibc-20041219T2331/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13
+++ glibc-20041218T2312-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
# define __need_timespec # define __need_timespec
# include <time.h> # include <time.h>
@ -770,8 +770,8 @@
#ifndef _PTHREAD_DESCR_DEFINED #ifndef _PTHREAD_DESCR_DEFINED
/* Thread descriptors. Needed for `sem_t' definition. */ /* Thread descriptors. Needed for `sem_t' definition. */
--- glibc-20041218T2312/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 --- glibc-20041219T2331/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1
+++ glibc-20041218T2312-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <tls.h> #include <tls.h>
@ -781,8 +781,8 @@
struct tls_obj struct tls_obj
{ {
--- glibc-20041218T2312/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5 --- glibc-20041219T2331/linuxthreads/sysdeps/alpha/tls.h 30 Jan 2003 21:03:40 -0000 1.5
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/alpha/tls.h 22 Sep 2004 21:20:55 -0000 1.5.2.1
@@ -53,54 +53,76 @@ typedef struct @@ -53,54 +53,76 @@ typedef struct
# include <sysdep.h> # include <sysdep.h>
@ -872,8 +872,8 @@
/* Get the thread descriptor definition. */ /* Get the thread descriptor definition. */
# include <linuxthreads/descr.h> # include <linuxthreads/descr.h>
--- glibc-20041218T2312/linuxthreads/sysdeps/i386/tls.h 19 Oct 2004 05:12:58 -0000 1.37 --- glibc-20041219T2331/linuxthreads/sysdeps/i386/tls.h 19 Oct 2004 05:12:58 -0000 1.37
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/i386/tls.h 20 Oct 2004 10:47:17 -0000 1.35.2.4 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/i386/tls.h 20 Oct 2004 10:47:17 -0000 1.35.2.4
@@ -81,7 +81,14 @@ typedef struct @@ -81,7 +81,14 @@ typedef struct
# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
@ -890,8 +890,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9 --- glibc-20041219T2331/linuxthreads/sysdeps/ia64/tls.h 8 Jul 2004 21:20:57 -0000 1.9
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/ia64/tls.h 22 Sep 2004 21:20:55 -0000 1.9.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/ia64/tls.h 22 Sep 2004 21:20:55 -0000 1.9.2.1
@@ -60,7 +60,14 @@ typedef struct @@ -60,7 +60,14 @@ typedef struct
# define TLS_TCB_SIZE sizeof (tcbhead_t) # define TLS_TCB_SIZE sizeof (tcbhead_t)
@ -908,8 +908,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8 --- glibc-20041219T2331/linuxthreads/sysdeps/powerpc/tls.h 9 Apr 2004 19:09:42 -0000 1.8
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/powerpc/tls.h 22 Sep 2004 21:20:55 -0000 1.8.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/powerpc/tls.h 22 Sep 2004 21:20:55 -0000 1.8.2.1
@@ -64,11 +64,19 @@ typedef struct @@ -64,11 +64,19 @@ typedef struct
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
@ -932,8 +932,8 @@
TCB + 0x7000 (per the ABI). This implies that TCB address is TCB + 0x7000 (per the ABI). This implies that TCB address is
TP - 0x7000. As we define TLS_DTV_AT_TP we can TP - 0x7000. As we define TLS_DTV_AT_TP we can
assume that the pthread_descr is allocated immediately ahead of the assume that the pthread_descr is allocated immediately ahead of the
--- glibc-20041218T2312/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 --- glibc-20041219T2331/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1
@@ -12,3 +12,15 @@ endif @@ -12,3 +12,15 @@ endif
ifeq ($(subdir),posix) ifeq ($(subdir),posix)
CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\""
@ -950,8 +950,8 @@
+ @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@
+endif +endif
+endif +endif
--- glibc-20041218T2312/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifdef HAVE_TLS_SUPPORT +#ifdef HAVE_TLS_SUPPORT
+# ifndef HAVE_FORCED_UNWIND +# ifndef HAVE_FORCED_UNWIND
@ -966,8 +966,8 @@
+#ifdef HAVE_TLS_SUPPORT +#ifdef HAVE_TLS_SUPPORT
+NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread)
+#endif +#endif
--- glibc-20041218T2312/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3 --- glibc-20041219T2331/linuxthreads/sysdeps/s390/tls.h 30 Jan 2003 18:34:11 -0000 1.3
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/s390/tls.h 22 Sep 2004 21:20:56 -0000 1.3.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/s390/tls.h 22 Sep 2004 21:20:56 -0000 1.3.2.1
@@ -72,7 +72,14 @@ typedef struct @@ -72,7 +72,14 @@ typedef struct
# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
@ -984,8 +984,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9 --- glibc-20041219T2331/linuxthreads/sysdeps/sh/tls.h 2 Mar 2003 11:44:20 -0000 1.9
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/sh/tls.h 22 Sep 2004 21:20:57 -0000 1.9.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/sh/tls.h 22 Sep 2004 21:20:57 -0000 1.9.2.1
@@ -64,7 +64,14 @@ typedef struct @@ -64,7 +64,14 @@ typedef struct
# define TLS_TCB_SIZE sizeof (tcbhead_t) # define TLS_TCB_SIZE sizeof (tcbhead_t)
@ -1002,8 +1002,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3 --- glibc-20041219T2331/linuxthreads/sysdeps/sparc/tls.h 4 Feb 2003 20:41:02 -0000 1.3
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/sparc/tls.h 22 Sep 2004 21:20:57 -0000 1.3.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/sparc/tls.h 22 Sep 2004 21:20:57 -0000 1.3.2.1
@@ -64,7 +64,14 @@ typedef struct @@ -64,7 +64,14 @@ typedef struct
# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
@ -1020,8 +1020,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6 --- glibc-20041219T2331/linuxthreads/sysdeps/x86_64/tls.h 18 Apr 2004 02:32:25 -0000 1.6
+++ glibc-20041218T2312-fedora/linuxthreads/sysdeps/x86_64/tls.h 22 Sep 2004 21:20:57 -0000 1.6.2.1 +++ glibc-20041219T2331-fedora/linuxthreads/sysdeps/x86_64/tls.h 22 Sep 2004 21:20:57 -0000 1.6.2.1
@@ -66,7 +66,14 @@ typedef struct @@ -66,7 +66,14 @@ typedef struct
# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
@ -1038,8 +1038,8 @@
/* Alignment requirements for the TCB. */ /* Alignment requirements for the TCB. */
# define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
--- glibc-20041218T2312/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15 --- glibc-20041219T2331/locale/iso-4217.def 10 Aug 2004 05:10:38 -0000 1.15
+++ glibc-20041218T2312-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1 +++ glibc-20041219T2331-fedora/locale/iso-4217.def 22 Sep 2004 21:20:57 -0000 1.15.2.1
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -1131,8 +1131,8 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("ROL") /* Romanian Leu */
--- glibc-20041218T2312/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 --- glibc-20041219T2331/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5
+++ glibc-20041218T2312-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +++ glibc-20041219T2331-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, @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
} }
} }
@ -1176,8 +1176,8 @@
#endif #endif
#ifndef NO_FINALIZE #ifndef NO_FINALIZE
--- glibc-20041218T2312/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 --- glibc-20041219T2331/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101
+++ glibc-20041218T2312-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +++ glibc-20041219T2331-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1
@@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
echo -n '...'; \ echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -1186,8 +1186,8 @@
-i locales/$$input -c -f charmaps/$$charset \ -i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \ echo ' done'; \
--- glibc-20041218T2312/localedata/SUPPORTED 31 Oct 2004 20:49:54 -0000 1.72 --- glibc-20041219T2331/localedata/SUPPORTED 31 Oct 2004 20:49:54 -0000 1.72
+++ glibc-20041218T2312-fedora/localedata/SUPPORTED 2 Nov 2004 12:25:45 -0000 1.71.2.2 +++ glibc-20041219T2331-fedora/localedata/SUPPORTED 2 Nov 2004 12:25:45 -0000 1.71.2.2
@@ -63,6 +63,7 @@ cy_GB.UTF-8/UTF-8 \ @@ -63,6 +63,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \ cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \ da_DK.UTF-8/UTF-8 \
@ -1229,8 +1229,8 @@
ta_IN/UTF-8 \ ta_IN/UTF-8 \
te_IN/UTF-8 \ te_IN/UTF-8 \
tg_TJ/KOI8-T \ tg_TJ/KOI8-T \
--- glibc-20041218T2312/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 --- glibc-20041219T2331/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4
+++ glibc-20041218T2312-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +++ glibc-20041219T2331-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061 @@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@ -1245,8 +1245,8 @@
END LC_TIME END LC_TIME
LC_MESSAGES LC_MESSAGES
--- glibc-20041218T2312/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 --- glibc-20041219T2331/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12
+++ glibc-20041218T2312-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +++ glibc-20041219T2331-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2
@@ -112,8 +112,8 @@ mon "<U004A><U0061><U006E><U0075 @@ -112,8 +112,8 @@ mon "<U004A><U0061><U006E><U0075
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@ -1258,8 +1258,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>" <U0025><U005A><U0020><U0025><U0059>"
--- glibc-20041218T2312/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 --- glibc-20041219T2331/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9
+++ glibc-20041218T2312-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +++ glibc-20041219T2331-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2
@@ -100,7 +100,6 @@ mon "<U004A><U0061><U006E><U0075><U0061> @@ -100,7 +100,6 @@ mon "<U004A><U0061><U006E><U0075><U0061>
"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/ "<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
"<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
@ -1268,8 +1268,8 @@
% Appropriate date and time representation (%c) % Appropriate date and time representation (%c)
% "%a %d %b %Y %r %Z" % "%a %d %b %Y %r %Z"
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>" d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
--- glibc-20041218T2312/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +++ glibc-20041219T2331-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -1340,8 +1340,8 @@
+LC_ADDRESS +LC_ADDRESS
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
--- glibc-20041218T2312/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 --- glibc-20041219T2331/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7
+++ glibc-20041218T2312-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +++ glibc-20041219T2331-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -1369,8 +1369,8 @@
revision "0.2" revision "0.2"
date "2000-08-02" date "2000-08-02"
% %
--- glibc-20041218T2312/malloc/arena.c 10 Dec 2004 11:42:08 -0000 1.13 --- glibc-20041219T2331/malloc/arena.c 10 Dec 2004 11:42:08 -0000 1.13
+++ glibc-20041218T2312-fedora/malloc/arena.c 13 Dec 2004 23:32:35 -0000 1.8.2.6 +++ glibc-20041219T2331-fedora/malloc/arena.c 13 Dec 2004 23:32:35 -0000 1.8.2.6
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
@ -1380,8 +1380,8 @@
/* Compile-time constants. */ /* Compile-time constants. */
--- glibc-20041218T2312/malloc/hooks.c 14 Dec 2004 21:18:02 -0000 1.16 --- glibc-20041219T2331/malloc/hooks.c 14 Dec 2004 21:18:02 -0000 1.16
+++ glibc-20041218T2312-fedora/malloc/hooks.c 15 Dec 2004 09:16:05 -0000 1.15.2.1 +++ glibc-20041219T2331-fedora/malloc/hooks.c 15 Dec 2004 09:16:05 -0000 1.15.2.1
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
@ -1391,8 +1391,8 @@
/* What to do if the standard debugging hooks are in place and a /* What to do if the standard debugging hooks are in place and a
corrupt pointer is detected: do nothing (0), print an error message corrupt pointer is detected: do nothing (0), print an error message
--- glibc-20041218T2312/malloc/malloc.c 11 Dec 2004 21:14:40 -0000 1.142 --- glibc-20041219T2331/malloc/malloc.c 11 Dec 2004 21:14:40 -0000 1.142
+++ glibc-20041218T2312-fedora/malloc/malloc.c 13 Dec 2004 23:32:35 -0000 1.127.2.13 +++ glibc-20041219T2331-fedora/malloc/malloc.c 13 Dec 2004 23:32:35 -0000 1.127.2.13
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger. Doug Lea and adapted to multiple threads/arenas by Wolfram Gloger.
@ -1402,8 +1402,8 @@
based on: based on:
VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee) VERSION 2.7.0 Sun Mar 11 14:14:06 2001 Doug Lea (dl at gee)
--- glibc-20041218T2312/nptl/ChangeLog 18 Dec 2004 22:51:00 -0000 1.756 --- glibc-20041219T2331/nptl/ChangeLog 18 Dec 2004 22:51:00 -0000 1.756
+++ glibc-20041218T2312-fedora/nptl/ChangeLog 18 Dec 2004 23:21:48 -0000 1.706.2.33 +++ glibc-20041219T2331-fedora/nptl/ChangeLog 18 Dec 2004 23:21:48 -0000 1.706.2.33
@@ -457,6 +457,11 @@ @@ -457,6 +457,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1428,8 +1428,8 @@
2003-07-25 Jakub Jelinek <jakub@redhat.com> 2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed. * tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-20041218T2312/nptl/Makefile 7 Dec 2004 20:31:27 -0000 1.165 --- glibc-20041219T2331/nptl/Makefile 7 Dec 2004 20:31:27 -0000 1.165
+++ glibc-20041218T2312-fedora/nptl/Makefile 7 Dec 2004 14:20:57 -0000 1.157.2.8 +++ glibc-20041219T2331-fedora/nptl/Makefile 7 Dec 2004 14:20:57 -0000 1.157.2.8
@@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \
$(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
$(objpfx)libpthread_nonshared.a $(objpfx)libpthread_nonshared.a
@ -1452,8 +1452,8 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-20041218T2312/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1 --- glibc-20041219T2331/nptl/alloca_cutoff.c 26 Nov 2002 22:50:01 -0000 1.1.1.1
+++ glibc-20041218T2312-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1 +++ glibc-20041219T2331-fedora/nptl/alloca_cutoff.c 22 Sep 2004 21:21:01 -0000 1.1.1.1.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1475,8 +1475,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 --- glibc-20041219T2331/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25
+++ glibc-20041218T2312-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +++ glibc-20041219T2331-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3
@@ -27,9 +27,13 @@ @@ -27,9 +27,13 @@
#include <sys/types.h> #include <sys/types.h>
#include <hp-timing.h> #include <hp-timing.h>
@ -1491,8 +1491,8 @@
#include "../nptl_db/thread_db.h" #include "../nptl_db/thread_db.h"
#include <tls.h> #include <tls.h>
#ifdef HAVE_FORCED_UNWIND #ifdef HAVE_FORCED_UNWIND
--- glibc-20041218T2312/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 --- glibc-20041219T2331/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5
+++ glibc-20041218T2312-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +++ glibc-20041219T2331-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) @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond)
broadcasted, but still are using the pthread_cond_t structure, broadcasted, but still are using the pthread_cond_t structure,
pthread_cond_destroy needs to wait for them. */ pthread_cond_destroy needs to wait for them. */
@ -1534,8 +1534,8 @@
} }
return 0; return 0;
--- glibc-20041218T2312/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3 --- glibc-20041219T2331/nptl/tst-unload.c 25 Feb 2004 18:41:32 -0000 1.3
+++ glibc-20041218T2312-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1 +++ glibc-20041219T2331-fedora/nptl/tst-unload.c 22 Sep 2004 21:21:01 -0000 1.3.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000. Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
@ -1557,8 +1557,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 --- glibc-20041219T2331/nptl/sysdeps/pthread/allocalim.h 26 Nov 2002 22:50:35 -0000 1.1.1.1
+++ glibc-20041218T2312-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/pthread/allocalim.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1580,8 +1580,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3 --- glibc-20041219T2331/nptl/sysdeps/pthread/pt-initfini.c 31 Dec 2002 08:46:38 -0000 1.3
+++ glibc-20041218T2312-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/pthread/pt-initfini.c 22 Sep 2004 21:21:02 -0000 1.3.2.1
@@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1608,8 +1608,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, 59 Temple Place - Suite 330, write to the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17 --- glibc-20041219T2331/nptl/sysdeps/pthread/bits/libc-lock.h 11 Dec 2003 04:50:49 -0000 1.17
+++ glibc-20041218T2312-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/pthread/bits/libc-lock.h 22 Sep 2004 21:21:02 -0000 1.17.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1631,8 +1631,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1 --- glibc-20041219T2331/nptl/sysdeps/pthread/bits/sigthread.h 26 Nov 2002 22:50:35 -0000 1.1.1.1
+++ glibc-20041218T2312-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/pthread/bits/sigthread.h 22 Sep 2004 21:21:02 -0000 1.1.1.1.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1654,8 +1654,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#include_next <kernel-features.h> +#include_next <kernel-features.h>
+ +
@ -1663,8 +1663,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS +#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1 +# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif +#endif
--- glibc-20041218T2312/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6 --- glibc-20041219T2331/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 13 Apr 2004 02:00:09 -0000 1.6
+++ glibc-20041218T2312-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1 +++ glibc-20041219T2331-fedora/nptl/sysdeps/unix/sysv/linux/bits/local_lim.h 22 Sep 2004 21:21:02 -0000 1.6.2.1
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1686,8 +1686,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 10 Dec 2004 00:23:51 -0000 1.11 --- glibc-20041219T2331/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 10 Dec 2004 00:23:51 -0000 1.11
+++ glibc-20041218T2312-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 3 Dec 2004 11:20:52 -0000 1.8.2.4 +++ glibc-20041219T2331-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 3 Dec 2004 11:20:52 -0000 1.8.2.4
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -1709,8 +1709,8 @@
License along with the GNU C Library; see the file COPYING.LIB. If not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
--- glibc-20041218T2312/nscd/connections.c 15 Oct 2004 21:12:15 -0000 1.64 --- glibc-20041219T2331/nscd/connections.c 15 Oct 2004 21:12:15 -0000 1.64
+++ glibc-20041218T2312-fedora/nscd/connections.c 18 Oct 2004 09:58:49 -0000 1.55.2.5 +++ glibc-20041219T2331-fedora/nscd/connections.c 18 Oct 2004 09:58:49 -0000 1.55.2.5
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include <alloca.h> #include <alloca.h>
#include <assert.h> #include <assert.h>
@ -1801,8 +1801,8 @@
+ prune_cache (&dbs[hstdb], LONG_MAX); + prune_cache (&dbs[hstdb], LONG_MAX);
+} +}
+ +
--- glibc-20041218T2312/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42 --- glibc-20041219T2331/nscd/nscd.c 4 Oct 2004 16:14:31 -0000 1.42
+++ glibc-20041218T2312-fedora/nscd/nscd.c 5 Oct 2004 08:25:25 -0000 1.38.2.4 +++ glibc-20041219T2331-fedora/nscd/nscd.c 5 Oct 2004 08:25:25 -0000 1.38.2.4
@@ -122,9 +122,16 @@ static struct argp argp = @@ -122,9 +122,16 @@ static struct argp argp =
options, parse_opt, NULL, doc, options, parse_opt, NULL, doc,
}; };
@ -1828,8 +1828,8 @@
signal (SIGPIPE, SIG_IGN); signal (SIGPIPE, SIG_IGN);
/* Cleanup files created by a previous 'bind'. */ /* Cleanup files created by a previous 'bind'. */
--- glibc-20041218T2312/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 --- glibc-20041219T2331/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10
+++ glibc-20041218T2312-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +++ glibc-20041219T2331-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2
@@ -31,8 +31,8 @@ @@ -31,8 +31,8 @@
# logfile /var/log/nscd.log # logfile /var/log/nscd.log
# threads 6 # threads 6
@ -1841,8 +1841,8 @@
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
paranoia no paranoia no
--- glibc-20041218T2312/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 --- glibc-20041219T2331/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16
+++ glibc-20041218T2312-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +++ glibc-20041219T2331-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 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru
if (strcmp (arg2, "no") == 0) if (strcmp (arg2, "no") == 0)
dbs[cnt].shared = 0; dbs[cnt].shared = 0;
@ -1855,8 +1855,8 @@
break; break;
} }
if (cnt == lastdb) if (cnt == lastdb)
--- glibc-20041218T2312/posix/Makefile 27 Nov 2004 22:46:43 -0000 1.179 --- glibc-20041219T2331/posix/Makefile 27 Nov 2004 22:46:43 -0000 1.179
+++ glibc-20041218T2312-fedora/posix/Makefile 14 Dec 2004 09:23:25 -0000 1.171.2.9 +++ glibc-20041219T2331-fedora/posix/Makefile 14 Dec 2004 09:23:25 -0000 1.171.2.9
@@ -102,7 +102,8 @@ generated := $(addprefix wordexp-test-re @@ -102,7 +102,8 @@ generated := $(addprefix wordexp-test-re
bug-regex21-mem bug-regex21.mtrace \ bug-regex21-mem bug-regex21.mtrace \
tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@ -1890,8 +1890,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new + > $@.new
+ mv -f $@.new $@ + mv -f $@.new $@
--- glibc-20041218T2312/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +++ glibc-20041219T2331-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+#include <unistd.h> +#include <unistd.h>
+const char *START_OF_STRINGS = +const char *START_OF_STRINGS =
@ -1908,8 +1908,8 @@
+"POSIX_V6_LPBIG_OFFBIG" +"POSIX_V6_LPBIG_OFFBIG"
+#endif +#endif
+""; +"";
--- glibc-20041218T2312/resolv/gethnamaddr.c 18 Oct 2004 05:09:59 -0000 1.50 --- glibc-20041219T2331/resolv/gethnamaddr.c 18 Oct 2004 05:09:59 -0000 1.50
+++ glibc-20041218T2312-fedora/resolv/gethnamaddr.c 18 Oct 2004 09:58:50 -0000 1.49.2.1 +++ glibc-20041219T2331-fedora/resolv/gethnamaddr.c 18 Oct 2004 09:58:50 -0000 1.49.2.1
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1919,8 +1919,8 @@
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/types.h> #include <sys/types.h>
--- glibc-20041218T2312/sunrpc/rpc_clntout.c 17 Oct 2004 14:59:39 -0000 1.7 --- glibc-20041219T2331/sunrpc/rpc_clntout.c 17 Oct 2004 14:59:39 -0000 1.7
+++ glibc-20041218T2312-fedora/sunrpc/rpc_clntout.c 18 Oct 2004 09:58:53 -0000 1.6.4.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_clntout.c 18 Oct 2004 09:58:53 -0000 1.6.4.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1930,8 +1930,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_cout.c 17 Oct 2004 14:59:39 -0000 1.14 --- glibc-20041219T2331/sunrpc/rpc_cout.c 17 Oct 2004 14:59:39 -0000 1.14
+++ glibc-20041218T2312-fedora/sunrpc/rpc_cout.c 18 Oct 2004 09:58:53 -0000 1.13.4.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_cout.c 18 Oct 2004 09:58:53 -0000 1.13.4.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1941,8 +1941,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_hout.c 17 Oct 2004 14:59:39 -0000 1.8 --- glibc-20041219T2331/sunrpc/rpc_hout.c 17 Oct 2004 14:59:39 -0000 1.8
+++ glibc-20041218T2312-fedora/sunrpc/rpc_hout.c 18 Oct 2004 09:58:53 -0000 1.7.4.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_hout.c 18 Oct 2004 09:58:53 -0000 1.7.4.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1952,8 +1952,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_main.c 17 Oct 2004 14:59:39 -0000 1.24 --- glibc-20041219T2331/sunrpc/rpc_main.c 17 Oct 2004 14:59:39 -0000 1.24
+++ glibc-20041218T2312-fedora/sunrpc/rpc_main.c 18 Oct 2004 09:58:53 -0000 1.23.2.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_main.c 18 Oct 2004 09:58:53 -0000 1.23.2.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1963,8 +1963,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_parse.c 17 Oct 2004 14:59:39 -0000 1.8 --- glibc-20041219T2331/sunrpc/rpc_parse.c 17 Oct 2004 14:59:39 -0000 1.8
+++ glibc-20041218T2312-fedora/sunrpc/rpc_parse.c 18 Oct 2004 09:58:53 -0000 1.5.4.2 +++ glibc-20041219T2331-fedora/sunrpc/rpc_parse.c 18 Oct 2004 09:58:53 -0000 1.5.4.2
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1974,8 +1974,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_sample.c 17 Oct 2004 14:59:39 -0000 1.6 --- glibc-20041219T2331/sunrpc/rpc_sample.c 17 Oct 2004 14:59:39 -0000 1.6
+++ glibc-20041218T2312-fedora/sunrpc/rpc_sample.c 18 Oct 2004 09:58:53 -0000 1.5.6.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_sample.c 18 Oct 2004 09:58:53 -0000 1.5.6.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1985,8 +1985,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_scan.c 17 Oct 2004 14:59:39 -0000 1.9 --- glibc-20041219T2331/sunrpc/rpc_scan.c 17 Oct 2004 14:59:39 -0000 1.9
+++ glibc-20041218T2312-fedora/sunrpc/rpc_scan.c 18 Oct 2004 09:58:53 -0000 1.8.4.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_scan.c 18 Oct 2004 09:58:53 -0000 1.8.4.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -1996,8 +1996,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_svcout.c 17 Oct 2004 14:59:39 -0000 1.12 --- glibc-20041219T2331/sunrpc/rpc_svcout.c 17 Oct 2004 14:59:39 -0000 1.12
+++ glibc-20041218T2312-fedora/sunrpc/rpc_svcout.c 18 Oct 2004 09:58:53 -0000 1.11.2.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_svcout.c 18 Oct 2004 09:58:53 -0000 1.11.2.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -2007,8 +2007,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_tblout.c 17 Oct 2004 14:59:39 -0000 1.3 --- glibc-20041219T2331/sunrpc/rpc_tblout.c 17 Oct 2004 14:59:39 -0000 1.3
+++ glibc-20041218T2312-fedora/sunrpc/rpc_tblout.c 18 Oct 2004 09:58:53 -0000 1.2.6.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_tblout.c 18 Oct 2004 09:58:53 -0000 1.2.6.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -2018,8 +2018,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sunrpc/rpc_util.c 17 Oct 2004 14:59:39 -0000 1.7 --- glibc-20041219T2331/sunrpc/rpc_util.c 17 Oct 2004 14:59:39 -0000 1.7
+++ glibc-20041218T2312-fedora/sunrpc/rpc_util.c 18 Oct 2004 09:58:53 -0000 1.6.6.1 +++ glibc-20041219T2331-fedora/sunrpc/rpc_util.c 18 Oct 2004 09:58:53 -0000 1.6.6.1
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
@ -2029,8 +2029,8 @@
#endif #endif
/* /*
--- glibc-20041218T2312/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 --- glibc-20041219T2331/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13
+++ glibc-20041218T2312-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +++ glibc-20041219T2331-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1
@@ -36,6 +36,14 @@ @@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir) # define add_system_dir(dir) add_dir (dir)
#endif #endif
@ -2046,8 +2046,8 @@
#define CACHEMAGIC "ld.so-1.7.0" #define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
--- glibc-20041218T2312/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +++ glibc-20041219T2331-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3
@@ -0,0 +1,410 @@ @@ -0,0 +1,410 @@
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library. + This file is part of the GNU C Library.
@ -2459,8 +2459,8 @@
+ +
+ +
+#define atomic_delay() asm ("rep; nop") +#define atomic_delay() asm ("rep; nop")
--- glibc-20041218T2312/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 --- glibc-20041219T2331/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10
+++ glibc-20041218T2312-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +++ glibc-20041219T2331-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
@ -2472,8 +2472,8 @@
endif endif
endif endif
--- glibc-20041218T2312/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 --- glibc-20041219T2331/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2
+++ glibc-20041218T2312-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +++ glibc-20041219T2331-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1
@@ -1,350 +0,0 @@ @@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */ - alternative. */
@ -2825,8 +2825,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2 - .symver ___multi3, __multi3@GLIBC_2.2
- -
-#endif -#endif
--- glibc-20041218T2312/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility +/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002 Free Software Foundation, Inc.
@ -2912,8 +2912,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+ +
+#endif +#endif
--- glibc-20041218T2312/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 --- glibc-20041219T2331/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6
+++ glibc-20041218T2312-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1
@@ -41,7 +41,12 @@ nice (int incr) @@ -41,7 +41,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -2928,8 +2928,8 @@
if (result != -1) if (result != -1)
return getpriority (PRIO_PROCESS, 0); return getpriority (PRIO_PROCESS, 0);
else else
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
#define _PATH_TTY "/dev/tty" #define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux" #define _PATH_UNIX "/boot/vmlinux"
@ -2939,8 +2939,8 @@
#define _PATH_WTMP "/var/log/wtmp" #define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +++ glibc-20041219T2331-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 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t
FILE *fp = fopen ("/proc/self/maps", "rc"); FILE *fp = fopen ("/proc/self/maps", "rc");
@ -2953,8 +2953,8 @@
/* We need no locking. */ /* We need no locking. */
__fsetlocking (fp, FSETLOCKING_BYCALLER); __fsetlocking (fp, FSETLOCKING_BYCALLER);
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +++ glibc-20041219T2331-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 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
{ {
struct __kernel_termios k_termios; struct __kernel_termios k_termios;
@ -3000,8 +3000,8 @@
+ return retval; + return retval;
} }
libc_hidden_def (tcsetattr) libc_hidden_def (tcsetattr)
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004 Free Software Foundation, Inc.
@ -3062,8 +3062,8 @@
+ } while (0) + } while (0)
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1
@@ -22,4 +22,31 @@ @@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \ #define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID) ((flags) == _DL_CACHE_DEFAULT_ID)
@ -3096,24 +3096,24 @@
+ } while (0) + } while (0)
+ +
#include_next <dl-cache.h> #include_next <dl-cache.h>
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c> +#include <sysdeps/i386/dl-procinfo.c>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.c> +#include <sysdeps/generic/dl-procinfo.c>
+#endif +#endif
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.h> +#include <sysdeps/generic/dl-procinfo.h>
+#endif +#endif
--- glibc-20041218T2312/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 --- glibc-20041219T2331/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2
+++ glibc-20041218T2312-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +++ glibc-20041219T2331-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1
@@ -1 +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 \2\3"_
+s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_

33
glibc.spec
View File

@ -1,6 +1,7 @@
%define glibcdate 20041218T2312 %define glibcdate 20041219T2331
%define glibcversion 2.3.3 %define glibcname glibc
%define glibcrelease 99 %define glibcversion 2.3.4
%define glibcrelease 3
%define auxarches i586 i686 athlon sparcv9 alphaev6 %define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches noarch %define prelinkarches noarch
%define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@ -526,8 +527,9 @@ $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_tar
%ifarch %{nptlarches} %ifarch %{nptlarches}
'-DLIBTLS="/%{_lib}/tls/"' \ '-DLIBTLS="/%{_lib}/tls/"' \
%endif %endif
'-DGCONV_MODULES_CACHE="%{_prefix}/%{_lib}/gconv/gconv-modules.cache"' \ '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
'-DLD_SO_CONF="/etc/ld.so.conf"' '-DLD_SO_CONF="/etc/ld.so.conf"' \
'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
cd .. cd ..
# hack # hack
@ -802,6 +804,9 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
%endif %endif
# Ugly hack for buggy rpm
ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
# BUILD THE FILE LIST # BUILD THE FILE LIST
find $RPM_BUILD_ROOT -type f -or -type l | find $RPM_BUILD_ROOT -type f -or -type l |
sed -e 's|.*/etc|%config &|' \ sed -e 's|.*/etc|%config &|' \
@ -1268,6 +1273,24 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Dec 21 2004 Jakub Jelinek <jakub@redhat.com> 2.3.4-3
- rebuilt
* Mon Dec 20 2004 Jakub Jelinek <jakub@redhat.com> 2.3.4-2
- work around rpm bug some more, this time by copying
iconvconfig to iconvconfig.%%{_target_cpu}.
* Mon Dec 20 2004 Jakub Jelinek <jakub@redhat.com> 2.3.4-1
- update from CVS
- glibc 2.3.4 release
- add -o and --nostdlib options to iconvconfig
- if /sbin/ldconfig doesn't exist when running
glibc_post_upgrade.%%{_target_cpu}, just don't attempt to run it.
This can happen during first install of bi-arch glibc and the
other arch glibc's %post wil run /sbin/ldconfig (#143326)
- use -o and --nostdlib options to create all needed
gconv-modules.cache files on bi-arch setups
* Sun Dec 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-99 * Sun Dec 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-99
- rebuilt - rebuilt

4
sources
View File

@ -1,2 +1,2 @@
2d3ba6bd775b2fa8ed328055d1eea48a glibc-20041218T2312.tar.bz2 350d3b46431e954a97561b6f0ec27f0a glibc-20041219T2331.tar.bz2
7deea9147ca08a6373341533e93172f0 glibc-fedora-20041218T2312.tar.bz2 d9c3375c57ed27cb53408e872e00fc94 glibc-fedora-20041219T2331.tar.bz2