r3018 - in glibc-package/trunk/debian/patches: all any arm hurd-i386 locale
Author: madcoder
Date: 2008-07-28 13:10:07 +0000 (Mon, 28 Jul 2008)
New Revision: 3018
Modified:
glibc-package/trunk/debian/patches/all/cvs-gai_conf.diff
glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff
glibc-package/trunk/debian/patches/any/cvs-strtod.diff
glibc-package/trunk/debian/patches/any/cvs-vfscanf.diff
glibc-package/trunk/debian/patches/any/local-sysctl.diff
glibc-package/trunk/debian/patches/arm/local-ioperm.diff
glibc-package/trunk/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff
glibc-package/trunk/debian/patches/hurd-i386/submitted-ptr-mangle.diff
glibc-package/trunk/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
Log:
Refresh a few patches.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/patches/all/cvs-gai_conf.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/cvs-gai_conf.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/all/cvs-gai_conf.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -10,9 +10,8 @@
RCS file: /cvs/glibc/libc/posix/gai.conf,v
retrieving revision 1.2
retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- libc/posix/gai.conf 2006/05/18 16:57:50 1.2
-+++ libc/posix/gai.conf 2007/11/19 17:30:28 1.3
+--- glibc-2.7.orig/posix/gai.conf
++++ glibc-2.7/posix/gai.conf
@@ -19,13 +19,14 @@
# Add another rule to the RFC 3484 label table. See section 2.1 in
# RFC 3484. The default is:
@@ -49,7 +48,7 @@
# and 10.3 in RFC 3484. The default is:
#
#precedence ::1/128 50
-@@ -52,3 +52,17 @@
+@@ -50,3 +52,17 @@
# For sites which prefer IPv4 connections change the last line to
#
#precedence ::ffff:0:0/96 100
Modified: glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/any/cvs-gcc-4.3.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -9,11 +9,9 @@
for each of include and include-fixed.
* configure: Regenerated.
-diff --git a/configure b/configure
-index 1f2cd4f..4b96978 100755
---- a/configure
-+++ b/configure
-@@ -5065,8 +5065,12 @@ echo "$as_me: WARNING:
+--- glibc-2.7.orig/configure
++++ glibc-2.7/configure
+@@ -5067,8 +5067,12 @@
# header directory and add that to the list. NOTE: Only does the right
# thing on a system that doesn't need fixincludes. (Not presently a problem.)
if test -n "$sysheaders"; then
@@ -28,11 +26,9 @@
-isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
if test -n "$CXX"; then
cxxversion=`$CXX -dumpversion 2>&5` &&
-diff --git a/configure.in b/configure.in
-index 6ea1b26..3098ebf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -914,8 +914,12 @@ test -n "$aux_missing" && AC_MSG_WARN([
+--- glibc-2.7.orig/configure.in
++++ glibc-2.7/configure.in
+@@ -916,8 +916,12 @@
# header directory and add that to the list. NOTE: Only does the right
# thing on a system that doesn't need fixincludes. (Not presently a problem.)
if test -n "$sysheaders"; then
Modified: glibc-package/trunk/debian/patches/any/cvs-strtod.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-strtod.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/any/cvs-strtod.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -4,11 +4,9 @@
(____STRTOF_INTERNAL): Consume closing brace on NAN(...) sequence.
-diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
-index d1c2b62..9c2f86a 100644
---- a/stdlib/strtod_l.c
-+++ b/stdlib/strtod_l.c
-@@ -594,6 +594,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
+--- glibc-2.7.orig/stdlib/strtod_l.c
++++ glibc-2.7/stdlib/strtod_l.c
+@@ -610,6 +610,9 @@
mant = STRTOULL (startp + 1, &endp, 0);
if (endp == cp)
SET_MANTISSA (retval, mant);
Modified: glibc-package/trunk/debian/patches/any/cvs-vfscanf.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-vfscanf.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/any/cvs-vfscanf.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -4,15 +4,9 @@
* stdio-common/vfscanf.c (_IO_vfwscanf): Don't free ptrs_to_free
structure, it's allocated with alloca.
-Index: stdio-common/vfscanf.c
-===================================================================
-RCS file: /cvs/glibc/libc/stdio-common/vfscanf.c,v
-retrieving revision 1.127
-retrieving revision 1.128
-diff -u -d -p -r1.127 -r1.128
---- stdio-common/vfscanf.c 28 Oct 2007 08:40:36 -0000 1.127
-+++ stdio-common/vfscanf.c 7 Dec 2007 16:40:58 -0000 1.128
-@@ -2845,7 +2845,6 @@ _IO_vfscanf_internal (_IO_FILE *s, const
+--- stdio-common/vfscanf.c.orig
++++ stdio-common/vfscanf.c
+@@ -2843,7 +2843,6 @@
*p->ptrs[cnt] = NULL;
}
p = p->next;
Modified: glibc-package/trunk/debian/patches/any/local-sysctl.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-sysctl.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/any/local-sysctl.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -29,7 +29,7 @@
}
--- ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig
+++ ports/sysdeps/unix/sysv/linux/arm/ioperm.c
-@@ -50,6 +50,8 @@
+@@ -49,6 +49,8 @@
#define PATH_ARM_SYSTYPE "/etc/arm_systype"
#define PATH_CPUINFO "/proc/cpuinfo"
@@ -38,7 +38,7 @@
#define MAX_PORT 0x10000
-@@ -101,15 +103,25 @@
+@@ -100,15 +102,25 @@
{
char systype[256];
int i, n;
@@ -70,7 +70,7 @@
}
n = readlink (PATH_ARM_SYSTYPE, systype, sizeof (systype) - 1);
-@@ -128,8 +140,6 @@
+@@ -127,8 +139,6 @@
}
else
{
Modified: glibc-package/trunk/debian/patches/arm/local-ioperm.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/local-ioperm.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/arm/local-ioperm.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -2,7 +2,7 @@
--- ports/sysdeps/unix/sysv/linux/arm/ioperm.c.orig
+++ ports/sysdeps/unix/sysv/linux/arm/ioperm.c
-@@ -96,19 +96,13 @@
+@@ -95,19 +95,13 @@
* values.
*/
Modified: glibc-package/trunk/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -3,11 +3,9 @@
* sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
(RTLD_SINGLE_THREAD_P): Define.
-Index: ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
-===================================================================
---- ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig 2007-10-23 08:46:16.000000000 -0400
-+++ ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-10-23 08:49:15.000000000 -0400
-@@ -132,3 +132,9 @@
+--- ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
++++ ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+@@ -135,3 +135,9 @@
__builtin_expect (THREAD_GETMEM (THREAD_SELF, \
header.multiple_threads) == 0, 1)
#endif
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-termios.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -1,11 +1,5 @@
-Index: bits/termios.h
-===================================================================
-RCS file: /cvs/glibc/libc/bits/termios.h,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -p -r1.7 -r1.8
---- glibc/bits/termios.h 26 Jul 2001 21:23:31 -0000 1.7
-+++ glibc/bits/termios.h 5 May 2008 23:06:01 -0000 1.8
+--- glibc-2.7.orig/bits/termios.h
++++ glibc-2.7/bits/termios.h
@@ -24,6 +24,50 @@
/* These macros are also defined in some <bits/ioctls.h> files (with
numerically identical values), but this serves to shut up cpp's
@@ -57,7 +51,7 @@
#ifdef __USE_BSD
# ifdef MDMBUF
-@@ -91,13 +135,47 @@ struct termios
+@@ -91,13 +135,47 @@
/* Output modes. */
tcflag_t c_oflag;
#define OPOST (1 << 0) /* Perform output processing. */
@@ -108,7 +102,7 @@
#endif
/* Control modes. */
-@@ -117,10 +195,12 @@ struct termios
+@@ -117,10 +195,12 @@
#define HUPCL (1 << 14) /* Hang up on last close. */
#define CLOCAL (1 << 15) /* Ignore modem status lines. */
#ifdef __USE_BSD
@@ -125,7 +119,7 @@
#endif
/* Local modes. */
-@@ -210,13 +290,17 @@ struct termios
+@@ -210,13 +290,17 @@
#define B2400 2400 /* 2400 baud. */
#define B4800 4800 /* 4800 baud. */
#define B9600 9600 /* 9600 baud. */
@@ -143,12 +137,8 @@
#define B115200 115200
#define B230400 230400
#define B460800 460800
-Index: sysdeps/mach/hurd/bits/ioctls.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/ioctls.h,v
-retrieving revision 1.10
---- glibc/sysdeps/mach/hurd/bits/ioctls.h 7 Sep 2007 20:38:57 -0000 1.10
-+++ glibc/sysdeps/mach/hurd/bits/ioctls.h 5 May 2008 23:56:29 -0000
+--- glibc-2.7.orig/sysdeps/mach/hurd/bits/ioctls.h
++++ glibc-2.7/sysdeps/mach/hurd/bits/ioctls.h
@@ -25,6 +25,46 @@
/* These macros are also defined in <bits/termios.h> (with numerically
@@ -196,7 +186,7 @@
#ifdef MDMBUF
# undef MDMBUF
#endif
-@@ -284,31 +324,25 @@
+@@ -297,31 +337,25 @@
#define ODDP 0x00000040 /* get/send odd parity */
#define EVENP 0x00000080 /* get/send even parity */
#define ANYP 0x000000c0 /* get any parity/send none */
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-gcc-4.1-init-first.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -6,8 +6,8 @@
CALLER and pass that one on.
(init): Avoid an ugly typecast.
---- glibc-2.7/sysdeps/mach/hurd/i386/init-first.c.orig 2008-03-09 21:19:54.126246000 +0000
-+++ glibc-2.7/sysdeps/mach/hurd/i386/init-first.c 2008-03-09 21:22:19.348744000 +0000
+--- glibc-2.7.orig/sysdeps/mach/hurd/i386/init-first.c
++++ glibc-2.7/sysdeps/mach/hurd/i386/init-first.c
@@ -334,11 +334,11 @@
stack set up just as the user will see it, so it can switch stacks. */
@@ -51,7 +51,7 @@
asm volatile ("movl %0, %%esp\n" /* Switch to new outermost stack. */
"movl $0, %%ebp\n" /* Clear outermost frame pointer. */
"jmp *%1" : : "r" (data), "r" (&doinit1) : "sp");
-@@ -391,7 +391,7 @@
+@@ -390,7 +390,7 @@
first_init ();
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -1,10 +1,5 @@
-Index: sysdeps/mach/hurd/bits/ioctls.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/ioctls.h,v
-retrieving revision 1.10
-diff -u -p -r1.10 ioctls.h
---- sysdeps/mach/hurd/bits/ioctls.h 7 Sep 2007 20:38:57 -0000 1.10
-+++ sysdeps/mach/hurd/bits/ioctls.h 16 Dec 2007 02:49:36 -0000
+--- sysdeps/mach/hurd/bits/ioctls.h.orig
++++ sysdeps/mach/hurd/bits/ioctls.h
@@ -109,9 +109,17 @@
#define _IOT_SIMPLE(type) _IOT (_IOTS (type), 1, 0, 0, 0, 0)
@@ -24,7 +19,7 @@
/* Standard flavors of ioctls.
-@@ -133,6 +141,10 @@
+@@ -134,6 +142,10 @@
#define _IOC_ENCODE_TYPE_1(typespec) _IOC_ENCODE_TYPE_2(typespec)
#define _IOC_ENCODE_TYPE_2(typespec) _IOT_##typespec
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-libc_once.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -46,7 +46,7 @@
cancel handling. It does not have to be integrated with C++ snce
--- sysdeps/mach/hurd/bits/libc-lock.h.orig
+++ sysdeps/mach/hurd/bits/libc-lock.h
-@@ -185,6 +185,10 @@
+@@ -186,6 +186,10 @@
__libc_lock_unlock (ONCE_CONTROL.lock); \
} while (0)
@@ -59,7 +59,7 @@
used as argument to __libc_cleanup_region_start. */
--- sysdeps/posix/getaddrinfo.c.orig
+++ sysdeps/posix/getaddrinfo.c
-@@ -2076,7 +2076,7 @@
+@@ -2064,7 +2064,7 @@
__libc_lock_define_initialized (static, lock);
__libc_lock_lock (lock);
Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-ptr-mangle.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ptr-mangle.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ptr-mangle.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -5,7 +5,7 @@
--- sysdeps/mach/i386/sysdep.h.orig
+++ sysdeps/mach/i386/sysdep.h
-@@ -58,6 +58,15 @@
+@@ -55,6 +55,15 @@
#define STACK_GROWTH_DOWN
Modified: glibc-package/trunk/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2008-07-28 13:10:00 UTC (rev 3017)
+++ glibc-package/trunk/debian/patches/locale/LC_COLLATE-keywords-ordering.diff 2008-07-28 13:10:07 UTC (rev 3018)
@@ -10,7 +10,7 @@
--- locale/programs/ld-collate.c.orig
+++ locale/programs/ld-collate.c
-@@ -2832,14 +2832,23 @@
+@@ -2894,14 +2894,23 @@
switch (nowtok)
{
case tok_copy:
@@ -38,7 +38,7 @@
lr_ignore_rest (ldfile, 1);
break;
-@@ -2853,9 +2862,6 @@
+@@ -2915,9 +2924,6 @@
break;
}
@@ -48,7 +48,7 @@
arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
-@@ -2876,7 +2882,7 @@
+@@ -2938,7 +2944,7 @@
break;
}
@@ -57,7 +57,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2923,7 +2929,7 @@
+@@ -2985,7 +2991,7 @@
break;
}
@@ -66,7 +66,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -2992,7 +2998,7 @@
+@@ -3054,7 +3060,7 @@
break;
}
@@ -75,7 +75,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3140,7 +3146,7 @@
+@@ -3202,7 +3208,7 @@
break;
}
@@ -84,7 +84,7 @@
goto err_label;
arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3256,7 +3262,7 @@
+@@ -3318,7 +3324,7 @@
break;
}
@@ -93,7 +93,7 @@
goto err_label;
state = 1;
-@@ -3566,8 +3572,6 @@
+@@ -3628,8 +3634,6 @@
%s: missing `reorder-end' keyword"), "LC_COLLATE"));
state = 4;
}
Reply to: