r6333 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2014-11-16 11:29:46 +0000 (Sun, 16 Nov 2014)
New Revision: 6333
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 5688 (from glibc-bsd) - do not return EINTR from sigwait. Closes: #763705.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-11-15 14:27:10 UTC (rev 6332)
+++ glibc-package/trunk/debian/changelog 2014-11-16 11:29:46 UTC (rev 6333)
@@ -7,6 +7,10 @@
[ Adam Conrad ]
* debian/rules.d/tarball.mk: Fix update-from-upstream manual/* filter rule.
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 5688 (from glibc-bsd).
+ Do not return EINTR from sigwait. Closes: #763705.
+
-- Samuel Thibault <sthibault@debian.org> Fri, 07 Nov 2014 13:48:08 +0000
glibc (2.19-13) unstable; urgency=medium
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2014-11-15 14:27:10 UTC (rev 6332)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2014-11-16 11:29:46 UTC (rev 6333)
@@ -11201,7 +11201,7 @@
+weak_alias (__sigtimedwait, sigtimedwait)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sigwait.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,78 @@
+/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -11234,6 +11234,8 @@
+static int
+do_sigwait (const sigset_t *set, int *sig)
+{
++ int ret;
++
+#ifdef SIGCANCEL
+ sigset_t tmpset;
+ if (set != NULL
@@ -11252,8 +11254,11 @@
+ set = &tmpset;
+ }
+#endif
-+
-+ return INLINE_SYSCALL (sigwait, 2, set, sig);
++ do {
++ ret = INLINE_SYSCALL (sigwait, 2, set, sig);
++ } while (ret == EINTR);
++
++ return ret;
+}
+
+int
Reply to: