This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch sid in repository glibc.
commit 3a6d87e99cd8f7f916da2dc30d6fb35488009a08 Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Fri Dec 9 01:51:19 2016 +0100 hurd: fix trylock error return. hurd-i386/tg-libpthread-gsync-mutex.diff: Update patch. --- debian/changelog | 7 +++++++ debian/patches/hurd-i386/tg-libpthread-gsync-mutex.diff | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 470eda5..4a115b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +glibc (2.24-9) UNRELEASED; urgency=medium + + * hurd-i386/tg-libpthread-gsync-mutex.diff: Update patch, fixes trylock + error return. + + -- Samuel Thibault <sthiba...@debian.org> Fri, 09 Dec 2016 01:51:00 +0100 + glibc (2.24-8) unstable; urgency=medium [ Samuel Thibault ] diff --git a/debian/patches/hurd-i386/tg-libpthread-gsync-mutex.diff b/debian/patches/hurd-i386/tg-libpthread-gsync-mutex.diff index f245153..705d40d 100644 --- a/debian/patches/hurd-i386/tg-libpthread-gsync-mutex.diff +++ b/debian/patches/hurd-i386/tg-libpthread-gsync-mutex.diff @@ -194,7 +194,7 @@ new file mode 100644 index 0000000..8104fa3 --- /dev/null +++ b/libpthread/sysdeps/mach/hurd/pt-mutex.c -@@ -0,0 +1,548 @@ +@@ -0,0 +1,552 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + Contributed by Agustina Arzille <avarzi...@riseup.net>, 2016. + @@ -477,7 +477,7 @@ index 0000000..8104fa3 + switch (MTX_TYPE (mtxp)) + { + case PT_MTX_NORMAL: -+ ret = lll_trylock (&mtxp->__lock); ++ ret = lll_trylock (&mtxp->__lock) == 0 ? 0 : EBUSY; + break; + + case PT_MTX_RECURSIVE: @@ -495,6 +495,8 @@ index 0000000..8104fa3 + mtx_set_owner (mtxp, self, mtxp->__flags); + mtxp->__cnt = 1; + } ++ else ++ ret = EBUSY; + + break; + @@ -502,6 +504,8 @@ index 0000000..8104fa3 + self = _pthread_self (); + if ((ret = lll_trylock (&mtxp->__lock)) == 0) + mtx_set_owner (mtxp, self, mtxp->__flags); ++ else ++ ret = EBUSY; + break; + + case PT_MTX_NORMAL | PTHREAD_MUTEX_ROBUST: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git