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

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



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 <aurelien@aurel32.net>
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  <aurelien@aurel32.net>
++
++	[BZ #22611]
++	* malloc/tst-realloc.c (do_test): Remove the test checking that errno
++	is unchanged on success.
++
 +2017-12-30  Aurelien Jarno  <aurelien@aurel32.net>
 +	    Dmitry V. Levin  <ldv@altlinux.org>
 +
@@ -3156,6 +3162,21 @@ index 0000000000..22c679b65b
 +}
 +
 +#include <support/test-driver.c>
+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


Reply to: