[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4538 - in glibc-package/branches/eglibc-2.13/debian/patches: all alpha amd64 any arm hppa hurd-i386 i386 locale localedata m68k s390 sparc



Author: aurel32
Date: 2011-02-26 14:22:32 +0000 (Sat, 26 Feb 2011)
New Revision: 4538

Modified:
   glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff
   glibc-package/branches/eglibc-2.13/debian/patches/all/local-pthread-manpages.diff
   glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-syscall.diff
   glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-rtld-prelink.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-dlfptr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-gai-rfc1918-scope-global.patch
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-getaddrinfo-interface.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-ld-multiarch.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-linuxthreads-defines.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-SOCK_NONBLOCK.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-nss-upgrade.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-relro-mprotect.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-getaddrinfo-lo.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-ldsodefs_rtld_debug.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-localedef-mmap.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-missing-etc-hosts.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-popen.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff
   glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-string2-strcmp.diff
   glibc-package/branches/eglibc-2.13/debian/patches/arm/local-sigaction.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-dlfptr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-nptl-carlos.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-i686.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-locarchive.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-mkdir_root.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-no-hp-timing.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-sendmsg-SCM_RIGHTS.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-catch-signal.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-dl-sysdep.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-libc_once.diff
   glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-stat.diff
   glibc-package/branches/eglibc-2.13/debian/patches/i386/local-cpuid-level2.diff
   glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff
   glibc-package/branches/eglibc-2.13/debian/patches/i386/submitted-i686-timing.diff
   glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-C.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-de_LI.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-en_DK.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eo_EO.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eu_FR.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-ia.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-translit-colon.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/supported.diff
   glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1-common.diff
   glibc-package/branches/eglibc-2.13/debian/patches/m68k/local-reloc.diff
   glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff
   glibc-package/branches/eglibc-2.13/debian/patches/sparc/local-sparcv9-target.diff
Log:
Refresh all patches


Modified: glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/all/local-nis-shadow.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,5 +1,7 @@
-diff --git a/nis/nss b/nis/nss
-index 0ac6774..c43e88b 100644
+---
+ nis/nss |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss
 +++ b/nis/nss
 @@ -34,4 +34,4 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/all/local-pthread-manpages.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/all/local-pthread-manpages.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/all/local-pthread-manpages.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -6,7 +6,7 @@
  linuxthreads/man/pthread_cond_init.man             |  114 +++++++++---------
  linuxthreads/man/pthread_condattr_init.man         |   14 +-
  linuxthreads/man/pthread_create.man                |   36 ++---
- linuxthreads/man/pthread_detach.man                |   31 ++--
+ linuxthreads/man/pthread_detach.man                |   34 ++---
  linuxthreads/man/pthread_equal.man                 |    6 
  linuxthreads/man/pthread_exit.man                  |   18 +-
  linuxthreads/man/pthread_join.man                  |   64 +++++-----
@@ -20,7 +20,7 @@
  linuxthreads/man/pthread_setschedparam.man         |   62 ++++-----
  linuxthreads/man/pthread_sigmask.man               |   86 ++++++-------
  linuxthreads/man/sem_init.man                      |   88 +++++++-------
- 21 files changed, 569 insertions(+), 572 deletions(-)
+ 21 files changed, 572 insertions(+), 572 deletions(-)
 
 --- a/linuxthreads/man/pthread_atfork.man
 +++ b/linuxthreads/man/pthread_atfork.man

Modified: glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-syscall.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-syscall.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/alpha/submitted-syscall.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -3,6 +3,10 @@
 	* sysdeps/unix/sysv/linux/alpha/syscall.S: add support for 6th
 	argument.
 
+---
+ ports/sysdeps/unix/sysv/linux/alpha/syscall.S |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 --- a/ports/sysdeps/unix/sysv/linux/alpha/syscall.S
 +++ b/ports/sysdeps/unix/sysv/linux/alpha/syscall.S
 @@ -31,13 +31,13 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/amd64/submitted-rwlock-stack-imbalance.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,10 +1,13 @@
 http://sourceware.org/bugzilla/show_bug.cgi?id=12403
 
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-index f5d055c..8f3c68c 100644
+---
+ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S |    2 +-
+ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
 +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
+@@ -210,7 +210,7 @@
  	cfi_restore(%r12)
  	retq
  
@@ -13,11 +16,9 @@
  	cfi_adjust_cfa_offset(16)
  	cfi_rel_offset(%r12, 8)
  	cfi_rel_offset(%r13, 0)
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-index 6ed8b49..9aaaeba 100644
 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
 +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
+@@ -192,7 +192,7 @@
  
  7:	movq	%rdx, %rax
  
@@ -26,7 +27,7 @@
  	addq	$16, %rsp
  	cfi_adjust_cfa_offset(-16)
  	popq	%r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
+@@ -207,7 +207,7 @@
  	cfi_restore(%r12)
  	retq
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -4,11 +4,13 @@
 	* elf/dl-deps.c (_dl_map_object_deps): Signal error early when
 	dependencies are missing.
  
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 440fb56..5288353 100644
+---
+ elf/dl-deps.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
 --- a/elf/dl-deps.c
 +++ b/elf/dl-deps.c
-@@ -491,6 +491,10 @@ _dl_map_object_deps (struct link_map *map,
+@@ -491,6 +491,10 @@
    if (errno == 0 && errno_saved != 0)
      __set_errno (errno_saved);
  
@@ -19,7 +21,7 @@
    struct link_map **old_l_initfini = NULL;
    if (map->l_initfini != NULL && map->l_type == lt_loaded)
      {
-@@ -683,8 +687,4 @@ Filters not supported with LD_TRACE_PRELINKING"));
+@@ -683,8 +687,4 @@
      }
    if (old_l_initfini != NULL)
      _dl_scope_free (old_l_initfini);

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dlopen_memory_leak.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -16,8 +16,13 @@
 	* elf/noload.c: Include <memcheck.h>.
 	(main): Call mtrace.  Close all opened handles.
 
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index f6d8dd3..efb2b58 100644
+---
+ elf/dl-close.c |   15 ++++++++++++---
+ elf/dl-deps.c  |    2 +-
+ elf/dl-load.c  |    2 ++
+ include/link.h |    5 ++++-
+ 4 files changed, 19 insertions(+), 5 deletions(-)
+
 --- a/elf/dl-close.c
 +++ b/elf/dl-close.c
 @@ -1,5 +1,5 @@
@@ -47,22 +52,18 @@
  
        /* There are still references to this object.  Do nothing more.  */
        if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 5288353..d3c27f1 100644
 --- a/elf/dl-deps.c
 +++ b/elf/dl-deps.c
-@@ -686,5 +686,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+@@ -686,5 +686,5 @@
        _dl_scope_free (old_l_reldeps);
      }
    if (old_l_initfini != NULL)
 -    _dl_scope_free (old_l_initfini);
 +      map->l_orig_initfini = old_l_initfini;
  }
-diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 41b5ce7..1ad16a0 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -894,6 +894,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
+@@ -894,6 +894,7 @@
      {
        /* We are not supposed to load the object unless it is already
  	 loaded.  So return now.  */
@@ -70,7 +71,7 @@
        __close (fd);
        return NULL;
      }
-@@ -912,6 +913,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
+@@ -912,6 +913,7 @@
        _dl_zerofd = _dl_sysdep_open_zero_fill ();
        if (_dl_zerofd == -1)
  	{
@@ -78,8 +79,6 @@
  	  __close (fd);
  	  _dl_signal_error (errno, NULL, NULL,
  			    N_("cannot open zero fill device"));
-diff --git a/include/link.h b/include/link.h
-index 9d1fc1a..e877104 100644
 --- a/include/link.h
 +++ b/include/link.h
 @@ -1,6 +1,6 @@
@@ -90,7 +89,7 @@
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
-@@ -240,6 +240,9 @@ struct link_map
+@@ -240,6 +240,9 @@
  
      /* List of object in order of the init and fini calls.  */
      struct link_map **l_initfini;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,6 +1,10 @@
---- a/elf/dl-lookup.c.original	2011-02-11 11:01:37.000000000 +0000
-+++ b/elf/dl-lookup.c	2011-02-11 11:02:19.000000000 +0000
-@@ -423,7 +423,7 @@ do_lookup_x (const char *undef_name, uin
+---
+ elf/dl-lookup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
+@@ -423,7 +423,7 @@
  		     hash table.  */
  		  if (__builtin_expect (tab->size, 0))
  		    {

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-rtld-prelink.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-rtld-prelink.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-rtld-prelink.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -6,8 +6,10 @@
 	before performing relro protection.  At old place add assertion
 	to make sure nothing changed.
 
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 8510380..174954b 100644
+---
+ elf/rtld.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
 @@ -1,5 +1,5 @@
@@ -17,7 +19,7 @@
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
-@@ -2179,6 +2179,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+@@ -2184,6 +2184,10 @@
       we need it in the memory handling later.  */
    GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
  
@@ -28,7 +30,7 @@
    if (prelinked)
      {
        if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
-@@ -2298,9 +2302,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
+@@ -2303,9 +2307,8 @@
  			  lossage);
      }
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-dlfptr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-dlfptr.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-dlfptr.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,7 +1,7 @@
 ---
- elf/dl-fptr.c                   |   18 +++++++++++++++++-
- sysdeps/generic/dl-fptr.h       |    3 +++
- 3 files changed, 20 insertions(+), 1 deletions(-)
+ elf/dl-fptr.c             |   18 +++++++++++++++++-
+ sysdeps/generic/dl-fptr.h |    3 +++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
 
 --- a/elf/dl-fptr.c
 +++ b/elf/dl-fptr.c

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-gai-rfc1918-scope-global.patch
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-gai-rfc1918-scope-global.patch	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-gai-rfc1918-scope-global.patch	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,7 +5,7 @@
 
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
-@@ -1098,10 +1098,6 @@
+@@ -1101,10 +1101,6 @@
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
      { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-getaddrinfo-interface.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-getaddrinfo-interface.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-getaddrinfo-interface.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -9,7 +9,7 @@
 
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
-@@ -1453,13 +1453,13 @@
+@@ -1456,13 +1456,13 @@
  
  	      /* Fill in the results in all the records.  */
  	      for (int i = 0; i < src->nresults; ++i)

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-ld-multiarch.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-ld-multiarch.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -39,7 +39,7 @@
  # Where to install the shared library and dynamic linker.
  ifndef slibdir
  slibdir = $(exec_prefix)/lib
-@@ -514,6 +529,10 @@
+@@ -523,6 +538,10 @@
  default-rpath = $(libdir)
  endif
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-ldso-disable-hwcap.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -14,7 +14,7 @@
 
 --- a/elf/dl-sysdep.c
 +++ b/elf/dl-sysdep.c
-@@ -416,6 +416,20 @@
+@@ -417,6 +417,20 @@
    /* For TLS enabled builds always add 'tls'.  */
    ++cnt;
  
@@ -35,7 +35,7 @@
    /* Create temporary data structure to generate result table.  */
    temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
    m = 0;
-@@ -490,8 +504,11 @@
+@@ -496,8 +510,11 @@
    *sz = 1 << cnt;
    result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
    if (result == NULL)
@@ -51,7 +51,7 @@
      {
 --- a/elf/dl-cache.c
 +++ b/elf/dl-cache.c
-@@ -245,6 +245,7 @@ _dl_load_cache_lookup (const char *name)
+@@ -245,6 +245,7 @@
    if (cache_new != (void *) -1)
      {
        uint64_t platform;
@@ -59,7 +59,7 @@
  
        /* This is where the strings start.  */
        cache_data = (const char *) cache_new;
-@@ -256,6 +257,9 @@ _dl_load_cache_lookup (const char *name)
+@@ -256,6 +257,9 @@
        if (platform != (uint64_t) -1)
  	platform = 1ULL << platform;
  
@@ -69,7 +69,7 @@
  #define _DL_HWCAP_TLS_MASK (1LL << 63)
        uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
  				 | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
-@@ -266,6 +270,8 @@ _dl_load_cache_lookup (const char *name)
+@@ -266,6 +270,8 @@
  	continue;							      \
        if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion))	      \
  	continue;							      \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-linuxthreads-defines.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-linuxthreads-defines.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-linuxthreads-defines.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -8,7 +8,7 @@
 
 --- a/config.make.in
 +++ b/config.make.in
-@@ -43,6 +43,11 @@
+@@ -44,6 +44,11 @@
  all-warnings = @all_warnings@
  
  elf = @elf@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-SOCK_NONBLOCK.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-SOCK_NONBLOCK.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-SOCK_NONBLOCK.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -21,7 +21,7 @@
  
  /* From ev_streams.c.  */
  
-@@ -913,6 +913,7 @@
+@@ -917,6 +917,7 @@
  
  		/* only try IPv6 if IPv6 NS and if not failed before */
  		if (nsap->sa_family == AF_INET6 && !statp->ipv6_unavail) {
@@ -29,7 +29,7 @@
  			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
  				EXT(statp).nssocks[ns] =
  				  socket(PF_INET6, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -925,12 +926,14 @@
+@@ -929,12 +930,14 @@
  #endif
  			}
  			if (__builtin_expect (__have_o_nonblock < 0, 0))
@@ -44,7 +44,7 @@
  			if (__builtin_expect (__have_o_nonblock >= 0, 1)) {
  				EXT(statp).nssocks[ns]
  				  = socket(PF_INET, SOCK_DGRAM|SOCK_NONBLOCK,
-@@ -943,6 +946,7 @@
+@@ -947,6 +950,7 @@
  #endif
  			}
  			if (__builtin_expect (__have_o_nonblock < 0, 0))
@@ -52,7 +52,7 @@
  				EXT(statp).nssocks[ns]
  				  = socket(PF_INET, SOCK_DGRAM, 0);
  			slen = sizeof (struct sockaddr_in);
-@@ -969,7 +973,11 @@
+@@ -973,7 +977,11 @@
  			__res_iclose(statp, false);
  			return (0);
  		}
@@ -66,7 +66,7 @@
  			if  (fl != -1)
 --- a/nscd/connections.c
 +++ b/nscd/connections.c
-@@ -1835,6 +1835,7 @@
+@@ -1834,6 +1834,7 @@
  	      /* We have a new incoming connection.  Accept the connection.  */
  	      int fd;
  
@@ -74,7 +74,7 @@
  #ifndef __ASSUME_ACCEPT4
  	      fd = -1;
  	      if (have_accept4 >= 0)
-@@ -1851,6 +1852,9 @@
+@@ -1850,6 +1851,9 @@
  	      if (have_accept4 < 0)
  		fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
  #endif
@@ -84,7 +84,7 @@
  
  	      /* Use the descriptor if we have not reached the limit.  */
  	      if (fd >= 0)
-@@ -2040,7 +2044,7 @@
+@@ -2039,7 +2043,7 @@
  	  {
  	    /* A new connection.  */
  	    int fd;
@@ -93,7 +93,7 @@
  # ifndef __ASSUME_ACCEPT4
  	    fd = -1;
  	    if (have_accept4 >= 0)
-@@ -2057,6 +2061,9 @@
+@@ -2056,6 +2060,9 @@
  	    if (have_accept4 < 0)
  	      fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
  # endif

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-no-pagesize.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,8 +1,8 @@
 ---
- ports/sysdeps/unix/sysv/linux/mips/sys/user.h  |    4 ++--
- sysdeps/unix/sysv/linux/ia64/sys/user.h        |    3 ++-
- sysdeps/unix/sysv/linux/x86_64/sys/user.h      |    4 ++--
- 4 files changed, 8 insertions(+), 7 deletions(-)
+ ports/sysdeps/unix/sysv/linux/mips/sys/user.h |    4 ++--
+ sysdeps/unix/sysv/linux/ia64/sys/user.h       |    3 ++-
+ sysdeps/unix/sysv/linux/x86_64/sys/user.h     |    4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 --- a/sysdeps/unix/sysv/linux/ia64/sys/user.h
 +++ b/sysdeps/unix/sysv/linux/ia64/sys/user.h

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-nss-upgrade.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-nss-upgrade.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-nss-upgrade.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -7,7 +7,7 @@
 
 --- a/nss/nsswitch.c
 +++ b/nss/nsswitch.c
-@@ -405,9 +405,20 @@
+@@ -409,9 +409,20 @@
  	      ni->library->lib_handle = __libc_dlopen (shlib_name);
  	      if (ni->library->lib_handle == NULL)
  		{

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-relro-mprotect.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-relro-mprotect.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-relro-mprotect.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,8 +1,12 @@
 http://sources.redhat.com/bugzilla/show_bug.cgi?id=12492
 
+---
+ elf/dl-load.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -1398,7 +1398,11 @@
+@@ -1388,7 +1388,11 @@
  	  if (__builtin_expect (p + s <= relro_end, 1))
  	    {
  	      /* The variable lies in the region protected by RELRO.  */
@@ -15,4 +19,3 @@
  	      __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
  	      __mprotect ((void *) p, s, PROT_READ);
  	    }
-

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -26,7 +26,7 @@
  # Prefix to put on files installed in $(libdir).  For libraries `libNAME.a',
  # the prefix is spliced between `lib' and the name, so the linker switch
  # `-l$(libprefix)NAME' finds the library; for other files the prefix is
-@@ -488,7 +493,7 @@
+@@ -496,7 +501,7 @@
  endif
  ifndef config-LDFLAGS
  ifeq (yesyes,$(build-shared)$(elf))
@@ -37,7 +37,7 @@
  ifndef link-libc
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -380,7 +380,7 @@
+@@ -397,7 +397,7 @@
  	  | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
  
  # interp.c exists just to get this string into the libraries.

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-bits-fcntl_h-at.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -28,27 +28,27 @@
 	constants.
 
 ---
- io/fcntl.h                                       |   14 ------------
- ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |   15 +++++++++++++
- ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h  |   17 +++++++++++++++
- ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h   |   15 +++++++++++++
- ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h  |   15 +++++++++++++
- ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h  |   15 +++++++++++++
- ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h  |   15 +++++++++++++
- ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h  |   15 +++++++++++++
- sysdeps/mach/hurd/bits/fcntl.h                   |   15 +++++++++++++
- sysdeps/unix/sysv/linux/i386/bits/fcntl.h        |   15 +++++++++++++
- sysdeps/unix/sysv/linux/ia64/bits/fcntl.h        |   15 +++++++++++++
- sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h     |   15 +++++++++++++
- sysdeps/unix/sysv/linux/s390/bits/fcntl.h        |   15 +++++++++++++
- sysdeps/unix/sysv/linux/sh/bits/fcntl.h          |   15 +++++++++++++
- sysdeps/unix/sysv/linux/sparc/bits/fcntl.h       |   15 +++++++++++++
- sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h      |   15 +++++++++++++
- 16 files changed, 197 insertions(+), 12 deletions(-)
+ io/fcntl.h                                       |   14 --------------
+ ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h |   15 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/am33/bits/fcntl.h  |   17 +++++++++++++++++
+ ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h   |   15 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/cris/bits/fcntl.h  |   15 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h  |   15 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h  |   15 +++++++++++++++
+ ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h  |   15 +++++++++++++++
+ sysdeps/mach/hurd/bits/fcntl.h                   |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/i386/bits/fcntl.h        |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/ia64/bits/fcntl.h        |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h     |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/s390/bits/fcntl.h        |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/sh/bits/fcntl.h          |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/sparc/bits/fcntl.h       |   15 +++++++++++++++
+ sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h      |   15 +++++++++++++++
+ 16 files changed, 227 insertions(+), 14 deletions(-)
 
 --- a/io/fcntl.h
 +++ b/io/fcntl.h
-@@ -56,20 +56,6 @@
+@@ -102,20 +102,6 @@
  # define SEEK_END	2	/* Seek from end of file.  */
  #endif	/* XPG */
  
@@ -92,7 +92,7 @@
 +#endif
 --- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-@@ -227,6 +227,21 @@
+@@ -234,6 +234,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -116,7 +116,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
-@@ -221,6 +221,21 @@
+@@ -229,6 +229,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -140,7 +140,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
-@@ -227,6 +227,21 @@
+@@ -234,6 +234,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -164,7 +164,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
-@@ -247,6 +247,21 @@
+@@ -255,6 +255,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -188,7 +188,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
-@@ -227,6 +227,21 @@
+@@ -235,6 +235,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -212,7 +212,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
-@@ -246,6 +246,21 @@
+@@ -245,6 +245,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -236,7 +236,7 @@
  #ifdef __USE_GNU
 --- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
 +++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
-@@ -241,6 +241,21 @@
+@@ -249,6 +249,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -260,7 +260,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-@@ -215,6 +215,21 @@
+@@ -223,6 +223,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -307,7 +307,7 @@
 +
 --- a/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
-@@ -227,6 +227,21 @@
+@@ -234,6 +234,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -355,7 +355,7 @@
  /* Provide kernel hint to read ahead.  */
 --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
-@@ -198,6 +198,21 @@
+@@ -229,6 +229,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -379,7 +379,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
-@@ -226,6 +226,21 @@
+@@ -233,6 +233,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  
@@ -403,7 +403,7 @@
  #ifdef __USE_GNU
 --- a/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
 +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
-@@ -240,6 +240,21 @@
+@@ -247,6 +247,21 @@
  # define SPLICE_F_GIFT		8	/* Pages passed in are a gift.  */
  #endif
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-getaddrinfo-lo.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-getaddrinfo-lo.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-getaddrinfo-lo.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -9,7 +9,7 @@
 
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
-@@ -2262,7 +2262,14 @@
+@@ -2265,7 +2265,14 @@
  			  tmp.addr[0] = 0;
  			  tmp.addr[1] = 0;
  			  tmp.addr[2] = htonl (0xffff);

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-ldsodefs_rtld_debug.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-ldsodefs_rtld_debug.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-ldsodefs_rtld_debug.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -2,8 +2,12 @@
 
 	* sysdeps/generic/ldsodefs.h: include <gnu/option-groups.h>.
 
---- libc/sysdeps/generic/ldsodefs.h
-+++ libc/sysdeps/generic/ldsodefs.h
+---
+ sysdeps/generic/ldsodefs.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sysdeps/generic/ldsodefs.h
++++ b/sysdeps/generic/ldsodefs.h
 @@ -39,6 +39,7 @@
  #include <hp-timing.h>
  #include <tls.h>

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-localedef-mmap.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-localedef-mmap.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-localedef-mmap.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -28,7 +28,7 @@
  		       -1, 0)) != MAP_FAILED))
      xflags = MAP_FIXED;
    else
-@@ -624,7 +624,7 @@
+@@ -633,7 +633,7 @@
    int xflags = 0;
    void *p;
    if (st.st_size < reserved

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-longdouble.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -25,7 +25,7 @@
  	test-ifloat test-idouble
  libm-tests.o = $(addsuffix .o,$(libm-tests))
  
-@@ -173,11 +177,15 @@
+@@ -178,11 +182,15 @@
  ifneq ($(long-double-fcts),yes)
  # The `double' and `long double' types are the same on this machine.
  # We won't compile the `long double' code at all.  Tell the `double' code

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-missing-etc-hosts.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-missing-etc-hosts.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-missing-etc-hosts.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -4,7 +4,7 @@
 
 --- a/nss/nss_files/files-hosts.c
 +++ b/nss/nss_files/files-hosts.c
-@@ -431,7 +431,7 @@
+@@ -480,7 +480,7 @@
    else
      {
        *errnop = errno;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-popen.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-popen.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-popen.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -37,8 +37,8 @@
 -#define __have_pipe2 __have_sock_cloexec
 +extern int __have_pipe2;
  
- __END_DECLS
- 
+ extern int __getlogin_r_loginuid (char *name, size_t namesize)
+      attribute_hidden;
 --- a/socket/have_sock_cloexec.c
 +++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -8,7 +8,7 @@
 
 --- a/bits/sched.h
 +++ b/bits/sched.h
-@@ -69,6 +69,9 @@
+@@ -84,6 +84,9 @@
  # define __CPU_ISSET(cpu, cpusetp) \
    (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-string2-strcmp.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-string2-strcmp.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-string2-strcmp.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -3,11 +3,13 @@
         * string/bits/string2.h (strcmp): Use __builtin_strlen instead of
 	strlen for values known at compile-time.
 
-diff --git a/string/bits/string2.h b/string/bits/string2.h
-index d298bed..a798acf 100644
+---
+ string/bits/string2.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
 --- a/string/bits/string2.h
 +++ b/string/bits/string2.h
-@@ -801,17 +801,17 @@ __stpcpy_small (char *__dest,
+@@ -801,17 +801,17 @@
    __extension__								      \
    ({ size_t __s1_len, __s2_len;						      \
       (__builtin_constant_p (s1) && __builtin_constant_p (s2)		      \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/arm/local-sigaction.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/arm/local-sigaction.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/arm/local-sigaction.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,6 +1,10 @@
+---
+ ports/sysdeps/unix/sysv/linux/arm/sigaction.c |   18 ++++--------------
+ 1 file changed, 4 insertions(+), 14 deletions(-)
+
 --- a/ports/sysdeps/unix/sysv/linux/arm/sigaction.c
 +++ b/ports/sysdeps/unix/sysv/linux/arm/sigaction.c
-@@ -98,13 +98,8 @@ __libc_sigaction (sig, act, oact)
+@@ -98,13 +98,8 @@
  	  memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
  	  kact.sa_flags = act->sa_flags;
  # ifdef HAVE_SA_RESTORER
@@ -16,7 +20,7 @@
  # endif
  	}
  
-@@ -144,13 +139,8 @@ __libc_sigaction (sig, act, oact)
+@@ -144,13 +139,8 @@
        k_sigact.sa_mask = act->sa_mask.__val[0];
        k_sigact.sa_flags = act->sa_flags;
  # ifdef HAVE_SA_RESTORER

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-dlfptr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-dlfptr.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-dlfptr.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,6 +1,6 @@
 ---
  ports/sysdeps/hppa/dl-machine.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 --- a/ports/sysdeps/hppa/dl-machine.h
 +++ b/ports/sysdeps/hppa/dl-machine.h

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/local-stack-grows-up.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,14 +1,14 @@
 ---
- nptl/allocatestack.c         |   24 ++++++++++++++++--------
+ nptl/allocatestack.c         |   22 +++++++++++++++-------
  nptl/pthread_attr_getstack.c |    6 +++++-
  nptl/pthread_attr_setstack.c |   10 +++++++++-
- nptl/pthread_create.c        |   14 ++++++++++----
+ nptl/pthread_create.c        |   12 +++++++++---
  nptl/pthread_getattr_np.c    |   15 ++++++++++++++-
- 5 files changed, 54 insertions(+), 15 deletions(-)
+ 5 files changed, 52 insertions(+), 13 deletions(-)
 
 --- a/nptl/allocatestack.c
 +++ b/nptl/allocatestack.c
-@@ -353,6 +353,15 @@
+@@ -356,6 +356,15 @@
    if (__builtin_expect (attr->flags & ATTR_FLAG_STACKADDR, 0))
      {
        uintptr_t adj;
@@ -24,7 +24,7 @@
  
        /* If the user also specified the size of the stack make sure it
  	 is large enough.  */
-@@ -362,11 +371,11 @@
+@@ -365,11 +374,11 @@
  
        /* Adjust stack size for alignment of the TLS block.  */
  #if TLS_TCB_AT_TP
@@ -38,7 +38,7 @@
  	    & __static_tls_align_m1;
        assert (size > adj);
  #endif
-@@ -376,10 +385,10 @@
+@@ -379,10 +388,10 @@
  	 the stack.  It is the user's responsibility to do this if it
  	 is wanted.  */
  #if TLS_TCB_AT_TP
@@ -48,10 +48,10 @@
  #elif TLS_DTV_AT_TP
 -      pd = (struct pthread *) (((uintptr_t) attr->stackaddr
 +      pd = (struct pthread *) (((uintptr_t) stackaddr
-				- __static_tls_size - adj)
+ 				- __static_tls_size - adj)
  			       - TLS_PRE_TCB_SIZE);
  #endif
-@@ -391,7 +400,7 @@
+@@ -394,7 +403,7 @@
        pd->specific[0] = pd->specific_1stblock;
  
        /* Remember the stack-related values.  */
@@ -60,7 +60,7 @@
        pd->stackblock_size = size;
  
        /* This is a user-provided stack.  It will not be queued in the
-@@ -616,7 +625,7 @@
+@@ -625,7 +634,7 @@
  	  char *guard = mem + (((size - guardsize) / 2) & ~pagesize_m1);
  #elif _STACK_GROWS_DOWN
  	  char *guard = mem;
@@ -69,7 +69,7 @@
  	  char *guard = (char *) (((uintptr_t) pd - guardsize) & ~pagesize_m1);
  #endif
  	  if (mprotect (guard, guardsize, PROT_NONE) != 0)
-@@ -715,7 +724,6 @@
+@@ -724,7 +733,6 @@
    *stack = stacktop;
  #elif _STACK_GROWS_UP
    *stack = pd->stackblock;
@@ -131,7 +131,7 @@
    return 0;
 --- a/nptl/pthread_create.c
 +++ b/nptl/pthread_create.c
-@@ -388,12 +388,18 @@
+@@ -392,12 +392,18 @@
  #ifdef _STACK_GROWS_DOWN
    char *sp = CURRENT_STACK_FRAME;
    size_t freesize = (sp - (char *) pd->stackblock) & ~pagesize_m1;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-nptl-carlos.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-nptl-carlos.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hppa/submitted-nptl-carlos.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -10,7 +10,7 @@
 
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
-@@ -389,14 +389,14 @@
+@@ -392,14 +392,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
       are initialized to zero by default.  */
@@ -151,7 +151,7 @@
  						   __atg19_old | __atg19_mask,\
 --- a/nptl/Makefile
 +++ b/nptl/Makefile
-@@ -276,9 +276,9 @@
+@@ -279,9 +279,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
  
@@ -164,7 +164,7 @@
  
  distribute = eintr.c tst-cleanup4aux.c
  
-@@ -442,6 +442,35 @@
+@@ -445,6 +445,35 @@
  CFLAGS-tst-cleanupx4.c += -fexceptions
  CFLAGS-tst-oncex3.c += -fexceptions
  CFLAGS-tst-oncex4.c += -fexceptions
@@ -213,7 +213,7 @@
    /* Make sure the init_count is stored locally or in a register.  */
 --- a/nptl/sysdeps/pthread/Makefile
 +++ b/nptl/sysdeps/pthread/Makefile
-@@ -44,7 +44,9 @@
+@@ -36,7 +36,9 @@
  
  ifeq ($(have-forced-unwind),yes)
  tests += tst-mqueue8x

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-header-prot.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,8 +5,13 @@
 	* sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
 	inclusion protection macro.
 
---- a/sysdeps/mach/i386/sysdep.h.original	2011-02-12 02:25:25.000000000 +0000
-+++ b/sysdeps/mach/i386/sysdep.h	2011-02-12 02:25:54.000000000 +0000
+---
+ sysdeps/mach/i386/sysdep.h       |    5 +++++
+ sysdeps/mach/i386/thread_state.h |    5 +++++
+ 2 files changed, 10 insertions(+)
+
+--- a/sysdeps/mach/i386/sysdep.h
++++ b/sysdeps/mach/i386/sysdep.h
 @@ -18,6 +18,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -23,8 +28,8 @@
  #include <sysdeps/unix/i386/sysdep.h>
 +
 +#endif /* mach/i386/sysdep.h */
---- a/sysdeps/mach/i386/thread_state.h.original	2011-02-12 02:26:16.000000000 +0000
-+++ b/sysdeps/mach/i386/thread_state.h	2011-02-12 02:26:31.000000000 +0000
+--- a/sysdeps/mach/i386/thread_state.h
++++ b/sysdeps/mach/i386/thread_state.h
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -35,7 +40,7 @@
  #include <mach/machine/thread_status.h>
  
  #define MACHINE_NEW_THREAD_STATE_FLAVOR	i386_THREAD_STATE
-@@ -45,3 +48,5 @@ struct machine_thread_all_state
+@@ -45,3 +48,5 @@
    };
  
  #include <sysdeps/mach/thread_state.h>

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-psiginfo.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,11 +5,11 @@
 	SIGRTMIN is defined.
 
 ---
- psiginfo.c |    7 ++++++-
+ stdio-common/psiginfo.c |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
---- eglibc-2.13/stdio-common/psiginfo.c.original	2011-02-10 18:39:10.000000000 +0000
-+++ eglibc-2.13/stdio-common/psiginfo.c	2011-02-10 18:40:19.000000000 +0000
-@@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const
+--- a/stdio-common/psiginfo.c
++++ b/stdio-common/psiginfo.c
+@@ -86,8 +86,12 @@
    const char *desc;
    if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
        && ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
@@ -23,7 +23,7 @@
        if (desc == NULL)
  	{
  	  if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
-@@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const
+@@ -106,6 +110,7 @@
  	    }
  	}
        else

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-dl-dynamic-weak.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-dl-dynamic-weak.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-dl-dynamic-weak.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -8,8 +8,8 @@
 
 --- a/elf/dl-support.c
 +++ b/elf/dl-support.c
-@@ -43,7 +43,13 @@
- int _dl_debug_mask;
+@@ -46,7 +46,13 @@
+ #endif
  int _dl_lazy;
  ElfW(Addr) _dl_use_load_bias = -2;
 +#ifdef __GNU__
@@ -24,7 +24,7 @@
  int _dl_verbose;
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
-@@ -151,6 +151,11 @@
+@@ -154,6 +154,11 @@
  #ifdef NEED_DL_SYSINFO
      ._dl_sysinfo = DL_SYSINFO_DEFAULT,
  #endif

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-i686.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-i686.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-i686.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -3,11 +3,11 @@
         * sysdeps/mach/i386/sysdep.h [__ASSEMBLER__] (__i686): New macro.
 
 ---
- sysdep.h |    5 +++++
+ sysdeps/mach/i386/sysdep.h |    5 +++++
  1 file changed, 5 insertions(+)
 
---- a/sysdeps/mach/i386/sysdep.h.orig	2010-08-22 16:44:46.000000000 +0200
-+++ b/sysdeps/mach/i386/sysdep.h	2010-08-22 16:45:35.000000000 +0200
+--- a/sysdeps/mach/i386/sysdep.h
++++ b/sysdeps/mach/i386/sysdep.h
 @@ -22,6 +22,11 @@
  #include <dl-sysdep.h>
  #include <tls.h>

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-locarchive.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-locarchive.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-locarchive.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -24,7 +24,7 @@
      {
        int errval = errno;
        unlink (fname);
-@@ -563,7 +572,16 @@ open_archive (struct locarhandle *ah, bool readonly)
+@@ -564,7 +573,16 @@
  	error (EXIT_FAILURE, errno, _("cannot stat locale archive \"%s\""),
  	       archivefname);
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-mkdir_root.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-mkdir_root.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-mkdir_root.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,12 +5,12 @@
 file_name... Changing the interface is being proposed.
 
 ---
- mkdir.c   |    6 +++++-
- mkdirat.c |    6 +++++-
+ sysdeps/mach/hurd/mkdir.c   |    6 +++++-
+ sysdeps/mach/hurd/mkdirat.c |    6 +++++-
  2 files changed, 10 insertions(+), 2 deletions(-)
 
---- eglibc/sysdeps/mach/hurd/mkdir.c.orig	2010-06-12 00:48:27.000000000 +0000
-+++ eglibc/sysdeps/mach/hurd/mkdir.c	2010-06-12 00:55:00.000000000 +0000
+--- a/sysdeps/mach/hurd/mkdir.c
++++ b/sysdeps/mach/hurd/mkdir.c
 @@ -20,6 +20,7 @@
  #include <stddef.h>
  #include <sys/stat.h>
@@ -31,8 +31,8 @@
    if (parent == MACH_PORT_NULL)
      return -1;
    err = __dir_mkdir (parent, name, mode & ~_hurd_umask);
---- eglibc/sysdeps/mach/hurd/mkdirat.c.orig	2010-06-12 00:49:02.000000000 +0000
-+++ eglibc/sysdeps/mach/hurd/mkdirat.c	2010-06-12 00:54:45.000000000 +0000
+--- a/sysdeps/mach/hurd/mkdirat.c
++++ b/sysdeps/mach/hurd/mkdirat.c
 @@ -23,6 +23,7 @@
  #include <sys/stat.h>
  #include <hurd.h>

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-no-hp-timing.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-no-hp-timing.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-no-hp-timing.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,12 +5,9 @@
 Copied from sysdeps/generic/hp-timing.h
 
 ---
- hp-timing.h |   41 +++++++++++++++++++++++++++++++++++++++++
+ sysdeps/mach/hurd/hp-timing.h |   41 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 41 insertions(+)
 
-diff --git a/sysdeps/mach/hurd/hp-timing.h b/sysdeps/mach/hurd/hp-timing.h
-new file mode 100644
-index 0000000..933fb83
 --- /dev/null
 +++ b/sysdeps/mach/hurd/hp-timing.h
 @@ -0,0 +1,41 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-pthread_posix-option.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -4,10 +4,10 @@
 Avoid letting glibc try to install its own headers for libpthread.
 
 ---
- sysdeps/mach/hurd/Makeconfig       |   14 +++++++++++
+ sysdeps/mach/hurd/Makeconfig       |   14 ++++++++++++
  sysdeps/mach/hurd/bits/posix_opt.h |   40 +++++++++++++++++++++++-----------
  sysdeps/mach/hurd/gai_misc.h       |   43 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 80 insertions(+), 13 deletions(-)
+ 3 files changed, 84 insertions(+), 13 deletions(-)
 
 --- a/sysdeps/mach/hurd/bits/posix_opt.h
 +++ b/sysdeps/mach/hurd/bits/posix_opt.h

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,11 +1,11 @@
 This is a bit lame (thus not submitted), but should work for now.
 
 ---
- ptsname.c |    8 ++++++++
+ sysdeps/mach/hurd/ptsname.c |    8 ++++++++
  1 file changed, 8 insertions(+)
---- a/sysdeps/mach/hurd/ptsname.c.original	2011-02-11 12:24:59.000000000 +0000
-+++ b/sysdeps/mach/hurd/ptsname.c	2011-02-11 12:26:57.000000000 +0000
-@@ -63,3 +63,11 @@ __ptsname_r (int fd, char *buf, size_t b
+--- a/sysdeps/mach/hurd/ptsname.c
++++ b/sysdeps/mach/hurd/ptsname.c
+@@ -63,3 +63,11 @@
    return 0;
  }
  weak_alias (__ptsname_r, ptsname_r)

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-sendmsg-SCM_RIGHTS.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-sendmsg-SCM_RIGHTS.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-sendmsg-SCM_RIGHTS.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -3,8 +3,11 @@
 Date: Sat, 17 Jul 2010 22:09:13 +0200
 Subject: [PATCH] Add support to send file descriptors over Unix sockets
 
-diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
-index 33897b8..0935c79 100644
+---
+ sysdeps/mach/hurd/recvmsg.c |  108 ++++++++++++++++++++++++++++++++++++++++++--
+ sysdeps/mach/hurd/sendmsg.c |   73 ++++++++++++++++++++++++-----
+ 2 files changed, 166 insertions(+), 15 deletions(-)
+
 --- a/sysdeps/mach/hurd/recvmsg.c
 +++ b/sysdeps/mach/hurd/recvmsg.c
 @@ -1,4 +1,4 @@
@@ -13,7 +16,7 @@
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
-@@ -33,13 +33,35 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
+@@ -33,13 +33,35 @@
    addr_port_t aport;
    char *data = NULL;
    mach_msg_type_number_t len = 0;
@@ -51,7 +54,7 @@
  
    /* Find the total number of bytes to be read.  */
    amount = 0;
-@@ -136,6 +158,86 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
+@@ -136,6 +158,86 @@
      message->msg_controllen = clen;
    memcpy (message->msg_control, cdata, message->msg_controllen);
  
@@ -138,8 +141,6 @@
    __vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen);
  
    return (buf - data);
-diff --git a/sysdeps/mach/hurd/sendmsg.c b/sysdeps/mach/hurd/sendmsg.c
-index 118fd59..fb8dd2d 100644
 --- a/sysdeps/mach/hurd/sendmsg.c
 +++ b/sysdeps/mach/hurd/sendmsg.c
 @@ -1,4 +1,4 @@
@@ -148,7 +149,7 @@
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
-@@ -32,6 +32,10 @@ ssize_t
+@@ -32,6 +32,10 @@
  __libc_sendmsg (int fd, const struct msghdr *message, int flags)
  {
    error_t err = 0;
@@ -159,7 +160,7 @@
    struct sockaddr_un *addr = message->msg_name;
    socklen_t addr_len = message->msg_namelen;
    addr_port_t aport = MACH_PORT_NULL;
-@@ -44,6 +48,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -44,6 +48,7 @@
    mach_msg_type_number_t len;
    mach_msg_type_number_t amount;
    int dealloc = 0;
@@ -167,7 +168,7 @@
    int i;
  
    /* Find the total number of bytes to be written.  */
-@@ -101,6 +106,46 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -101,6 +106,46 @@
  	}
      }
  
@@ -214,7 +215,7 @@
    if (addr)
      {
        if (addr->sun_family == AF_LOCAL)
-@@ -110,9 +155,8 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -110,9 +155,8 @@
  	  file_t file = __file_name_lookup (addr->sun_path, 0, 0);
  	  if (file == MACH_PORT_NULL)
  	    {
@@ -226,7 +227,7 @@
  	    }
  	  err = __ifsock_getsockaddr (file, &aport);
  	  __mach_port_deallocate (__mach_task_self (), file);
-@@ -120,11 +164,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -120,11 +164,7 @@
  	    /* The file did not grok the ifsock protocol.  */
  	    err = ENOTSOCK;
  	  if (err)
@@ -239,7 +240,7 @@
  	}
        else
  	err = EIEIO;
-@@ -143,8 +183,9 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -143,8 +183,9 @@
  			      /* Send the data.  */
  			      err = __socket_send (port, aport,
  						   flags, data.ptr, len,
@@ -251,7 +252,7 @@
  						   message->msg_control,
  						   message->msg_controllen,
  						   &amount);
-@@ -153,11 +194,19 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags)
+@@ -153,11 +194,19 @@
  			    }
  			  err;
  			}));

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-catch-signal.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-catch-signal.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-catch-signal.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -12,13 +12,11 @@
         when handler == SIG_ERR, not when handler != SIG_ERR.
 
 ---
- catch-signal.c |    8 ++++----
+ hurd/catch-signal.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/hurd/catch-signal.c b/hurd/catch-signal.c
-index 583f99e..42f490e 100644
 --- a/hurd/catch-signal.c
 +++ b/hurd/catch-signal.c
-@@ -28,9 +28,9 @@ hurd_catch_signal (sigset_t sigset,
+@@ -28,9 +28,9 @@
  		   error_t (*operate) (struct hurd_signal_preemptor *),
  		   sighandler_t handler)
  {
@@ -30,7 +28,7 @@
  
    struct hurd_signal_preemptor preemptor =
      {
-@@ -41,12 +41,12 @@ hurd_catch_signal (sigset_t sigset,
+@@ -41,12 +41,12 @@
    struct hurd_sigstate *const ss = _hurd_self_sigstate ();
    error_t error;
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-dl-sysdep.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-dl-sysdep.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-dl-sysdep.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -19,7 +19,7 @@
  extern void __mach_init (void);
  
  extern int _dl_argc;
-@@ -668,3 +670,5 @@
+@@ -669,3 +671,5 @@
  {
    /* This no-op definition only gets used if libc is not linked in.  */
  }

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-libc_once.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-libc_once.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-libc_once.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -54,7 +54,7 @@
     cancel handling.  It does not have to be integrated with C++ snce
 --- a/sysdeps/mach/hurd/bits/libc-lock.h
 +++ b/sysdeps/mach/hurd/bits/libc-lock.h
-@@ -188,6 +188,10 @@
+@@ -191,6 +191,10 @@
      __libc_lock_unlock (ONCE_CONTROL.lock);				      \
    } while (0)
  
@@ -67,7 +67,7 @@
     used as argument to __libc_cleanup_region_start.  */
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
-@@ -2335,7 +2335,7 @@
+@@ -2338,7 +2338,7 @@
  	  __libc_lock_define_initialized (static, lock);
  
  	  __libc_lock_lock (lock);

Modified: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-stat.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-stat.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-stat.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -41,7 +41,7 @@
    buf->st_author = buf64->st_author;
 --- a/sysdeps/mach/hurd/bits/stat.h
 +++ b/sysdeps/mach/hurd/bits/stat.h
-@@ -55,12 +55,27 @@
+@@ -59,12 +59,27 @@
      __off64_t st_size;		/* Size in bytes.  */
  #endif
  
@@ -75,7 +75,7 @@
  
      __blksize_t st_blksize;	/* Optimal size for I/O.  */
  
-@@ -104,12 +119,24 @@
+@@ -108,12 +123,24 @@
  
      __off64_t st_size;		/* Size in bytes.  */
  
@@ -106,7 +106,7 @@
  
      __blksize_t st_blksize;	/* Optimal size for I/O.  */
  
-@@ -127,7 +154,10 @@
+@@ -131,7 +158,10 @@
    };
  #endif
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/i386/local-cpuid-level2.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/i386/local-cpuid-level2.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/i386/local-cpuid-level2.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,8 +1,10 @@
-diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c
-index 5422037..1debf12 100644
+---
+ sysdeps/x86_64/cacheinfo.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/x86_64/cacheinfo.c
 +++ b/sysdeps/x86_64/cacheinfo.c
-@@ -254,7 +254,13 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
+@@ -254,7 +254,13 @@
  static long int __attribute__ ((noinline))
  handle_intel (int name, unsigned int maxidx)
  {

Modified: glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/i386/local-pthread_cond_wait.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,3 +1,9 @@
+---
+ nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S |  592 -------------
+ nptl/sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S |   20 
+ nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S |   20 
+ 3 files changed, 632 deletions(-)
+
 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
 +++ /dev/null
 @@ -1,592 +0,0 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/i386/submitted-i686-timing.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/i386/submitted-i686-timing.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/i386/submitted-i686-timing.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -33,7 +33,7 @@
 
 --- a/sysdeps/generic/ldsodefs.h
 +++ b/sysdeps/generic/ldsodefs.h
-@@ -423,7 +423,7 @@
+@@ -427,7 +427,7 @@
    /* The object to be initialized first.  */
    EXTERN struct link_map *_dl_initfirst;
  
@@ -42,7 +42,7 @@
    /* Start time on CPU clock.  */
    EXTERN hp_timing_t _dl_cpuclock_offset;
  #endif
-@@ -629,7 +629,7 @@
+@@ -641,7 +641,7 @@
    /* All search directories defined at startup.  */
    EXTERN struct r_search_path_elem *_dl_init_all_dirs;
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/locale/locale-print-LANGUAGE.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -12,7 +12,7 @@
 
 --- a/locale/programs/locale.c
 +++ b/locale/programs/locale.c
-@@ -793,6 +793,7 @@ show_locale_vars (void)
+@@ -796,6 +796,7 @@
  {
    size_t cat_no;
    const char *lcall = getenv ("LC_ALL") ? : "";
@@ -20,7 +20,7 @@
    const char *lang = getenv ("LANG") ? : "";
  
    auto void get_source (const char *name);
-@@ -811,6 +812,9 @@ show_locale_vars (void)
+@@ -814,6 +815,9 @@
    /* LANG has to be the first value.  */
    print_assignment ("LANG", lang, false);
  

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/first_weekday.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -149,7 +149,7 @@
  localedata/locales/zh_SG          |    2 ++
  localedata/locales/zh_TW          |    3 +++
  localedata/locales/zu_ZA          |    2 ++
- 138 files changed, 278 insertions(+), 2 deletions(-)
+ 137 files changed, 276 insertions(+), 2 deletions(-)
 
 --- a/localedata/locales/aa_DJ
 +++ b/localedata/locales/aa_DJ
@@ -700,7 +700,7 @@
  LC_PAPER
 --- a/localedata/locales/es_GT
 +++ b/localedata/locales/es_GT
-@@ -122,6 +122,8 @@
+@@ -121,6 +121,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
@@ -1235,7 +1235,7 @@
  
 --- a/localedata/locales/pt_BR
 +++ b/localedata/locales/pt_BR
-@@ -121,6 +121,7 @@
+@@ -120,6 +120,7 @@
  date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
@@ -1395,7 +1395,7 @@
  LC_PAPER
 --- a/localedata/locales/ta_IN
 +++ b/localedata/locales/ta_IN
-@@ -247,6 +247,8 @@
+@@ -154,6 +154,8 @@
  % Appropriate 12 h time representation (%r)
  t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070><U0020><U0025><U005A>"
  %

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-C.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-C.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-C.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -1,3 +1,7 @@
+---
+ localedata/locales/C |   34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
 --- /dev/null
 +++ b/localedata/locales/C
 @@ -0,0 +1,34 @@

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-de_LI.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-de_LI.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-de_LI.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -102,7 +102,7 @@
 +
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -97,6 +97,7 @@
+@@ -98,6 +98,7 @@
  de_DE.UTF-8/UTF-8 \
  de_DE/ISO-8859-1 \
  de_DE@euro/ISO-8859-15 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-en_DK.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-en_DK.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-en_DK.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -14,7 +14,7 @@
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -114,6 +114,7 @@
+@@ -115,6 +115,7 @@
  en_CA.UTF-8/UTF-8 \
  en_CA/ISO-8859-1 \
  en_DK.UTF-8/UTF-8 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eo_EO.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eo_EO.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eo_EO.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -232,7 +232,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -136,6 +136,8 @@
+@@ -137,6 +137,8 @@
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
  en_ZW/ISO-8859-1 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-et_EE.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -3,8 +3,8 @@
 	* locales/et_EE: Change currency to euro.
 
 ---
- localedata/locales/et_EE |    8 ++--
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ localedata/locales/et_EE |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- a/localedata/locales/et_EE
 +++ b/localedata/locales/et_EE

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eu_FR.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eu_FR.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-eu_FR.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -100,7 +100,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -185,6 +185,9 @@
+@@ -186,6 +186,9 @@
  eu_ES.UTF-8/UTF-8 \
  eu_ES/ISO-8859-1 \
  eu_ES@euro/ISO-8859-15 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-ia.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-ia.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locale-ia.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -153,7 +153,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -243,6 +243,7 @@
+@@ -244,6 +244,7 @@
  hu_HU/ISO-8859-2 \
  hy_AM/UTF-8 \
  hy_AM.ARMSCII-8/ARMSCII-8 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/locales-fr.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -35,10 +35,10 @@
 +<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
 +<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 +<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
-
+ 
  week    7;19971130;4
  first_weekday 2
-@@ -142,8 +144,7 @@
+@@ -146,8 +148,7 @@
  END LC_MEASUREMENT
  
  LC_NAME
@@ -48,7 +48,7 @@
  END LC_NAME
  
  LC_ADDRESS
-@@ -155,4 +156,13 @@
+@@ -159,4 +160,13 @@
  country_ab2 "<U0042><U0045>"
  country_ab3 "<U0042><U0045><U004C>"
  country_num 056

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/sort-UTF8-first.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -4,7 +4,7 @@
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -227,8 +227,8 @@ hi_IN/UTF-8 \
+@@ -227,8 +227,8 @@
  hne_IN/UTF-8 \
  hr_HR.UTF-8/UTF-8 \
  hr_HR/ISO-8859-2 \
@@ -14,7 +14,7 @@
  ht_HT/UTF-8 \
  hu_HU.UTF-8/UTF-8 \
  hu_HU/ISO-8859-2 \
-@@ -248,8 +248,8 @@ it_IT@euro/ISO-8859-15 \
+@@ -248,8 +248,8 @@
  iu_CA/UTF-8 \
  iw_IL.UTF-8/UTF-8 \
  iw_IL/ISO-8859-8 \
@@ -24,7 +24,7 @@
  ka_GE.UTF-8/UTF-8 \
  ka_GE/GEORGIAN-PS \
  kk_KZ.UTF-8/UTF-8 \
-@@ -258,8 +258,8 @@ kl_GL.UTF-8/UTF-8 \
+@@ -258,8 +258,8 @@
  kl_GL/ISO-8859-1 \
  km_KH/UTF-8 \
  kn_IN/UTF-8 \
@@ -34,7 +34,7 @@
  kok_IN/UTF-8 \
  ks_IN/UTF-8 \
  ks_IN@devanagari/UTF-8 \
-@@ -328,8 +328,8 @@ pt_PT/ISO-8859-1 \
+@@ -328,8 +328,8 @@
  pt_PT@euro/ISO-8859-15 \
  ro_RO.UTF-8/UTF-8 \
  ro_RO/ISO-8859-2 \
@@ -44,7 +44,7 @@
  ru_RU/ISO-8859-5 \
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
-@@ -394,28 +394,28 @@ ur_PK/UTF-8 \
+@@ -394,28 +394,28 @@
  uz_UZ/ISO-8859-1 \
  uz_UZ@cyrillic/UTF-8 \
  ve_ZA/UTF-8 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-translit-colon.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-translit-colon.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/submitted-translit-colon.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -2,8 +2,11 @@
 
 	* locale/C-translit.h.in: Add entry for U20A1.
 
-diff --git a/locale/C-translit.h.in b/locale/C-translit.h.in
-index ab0b130..5286802 100644
+---
+ locale/C-translit.h.in              |    1 +
+ localedata/locales/translit_neutral |    2 ++
+ 2 files changed, 3 insertions(+)
+
 --- a/locale/C-translit.h.in
 +++ b/locale/C-translit.h.in
 @@ -103,6 +103,7 @@
@@ -14,17 +17,9 @@
  "\x20a8"	"Rs"	/* <U20A8> RUPEE SIGN */
  "\x20ac"	"EUR"	/* <U20AC> EURO SIGN */
  "\x2100"	"a/c"	/* <U2100> ACCOUNT OF */
-
-
-2010-06-13  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* locales/translit_neutral: Add entry for U20A1.
-
-diff --git a/localedata/locales/translit_neutral b/localedata/locales/translit_neutral
-index 5883d28..5712361 100644
 --- a/localedata/locales/translit_neutral
 +++ b/localedata/locales/translit_neutral
-@@ -128,6 +128,8 @@ include "translit_wide";""
+@@ -128,6 +128,8 @@
  <U2063> ""
  % DONG SIGN
  <U20AB> "<U0110><U1ED3><U006E><U0067>"

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/supported.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/supported.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/supported.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -15,7 +15,7 @@
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -115,6 +115,7 @@
+@@ -116,6 +116,7 @@
  en_DK/ISO-8859-1 \
  en_GB.UTF-8/UTF-8 \
  en_GB/ISO-8859-1 \
@@ -23,7 +23,7 @@
  en_HK.UTF-8/UTF-8 \
  en_HK/ISO-8859-1 \
  en_IE.UTF-8/UTF-8 \
-@@ -130,6 +131,7 @@
+@@ -131,6 +132,7 @@
  en_SG/ISO-8859-1 \
  en_US.UTF-8/UTF-8 \
  en_US/ISO-8859-1 \
@@ -31,7 +31,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -253,6 +255,7 @@
+@@ -254,6 +256,7 @@
  ka_GE/GEORGIAN-PS \
  kk_KZ.UTF-8/UTF-8 \
  kk_KZ/PT154 \
@@ -39,7 +39,7 @@
  kl_GL.UTF-8/UTF-8 \
  kl_GL/ISO-8859-1 \
  km_KH/UTF-8 \
-@@ -329,6 +332,7 @@
+@@ -331,6 +334,7 @@
  ru_RU.UTF-8/UTF-8 \
  ru_RU.KOI8-R/KOI8-R \
  ru_RU/ISO-8859-5 \
@@ -47,7 +47,7 @@
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
  rw_RW/UTF-8 \
-@@ -364,6 +368,7 @@
+@@ -367,6 +371,7 @@
  sv_FI@euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -55,7 +55,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
-@@ -388,6 +393,7 @@
+@@ -391,6 +396,7 @@
  uk_UA.UTF-8/UTF-8 \
  uk_UA/KOI8-U \
  ur_PK/UTF-8 \

Modified: glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1-common.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1-common.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/localedata/tailor-iso14651_t1-common.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -4,7 +4,7 @@
 
 --- a/localedata/locales/iso14651_t1_common
 +++ b/localedata/locales/iso14651_t1_common
-@@ -2728,7 +2728,11 @@
+@@ -2810,7 +2810,11 @@
  # SYMB. N°
  #
  <RES-1>
@@ -16,7 +16,7 @@
  # forme de base (bas de casse, arabe intrinsèque,
  # hébreu intrinsèque, etc.
  # basic form (lower case, intrinsic Arabic
-@@ -2747,14 +2751,21 @@
+@@ -2829,14 +2833,21 @@
  <AME> # medial/m<e'>dian
  # 6
  #

Modified: glibc-package/branches/eglibc-2.13/debian/patches/m68k/local-reloc.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/m68k/local-reloc.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/m68k/local-reloc.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -12,7 +12,7 @@
 
 --- a/ports/sysdeps/m68k/dl-machine.h
 +++ b/ports/sysdeps/m68k/dl-machine.h
-@@ -286,6 +286,8 @@
+@@ -312,6 +312,8 @@
    Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
    if (ELF32_R_TYPE (reloc->r_info) == R_68K_JMP_SLOT)
      *reloc_addr += l_addr;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/s390/submitted-nexttowardf.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -5,12 +5,12 @@
 	using asm.
 
 ---
- sysdeps/ieee754/ldbl-128/s_nexttowardf.c |   26 ++++++++++++++++----------
- 1 file changed, 16 insertions(+), 10 deletions(-)
+ sysdeps/ieee754/ldbl-128/s_nexttowardf.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
 
 --- a/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
 +++ b/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
-@@ -19,7 +19,8 @@ static char rcsid[] = "$NetBSD: $";
+@@ -19,7 +19,8 @@
  #endif
  
  #include "math.h"
@@ -20,7 +20,7 @@
  
  #ifdef __STDC__
  	float __nexttowardf(float x, long double y)
-@@ -69,7 +70,13 @@ static char rcsid[] = "$NetBSD: $";
+@@ -69,7 +70,13 @@
  	    }
  	}
  	hy = hx&0x7f800000;

Modified: glibc-package/branches/eglibc-2.13/debian/patches/sparc/local-sparcv9-target.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/sparc/local-sparcv9-target.diff	2011-02-26 12:42:50 UTC (rev 4537)
+++ glibc-package/branches/eglibc-2.13/debian/patches/sparc/local-sparcv9-target.diff	2011-02-26 14:22:32 UTC (rev 4538)
@@ -11,7 +11,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -4056,6 +4056,11 @@
+@@ -4046,6 +4046,11 @@
    machine="powerpc"
  fi
  
@@ -25,7 +25,7 @@
    powerpc*-*soft)
 --- a/configure.in
 +++ b/configure.in
-@@ -378,6 +378,11 @@
+@@ -373,6 +373,11 @@
    machine="powerpc"
  fi
  


Reply to: