[glibc] 02/02: debian/patches/git-updates.diff: update from upstream stable branch.

[Aurelien Jarno]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.26
in repository glibc.

commit 7820b3798ab1fa8558976251dadf555bd56bb259
Author: Aurelien Jarno 
Date:   Wed Nov 22 00:23:13 2017 +0100

debian/patches/git-updates.diff: update from upstream stable branch.
---
 debian/changelog|   1 +
 debian/patches/git-updates.diff | 630 +++-
 2 files changed, 627 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f82917..63e5b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ glibc (2.26-0experimental1) UNRELEASED; urgency=medium
   * Bump build-dependency on binutils to >= 2.25, as required by glibc 2.26.
   * debian/testsuite-xfail-debian.mk: re-add double-lround XFAILs for
 mips64el.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
 
  -- Aurelien Jarno   Sun, 19 Nov 2017 13:44:52 +0100
 
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 7e072fe..c79e921 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,53 @@
 GIT update of git://sourceware.org/git/glibc.git/release/2.26/master from 
glibc-2.26
 
 diff --git a/ChangeLog b/ChangeLog
-index 8dbfc7eaff..d67ad031bc 100644
+index 8dbfc7eaff..0dcbe3bc69 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,847 @@
+@@ -1,3 +1,890 @@
++2017-08-09  Andreas Schwab  
++
++  * nptl/Makefile (tests) [$(build-shared) = yes]: Add
++  tst-compat-forwarder.
++  (modules-names): Add tst-compat-forwarder-mod.
++  ($(objpfx)tst-compat-forwarder): Depend on
++  $(objpfx)tst-compat-forwarder-mod.so.
++  * nptl/tst-compat-forwarder.c: New file.
++  * nptl/tst-compat-forwarder-mod.c: New file.
++
++2017-08-09  Andreas Schwab  
++
++  * sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Update reference to
++  renamed alias.
++
++2017-08-08  Andreas Schwab  
++
++  [BZ #21041]
++  * nptl/pt-longjmp.c (longjmp, siglongjmp): Don't use IFUNC resolver.
++  * nptl/pt-system.c (system): Likewise.
++
++2017-11-21  Rajalakshmi Srinivasaraghavan  
++
++  * sysdeps/powerpc/powerpc64/power7/memcpy.S: Replace
++  lxvd2x/stxvd2x with lvx/stvx.
++  * sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
++
++2017-10-04  Florian Weimer  
++
++  * scripts/check-local-headers.sh: Ignore nspr4 header file
++  directory in addition to nspr.
++
++2017-10-04  Guido Trentalancia  
++
++  [BZ #17956]
++  * configure.ac (--enable-nss-crypt): Use NSPR include directory.
++  * configure: Regenerate.
++  * crypt/Makefile (nss-cpp-flags): New variable.
++  (CPPFLAGS-sha256-crypt.c, CPPFLAGS-sha512-crypt.c)
++  (CPPFLAGS-md5-crypt.c): Use it.
++  * scripts/check-local-headers.sh: Ignore nspr header file
++  directory.
++
 +2017-10-18  Wilco Dijkstra  
 +
 +  * malloc/malloc.c (malloc_state): Use int for have_fastchunks since
@@ -876,10 +919,10 @@ index 9bb707c168..828a445f24 100644
  # Don't try to use -lc when making libc.so itself.
  # Also omits crti.o and crtn.o, which we do not want
 diff --git a/NEWS b/NEWS
-index 8295f20c0a..ea1c1f1c04 100644
+index 8295f20c0a..e7b62a8d46 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,54 @@ See the end for copying conditions.
+@@ -5,6 +5,55 @@ See the end for copying conditions.
  Please send GNU C library bug reports via 
  using `glibc' in the "product" field.
  
@@ -901,6 +944,7 @@ index 8295f20c0a..ea1c1f1c04 100644
 +The following bugs are resolved with this release:
 +
 +  [16750] ldd: Never run file directly.
++  [17956] crypt: Use NSPR header files in addition to NSS header files
 +  [21242] assert: Suppress pedantic warning caused by statement expression
 +  [21265] x86-64: Use fxsave/xsave/xsavec in _dl_runtime_resolve
 +  [21780] posix: Set p{read,write}v2 to return ENOTSUP
@@ -1110,6 +1154,61 @@ index 00..8c06402825
 +   .  */
 +
 +#include 
+diff --git a/configure b/configure
+index d8e1c50e11..47d8c75248 100755
+--- a/configure
 b/configure
+@@ -3547,8 +3547,12 @@ if test x$nss_crypt = xyes; then
+   if test $? -ne 0; then
+ as_fn_error $? "cannot find include directory with nss-config" "$LINENO" 5
+   fi
++  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
++  if test $? -ne 0; then
++as_fn_error $? "cannot find include directory with nspr-config" "$LINENO" 
5
++  fi
+   old_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $nss_includes"
++  CFLAGS="$CFLAGS $nss_includes $nspr_includes"
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+diff --git a/configure.ac b/configure.ac
+index 77456aa8d9..e8a1ab3562 

[glibc] 02/02: debian/patches/git-updates.diff: update from upstream stable branch:

[Aurelien Jarno]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository glibc.

commit 229bd44ca18920090fdeb1979d82b7055f04eaa5
Author: Aurelien Jarno 
Date:   Mon Jul 31 22:58:26 2017 +0200

debian/patches/git-updates.diff: update from upstream stable branch:

* debian/patches/git-updates.diff: update from upstream stable branch:
  - Fix namespace register pollution on sh4.  Closes: #776471.
---
 debian/changelog|   2 +
 debian/patches/git-updates.diff | 190 +++-
 2 files changed, 190 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7125a0..d2b7e78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 glibc (2.24-14) UNRELEASED; urgency=medium
 
   [ Aurelien Jarno ]
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+- Fix namespace register pollution on sh4.  Closes: #776471.
   * debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: new proposed
 patch to fix tst-tlsopt-powerpc when built with binutils >= 2.29.
 
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 48e37ce..51f448e 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,22 @@
 GIT update of git://sourceware.org/git/glibc.git/release/2.24/master from 
glibc-2.24
 
 diff --git a/ChangeLog b/ChangeLog
-index c44c926094..178ffca243 100644
+index c44c926094..e2d55512c4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,596 @@
+@@ -1,3 +1,608 @@
++2017-01-24  James Clarke  
++
++  * sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.sym: Use new REG_R*
++  constants instead of the old R* ones.
++  * sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym: Likewise.
++  * sysdeps/unix/sysv/linux/sh/sys/ucontext.h (NGPREG): Rename...
++  (NGREG): ... to this, to fit in with other architectures.
++  (gpregset_t): Use new NGREG macro.
++  [__USE_GNU]: Remove condition; all architectures other than tile
++  are unconditional.
++  (R*): Rename to REG_R*.
++
 +2017-07-26  H.J. Lu  
 +
 +  [BZ #21666]
@@ -14351,6 +14363,180 @@ index 683a5d9886..00
 -   offset.  */
 -#define __ALIGNMENT_ARG
 -#include 
+diff --git a/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.sym 
b/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.sym
+index 17397c5511..25f914a93b 100644
+--- a/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.sym
 b/sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.sym
+@@ -13,22 +13,22 @@ SIG_SETMASK
+ oLINK ucontext (uc_link)
+ oSS_SPucontext (uc_stack.ss_sp)
+ oSS_SIZE  ucontext (uc_stack.ss_size)
+-oR0   mcontext (gregs[R0])
+-oR1   mcontext (gregs[R1])
+-oR2   mcontext (gregs[R2])
+-oR3   mcontext (gregs[R3])
+-oR4   mcontext (gregs[R4])
+-oR5   mcontext (gregs[R5])
+-oR6   mcontext (gregs[R6])
+-oR7   mcontext (gregs[R7])
+-oR8   mcontext (gregs[R8])
+-oR9   mcontext (gregs[R9])
+-oR10  mcontext (gregs[R10])
+-oR11  mcontext (gregs[R11])
+-oR12  mcontext (gregs[R12])
+-oR13  mcontext (gregs[R13])
+-oR14  mcontext (gregs[R14])
+-oR15  mcontext (gregs[R15])
++oR0   mcontext (gregs[REG_R0])
++oR1   mcontext (gregs[REG_R1])
++oR2   mcontext (gregs[REG_R2])
++oR3   mcontext (gregs[REG_R3])
++oR4   mcontext (gregs[REG_R4])
++oR5   mcontext (gregs[REG_R5])
++oR6   mcontext (gregs[REG_R6])
++oR7   mcontext (gregs[REG_R7])
++oR8   mcontext (gregs[REG_R8])
++oR9   mcontext (gregs[REG_R9])
++oR10  mcontext (gregs[REG_R10])
++oR11  mcontext (gregs[REG_R11])
++oR12  mcontext (gregs[REG_R12])
++oR13  mcontext (gregs[REG_R13])
++oR14  mcontext (gregs[REG_R14])
++oR15  mcontext (gregs[REG_R15])
+ oPC   mcontext (pc)
+ oPR   mcontext (pr)
+ oSR   mcontext (sr)
+diff --git a/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym 
b/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym
+index 65633fbcf4..130f60cd96 100644
+--- a/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym
 b/sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.sym
+@@ -13,22 +13,22 @@ SIG_SETMASK
+ oLINK ucontext (uc_link)
+ oSS_SPucontext (uc_stack.ss_sp)
+ oSS_SIZE  ucontext (uc_stack.ss_size)
+-oR0   mcontext (gregs[R0])
+-oR1   mcontext (gregs[R1])
+-oR2   mcontext (gregs[R2])
+-oR3   mcontext (gregs[R3])
+-oR4   mcontext (gregs[R4])
+-oR5   mcontext (gregs[R5])
+-oR6   mcontext (gregs[R6])
+-oR7   mcontext (gregs[R7])
+-oR8   mcontext (gregs[R8])
+-oR9   mcontext (gregs[R9])
+-oR10  mcontext (gregs[R10])
+-oR11  mcontext (gregs[R11])
+-oR12