r3288 - in glibc-package/trunk/debian/patches: any arm hppa hurd-i386 localedata
Author: aurel32
Date: 2009-02-19 19:34:27 +0000 (Thu, 19 Feb 2009)
New Revision: 3288
Modified:
glibc-package/trunk/debian/patches/any/cvs-bz697-posix-regexec.diff
glibc-package/trunk/debian/patches/any/cvs-bz9697-posix-regcomp.diff
glibc-package/trunk/debian/patches/any/cvs-bz9706-nss_nss-files_files-parse.diff
glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff
glibc-package/trunk/debian/patches/any/local-linuxthreads-thread_self.diff
glibc-package/trunk/debian/patches/any/local-nss-overflow.diff
glibc-package/trunk/debian/patches/any/submitted-popen.diff
glibc-package/trunk/debian/patches/arm/submitted-setjmp.diff
glibc-package/trunk/debian/patches/hppa/cvs-tsd.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-get_pc_thunk.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-hurdsig-fix.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-report-wait-fix.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-resource-prio.diff
glibc-package/trunk/debian/patches/hurd-i386/local-check_native.diff
glibc-package/trunk/debian/patches/hurd-i386/local-net-headers.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-critical-sections.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-dl-sysdep.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-dup2-fix.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-itimer-lock.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff
glibc-package/trunk/debian/patches/localedata/first_weekday.diff
glibc-package/trunk/debian/patches/localedata/locale-fr_FR.diff
glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff
glibc-package/trunk/debian/patches/localedata/submitted-bz9730-locale-sv_FI.diff
glibc-package/trunk/debian/patches/localedata/submitted-bz9835-en_GB-first_day.diff
Log:
Refresh all patches
Modified: glibc-package/trunk/debian/patches/any/cvs-bz697-posix-regexec.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-bz697-posix-regexec.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/cvs-bz697-posix-regexec.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -5,8 +5,11 @@
being NULL also if there are no backreferences.
* posix/rxspencer/tests: Add testcases.
-diff --git a/posix/regexec.c b/posix/regexec.c
-index 135efe7..7bf0c08 100644
+---
+ posix/regexec.c | 7 ++++++-
+ posix/rxspencer/tests | 4 ++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -1,5 +1,5 @@
@@ -16,7 +19,7 @@
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
-@@ -1004,6 +1004,11 @@ prune_impossible_nodes (mctx)
+@@ -1004,6 +1004,11 @@
re_node_set_free (&sctx.limits);
if (BE (ret != REG_NOERROR, 0))
goto free_return;
@@ -28,11 +31,9 @@
}
re_free (mctx->state_log);
mctx->state_log = sifted_states;
-diff --git a/posix/rxspencer/tests b/posix/rxspencer/tests
-index b84a270..3ad46e2 100644
--- a/posix/rxspencer/tests
+++ b/posix/rxspencer/tests
-@@ -536,3 +536,7 @@ a.*\b & abT ab
+@@ -536,3 +536,7 @@
\B & aSbTc
\B & SaT @SaT
\B & aSTSb @TSb
Modified: glibc-package/trunk/debian/patches/any/cvs-bz9697-posix-regcomp.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-bz9697-posix-regcomp.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/cvs-bz9697-posix-regcomp.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -5,8 +5,11 @@
* posix/regcomp.c (re_compile_fastmap_iter): Rewrite COMPLEX_BRACKET
handling.
-diff --git a/posix/bug-regex17.c b/posix/bug-regex17.c
-index b42f9b6..1c11a1d 100644
+---
+ posix/bug-regex17.c | 31 +++++++++++++++-----
+ posix/regcomp.c | 79 ++++++++++++++++++++++++++++++++--------------------
+ 2 files changed, 73 insertions(+), 37 deletions(-)
+
--- a/posix/bug-regex17.c
+++ b/posix/bug-regex17.c
@@ -1,5 +1,5 @@
@@ -17,7 +20,7 @@
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
-@@ -33,10 +33,10 @@ struct
+@@ -33,10 +33,10 @@
int flags, nmatch;
regmatch_t rm[5];
} tests[] = {
@@ -32,7 +35,7 @@
{ "\xc3\x84\xc3\x96*\xc3\xb6$", "aB\xc3\xa4\xc3\xb6\xc3\xb6\xc3\x96", REG_ICASE, 2,
{ { 2, 10 }, { -1, -1 } } },
{ "[\xc3\x84x]\xc3\x96*\xc3\xb6$", "aB\xc3\x84\xc3\xb6\xc3\xb6\xc3\x96", REG_ICASE, 2,
-@@ -45,10 +45,22 @@ struct
+@@ -45,10 +45,22 @@
{ { 2, 10 }, { -1, -1 } } },
{ "[^x]\xc3\x96*\xc3\xb6$", "aB\xc3\xa4\xc3\xb6\xc3\xb6\xc3\x96", REG_ICASE, 2,
{ { 2, 10 }, { -1, -1 } } },
@@ -57,15 +60,13 @@
{
regex_t re;
regmatch_t rm[5];
-@@ -93,3 +105,6 @@ main (void)
+@@ -93,3 +105,6 @@
return ret;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
-diff --git a/posix/regcomp.c b/posix/regcomp.c
-index d5a0535..4843cfe 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -1,5 +1,6 @@
@@ -76,7 +77,7 @@
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
-@@ -350,47 +351,67 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+@@ -350,47 +351,67 @@
#ifdef RE_ENABLE_I18N
else if (type == COMPLEX_BRACKET)
{
Modified: glibc-package/trunk/debian/patches/any/cvs-bz9706-nss_nss-files_files-parse.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-bz9706-nss_nss-files_files-parse.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/cvs-bz9706-nss_nss-files_files-parse.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,5 +1,7 @@
-diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
-index 3ba37c8..66615da 100644
+---
+ nss/nss_files/files-parse.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -1,5 +1,5 @@
@@ -9,7 +11,7 @@
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
-@@ -127,10 +127,24 @@ nss_files_parse_hidden_def (parse_line)
+@@ -127,10 +127,24 @@
} \
}
@@ -35,7 +37,7 @@
if (endp == line) \
return 0; \
else if (terminator_p (*endp)) \
-@@ -148,7 +162,7 @@ nss_files_parse_hidden_def (parse_line)
+@@ -148,7 +162,7 @@
if (*line == '\0') \
/* We expect some more input, so don't allow the string to end here. */ \
return 0; \
Modified: glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/cvs-pthread_h.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -6,11 +6,13 @@
warnings.
(pthread_cleanup_pop_restore_np): Likewise.
-diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
-index d5ffd38..cc7472e 100644
+---
+ nptl/sysdeps/pthread/pthread.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
-@@ -655,7 +655,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
+@@ -655,7 +655,7 @@
/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
If EXECUTE is non-zero, the handler function is called. */
# define pthread_cleanup_pop(execute) \
@@ -19,7 +21,7 @@
} while (0); \
__pthread_unregister_cancel (&__cancel_buf); \
if (execute) \
-@@ -691,7 +691,7 @@ extern void __pthread_register_cancel_defer (__pthread_unwind_buf_t *__buf)
+@@ -691,7 +691,7 @@
restores the cancellation type that was in effect when the matching
pthread_cleanup_push_defer was called. */
# define pthread_cleanup_pop_restore_np(execute) \
Modified: glibc-package/trunk/debian/patches/any/local-linuxthreads-thread_self.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-thread_self.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-thread_self.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -3,9 +3,13 @@
* linuxthreads/descr.h (thread_self): Remove static to prevent
warning.
---- glibc-2.9.orig/linuxthreads/descr.h
-+++ glibc-2.9/linuxthreads/descr.h
-@@ -248,8 +248,8 @@
+---
+ linuxthreads/descr.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/linuxthreads/descr.h
++++ b/linuxthreads/descr.h
+@@ -260,8 +260,8 @@
extern pthread_descr __pthread_find_self (void) __attribute__ ((pure));
@@ -16,4 +20,3 @@
{
#ifdef THREAD_SELF
return THREAD_SELF;
-
Modified: glibc-package/trunk/debian/patches/any/local-nss-overflow.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-nss-overflow.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/local-nss-overflow.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -6,7 +6,7 @@
---
nss/nss_files/files-parse.c | 15 +++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
+ 1 file changed, 13 insertions(+), 2 deletions(-)
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
Modified: glibc-package/trunk/debian/patches/any/submitted-popen.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-popen.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/any/submitted-popen.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -20,6 +20,11 @@
older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
stub for it. so popen() will always fail as glibc assumes pipe2() works.
+---
+ include/unistd.h | 5 +----
+ socket/have_sock_cloexec.c | 5 +++++
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -167,9 +167,6 @@
Modified: glibc-package/trunk/debian/patches/arm/submitted-setjmp.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/submitted-setjmp.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/arm/submitted-setjmp.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,6 +1,10 @@
+---
+ ports/sysdeps/arm/fpu/setjmp.S | 2 ++
+ 1 file changed, 2 insertions(+)
+
--- a/ports/sysdeps/arm/fpu/setjmp.S
+++ b/ports/sysdeps/arm/fpu/setjmp.S
-@@ -33,3 +33,5 @@ ENTRY (__sigsetjmp)
+@@ -33,3 +33,5 @@
/* Make a tail call to __sigjmp_save; it takes the same args. */
B PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
END (__sigsetjmp)
Modified: glibc-package/trunk/debian/patches/hppa/cvs-tsd.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-tsd.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hppa/cvs-tsd.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -6,12 +6,12 @@
arguments.
---
- .../sysv/linux/hppa/linuxthreads/malloc-machine.h | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/malloc-machine.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/malloc-machine.h
+++ b/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/malloc-machine.h
-@@ -63,10 +63,10 @@ extern void *__dso_handle __attribute__ ((__weak__));
+@@ -63,10 +63,10 @@
#include <bits/libc-tsd.h>
typedef int tsd_key_t[1]; /* no key data structure, libc magic does it */
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-get_pc_thunk.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-get_pc_thunk.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-get_pc_thunk.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,12 +1,10 @@
-Index: glibc/sysdeps/i386/dl-tlsdesc.S
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/i386/dl-tlsdesc.S,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- glibc/sysdeps/i386/dl-tlsdesc.S 13 May 2008 05:33:06 -0000 1.1
-+++ glibc/sysdeps/i386/dl-tlsdesc.S 6 Dec 2008 00:15:17 -0000 1.2
-@@ -128,8 +128,7 @@ _dl_tlsdesc_dynamic:
+---
+ sysdeps/i386/dl-tlsdesc.S | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/sysdeps/i386/dl-tlsdesc.S
++++ b/sysdeps/i386/dl-tlsdesc.S
+@@ -128,8 +128,7 @@
.Lslow:
cfi_adjust_cfa_offset (28)
movl %ebx, 16(%esp)
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-hurdsig-fix.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-hurdsig-fix.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-hurdsig-fix.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,12 +1,10 @@
-Index: glibc/hurd/hurdsig.c
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/hurdsig.c,v
-retrieving revision 1.160
-retrieving revision 1.161
-diff -u -p -r1.160 -r1.161
---- glibc/hurd/hurdsig.c 8 Mar 2008 21:47:23 -0000 1.160
-+++ glibc/hurd/hurdsig.c 7 Jan 2009 01:59:35 -0000 1.161
-@@ -1134,6 +1134,7 @@ signal_allowed (int signo, mach_port_t r
+---
+ hurd/hurdsig.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/hurd/hurdsig.c
++++ b/hurd/hurdsig.c
+@@ -1134,6 +1134,7 @@
}
_hurd_port_free (&_hurd_dtable[d]->port, &ulink, port);
}
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-report-wait-fix.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-report-wait-fix.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-report-wait-fix.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,11 +1,9 @@
-Index: glibc/hurd/report-wait.c
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/report-wait.c,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -p -r1.15 -r1.16
---- glibc/hurd/report-wait.c 29 Dec 2005 10:38:12 -0000 1.15
-+++ glibc/hurd/report-wait.c 7 Jan 2009 01:59:26 -0000 1.16
+---
+ hurd/report-wait.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/hurd/report-wait.c
++++ b/hurd/report-wait.c
@@ -1,5 +1,5 @@
/* Report on what a thread in our task is waiting for.
- Copyright (C) 1996,1997,1999,2002,2005 Free Software Foundation, Inc.
@@ -13,7 +11,7 @@
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
-@@ -30,7 +30,7 @@ static char *
+@@ -30,7 +30,7 @@
describe_number (string_t description, const char *flavor, long int i)
{
unsigned long int j;
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-resource-prio.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-resource-prio.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-resource-prio.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,12 +1,10 @@
-Index: glibc/bits/resource.h
-===================================================================
-RCS file: /cvs/glibc/libc/bits/resource.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- glibc/bits/resource.h 5 Mar 2006 22:48:10 -0000 1.8
-+++ glibc/bits/resource.h 3 Jan 2009 21:04:01 -0000 1.9
-@@ -185,6 +185,9 @@ struct rusage
+---
+ bits/resource.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/bits/resource.h
++++ b/bits/resource.h
+@@ -185,6 +185,9 @@
enum __priority_which
{
PRIO_PROCESS = 0, /* WHO is a process ID. */
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-check_native.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-check_native.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-check_native.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,5 +1,9 @@
---- /dev/null 2007-12-29 19:47:02.000000000 +0000
-+++ glibc/sysdeps/mach/hurd/check_native.c 2009-01-28 01:29:50.000000000 +0000
+---
+ sysdeps/mach/hurd/check_native.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+--- /dev/null
++++ b/sysdeps/mach/hurd/check_native.c
@@ -0,0 +1,27 @@
+/* Determine whether interfaces use native transport. Dummy version.
+ Copyright (C) 2008 Free Software Foundation, Inc.
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-net-headers.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-net-headers.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-net-headers.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,11 +1,10 @@
-Index: glibc/sysdeps/mach/hurd/Makefile
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/Makefile,v
-retrieving revision 1.95
-diff -u -p -r1.95 Makefile
---- glibc/sysdeps/mach/hurd/Makefile 17 Oct 2004 20:00:25 -0000 1.95
-+++ glibc/sysdeps/mach/hurd/Makefile 6 Jan 2009 15:15:13 -0000
-@@ -206,4 +206,9 @@ ifeq ($(subdir),sunrpc)
+---
+ sysdeps/mach/hurd/Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/mach/hurd/Makefile
++++ b/sysdeps/mach/hurd/Makefile
+@@ -206,4 +206,9 @@
sysdep_headers += nfs/nfs.h
endif
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-critical-sections.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-critical-sections.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-critical-sections.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,11 +1,12 @@
-Index: glibc/hurd/hurd/fd.h
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/hurd/fd.h,v
-retrieving revision 1.37
-diff -u -p -r1.37 fd.h
---- glibc/hurd/hurd/fd.h 2 Jul 2008 09:53:29 -0000 1.37
-+++ glibc/hurd/hurd/fd.h 27 Jan 2009 21:15:32 -0000
-@@ -63,6 +63,7 @@ extern struct mutex _hurd_dtable_lock; /
+---
+ hurd/hurd/fd.h | 2 ++
+ sysdeps/mach/hurd/dirfd.c | 3 +++
+ sysdeps/mach/hurd/opendir.c | 2 ++
+ 3 files changed, 7 insertions(+)
+
+--- a/hurd/hurd/fd.h
++++ b/hurd/hurd/fd.h
+@@ -68,6 +68,7 @@
{
struct hurd_fd *descriptor;
@@ -13,7 +14,7 @@
__mutex_lock (&_hurd_dtable_lock);
if (fd < 0 || fd >= _hurd_dtablesize)
descriptor = NULL;
-@@ -87,6 +88,7 @@ _hurd_fd_get (int fd)
+@@ -90,6 +91,7 @@
}
}
__mutex_unlock (&_hurd_dtable_lock);
@@ -21,14 +22,9 @@
return descriptor;
}
-Index: glibc/sysdeps/mach/hurd/dirfd.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dirfd.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 dirfd.c
---- glibc/sysdeps/mach/hurd/dirfd.c 6 Jul 2001 04:55:56 -0000 1.4
-+++ glibc/sysdeps/mach/hurd/dirfd.c 27 Jan 2009 21:15:35 -0000
-@@ -26,6 +26,8 @@ int
+--- a/sysdeps/mach/hurd/dirfd.c
++++ b/sysdeps/mach/hurd/dirfd.c
+@@ -26,6 +26,8 @@
dirfd (DIR *dirp)
{
int fd;
@@ -37,7 +33,7 @@
__mutex_lock (&_hurd_dtable_lock);
for (fd = 0; fd < _hurd_dtablesize; ++fd)
if (_hurd_dtable[fd] == dirp->__fd)
-@@ -36,6 +38,7 @@ dirfd (DIR *dirp)
+@@ -36,6 +38,7 @@
fd = -1;
}
__mutex_unlock (&_hurd_dtable_lock);
@@ -45,13 +41,9 @@
return fd;
}
-Index: glibc/sysdeps/mach/hurd/opendir.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/opendir.c,v
-retrieving revision 1.17
---- glibc/sysdeps/mach/hurd/opendir.c 5 Mar 2006 11:53:30 -0000 1.17
-+++ glibc/sysdeps/mach/hurd/opendir.c 27 Jan 2009 21:15:36 -0000
-@@ -51,9 +51,11 @@ _hurd_fd_opendir (struct hurd_fd *d)
+--- a/sysdeps/mach/hurd/opendir.c
++++ b/sysdeps/mach/hurd/opendir.c
+@@ -51,9 +51,11 @@
return NULL;
/* Set the descriptor to close on exec. */
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-dl-sysdep.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-dl-sysdep.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-dl-sysdep.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -2,13 +2,12 @@
* sysdeps/mach/hurd/dl-sysdep.c: Include code only #ifdef SHARED.
-Index: sysdeps/mach/hurd/dl-sysdep.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dl-sysdep.c,v
-retrieving revision 1.79
-diff -u -p -r1.79 dl-sysdep.c
---- glibc/sysdeps/mach/hurd/dl-sysdep.c 2 Jul 2008 19:34:58 -0000 1.79
-+++ glibc/sysdeps/mach/hurd/dl-sysdep.c 30 Jan 2009 00:56:56 -0000
+---
+ sysdeps/mach/hurd/dl-sysdep.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/mach/hurd/dl-sysdep.c
++++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -42,6 +42,8 @@
#include <dl-machine.h>
#include <dl-procinfo.h>
@@ -18,7 +17,7 @@
extern void __mach_init (void);
extern int _dl_argc;
-@@ -668,3 +670,5 @@ _dl_init_first (int argc, ...)
+@@ -668,3 +670,5 @@
{
/* This no-op definition only gets used if libc is not linked in. */
}
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-dup2-fix.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-dup2-fix.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-dup2-fix.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,11 +1,10 @@
-Index: glibc/sysdeps/mach/hurd/dup2.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dup2.c,v
-retrieving revision 1.20
-diff -u -p -r1.20 dup2.c
---- glibc/sysdeps/mach/hurd/dup2.c 3 Aug 2002 06:46:57 -0000 1.20
-+++ glibc/sysdeps/mach/hurd/dup2.c 27 Jan 2009 21:15:36 -0000
-@@ -68,15 +68,14 @@ __dup2 (fd, fd2)
+---
+ sysdeps/mach/hurd/dup2.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/sysdeps/mach/hurd/dup2.c
++++ b/sysdeps/mach/hurd/dup2.c
+@@ -68,15 +68,14 @@
/* Get a hold of the destination descriptor. */
struct hurd_fd *d2;
@@ -23,7 +22,7 @@
d2 = _hurd_alloc_fd (NULL, fd2);
if (d2)
__spin_unlock (&d2->port.lock);
-@@ -96,6 +95,7 @@ __dup2 (fd, fd2)
+@@ -96,6 +95,7 @@
MACH_PORT_NULL);
}
}
@@ -31,7 +30,7 @@
if (d2 == NULL)
{
-@@ -119,7 +119,6 @@ __dup2 (fd, fd2)
+@@ -119,7 +119,6 @@
_hurd_port_locked_set (&d2->port, port); /* Unlocks D2. */
}
}
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-itimer-lock.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-itimer-lock.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-itimer-lock.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -3,8 +3,12 @@
* sysdeps/mach/hurd/setitimer.c (setitimer_locked): Use common exit path
instead of returning without unlocking.
---- glibc/sysdeps/mach/hurd/setitimer.c.orig 2009-02-01 16:02:06.000000000 +0100
-+++ glibc/sysdeps/mach/hurd/setitimer.c 2009-02-01 16:02:13.000000000 +0100
+---
+ sysdeps/mach/hurd/setitimer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/mach/hurd/setitimer.c
++++ b/sysdeps/mach/hurd/setitimer.c
@@ -220,7 +220,7 @@
/* Start up the itimer thread running `timer_thread' (below). */
if (err = __thread_create (__mach_task_self (),
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-stat.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -16,11 +16,14 @@
(_STATBUF_ST_NSEC): Define.
* sysdeps/mach/hurd/xstatconv.c (xstat64_conv): Adapt to that.
-diff --git a/sysdeps/mach/hurd/xstatconv.c b/sysdeps/mach/hurd/xstatconv.c
-index e28643c..d320285 100644
+---
+ sysdeps/mach/hurd/bits/stat.h | 56 ++++++++++++++++++++++++++++++++----------
+ sysdeps/mach/hurd/xstatconv.c | 9 ++----
+ 2 files changed, 46 insertions(+), 19 deletions(-)
+
--- a/sysdeps/mach/hurd/xstatconv.c
+++ b/sysdeps/mach/hurd/xstatconv.c
-@@ -42,12 +42,9 @@ xstat64_conv (struct stat *buf, const struct stat64 *buf64)
+@@ -42,12 +42,9 @@
buf->st_uid = buf64->st_uid;
buf->st_gid = buf64->st_gid;
buf->st_size = buf64->st_size;
@@ -36,11 +39,9 @@
buf->st_blksize = buf64->st_blksize;
buf->st_blocks = buf64->st_blocks;
buf->st_author = buf64->st_author;
-diff --git a/sysdeps/mach/hurd/bits/stat.h b/sysdeps/mach/hurd/bits/stat.h
-index c3f9666..62c4201 100644
--- a/sysdeps/mach/hurd/bits/stat.h
+++ b/sysdeps/mach/hurd/bits/stat.h
-@@ -55,12 +55,27 @@ struct stat
+@@ -55,12 +55,27 @@
__off64_t st_size; /* Size in bytes. */
#endif
@@ -74,7 +75,7 @@
__blksize_t st_blksize; /* Optimal size for I/O. */
-@@ -104,12 +119,24 @@ struct stat64
+@@ -104,12 +119,24 @@
__off64_t st_size; /* Size in bytes. */
@@ -105,7 +106,7 @@
__blksize_t st_blksize; /* Optimal size for I/O. */
-@@ -127,7 +154,10 @@ struct stat64
+@@ -127,7 +154,10 @@
};
#endif
Modified: glibc-package/trunk/debian/patches/localedata/first_weekday.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/first_weekday.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/localedata/first_weekday.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1485,7 +1485,7 @@
LC_MESSAGES
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
-@@ -105,6 +105,8 @@
+@@ -107,6 +107,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/
<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/
<U004D><U002E><U0025><U0053><U0020><U0025><U007A>"
Modified: glibc-package/trunk/debian/patches/localedata/locale-fr_FR.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-fr_FR.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/localedata/locale-fr_FR.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,10 +1,13 @@
Revert to old abbreviations for day of week and months.
-diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
-index ffa6513..29187ae 100644
+---
+ localedata/locales/fr_FR | 29 ++++++++++-------------------
+ localedata/tst-langinfo.sh | 36 ++++++++++++++++++------------------
+ 2 files changed, 28 insertions(+), 37 deletions(-)
+
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
-@@ -94,13 +94,10 @@ grouping 3
+@@ -95,13 +95,10 @@
END LC_NUMERIC
LC_TIME
@@ -22,7 +25,7 @@
day "<U0064><U0069><U006D><U0061><U006E><U0063><U0068><U0065>";/
"<U006C><U0075><U006E><U0064><U0069>";/
"<U006D><U0061><U0072><U0064><U0069>";/
-@@ -108,18 +105,12 @@ day "<U0064><U0069><U006D><U0061><U006E><U0063><U0068><U0065>";/
+@@ -109,18 +106,12 @@
"<U006A><U0065><U0075><U0064><U0069>";/
"<U0076><U0065><U006E><U0064><U0072><U0065><U0064><U0069>";/
"<U0073><U0061><U006D><U0065><U0064><U0069>"
@@ -47,11 +50,9 @@
mon "<U006A><U0061><U006E><U0076><U0069><U0065><U0072>";/
"<U0066><U00E9><U0076><U0072><U0069><U0065><U0072>";/
"<U006D><U0061><U0072><U0073>";/
-diff --git a/localedata/tst-langinfo.sh b/localedata/tst-langinfo.sh
-index b169ade..375352d 100755
--- a/localedata/tst-langinfo.sh
+++ b/localedata/tst-langinfo.sh
-@@ -245,13 +245,13 @@ de_DE.UTF-8 RADIXCHAR ,
+@@ -245,13 +245,13 @@
de_DE.UTF-8 THOUSEP .
de_DE.UTF-8 YESEXPR ^[jJyY].*
de_DE.UTF-8 NOEXPR ^[nN].*
@@ -72,7 +73,7 @@
fr_FR.ISO-8859-1 DAY_1 dimanche
fr_FR.ISO-8859-1 DAY_2 lundi
fr_FR.ISO-8859-1 DAY_3 mardi
-@@ -259,18 +259,18 @@ fr_FR.ISO-8859-1 DAY_4 mercredi
+@@ -259,18 +259,18 @@
fr_FR.ISO-8859-1 DAY_5 jeudi
fr_FR.ISO-8859-1 DAY_6 vendredi
fr_FR.ISO-8859-1 DAY_7 samedi
Modified: glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,10 +1,9 @@
-Index: localedata/locales/sv_SE
-===================================================================
-RCS file: /cvs/glibc/libc/localedata/locales/sv_SE,v
-retrieving revision 1.17
-diff -u -r1.17 sv_SE
---- a/localedata/locales/sv_SE 31 Oct 2008 19:00:57 -0000 1.17
-+++ b/localedata/locales/sv_SE 10 Jan 2009 03:14:00 -0000
+---
+ localedata/locales/sv_SE | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/sv_SE
++++ b/localedata/locales/sv_SE
@@ -169,14 +169,23 @@
"<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
Modified: glibc-package/trunk/debian/patches/localedata/submitted-bz9730-locale-sv_FI.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/submitted-bz9730-locale-sv_FI.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/localedata/submitted-bz9730-locale-sv_FI.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -1,10 +1,9 @@
-Index: localedata/locales/sv_FI
-===================================================================
-RCS file: /cvs/glibc/libc/localedata/locales/sv_FI,v
-retrieving revision 1.11
-diff -u -r1.11 sv_FI
---- a/localedata/locales/sv_FI 31 Oct 2008 19:00:57 -0000 1.11
-+++ b/localedata/locales/sv_FI 11 Jan 2009 17:46:22 -0000
+---
+ localedata/locales/sv_FI | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+--- a/localedata/locales/sv_FI
++++ b/localedata/locales/sv_FI
@@ -97,14 +97,16 @@
"<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
Modified: glibc-package/trunk/debian/patches/localedata/submitted-bz9835-en_GB-first_day.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/submitted-bz9835-en_GB-first_day.diff 2009-02-19 18:53:19 UTC (rev 3287)
+++ glibc-package/trunk/debian/patches/localedata/submitted-bz9835-en_GB-first_day.diff 2009-02-19 19:34:27 UTC (rev 3288)
@@ -2,11 +2,13 @@
* locales/en_GB: Set first weekday and workday to 1.
-diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
-index fe58f1f..d4d5afe 100644
+---
+ localedata/locales/en_GB | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
-@@ -122,8 +122,8 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+@@ -122,8 +122,8 @@
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
week 7;19971201;4
Reply to: