This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch glibc-2.23 in repository glibc.
commit 837c87111f45a0aca51802d7b4aee6fec0d5e17e Author: Aurelien Jarno <aurel...@aurel32.net> Date: Tue Jun 28 12:45:47 2016 +0200 debian/patches/git-updates.diff: update from upstream stable branch. --- debian/changelog | 7 +++++++ debian/patches/git-updates.diff | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6609d7b..a7210ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +glibc (2.23-0experimental4) UNRELEASED; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch. + + -- Aurelien Jarno <aure...@debian.org> Tue, 28 Jun 2016 12:45:35 +0200 + glibc (2.23-0experimental3) experimental; urgency=medium [ Aurelien Jarno ] diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff index 3f3ff95..7a3a8bd 100644 --- a/debian/patches/git-updates.diff +++ b/debian/patches/git-updates.diff @@ -1,10 +1,14 @@ GIT update of git://sourceware.org/git/glibc.git/release/2.23/master from glibc-2.23 diff --git a/ChangeLog b/ChangeLog -index 2e4afb7..0219113 100644 +index 2e4afb7..488381c 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,5 +1,580 @@ +@@ -1,5 +1,584 @@ ++2016-05-17 Stefan Liebler <s...@linux.vnet.ibm.com> ++ ++ * nptl/tst-cancel17.c (do_test): Wait for finishing aio_read(&a). ++ +2016-06-27 Aurelien Jarno <aurel...@aurel32.net> + + * sysdeps/mips/tst-mode-switch-1.c (main): Converted to ... @@ -3197,6 +3201,33 @@ index b65d6b4..db9b61d 100644 +compat_symbol (libpthread, __fork_alias, __fork, GLIBC_2_0); #endif +diff --git a/nptl/tst-cancel17.c b/nptl/tst-cancel17.c +index fb89292..eedd28e 100644 +--- a/nptl/tst-cancel17.c ++++ b/nptl/tst-cancel17.c +@@ -333,6 +333,22 @@ do_test (void) + + puts ("early cancellation succeeded"); + ++ if (ap == &a2) ++ { ++ /* The aio_read(&a) was not canceled because the read request was ++ already in progress. In the meanwhile aio_write(ap) wrote something ++ to the pipe and the read request either has already been finished or ++ is able to read the requested byte. ++ Wait for the read request before returning from this function because ++ the return value and error code from the read syscall will be written ++ to the struct aiocb a, which lies on the stack of this function. ++ Otherwise the stack from subsequent function calls - e.g. _dl_fini - ++ will be corrupted, which can lead to undefined behaviour like a ++ segmentation fault. */ ++ const struct aiocb *l[1] = { &a }; ++ TEMP_FAILURE_RETRY (aio_suspend(l, 1, NULL)); ++ } ++ + return 0; + } + diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 03c18d7..125a5e9 100644 --- a/nss/nss_db/db-XXX.c -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git