[glibc] branch glibc-2.26 updated (1fcd85e -> 43a9e03)

[Aurelien Jarno]

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

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

  from  1fcd85e   debian/testsuite-xfail-debian.mk: convert alpha math 
XFAILs into granular XFAILs.
   new  5141d49   debian/patches/git-updates.diff: update from upstream 
stable branch:
   new  43a9e03   debian/testsuite-xfail-debian.mk: remove tst-realloc from 
XFAIL on sparc64.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|  5 -
 debian/patches/git-updates.diff | 25 +++--
 2 files changed, 27 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/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 5141d49647863c78a343b971c938408400e15b24
Author: Aurelien Jarno 
Date:   Sun Dec 31 23:47:08 2017 +0100

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

  * debian/patches/git-updates.diff: update from upstream stable branch:
- Fix tst-realloc when heap space is exhausted.
---
 debian/changelog|  3 ++-
 debian/patches/git-updates.diff | 25 +++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 701a877..caddb28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
   * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
   * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
 on HPPA.
-  * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+- Fix tst-realloc when heap space is exhausted.
   * debian/testsuite-xfail-debian.mk: convert alpha math XFAILs into granular
 XFAILs.
 
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 753fa61..bd53b78 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,16 @@
 GIT update of https://sourceware.org/git/glibc.git/release/2.26/master from 
glibc-2.26
 
 diff --git a/ChangeLog b/ChangeLog
-index 8dbfc7eaff..414e931aa5 100644
+index 8dbfc7eaff..2e6383b3dc 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,1117 @@
+@@ -1,3 +1,1123 @@
++2017-12-29  Aurelien Jarno  
++
++  [BZ #22611]
++  * malloc/tst-realloc.c (do_test): Remove the test checking that errno
++  is unchanged on success.
++
 +2017-12-30  Aurelien Jarno  
 +  Dmitry V. Levin  
 +
@@ -3156,6 +3162,21 @@ index 00..22c679b65b
 +}
 +
 +#include 
+diff --git a/malloc/tst-realloc.c b/malloc/tst-realloc.c
+index 31a58bd026..d942c6e536 100644
+--- a/malloc/tst-realloc.c
 b/malloc/tst-realloc.c
+@@ -66,10 +66,6 @@ do_test (void)
+   if (p == NULL)
+ merror ("realloc (NULL, 10) failed.");
+ 
+-  /* errno should be clear on success (POSIX).  */
+-  if (p != NULL && save != 0)
+-merror ("errno is set but should not be");
+-
+   free (p);
+ 
+   p = calloc (20, 1);
 diff --git a/math/Makefile b/math/Makefile
 index e09b0c0545..2c17c68eda 100644
 --- a/math/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 02/02: debian/testsuite-xfail-debian.mk: remove tst-realloc from XFAIL on sparc64.

[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 43a9e03e22df0143b8751a60b77abce1965e1baa
Author: Aurelien Jarno 
Date:   Sun Dec 31 23:48:13 2017 +0100

debian/testsuite-xfail-debian.mk: remove tst-realloc from XFAIL on sparc64.
---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index caddb28..d09e81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
 - Fix tst-realloc when heap space is exhausted.
   * debian/testsuite-xfail-debian.mk: convert alpha math XFAILs into granular
 XFAILs.
+  * debian/testsuite-xfail-debian.mk: remove tst-realloc from XFAIL on
+sparc64.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch glibc-2.26 updated (0e58067 -> 1fcd85e)

[Aurelien Jarno]

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

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

  from  0e58067   Merge branch 'sid' into glibc-2.26
   new  d52a330   debian/patches/git-updates.diff: update from upstream 
stable branch.
   new  1fcd85e   debian/testsuite-xfail-debian.mk: convert alpha math 
XFAILs into granular XFAILs.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog |3 +
 debian/patches/git-updates.diff  | 3281 +-
 debian/testsuite-xfail-debian.mk |   56 +-
 3 files changed, 2900 insertions(+), 440 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/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 d52a330c4cea79690233af54f8f65929abbc3ae5
Author: Aurelien Jarno 
Date:   Sun Dec 31 19:11:21 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 3158f20..1c30857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
   * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
   * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
 on HPPA.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index e112efc..753fa61 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,70 @@
-GIT update of git://sourceware.org/git/glibc.git/release/2.26/master from 
glibc-2.26
+GIT update of https://sourceware.org/git/glibc.git/release/2.26/master from 
glibc-2.26
 
 diff --git a/ChangeLog b/ChangeLog
-index 8dbfc7eaff..55a17414ab 100644
+index 8dbfc7eaff..414e931aa5 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,1057 @@
+@@ -1,3 +1,1117 @@
++2017-12-30  Aurelien Jarno  
++  Dmitry V. Levin  
++
++  [BZ #22625]
++  * elf/dl-load.c (fillin_rpath): Check for empty tokens before dynamic
++  string token expansion. Check for NULL pointer or empty string possibly
++  returned by expand_dynamic_string_token.
++  (decompose_rpath): Check for empty path after dynamic string
++  token expansion.
++
++2017-12-18  Dmitry V. Levin  
++
++  [BZ #22627]
++  * elf/dl-load.c (_dl_init_paths): Remove _dl_dst_substitute preparatory
++  code and invocation.
++
++2017-11-18  Florian Weimer  
++
++  * sysdeps/unix/sysv/linux/tst-ttyname.c
++  (become_root_in_mount_ns): Remove.
++  (do_in_chroot_1): Call support_enter_mount_namespace.
++  (do_in_chroot_2): Likewise.
++  (do_test): Call support_become_root early.
++
++2017-11-15  Luke Shumaker  
++
++  [BZ #22145]
++  * sysdeps/unix/sysv/linux/tst-ttyname.c: New file.
++  * sysdeps/unix/sysv/linux/Makefile: Add tst-ttyname to tests.
++
++2017-11-15  Luke Shumaker  
++
++  [BZ #22145]
++  * sysdeps/unix/sysv/linux/ttyname.c (ttyname):
++  Defer is_pty check until end of the function.
++  * sysdeps/unix/sysv/linux/ttyname_r.c (__ttyname_r): Likewise.
++
++2017-11-15  Luke Shumaker  
++
++  [BZ #22145]
++  * sysdeps/unix/sysv/linux/ttyname.h (is_mytty): New function.
++  * sysdeps/unix/sysv/linux/ttyname.c (getttyname): Call is_mytty.
++  (ttyname): Likewise.
++  * sysdeps/unix/sysv/linux/ttyname_r.c (getttyname_r): Likewise.
++  (__ttyname_r): Likewise.
++
++2017-11-15  Luke Shumaker  
++
++  * sysdeps/unix/sysv/linux/ttyname.h (is_pty): Change return type from
++  int to bool.
++
++2017-11-15  Luke Shumaker  
++
++  * sysdeps/unix/sysv/linux/ttyname.h (is_pty): Update doc reference.
++
++2017-11-15  Luke Shumaker  
++
++  * manual/terminal.texi (Is It a Terminal):
++  Mention ENODEV for ttyname and ttyname_r.
++
 +2017-12-14  Florian Weimer  
 +
 +  [BZ #22607]
@@ -1086,10 +1146,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..2c49212cb5 100644
+index 8295f20c0a..f04b3ed4e8 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,92 @@ See the end for copying conditions.
+@@ -5,6 +5,98 @@ See the end for copying conditions.
  Please send GNU C library bug reports via 
  using `glibc' in the "product" field.
  
@@ -1143,6 +1203,10 @@ index 8295f20c0a..2c49212cb5 100644
 +  CVE-2017-1000366 has been applied, but it is mentioned here only because
 +  of the CVE assignment.)  Reported by Qualys.
 +
++  CVE-2017-16997: Incorrect handling of RPATH or RUNPATH containing $ORIGIN
++  for AT_SECURE or SUID binaries could be used to load libraries from the
++  current directory.
++
 +The following bugs are resolved with this release:
 +
 +  [16750] ldd: Never run file directly.
@@ -1168,6 +1232,7 @@ index 8295f20c0a..2c49212cb5 100644
 +  [22095] resolv: Fix memory leak with OOM during resolv.conf parsing
 +  [22096] resolv: 

[glibc] 02/02: debian/testsuite-xfail-debian.mk: convert alpha math XFAILs into granular XFAILs.

[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 1fcd85ef9aa39a328a52a78285f587aa9433e2af
Author: Aurelien Jarno 
Date:   Sun Dec 31 21:11:35 2017 +0100

debian/testsuite-xfail-debian.mk: convert alpha math XFAILs into granular 
XFAILs.
---
 debian/changelog |  2 ++
 debian/testsuite-xfail-debian.mk | 56 +++-
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c30857..701a877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
   * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
 on HPPA.
   * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debian/testsuite-xfail-debian.mk: convert alpha math XFAILs into granular
+XFAILs.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index f25b5cd..2757310 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -23,14 +23,58 @@ test-xfail-tst-backtrace5 = yes
 test-xfail-tst-backtrace6 = yes
 test-xfail-tst-cancel19 = yes
 test-xfail-check-localplt = yes
-test-xfail-test-double = yes
-test-xfail-test-double-finite = yes
-test-xfail-test-float = yes
-test-xfail-test-float-finite = yes
+test-xfail-test-double-ceil = yes
+test-xfail-test-double-finite-ceil = yes
+test-xfail-test-double-finite-floor = yes
+test-xfail-test-double-finite-fma = yes
+test-xfail-test-double-finite-llrint = yes
+test-xfail-test-double-finite-llround = yes
+test-xfail-test-double-finite-lrint = yes
+test-xfail-test-double-finite-lround = yes
+test-xfail-test-double-finite-remainder = yes
+test-xfail-test-double-finite-scalbln = yes
+test-xfail-test-double-finite-scalbn = yes
+test-xfail-test-double-finite-trunc = yes
+test-xfail-test-double-floor = yes
+test-xfail-test-double-fma = yes
+test-xfail-test-double-llrint = yes
+test-xfail-test-double-llround = yes
+test-xfail-test-double-lrint = yes
+test-xfail-test-double-lround = yes
+test-xfail-test-double-remainder = yes
+test-xfail-test-double-scalbln = yes
+test-xfail-test-double-scalbn = yes
+test-xfail-test-double-trunc = yes
+test-xfail-test-float-ceil = yes
+test-xfail-test-float-finite-ceil = yes
+test-xfail-test-float-finite-floor = yes
+test-xfail-test-float-finite-fma = yes
+test-xfail-test-float-finite-llrint = yes
+test-xfail-test-float-finite-llround = yes
+test-xfail-test-float-finite-lrint = yes
+test-xfail-test-float-finite-lround = yes
+test-xfail-test-float-finite-scalbln = yes
+test-xfail-test-float-finite-scalbn = yes
+test-xfail-test-float-finite-trunc = yes
+test-xfail-test-float-floor = yes
+test-xfail-test-float-fma = yes
+test-xfail-test-float-llrint = yes
+test-xfail-test-float-llround = yes
+test-xfail-test-float-lrint = yes
+test-xfail-test-float-lround = yes
+test-xfail-test-float-scalbln = yes
+test-xfail-test-float-scalbn = yes
+test-xfail-test-float-trunc = yes
 test-xfail-test-fenv-return = yes
 test-xfail-test-fexcept = yes
-test-xfail-test-ldouble = yes
-test-xfail-test-ldouble-finite = yes
+test-xfail-test-ldouble-finite-llrint = yes
+test-xfail-test-ldouble-finite-llround = yes
+test-xfail-test-ldouble-finite-lrint = yes
+test-xfail-test-ldouble-finite-lround = yes
+test-xfail-test-ldouble-llrint = yes
+test-xfail-test-ldouble-llround = yes
+test-xfail-test-ldouble-lrint = yes
+test-xfail-test-ldouble-lround = yes
 test-xfail-test-snan = yes
 test-xfail-tst-eintr1 = yes
 test-xfail-tst-mqueue5 = yes

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

glibc_2.25-6_source.changes ACCEPTED into unstable

[Debian FTP Masters]

Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sun, 31 Dec 2017 18:50:30 +0100
Source: glibc
Binary: libc-bin libc-dev-bin libc-l10n glibc-doc glibc-source locales 
locales-all nscd multiarch-support libc6 libc6-dev libc6-dbg libc6-pic 
libc6-udeb libc6.1 libc6.1-dev libc6.1-dbg libc6.1-pic libc6.1-udeb libc0.3 
libc0.3-dev libc0.3-dbg libc0.3-pic libc0.3-udeb libc0.1 libc0.1-dev 
libc0.1-dbg libc0.1-pic libc0.1-udeb libc6-i386 libc6-dev-i386 libc6-sparc 
libc6-dev-sparc libc6-sparc64 libc6-dev-sparc64 libc6-s390 libc6-dev-s390 
libc6-amd64 libc6-dev-amd64 libc6-powerpc libc6-dev-powerpc libc6-ppc64 
libc6-dev-ppc64 libc6-mips32 libc6-dev-mips32 libc6-mipsn32 libc6-dev-mipsn32 
libc6-mips64 libc6-dev-mips64 libc0.1-i386 libc0.1-dev-i386 libc6-x32 
libc6-dev-x32 libc6-xen libc0.3-xen libc6.1-alphaev67
Architecture: source
Version: 2.25-6
Distribution: unstable
Urgency: medium
Maintainer: GNU Libc Maintainers 
Changed-By: Aurelien Jarno 
Description:
 glibc-doc  - GNU C Library: Documentation
 glibc-source - GNU C Library: sources
 libc-bin   - GNU C Library: Binaries
 libc-dev-bin - GNU C Library: Development binaries
 libc-l10n  - GNU C Library: localization files
 libc0.1- GNU C Library: Shared libraries
 libc0.1-dbg - GNU C Library: detached debugging symbols
 libc0.1-dev - GNU C Library: Development Libraries and Header Files
 libc0.1-dev-i386 - GNU C Library: 32bit development libraries for AMD64
 libc0.1-i386 - GNU C Library: 32bit shared libraries for AMD64
 libc0.1-pic - GNU C Library: PIC archive library
 libc0.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3- GNU C Library: Shared libraries
 libc0.3-dbg - GNU C Library: detached debugging symbols
 libc0.3-dev - GNU C Library: Development Libraries and Header Files
 libc0.3-pic - GNU C Library: PIC archive library
 libc0.3-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3-xen - GNU C Library: Shared libraries [Xen version]
 libc6  - GNU C Library: Shared libraries
 libc6-amd64 - GNU C Library: 64bit Shared libraries for AMD64
 libc6-dbg  - GNU C Library: detached debugging symbols
 libc6-dev  - GNU C Library: Development Libraries and Header Files
 libc6-dev-amd64 - GNU C Library: 64bit Development Libraries for AMD64
 libc6-dev-i386 - GNU C Library: 32-bit development libraries for AMD64
 libc6-dev-mips32 - GNU C Library: o32 Development Libraries for MIPS
 libc6-dev-mips64 - GNU C Library: 64bit Development Libraries for MIPS64
 libc6-dev-mipsn32 - GNU C Library: n32 Development Libraries for MIPS64
 libc6-dev-powerpc - GNU C Library: 32bit powerpc development libraries for 
ppc64
 libc6-dev-ppc64 - GNU C Library: 64bit Development Libraries for PowerPC64
 libc6-dev-s390 - GNU C Library: 32bit Development Libraries for IBM zSeries
 libc6-dev-sparc - GNU C Library: 32bit Development Libraries for SPARC
 libc6-dev-sparc64 - GNU C Library: 64bit Development Libraries for UltraSPARC
 libc6-dev-x32 - GNU C Library: X32 ABI Development Libraries for AMD64
 libc6-i386 - GNU C Library: 32-bit shared libraries for AMD64
 libc6-mips32 - GNU C Library: o32 Shared libraries for MIPS
 libc6-mips64 - GNU C Library: 64bit Shared libraries for MIPS64
 libc6-mipsn32 - GNU C Library: n32 Shared libraries for MIPS64
 libc6-pic  - GNU C Library: PIC archive library
 libc6-powerpc - GNU C Library: 32bit powerpc shared libraries for ppc64
 libc6-ppc64 - GNU C Library: 64bit Shared libraries for PowerPC64
 libc6-s390 - GNU C Library: 32bit Shared libraries for IBM zSeries
 libc6-sparc - GNU C Library: 32bit Shared libraries for SPARC
 libc6-sparc64 - GNU C Library: 64bit Shared libraries for UltraSPARC
 libc6-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc6-x32  - GNU C Library: X32 ABI Shared libraries for AMD64
 libc6-xen  - GNU C Library: Shared libraries [Xen version]
 libc6.1- GNU C Library: Shared libraries
 libc6.1-alphaev67 - GNU C Library: Shared libraries (EV67 optimized)
 libc6.1-dbg - GNU C Library: detached debugging symbols
 libc6.1-dev - GNU C Library: Development Libraries and Header Files
 libc6.1-pic - GNU C Library: PIC archive library
 libc6.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
 locales- GNU C Library: National Language (locale) data [support]
 locales-all - GNU C Library: Precompiled locale data
 multiarch-support - Transitional package to ensure multiarch compatibility
 nscd   - GNU C Library: Name Service Cache Daemon
Closes: 884615 884774
Changes:
 glibc (2.25-6) unstable; urgency=medium
 .
   [ Aurelien Jarno ]
   * debian/control.in/main: add mips r6 architectures to Build-Depends:
 g++-6-multilib.  Closes: #884774.
   * debian/patches/git-updates.diff: update from upstream stable branch:
 - Fixes incorrect RPATH/RUNPATH handling for SUID binaries
   (CVE-2017-16997).  Closes: #884615.
   * debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer
 https 

Processing of glibc_2.25-6_source.changes

[Debian FTP Masters]

glibc_2.25-6_source.changes uploaded successfully to localhost
along with the files:
  glibc_2.25-6.dsc
  glibc_2.25-6.debian.tar.xz
  glibc_2.25-6_source.buildinfo

Greetings,

Your Debian queue daemon (running on host usper.debian.org)

[glibc] branch glibc-2.26 updated (865ac5a -> 0e58067)

[Aurelien Jarno]

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

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

  from  865ac5a   More  fixes to 
debian/patches/any/local-ldso-disable-hwcap.diff
   new  74784d0   debian/rules, debian/rules.d/build.mk: stop logging 
build/check messages to files, both sbuild and debuild are able to do that.
   new  81e86c3   debian/rules, debian/rules.d/build.mk: allow 
TIMEOUTFACTOR to be override per architecture.
   new  88ca7a1   debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
   new  fbb5cb3   debian/testsuite-xfail-debian.mk: remove 
tst-create-detached from XFAIL on HPPA.
  adds  0171d64   debian/control.in/main: add mips r6 architectures to 
Build-Depends:  g++-6-multilib.  Closes: #884774.
  adds  f2a51d8   debian/patches/git-updates.diff: update from upstream 
stable branch:
  adds  daed722   debian/control.in/main, debian/copyright, 
rules.d/tarball.mk: prefer https for upstream links.
  adds  f496dff   debian/control.in/main: bump Standards-Version to 4.1.3.
  adds  85a07c2   debian/patches/alpha/submitted-rlimit.diff: new patch to 
fix getrlimit and setrlimit with RLIM_INFINITY on alpha.
  adds  6c5cd60   debian/patches/alpha/submitted-fminmax.diff: new patch to 
fix fmin and fmax on alpha.
  adds  042406b   debian/testsuite-xfail-debian.mk: mark test-fexcept, 
test-ldouble and test-ldouble-finite as XFAIL as the failures are due to new 
tests, and thus not a regression.
  adds  cb97a23   Fix a typo
  adds  0fb733b   releasing package glibc version 2.25-6
   new  0e58067   Merge branch 'sid' into glibc-2.26

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|  28 ++
 debian/control  |   6 +-
 debian/control.in/main  |   6 +-
 debian/copyright|   2 +-
 debian/patches/alpha/submitted-fminmax.diff | 136 +++
 debian/patches/alpha/submitted-rlimit.diff  | 137 
 debian/patches/series   |   2 +
 debian/rules|   6 +-
 debian/rules.d/build.mk |  25 ++---
 debian/rules.d/tarball.mk   |   2 +-
 debian/sysdeps/hppa.mk  |   3 +
 debian/testsuite-xfail-debian.mk|   4 +-
 12 files changed, 327 insertions(+), 30 deletions(-)
 create mode 100644 debian/patches/alpha/submitted-fminmax.diff
 create mode 100644 debian/patches/alpha/submitted-rlimit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Bug#884615: marked as done (src:glibc: CVE-2017-16997: incorrect RPATH/RUNPATH handling for SUID binaries)

[Debian Bug Tracking System]

Your message dated Sun, 31 Dec 2017 18:04:17 +
with message-id 
and subject line Bug#884615: fixed in glibc 2.25-6
has caused the Debian Bug report #884615,
regarding src:glibc: CVE-2017-16997: incorrect RPATH/RUNPATH handling for SUID 
binaries
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
884615: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884615
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: src:glibc
Version: 2.19-1
Severity: important
Tags: upstream security patch
Forwarded: https://sourceware.org/bugzilla/show_bug.cgi?id=22625

The following vulnerability was published for glibc:

| CVE-2017-16997: Incorrect handling of RPATH or RUNPATH containing $ORIGIN
| for AT_SECURE or SUID binaries could be used to load libraries from the
| current directory.

See https://sourceware.org/bugzilla/show_bug.cgi?id=22625 for more details.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE= 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- End Message ---
--- Begin Message ---
Source: glibc
Source-Version: 2.25-6

We believe that the bug you reported is fixed in the latest version of
glibc, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 884...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Aurelien Jarno  (supplier of updated glibc package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sun, 31 Dec 2017 18:50:30 +0100
Source: glibc
Binary: libc-bin libc-dev-bin libc-l10n glibc-doc glibc-source locales 
locales-all nscd multiarch-support libc6 libc6-dev libc6-dbg libc6-pic 
libc6-udeb libc6.1 libc6.1-dev libc6.1-dbg libc6.1-pic libc6.1-udeb libc0.3 
libc0.3-dev libc0.3-dbg libc0.3-pic libc0.3-udeb libc0.1 libc0.1-dev 
libc0.1-dbg libc0.1-pic libc0.1-udeb libc6-i386 libc6-dev-i386 libc6-sparc 
libc6-dev-sparc libc6-sparc64 libc6-dev-sparc64 libc6-s390 libc6-dev-s390 
libc6-amd64 libc6-dev-amd64 libc6-powerpc libc6-dev-powerpc libc6-ppc64 
libc6-dev-ppc64 libc6-mips32 libc6-dev-mips32 libc6-mipsn32 libc6-dev-mipsn32 
libc6-mips64 libc6-dev-mips64 libc0.1-i386 libc0.1-dev-i386 libc6-x32 
libc6-dev-x32 libc6-xen libc0.3-xen libc6.1-alphaev67
Architecture: source
Version: 2.25-6
Distribution: unstable
Urgency: medium
Maintainer: GNU Libc Maintainers 
Changed-By: Aurelien Jarno 
Description:
 glibc-doc  - GNU C Library: Documentation
 glibc-source - GNU C Library: sources
 libc-bin   - GNU C Library: Binaries
 libc-dev-bin - GNU C Library: Development binaries
 libc-l10n  - GNU C Library: localization files
 libc0.1- GNU C Library: Shared libraries
 libc0.1-dbg - GNU C Library: detached debugging symbols
 libc0.1-dev - GNU C Library: Development Libraries and Header Files
 libc0.1-dev-i386 - GNU C Library: 32bit development libraries for AMD64
 libc0.1-i386 - GNU C Library: 32bit shared libraries for AMD64
 libc0.1-pic - GNU C Library: PIC archive library
 libc0.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3- GNU C Library: Shared libraries
 libc0.3-dbg - GNU C Library: detached debugging symbols
 libc0.3-dev - GNU C Library: Development Libraries and Header Files
 libc0.3-pic - GNU C Library: PIC archive library
 libc0.3-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3-xen - GNU C Library: Shared libraries [Xen version]
 libc6  - GNU C Library: Shared libraries
 libc6-amd64 - GNU C Library: 64bit Shared libraries for AMD64
 libc6-dbg  - GNU C Library: detached debugging symbols
 libc6-dev  - GNU C Library: Development Libraries and Header Files
 libc6-dev-amd64 - GNU C Library: 64bit Development Libraries for AMD64
 libc6-dev-i386 - GNU C Library: 32-bit development libraries for AMD64
 libc6-dev-mips32 - GNU C Library: o32 

[glibc] branch sid updated (cb97a23 -> 0fb733b)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  cb97a23   Fix a typo
   new  0fb733b   releasing package glibc version 2.25-6

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Bug#884774: marked as done (glibc: add mips r6 architectures into the list of gcc-6-multilib dep)

[Debian Bug Tracking System]

Your message dated Sun, 31 Dec 2017 18:04:17 +
with message-id 
and subject line Bug#884774: fixed in glibc 2.25-6
has caused the Debian Bug report #884774,
regarding glibc: add mips r6 architectures into the list of gcc-6-multilib dep
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
884774: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884774
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: src:glibc
Version: 2.25-5

Since current mips r6 architectures are multilibed.
Please add
mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
into the list of list of depending gcc-6-multilib.

-- 
YunQiang Su
--- End Message ---
--- Begin Message ---
Source: glibc
Source-Version: 2.25-6

We believe that the bug you reported is fixed in the latest version of
glibc, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 884...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Aurelien Jarno  (supplier of updated glibc package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Format: 1.8
Date: Sun, 31 Dec 2017 18:50:30 +0100
Source: glibc
Binary: libc-bin libc-dev-bin libc-l10n glibc-doc glibc-source locales 
locales-all nscd multiarch-support libc6 libc6-dev libc6-dbg libc6-pic 
libc6-udeb libc6.1 libc6.1-dev libc6.1-dbg libc6.1-pic libc6.1-udeb libc0.3 
libc0.3-dev libc0.3-dbg libc0.3-pic libc0.3-udeb libc0.1 libc0.1-dev 
libc0.1-dbg libc0.1-pic libc0.1-udeb libc6-i386 libc6-dev-i386 libc6-sparc 
libc6-dev-sparc libc6-sparc64 libc6-dev-sparc64 libc6-s390 libc6-dev-s390 
libc6-amd64 libc6-dev-amd64 libc6-powerpc libc6-dev-powerpc libc6-ppc64 
libc6-dev-ppc64 libc6-mips32 libc6-dev-mips32 libc6-mipsn32 libc6-dev-mipsn32 
libc6-mips64 libc6-dev-mips64 libc0.1-i386 libc0.1-dev-i386 libc6-x32 
libc6-dev-x32 libc6-xen libc0.3-xen libc6.1-alphaev67
Architecture: source
Version: 2.25-6
Distribution: unstable
Urgency: medium
Maintainer: GNU Libc Maintainers 
Changed-By: Aurelien Jarno 
Description:
 glibc-doc  - GNU C Library: Documentation
 glibc-source - GNU C Library: sources
 libc-bin   - GNU C Library: Binaries
 libc-dev-bin - GNU C Library: Development binaries
 libc-l10n  - GNU C Library: localization files
 libc0.1- GNU C Library: Shared libraries
 libc0.1-dbg - GNU C Library: detached debugging symbols
 libc0.1-dev - GNU C Library: Development Libraries and Header Files
 libc0.1-dev-i386 - GNU C Library: 32bit development libraries for AMD64
 libc0.1-i386 - GNU C Library: 32bit shared libraries for AMD64
 libc0.1-pic - GNU C Library: PIC archive library
 libc0.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3- GNU C Library: Shared libraries
 libc0.3-dbg - GNU C Library: detached debugging symbols
 libc0.3-dev - GNU C Library: Development Libraries and Header Files
 libc0.3-pic - GNU C Library: PIC archive library
 libc0.3-udeb - GNU C Library: Shared libraries - udeb (udeb)
 libc0.3-xen - GNU C Library: Shared libraries [Xen version]
 libc6  - GNU C Library: Shared libraries
 libc6-amd64 - GNU C Library: 64bit Shared libraries for AMD64
 libc6-dbg  - GNU C Library: detached debugging symbols
 libc6-dev  - GNU C Library: Development Libraries and Header Files
 libc6-dev-amd64 - GNU C Library: 64bit Development Libraries for AMD64
 libc6-dev-i386 - GNU C Library: 32-bit development libraries for AMD64
 libc6-dev-mips32 - GNU C Library: o32 Development Libraries for MIPS
 libc6-dev-mips64 - GNU C Library: 64bit Development Libraries for MIPS64
 libc6-dev-mipsn32 - GNU C Library: n32 Development Libraries for MIPS64
 libc6-dev-powerpc - GNU C Library: 32bit powerpc development libraries for 
ppc64
 libc6-dev-ppc64 - GNU C Library: 64bit Development Libraries for PowerPC64
 libc6-dev-s390 - GNU C Library: 32bit Development Libraries for IBM zSeries
 libc6-dev-sparc - GNU C Library: 32bit Development Libraries for SPARC
 libc6-dev-sparc64 - GNU C Library: 64bit Development Libraries for UltraSPARC
 libc6-dev-x32 - GNU C Library: X32 ABI Development Libraries for AMD64
 libc6-i386 - GNU C 

[glibc] annotated tag debian/2.25-6 created (now 8e5c8db)

[Aurelien Jarno]

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

aurel32 pushed a change to annotated tag debian/2.25-6
in repository glibc.

at  8e5c8db   (tag)
   tagging  e236991e72a261e1f13ca51e40fdc425475806a7 (commit)
  replaces  debian/2.25-5
 tagged by  Aurelien Jarno
on  Sun Dec 31 17:50:19 2017 +0100

- Log -
tagging package glibc version debian/2.25-6
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEUryGlb40+QrX1Ay4E4jA+JnoM2sFAlpJFUsACgkQE4jA+Jno
M2vVzQ//UGS1K7WFuUmD8dUFQAmkUgYexSkpVoOYYFNATkTyfB1Y6rVN0eQbBX//
XrMtdpTEBd2G8IUqFw4IfoI2DkGyFWnjU1UqOm/6vv1mC3uW9aMNLNkV2r0Yxuhh
7GNgoqTkPFU3DAo4e2mkuBbZ0R00FIUaYXMWzzpHijFhFv0r4wFpzjqgybohbFL/
gkYXSvozxG4HWyiPyLXJ4CDuC5Ob6k5ci0z0vp+Rt2hpZMJKjcGJCEPvRfRnTphB
opDcNrcfI9mHIbOQTrnJOwTf3hhUfr3Vd15Bt1A9ViOIn3Ap65kvcSehQxpr/+8Z
1BiTGqVhFOjs0VH9B5/lK/sSO9j9239IpJnbylHOAGZi3bQ2osxKoYBaGzC5fWPT
xeMmin6bf6PsoROZ+eh+eAGgBSVLwD755lH3BbagRjbRdqQoFBHyp6SdlPDUoGEX
Zy5exwo7xfo9nB5XUlk03ba4oOrIKJkz9Cd/aBa9ExoHHs8+NDUjTkbWLP6jBd3O
yVFmjgy3AMhaQmYKMGlDvEBSI4x1lTtmjyo7c0cSxYYP/kLTuEBwDt74YzX/bubO
i3vQXU7C4ATrHAahAlUH4kYRcPs+qokz+vBRzPuFTrS4lUDNmh+v/m8beMvxb/lF
MC8rIotLWHIeXahiu71h2zVfClXgbusyIUg99nWNBoZDHasPbJk=
=p4Mo
-END PGP SIGNATURE-

Aurelien Jarno (8):
  debian/control.in/main: add mips r6 architectures to Build-Depends:  
g++-6-multilib.  Closes: #884774.
  debian/patches/git-updates.diff: update from upstream stable branch:
  debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer 
https for upstream links.
  debian/control.in/main: bump Standards-Version to 4.1.3.
  debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit 
and setrlimit with RLIM_INFINITY on alpha.
  debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and 
fmax on alpha.
  debian/testsuite-xfail-debian.mk: mark test-fexcept, test-ldouble and 
test-ldouble-finite as XFAIL as the failures are due to new tests, and thus not 
a regression.
  releasing package glibc version 2.25-6

---

This annotated tag includes the following new commits:

   new  e236991   releasing package glibc version 2.25-6

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch sid updated (042406b -> cb97a23)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  042406b   debian/testsuite-xfail-debian.mk: mark test-fexcept, 
test-ldouble and test-ldouble-finite as XFAIL as the failures are due to new 
tests, and thus not a regression.
   new  cb97a23   Fix a typo

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/control | 2 +-
 debian/control.in/main | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 04/05: debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL on HPPA.

[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 fbb5cb35bef7908c0a43fff5f6b437c087e466b0
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:21:33 2017 +0100

debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL on 
HPPA.
---
 debian/changelog | 2 ++
 debian/testsuite-xfail-debian.mk | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0157060..f806469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
   * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
 per architecture.
   * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
+  * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
+on HPPA.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index 7da2af8..93568a6 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -114,7 +114,6 @@ test-xfail-tst-backtrace4 = yes
 test-xfail-tst-backtrace5 = yes
 test-xfail-tst-backtrace6 = yes
 test-xfail-tst-cleanupx4 = yes
-test-xfail-tst-create-detached = yes
 test-xfail-tst-makecontext = yes
 test-xfail-tst-protected1a = yes
 test-xfail-tst-protected1b = yes

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 02/05: debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override per architecture.

[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 81e86c3f3e8679ff3eeaf6c9580258eb05da1362
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:14:37 2017 +0100

debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override 
per architecture.
---
 debian/changelog| 2 ++
 debian/rules| 1 +
 debian/rules.d/build.mk | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a881791..d9e67c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
 before .
   * debian/rules, debian/rules.d/build.mk: stop logging build/check messages
 to files, both sbuild and debuild are able to do that.
+  * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
+per architecture.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 255b759..14db9fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,7 @@ BASE_MIG = mig
 DEB_GCC_VERSION ?= -7
 
 RUN_TESTSUITE = yes
+TIMEOUTFACTOR = 25
 
 # Set cross and native compiler names, including version.
 CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)$(DEB_GCC_VERSION) -no-pie -fno-PIE
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index 92747a6..17cf910 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -124,7 +124,7 @@ $(stamp)check_%: $(stamp)build_%
  echo "Testsuite disabled for $(curpass), skipping tests."; \
else \
  find $(DEB_BUILDDIR) -name '*.out' -delete ; \
- LD_PRELOAD="" LANG="" TIMEOUTFACTOR="25" $(MAKE) -C $(DEB_BUILDDIR) 
$(NJOBS) check || true ; \
+ LD_PRELOAD="" LANG="" TIMEOUTFACTOR="$(TIMEOUTFACTOR)" $(MAKE) -C 
$(DEB_BUILDDIR) $(NJOBS) check || true ; \
  if ! test -f $(DEB_BUILDDIR)/tests.sum ; then \
echo 
"+-+" ; \
echo "| Testsuite failed to build.  
|" ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 03/05: debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.

[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 88ca7a16e7e04626d0bd791051499554cc4966ff
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:20:25 2017 +0100

debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
---
 debian/changelog   | 1 +
 debian/sysdeps/hppa.mk | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d9e67c7..0157060 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
 to files, both sbuild and debuild are able to do that.
   * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
 per architecture.
+  * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/sysdeps/hppa.mk b/debian/sysdeps/hppa.mk
index 3cc0e6f..7c7fbf0 100644
--- a/debian/sysdeps/hppa.mk
+++ b/debian/sysdeps/hppa.mk
@@ -1,3 +1,6 @@
+# HPPA build daemons are very slow
+TIMEOUTFACTOR=100
+
 # hppa64 needs symlink /usr/hppa64-linux/include to /usr/include
 # (See: Bug#239020)  In future we may drop this file with supporting hppa64.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 05/05: Merge branch 'sid' into glibc-2.26

[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 0e5806717f7cacdf04fb7e10783f5cf89e2a05ca
Merge: fbb5cb3 0fb733b
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:55:50 2017 +0100

Merge branch 'sid' into glibc-2.26

 debian/changelog|  21 +
 debian/control  |   6 +-
 debian/control.in/main  |   6 +-
 debian/copyright|   2 +-
 debian/patches/alpha/submitted-fminmax.diff | 136 +++
 debian/patches/alpha/submitted-rlimit.diff  | 137 
 debian/patches/series   |   2 +
 debian/rules.d/tarball.mk   |   2 +-
 debian/testsuite-xfail-debian.mk|   3 +
 9 files changed, 307 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index f806469,0508f2f..3158f20
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,183 -1,24 +1,204 @@@
 +glibc (2.26-0experimental3) UNRELEASED; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * debian/patches/any/local-ldso-disable-hwcap.diff: Include 
 +before .
 +  * debian/rules, debian/rules.d/build.mk: stop logging build/check messages
 +to files, both sbuild and debuild are able to do that.
 +  * debian/rules, debian/rules.d/build.mk: allow TIMEOUTFACTOR to be override
 +per architecture.
 +  * debian/sysdeps/hppa.mk: set TIMEOUTFACTOR to 100 on HPPA.
 +  * debian/testsuite-xfail-debian.mk: remove tst-create-detached from XFAIL
 +on HPPA.
 +
 + -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 +
 +glibc (2.26-0experimental2) experimental; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * debian/testsuite-xfail-debian.mk: move double-lround XFAILs from mips64el
 +to mipsel.
 +  * debian/patches/git-updates.diff: update from upstream stable branch:
 +- Fix malloc returning pointer from tcache_get when it should returns
 +  NULL (CVE-2017-17426).  Closes: #883729.
 +- Drop debian/patches/ia64/git-ia64-crash-thread-exit.diff (merged
 +  upstream).
 +  * debian/control.in/libc: add a Breaks: libperl5.26 (<< 5.26.1-3) to
 +@libc@-dev to handle the xlocale.h removal.  Closes: #883392.
 +  * debian/control.in/main: point the Vcs-Git field to the glibc-2.26 branch
 +to shut up tracker.debian.org about missing commits.
 +  * debian/testsuite-xfail-debian.mk: x32: remove a bunch of conform issues,
 +add tst-platform-1, as this test has x86-64 specific expectations.
 +  * debian/sysdeps/sparc64.mk: don't force -mcpu=ultrasparc as that
 +miscompiles at least pthread_barrier_wait.c. Mark tst-realloc as XFAIL, as
 +there are way to trigger the issue on older libc and/or other
 +architectures.
 +  * debian/patches/locale/fix-LC_COLLATE-rules.diff: drop, not useful anymore
 +and has side effects.
 +  * debian/patches/localedata/local-hu_HU-sort.diff: removed, the hu_HU
 +collation is now the same than upstream.
 +
 + -- Aurelien Jarno   Sun, 17 Dec 2017 18:44:55 +0100
 +
 +glibc (2.26-0experimental1) experimental; urgency=medium
 +
 +  [ Samuel Thibault ]
 +  * debian/testsuite-xfail-debian.mk: Update hurd-i386 xfail with new test.
 +
 +  [ Aurelien Jarno ]
 +  * 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   Wed, 22 Nov 2017 17:46:32 +0100
 +
 +glibc (2.26-0experimental0) experimental; urgency=medium
 +
 +  [ Adam Conrad ]
 +  * New upstream release (LP: #1703368), with git updates to 2017-10-10:
 +- debian/{symbols.wildcards,control}: Update and regen for 2.26.
 +- debian/patches/alpha/submitted-termios_h.diff: upstreamed.
 +- debian/patches/arm/submitted-strip-bit-0.diff: upstreamed.
 +- debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff: upstreamed.
 +- debian/patches/any/submitted-string2-strcmp.diff: obsolete.
 +- debian/patches/any/local-tst-writev.diff: fixed upstream.
 +- debian/patches/any/local-dynamic-resolvconf.diff: fixed upstream.
 +- debian/patches/any/submitted-unicode-9.0.0.diff: obsolete.
 +- debian/patches/any/cvs-malloc-hardening.diff: upstreamed.
 +- debian/patches/any/local-bits-sigstack.diff: fixed upstream.
 +- debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: upstreamed.
 +- debian/patches/i386/local-cmov.diff: dropped, no longer useful.
 +- debian/patches/all/local-ldd.diff: rebased.
 +- debian/patches/any/local-ldso-disable-hwcap.diff: rebased.
 +- debian/patches/any/local-tcsetaddr.diff: rebased.
 +- debian/patches/any/submitted-resolv-unaligned.diff: rebased.
 +- debian/patches/arm/local-arm-futex.diff: rebased.
 +- 

[glibc] 01/05: debian/rules, debian/rules.d/build.mk: stop logging build/check messages to files, both sbuild and debuild are able to do that.

[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 74784d0d9e06adb57047548685e79ea0223a05ac
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:10:14 2017 +0100

debian/rules, debian/rules.d/build.mk: stop logging build/check messages to 
files, both sbuild and debuild are able to do that.
---
 debian/changelog|  2 ++
 debian/rules|  5 -
 debian/rules.d/build.mk | 25 +
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4926ccf..a881791 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ glibc (2.26-0experimental3) UNRELEASED; urgency=medium
   [ Aurelien Jarno ]
   * debian/patches/any/local-ldso-disable-hwcap.diff: Include 
 before .
+  * debian/rules, debian/rules.d/build.mk: stop logging build/check messages
+to files, both sbuild and debuild are able to do that.
 
  -- Aurelien Jarno   Sun, 17 Dec 2017 20:13:55 +0100
 
diff --git a/debian/rules b/debian/rules
index e104e00..255b759 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,11 +117,6 @@ configure_target := $(DEB_HOST_GNU_TYPE)
 # Among other things this lets tests run.
 configure_build := $(DEB_BUILD_GNU_TYPE)
 
-log_build= $(build-tree)/log-build-$(call xx,configure_target)-$(curpass)
-log_test = $(build-tree)/log-test-$(call xx,configure_target)-$(curpass)
-log_results  = $(build-tree)/test-results-$(call 
xx,configure_target)-$(curpass)
-log_expected = debian/testsuite-checking/expected-results-$(call 
xx,configure_target)-$(curpass)
-
 # Which build pass are we on?
 curpass = $(filter-out %_,$(subst _,_ ,$@))
 
diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk
index f1bc157..92747a6 100644
--- a/debian/rules.d/build.mk
+++ b/debian/rules.d/build.mk
@@ -3,14 +3,6 @@
 # This little bit of magic makes it possible:
 xx=$(if $($(curpass)_$(1)),$($(curpass)_$(1)),$($(1)))
 
-# We want to log output to a logfile but we also need to preserve the
-# return code of the command being run.
-# This little bit of magic makes it possible:
-# $(call logme, [-a] , )
-define logme
-(exec 3>&1; exit `( ( ( $(2) ) 2>&1 3>&-; echo $$? >&4) | tee $(1) >&3) 4>&1`)
-endef
-
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 libc_extra_config_options = $(extra_config_options) 
--disable-sanity-checks \
--enable-hacker-mode
@@ -80,9 +72,9 @@ $(stamp)configure_%: $(stamp)config_sub_guess $(stamp)patch 
$(KERNEL_HEADER_DIR)
echo "No.  Forcing cross-compile by setting build to 
$$configure_build."; \
  fi; \
fi; \
-   $(call logme, -a $(log_build), echo -n "Build started: " ; date 
--rfc-2822 ; echo "---") ; \
-   $(call logme, -a $(log_build), \
-   cd $(DEB_BUILDDIR) && \
+   echo -n "Build started: " ; date --rfc-2822
+   echo "---"
+   cd $(DEB_BUILDDIR) && \
CC="$(call xx,CC)" \
CXX=$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),:,"$(call 
xx,CXX)") \
MIG="$(call xx,MIG)" \
@@ -102,7 +94,7 @@ $(stamp)configure_%: $(stamp)config_sub_guess $(stamp)patch 
$(KERNEL_HEADER_DIR)
$(if $(filter $(pt_chown),yes),--enable-pt_chown) \
$(if $(filter $(threads),no),--disable-nscd) \
$(if $(filter $(call xx,mvec),no),--disable-mathvec) \
-   $(call xx,with_headers) $(call xx,extra_config_options))
+   $(call xx,with_headers) $(call xx,extra_config_options)
touch $@
 
 $(patsubst %,build_%,$(GLIBC_PASSES)) :: build_% : $(stamp)build_%
@@ -112,8 +104,9 @@ $(stamp)build_%: $(stamp)configure_%
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
$(MAKE) cross-compiling=yes -C $(DEB_BUILDDIR) $(NJOBS) csu/subdir_lib
 else
-   $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS))
-   $(call logme, -a $(log_build), echo "---" ; echo -n "Build 
ended: " ; date --rfc-2822)
+   $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS)
+   echo "---"
+   echo -n "Build ended: " ; date --rfc-2822
 endif
touch $@
 
@@ -131,7 +124,7 @@ $(stamp)check_%: $(stamp)build_%
  echo "Testsuite disabled for $(curpass), skipping tests."; \
else \
  find $(DEB_BUILDDIR) -name '*.out' -delete ; \
- LD_PRELOAD="" LANG="" TIMEOUTFACTOR="25" $(MAKE) -C $(DEB_BUILDDIR) 
$(NJOBS) check 2>&1 | tee $(log_test) ; \
+ LD_PRELOAD="" LANG="" TIMEOUTFACTOR="25" $(MAKE) -C $(DEB_BUILDDIR) 
$(NJOBS) check || true ; \
  if ! test -f $(DEB_BUILDDIR)/tests.sum ; then \
echo 
"+-+" ; \
echo "| Testsuite failed to build.  
|" ; \
@@ -171,7 +164,7 @@ $(stamp)install_%: 

[glibc] 01/01: releasing package glibc version 2.25-6

[Aurelien Jarno]

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

aurel32 pushed a commit to annotated tag debian/2.25-6
in repository glibc.

commit e236991e72a261e1f13ca51e40fdc425475806a7
Author: Aurelien Jarno 
Date:   Sun Dec 31 17:50:19 2017 +0100

releasing package glibc version 2.25-6
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c84f96..1e320d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-glibc (2.25-6) UNRELEASED; urgency=medium
+glibc (2.25-6) unstable; urgency=medium
 
   [ Aurelien Jarno ]
   * debian/control.in/main: add mips r6 architectures to Build-Depends:
@@ -17,7 +17,7 @@ glibc (2.25-6) UNRELEASED; urgency=medium
 test-ldouble-finite as XFAIL as the failures are due to new tests, and
 thus not a regression.
 
- -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
+ -- Aurelien Jarno   Sun, 31 Dec 2017 17:50:12 +0100
 
 glibc (2.25-5) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/01: releasing package glibc version 2.25-6

[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 0fb733b93e2065f1339970b256e01395c67f275c
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:50:39 2017 +0100

releasing package glibc version 2.25-6
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c84f96..0508f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-glibc (2.25-6) UNRELEASED; urgency=medium
+glibc (2.25-6) unstable; urgency=medium
 
   [ Aurelien Jarno ]
   * debian/control.in/main: add mips r6 architectures to Build-Depends:
@@ -17,7 +17,7 @@ glibc (2.25-6) UNRELEASED; urgency=medium
 test-ldouble-finite as XFAIL as the failures are due to new tests, and
 thus not a regression.
 
- -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
+ -- Aurelien Jarno   Sun, 31 Dec 2017 18:50:30 +0100
 
 glibc (2.25-5) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/01: Fix a typo

[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 cb97a23d900e5cb29ddcdb013b7147c6fc1f573b
Author: Aurelien Jarno 
Date:   Sun Dec 31 18:50:22 2017 +0100

Fix a typo
---
 debian/control | 2 +-
 debian/control.in/main | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index f6695c0..e3f7a47 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 
1.17.14), xz-utils, file,
  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386]  | libihash-dev 
[hurd-i386] ,
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.21),
- g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 
mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 
mips64r6e powerpc ppc64 s390x sparc sparc64 x32],
+ g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 
mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 
mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
  g++-6 (>= 6.1.1-1~) [hurd-i386 i386 kfreebsd-i386],
  python3:native ,
  libc-bin (>= 2.25) 
diff --git a/debian/control.in/main b/debian/control.in/main
index d46e5fc..31af6ce 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -10,7 +10,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 
1.17.14), xz-utils, file,
  hurd-dev (>= 1:0.9.git20171119-2~) [hurd-i386]  | libihash-dev 
[hurd-i386] ,
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.21),
- g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 
mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 
mips64r6e powerpc ppc64 s390x sparc sparc64 x32],
+ g++-6, g++-6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 
mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 
mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
  g++-6 (>= 6.1.1-1~) [hurd-i386 i386 kfreebsd-i386],
  python3:native ,
  libc-bin (>= @GLIBC_VERSION@) 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch sid updated (85a07c2 -> 042406b)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  85a07c2   debian/patches/alpha/submitted-rlimit.diff: new patch to 
fix getrlimit and setrlimit with RLIM_INFINITY on alpha.
   new  6c5cd60   debian/patches/alpha/submitted-fminmax.diff: new patch to 
fix fmin and fmax on alpha.
   new  042406b   debian/testsuite-xfail-debian.mk: mark test-fexcept, 
test-ldouble and test-ldouble-finite as XFAIL as the failures are due to new 
tests, and thus not a regression.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|   5 +
 debian/patches/alpha/submitted-fminmax.diff | 136 
 debian/patches/series   |   1 +
 debian/testsuite-xfail-debian.mk|   3 +
 4 files changed, 145 insertions(+)
 create mode 100644 debian/patches/alpha/submitted-fminmax.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 02/02: debian/testsuite-xfail-debian.mk: mark test-fexcept, test-ldouble and test-ldouble-finite as XFAIL as the failures are due to new tests, and thus not a regression.

[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 042406bf3a5e694704ee06acc64fcbcb3a1143b1
Author: Aurelien Jarno 
Date:   Sun Dec 31 17:49:13 2017 +0100

debian/testsuite-xfail-debian.mk: mark test-fexcept, test-ldouble and 
test-ldouble-finite as XFAIL as the failures are due to new tests, and thus not 
a regression.
---
 debian/changelog | 3 +++
 debian/testsuite-xfail-debian.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad1137d..9c84f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ glibc (2.25-6) UNRELEASED; urgency=medium
 and setrlimit with RLIM_INFINITY on alpha.
   * debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and
 fmax on alpha.
+  * debian/testsuite-xfail-debian.mk: mark test-fexcept, test-ldouble and
+test-ldouble-finite as XFAIL as the failures are due to new tests, and
+thus not a regression.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index fa8638b..18b76a9 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -34,6 +34,9 @@ test-xfail-test-double-finite = yes
 test-xfail-test-float = yes
 test-xfail-test-float-finite = yes
 test-xfail-test-fenv-return = yes
+test-xfail-test-fexcept = yes
+test-xfail-test-ldouble = yes
+test-xfail-test-ldouble-finite = yes
 test-xfail-test-snan = yes
 test-xfail-tst-eintr1 = yes
 test-xfail-tst-mqueue5 = yes

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/02: debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and fmax on alpha.

[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 6c5cd602d4c754532713c6784242e2ee4a95bd0c
Author: Aurelien Jarno 
Date:   Sun Dec 31 17:41:12 2017 +0100

debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and fmax 
on alpha.
---
 debian/changelog|   2 +
 debian/patches/alpha/submitted-fminmax.diff | 136 
 debian/patches/series   |   1 +
 3 files changed, 139 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e0076c3..ad1137d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ glibc (2.25-6) UNRELEASED; urgency=medium
   * debian/control.in/main: bump Standards-Version to 4.1.3.
   * debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit
 and setrlimit with RLIM_INFINITY on alpha.
+  * debian/patches/alpha/submitted-fminmax.diff: new patch to fix fmin and
+fmax on alpha.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/patches/alpha/submitted-fminmax.diff 
b/debian/patches/alpha/submitted-fminmax.diff
new file mode 100644
index 000..3aff040
--- /dev/null
+++ b/debian/patches/alpha/submitted-fminmax.diff
@@ -0,0 +1,136 @@
+2017-12-31  Aurelien Jarno  
+
+   [BZ #20947]
+   * sysdeps/alpha/fpu/s_fmax.S: Remove file.
+   * sysdeps/alpha/fpu/s_fmaxf.S: Likewise.
+   * sysdeps/alpha/fpu/s_fmin.S: Likewise.
+   * sysdeps/alpha/fpu/s_fminf.S: Likewise.
+
+--- a/sysdeps/alpha/fpu/s_fmax.S
 /dev/null
+@@ -1,57 +0,0 @@
+-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-   Contributed by Richard Henderson.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library.  If not, see
+-   .  */
+-
+-#include 
+-#include 
+-
+-.set noat
+-  .set noreorder
+-
+-  .text
+-ENTRY (__fmax)
+-  .prologue 0
+-
+-  cmptun/su   $f16, $f16, $f10
+-  cmptun/su   $f17, $f17, $f11
+-  fmov$f17, $f0
+-  unop
+-
+-  trapb
+-  fbne$f10, $ret
+-  fmov$f16, $f0
+-  fbne$f11, $ret
+-
+-  cmptlt/su   $f16, $f17, $f11
+-  trapb
+-  fcmovne $f11, $f17, $f0
+-$ret: ret
+-
+-END (__fmax)
+-
+-/* Given the in-register format of single-precision, this works there too.  */
+-strong_alias (__fmax, __fmaxf)
+-weak_alias (__fmaxf, fmaxf)
+-
+-weak_alias (__fmax, fmax)
+-#ifdef NO_LONG_DOUBLE
+-strong_alias (__fmax, __fmaxl)
+-weak_alias (__fmaxl, fmaxl)
+-#endif
+-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+-compat_symbol (libm, __fmax, fmaxl, GLIBC_2_1);
+-#endif
+--- a/sysdeps/alpha/fpu/s_fmaxf.S
 /dev/null
+@@ -1 +0,0 @@
+-/* __fmaxf is in s_fmax.c  */
+--- a/sysdeps/alpha/fpu/s_fmin.S
 /dev/null
+@@ -1,57 +0,0 @@
+-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-   Contributed by Richard Henderson.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library.  If not, see
+-   .  */
+-
+-#include 
+-#include 
+-
+-.set noat
+-  .set noreorder
+-
+-  .text
+-ENTRY (__fmin)
+-  .prologue 0
+-
+-  cmptun/su   $f16, $f16, $f10
+-  cmptun/su   $f17, $f17, $f11
+-  fmov$f17, $f0
+-  unop
+-
+-  trapb
+-  fbne$f10, $ret
+-  fmov$f16, $f0
+-  fbne$f11, $ret
+-
+-  cmptlt/su   $f17, $f16, $f11
+-  trapb
+-  fcmovne $f11, $f17, $f0
+-$ret: ret
+-
+-END (__fmin)
+-
+-/* Given the 

[glibc] branch sid updated (f496dff -> 85a07c2)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  f496dff   debian/control.in/main: bump Standards-Version to 4.1.3.
   new  85a07c2   debian/patches/alpha/submitted-rlimit.diff: new patch to 
fix getrlimit and setrlimit with RLIM_INFINITY on alpha.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |   2 +
 debian/patches/alpha/submitted-rlimit.diff | 137 +
 debian/patches/series  |   1 +
 3 files changed, 140 insertions(+)
 create mode 100644 debian/patches/alpha/submitted-rlimit.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch sid updated (f2a51d8 -> f496dff)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  f2a51d8   debian/patches/git-updates.diff: update from upstream 
stable branch:
   new  daed722   debian/control.in/main, debian/copyright, 
rules.d/tarball.mk: prefer https for upstream links.
   new  f496dff   debian/control.in/main: bump Standards-Version to 4.1.3.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  | 3 +++
 debian/control| 4 ++--
 debian/control.in/main| 4 ++--
 debian/copyright  | 2 +-
 debian/rules.d/tarball.mk | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 01/01: debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit and setrlimit with RLIM_INFINITY on alpha.

[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 85a07c27998f389564ff3a83e68bbfdae3fd3948
Author: Aurelien Jarno 
Date:   Sun Dec 31 13:40:02 2017 +0100

debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit and 
setrlimit with RLIM_INFINITY on alpha.
---
 debian/changelog   |   2 +
 debian/patches/alpha/submitted-rlimit.diff | 137 +
 debian/patches/series  |   1 +
 3 files changed, 140 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1480716..e0076c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ glibc (2.25-6) UNRELEASED; urgency=medium
   * debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer
 https for upstream links.
   * debian/control.in/main: bump Standards-Version to 4.1.3.
+  * debian/patches/alpha/submitted-rlimit.diff: new patch to fix getrlimit
+and setrlimit with RLIM_INFINITY on alpha.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/patches/alpha/submitted-rlimit.diff 
b/debian/patches/alpha/submitted-rlimit.diff
new file mode 100644
index 000..bedda31
--- /dev/null
+++ b/debian/patches/alpha/submitted-rlimit.diff
@@ -0,0 +1,137 @@
+2017-12-30  Aurelien Jarno 
+
+   [BZ #22648]
+   * sysdeps/unix/sysv/linux/alpha/getrlimit64.c: New file.
+   * sysdeps/unix/sysv/linux/alpha/setrlimit64.c: Ditto.
+
+--- /dev/null
 b/sysdeps/unix/sysv/linux/alpha/getrlimit64.c
+@@ -0,0 +1,64 @@
++/* Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   .  */
++
++#include 
++#include 
++
++/* Add this redirection so the strong_alias linking getrlimit64 to
++   {__}getrlimit does not throw a type error.  */
++#undef getrlimit
++#undef __getrlimit
++#define getrlimit getrlimit_redirect
++#define __getrlimit __getrlimit_redirect
++#include 
++#undef getrlimit
++#undef __getrlimit
++
++/* RLIM64_INFINITY was supposed to be a glibc convention rather than
++   anything seen by the kernel, but it ended being passed to the kernel
++   through the prlimit64 syscall.  Given that a lot of binaries with
++   the wrong constant value are in the wild, provide a wrapper function
++   fixing the value after the syscall.  */
++#define KERNEL_RLIM64_INFINITY0xULL
++
++int
++__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
++{
++  struct rlimit64 krlimits;
++
++  if (INLINE_SYSCALL_CALL (prlimit64, 0, resource, NULL, ) < 0)
++return -1;
++
++  if (krlimits.rlim_cur == KERNEL_RLIM64_INFINITY)
++rlimits->rlim_cur = RLIM64_INFINITY;
++  else
++rlimits->rlim_cur = krlimits.rlim_cur;
++  if (krlimits.rlim_max == KERNEL_RLIM64_INFINITY)
++rlimits->rlim_max = RLIM64_INFINITY;
++  else
++rlimits->rlim_max = krlimits.rlim_max;
++
++  return 0;
++}
++libc_hidden_def (__getrlimit64)
++strong_alias (__getrlimit64, __GI_getrlimit)
++strong_alias (__getrlimit64, __GI___getrlimit)
++strong_alias (__getrlimit64, __getrlimit)
++weak_alias (__getrlimit64, getrlimit)
++
++weak_alias (__getrlimit64, getrlimit64)
++libc_hidden_weak (getrlimit64)
+--- /dev/null
 b/sysdeps/unix/sysv/linux/alpha/setrlimit64.c
+@@ -0,0 +1,61 @@
++/* Copyright (C) 2013-2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   .  */
++
++#include 
++#include 
++
++/* Add this 

[glibc] 01/02: debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer https for upstream links.

[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 daed722dbaa10958c97823c3664746b6bb7fbfcb
Author: Aurelien Jarno 
Date:   Sun Dec 31 13:34:28 2017 +0100

debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer https 
for upstream links.
---
 debian/changelog  | 2 ++
 debian/control| 2 +-
 debian/control.in/main| 2 +-
 debian/copyright  | 2 +-
 debian/rules.d/tarball.mk | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b63b805..7cdb63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ glibc (2.25-6) UNRELEASED; urgency=medium
   * debian/patches/git-updates.diff: update from upstream stable branch:
 - Fixes incorrect RPATH/RUNPATH handling for SUID binaries
   (CVE-2017-16997).  Closes: #884615.
+  * debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer
+https for upstream links.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/control b/debian/control
index 6e3eb17..1fbef53 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Uploaders: Clint Adams , Aurelien Jarno 
,
 Standards-Version: 4.0.1
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
-Homepage: http://www.gnu.org/software/libc/libc.html
+Homepage: https://www.gnu.org/software/libc/libc.html
 
 Package: libc-bin
 Architecture: any
diff --git a/debian/control.in/main b/debian/control.in/main
index 262ad3a..3352123 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -20,7 +20,7 @@ Uploaders: Clint Adams , Aurelien Jarno 
,
 Standards-Version: 4.0.1
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
-Homepage: http://www.gnu.org/software/libc/libc.html
+Homepage: https://www.gnu.org/software/libc/libc.html
 
 Package: libc-bin
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index a97850b..0517e76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This is the Debian prepackaged version of the GNU C Library version 2.23.
 
 It was put together by the GNU Libc Maintainers 
-from 
+from 
 
 * Most of the GNU C library is under the following copyright:
 
diff --git a/debian/rules.d/tarball.mk b/debian/rules.d/tarball.mk
index 8d6e82f..1750564 100644
--- a/debian/rules.d/tarball.mk
+++ b/debian/rules.d/tarball.mk
@@ -1,4 +1,4 @@
-GLIBC_GIT = git://sourceware.org/git/glibc.git
+GLIBC_GIT = https://sourceware.org/git/glibc.git
 GLIBC_BRANCH = release/$(GLIBC_VERSION)/master
 GLIBC_TAG = glibc-$(GLIBC_VERSION)
 GLIBC_CHECKOUT = glibc-checkout

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] 02/02: debian/control.in/main: bump Standards-Version to 4.1.3.

[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 f496dffbcf09df9b7a918347929922897aab5e31
Author: Aurelien Jarno 
Date:   Sun Dec 31 13:35:46 2017 +0100

debian/control.in/main: bump Standards-Version to 4.1.3.
---
 debian/changelog   | 1 +
 debian/control | 2 +-
 debian/control.in/main | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cdb63a..1480716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ glibc (2.25-6) UNRELEASED; urgency=medium
   (CVE-2017-16997).  Closes: #884615.
   * debian/control.in/main, debian/copyright, rules.d/tarball.mk: prefer
 https for upstream links.
+  * debian/control.in/main: bump Standards-Version to 4.1.3.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/control b/debian/control
index 1fbef53..f6695c0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 
1.17.14), xz-utils, file,
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers 
 Uploaders: Clint Adams , Aurelien Jarno 
, Adam Conrad , Samuel Thibault 

-Standards-Version: 4.0.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
 Homepage: https://www.gnu.org/software/libc/libc.html
diff --git a/debian/control.in/main b/debian/control.in/main
index 3352123..d46e5fc 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -17,7 +17,7 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 
1.17.14), xz-utils, file,
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers 
 Uploaders: Clint Adams , Aurelien Jarno 
, Adam Conrad , Samuel Thibault 

-Standards-Version: 4.0.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
 Homepage: https://www.gnu.org/software/libc/libc.html

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

[glibc] branch sid updated (0171d64 -> f2a51d8)

[Aurelien Jarno]

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

aurel32 pushed a change to branch sid
in repository glibc.

  from  0171d64   debian/control.in/main: add mips r6 architectures to 
Build-Depends:  g++-6-multilib.  Closes: #884774.
   new  f2a51d8   debian/patches/git-updates.diff: update from upstream 
stable branch:

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog|   3 +
 debian/patches/git-updates.diff | 131 
 2 files changed, 123 insertions(+), 11 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Processed: Bug#884615 marked as pending

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tag 884615 pending
Bug #884615 [src:glibc] src:glibc: CVE-2017-16997: incorrect RPATH/RUNPATH 
handling for SUID binaries
Added tag(s) pending.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
884615: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884615
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

[glibc] 01/01: 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 f2a51d8c5a2e4a05320cf99e9ed7a8e58c23c412
Author: Aurelien Jarno 
Date:   Sun Dec 31 13:01:32 2017 +0100

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

* debian/patches/git-updates.diff: update from upstream stable branch:
  - Fixes incorrect RPATH/RUNPATH handling for SUID binaries
(CVE-2017-16997).  Closes: #884615.
---
 debian/changelog|   3 +
 debian/patches/git-updates.diff | 131 
 2 files changed, 123 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b53951..b63b805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ glibc (2.25-6) UNRELEASED; urgency=medium
   [ Aurelien Jarno ]
   * debian/control.in/main: add mips r6 architectures to Build-Depends:
 g++-6-multilib.  Closes: #884774.
+  * debian/patches/git-updates.diff: update from upstream stable branch:
+- Fixes incorrect RPATH/RUNPATH handling for SUID binaries
+  (CVE-2017-16997).  Closes: #884615.
 
  -- Aurelien Jarno   Wed, 20 Dec 2017 22:29:01 +0100
 
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 793c02f..eaba5e3 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,26 @@
 GIT update of git://sourceware.org/git/glibc.git/release/2.25/master from 
glibc-2.25
 
 diff --git a/ChangeLog b/ChangeLog
-index f140ee67de..1868c7a7be 100644
+index f140ee67de..a3db9c09f2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,734 @@
+@@ -1,3 +1,750 @@
++2017-12-30  Aurelien Jarno  
++  Dmitry V. Levin  
++
++  [BZ #22625]
++  * elf/dl-load.c (fillin_rpath): Check for empty tokens before dynamic
++  string token expansion. Check for NULL pointer or empty string possibly
++  returned by expand_dynamic_string_token.
++  (decompose_rpath): Check for empty path after dynamic string
++  token expansion.
++
++2017-12-18  Dmitry V. Levin  
++
++  [BZ #22627]
++  * elf/dl-load.c (_dl_init_paths): Remove _dl_dst_substitute preparatory
++  code and invocation.
++
 +2017-12-14  Florian Weimer  
 +
 +  [BZ #22607]
@@ -843,10 +859,10 @@ index e9194e54cf..43343f03ee 100644
| sed -n -f $< > $@.new
test -s $@.new
 diff --git a/NEWS b/NEWS
-index ec15dde761..2c4c9d63aa 100644
+index ec15dde761..7c44ba2a8a 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -5,6 +5,55 @@ See the end for copying conditions.
+@@ -5,6 +5,60 @@ See the end for copying conditions.
  Please send GNU C library bug reports via 
  using `glibc' in the "product" field.
  
@@ -881,6 +897,10 @@ index ec15dde761..2c4c9d63aa 100644
 +  CVE-2017-1000366 has been applied, but it is mentioned here only because
 +  of the CVE assignment.)  Reported by Qualys.
 +
++  CVE-2017-16997: Incorrect handling of RPATH or RUNPATH containing $ORIGIN
++  for AT_SECURE or SUID binaries could be used to load libraries from the
++  current directory.
++
 +The following bugs are resolved with this release:
 +
 +  [20257] sunrpc: clntudp_call does not enforce timeout when receiving data
@@ -898,6 +918,7 @@ index ec15dde761..2c4c9d63aa 100644
 +  [21778] Robust mutex may deadlock
 +  [21972] assert macro requires operator== (int) for its argument type
 +  [22322] libc: [mips64] wrong bits/long-double.h installed
++  [22627] $ORIGIN in $LD_LIBRARY_PATH is substituted twice
 +
  Version 2.25
  
@@ -1157,7 +1178,7 @@ index 61abeb59ee..cc4aeb25b6 100644
  tst-env-setuid-tunables-ENV = \
GLIBC_TUNABLES=glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index a5318f9c8d..92303b08e6 100644
+index a5318f9c8d..58e7220050 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
 @@ -37,6 +37,7 @@
@@ -1190,7 +1211,79 @@ index a5318f9c8d..92303b08e6 100644
  
  static bool
  is_trusted_path (const char *path, size_t len)
-@@ -688,9 +689,8 @@ _dl_init_paths (const char *llp)
+@@ -433,31 +434,40 @@ fillin_rpath (char *rpath, struct r_search_path_elem 
**result, const char *sep,
+ {
+   char *cp;
+   size_t nelems = 0;
+-  char *to_free;
+ 
+   while ((cp = __strsep (, sep)) != NULL)
+ {
+   struct r_search_path_elem *dirp;
++  char *to_free = NULL;
++  size_t len = 0;
+ 
+-  to_free = cp = expand_dynamic_string_token (l, cp, 1);
++  /* `strsep' can pass an empty string.  */
++  if (*cp != '\0')
++  {
++to_free = cp = expand_dynamic_string_token (l, cp, 1);
+ 
+-  size_t len = strlen (cp);
++/* expand_dynamic_string_token can return NULL in case of empty
++   path or memory allocation failure.  */
++if (cp == NULL)
++  continue;
+ 
+-