r5423 - in glibc-package/branches/eglibc-2.16/debian: . patches patches/hurd-i386
Author: adconrad
Date: 2012-11-27 23:55:28 +0000 (Tue, 27 Nov 2012)
New Revision: 5423
Added:
glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/patches/series
Log:
Merge from unstable
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-27 23:46:48 UTC (rev 5422)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-27 23:55:28 UTC (rev 5423)
@@ -471,6 +471,8 @@
* Add patches/hurd-i386/submitted-fork_port_leak.diff: New patch to fix port
leak on fork.
* libc0.3.symbols.hurd-i386: Add libpthread.so.0.3 symbols.
+ * Add patches/hurd-i386/tg-hurdsig-boot-fix.diff to fix
+ sigstate_is_global_rcv at boot in libpthread-based translators.
-- Adam Conrad <adconrad@0c3.net> Mon, 19 Nov 2012 14:23:26 -0700
Copied: glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff (from rev 5422, glibc-package/trunk/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff)
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff (rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff 2012-11-27 23:55:28 UTC (rev 5423)
@@ -0,0 +1,25 @@
+2012-09-05 Richard Braun <rbraun@sceen.net>
+
+ * hurd/hurdsig.c (sigstate_is_global_rcv): Do not return true
+ if _HURD_GLOBAL_SIGSTATE is null.
+
+---
+ hurd/hurdsig.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
+index 140f951..7840cd5 100644
+--- a/hurd/hurdsig.c
++++ b/hurd/hurdsig.c
+@@ -159,7 +159,8 @@ _hurd_sigstate_set_global_rcv (struct hurd_sigstate *ss)
+ static int
+ sigstate_is_global_rcv (const struct hurd_sigstate *ss)
+ {
+- return ss->actions[0].sa_handler == SIG_IGN;
++ return (_hurd_global_sigstate != NULL)
++ && (ss->actions[0].sa_handler == SIG_IGN);
+ }
+
+ /* Lock/unlock a hurd_sigstate structure. If the accessors below require
+--
+tg: (2ac13c4..) t/hurdsig-boot-fix (depends on: t/hurdsig-global-dispositions)
Modified: glibc-package/branches/eglibc-2.16/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-27 23:46:48 UTC (rev 5422)
+++ glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-27 23:55:28 UTC (rev 5423)
@@ -121,6 +121,7 @@
hurd-i386/unsubmitted-gnumach.defs.diff
hurd-i386/submitted-fork_port_leak.diff
hurd-i386/libpthread_hurd_cond_wait.diff
+hurd-i386/tg-hurdsig-boot-fix.diff
hurd-i386/cvs-add-missing-includes.diff
hurd-i386/submitted-libpthread-elf.diff
hurd-i386/cvs-mach-check-local-headers.sh.diff
Reply to: