r5421 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2012-11-27 21:57:18 +0000 (Tue, 27 Nov 2012)
New Revision: 5421
Added:
glibc-package/trunk/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff
Removed:
glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-sigstate_is_global_rcv.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
basically mv unsubmitted-sigstate_is_global_rcv.diff tg-hurdsig-boot-fix.diff
(actually import patch from topgit)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-11-27 02:13:47 UTC (rev 5420)
+++ glibc-package/trunk/debian/changelog 2012-11-27 21:57:18 UTC (rev 5421)
@@ -19,8 +19,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/unsubmitted-sigstate_is_global_rcv.diff to fix
- sigstate_is_global_rcv in libpthread-based translators.
+ * 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/trunk/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff (from rev 5420, glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-sigstate_is_global_rcv.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-hurdsig-boot-fix.diff 2012-11-27 21:57:18 UTC (rev 5421)
@@ -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)
Deleted: glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-sigstate_is_global_rcv.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-sigstate_is_global_rcv.diff 2012-11-27 02:13:47 UTC (rev 5420)
+++ glibc-package/trunk/debian/patches/hurd-i386/unsubmitted-sigstate_is_global_rcv.diff 2012-11-27 21:57:18 UTC (rev 5421)
@@ -1,20 +0,0 @@
-commit 6b2fca45129f07f1575a5a6e5a719090b59555d6
-Author: Richard Braun <rbraun@sceen.net>
-Date: Wed Sep 5 11:27:05 2012 +0200
-
- Hurd: fix sigstate_is_global_rcv
-
-diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
-index 736ce3d..87c685b 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
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2012-11-27 02:13:47 UTC (rev 5420)
+++ glibc-package/trunk/debian/patches/series 2012-11-27 21:57:18 UTC (rev 5421)
@@ -211,7 +211,7 @@
hurd-i386/unsubmitted-gnumach.defs.diff
hurd-i386/submitted-fork_port_leak.diff
hurd-i386/libpthread_hurd_cond_wait.diff
-hurd-i386/unsubmitted-sigstate_is_global_rcv.diff
+hurd-i386/tg-hurdsig-boot-fix.diff
kfreebsd/submitted-libc_once.diff
kfreebsd/local-getaddrinfo-freebsd-kernel.diff
Reply to: