This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 22d5b04819ac6adb8874719386419881de31baa4
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Fri Oct 14 15:59:10 2016 +0000
hurd-i386/cvs-setcancelstate.diff: work around a bug with newer libpthread
snapshot.
---
debian/changelog | 2 ++
debian/patches/hurd-i386/cvs-setcancelstate.diff | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 27 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 232ebce..23e7969 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium
hurd-i386/tg-timer_routines.diff.
* hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff: Restore malloc_hook for
now for mach-defpager.
+ * hurd-i386/cvs-setcancelstate.diff: New patch to work around a bug with
+ newer libpthread snapshot.
[ Adam Conrad ]
* debian/rules.d/tarball.mk: Apply --no-renames to make the diff readable.
diff --git a/debian/patches/hurd-i386/cvs-setcancelstate.diff
b/debian/patches/hurd-i386/cvs-setcancelstate.diff
new file mode 100644
index 0000000..e8d7465
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-setcancelstate.diff
@@ -0,0 +1,24 @@
+For some yet unknown reason, fixes exec crash at boot due to ext2fs.static
+including this.
+
+Index: glibc-2.24/libpthread/pthread/pt-exit.c
+===================================================================
+--- glibc-2.24.orig/libpthread/pthread/pt-exit.c
++++ glibc-2.24/libpthread/pthread/pt-exit.c
+@@ -39,14 +39,14 @@ __pthread_exit (void *status)
+ /* Run any cancelation handlers. According to POSIX, the
+ cancellation cleanup handlers should be called with cancellation
+ disabled. */
+- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
++ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
+
+ for (handlers = __pthread_get_cleanup_stack ();
+ *handlers;
+ *handlers = (*handlers)->__next)
+ (*handlers)->__handler ((*handlers)->__arg);
+
+- __pthread_setcancelstate (oldstate, &oldstate);
++ pthread_setcancelstate (oldstate, &oldstate);
+
+ /* Decrease the number of threads. We use an atomic operation to
+ make sure that only the last thread calls `exit'. */
diff --git a/debian/patches/series b/debian/patches/series
index a0a10b3..1f04c9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -131,6 +131,7 @@ hurd-i386/tg-gsync-libc.diff
hurd-i386/cvs-adjtime-NULL.diff
hurd-i386/tg-pthread_deps.diff
hurd-i386/cvs-mallocfork.diff
+hurd-i386/cvs-setcancelstate.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
