--- a/ChangeLog	Fri Oct 16 05:28:13 2009 +0000
+++ b/ChangeLog	Fri Oct 16 06:57:08 2009 +0000
@@ -1,12 +1,17 @@
+2009-10-16  Halton Huo  <[email protected]>
+
+	* patches/ConsoleKit-05-sol-sigpoll.diff: Updated based on review.
+	  Roll back to use sigaction().
+
 2009-10-16  Harry Fu <[email protected]>
 	* closed/SUNWzz-gnome-l10n.spec: Move new locales as/hy/ks/ku/ky from noinst
 	section to extra section.
 
 2009-10-16  Dave Lin <[email protected]>
 
-        * SUNWgnome-commander.spec: Bump to 1.2.8.2.
-        * patches/gnome-commander-02-g11n-collation-str.diff: Removed(upstreamed).
-        * patches/gnome-commander-03-g11n-search-wz-im.diff: Removed(upstreamed).
+	* SUNWgnome-commander.spec: Bump to 1.2.8.2.
+	* patches/gnome-commander-02-g11n-collation-str.diff: Removed(upstreamed).
+	* patches/gnome-commander-03-g11n-search-wz-im.diff: Removed(upstreamed).
 	* base-specs/poppler.spec: Add "--enable-xpdf-headers" to ship xpdf 
 	  headers required by gnome-commander(1.2.8.2).
 

--- a/patches/ConsoleKit-05-sol-sigpoll.diff	Fri Oct 16 05:28:13 2009 +0000
+++ b/patches/ConsoleKit-05-sol-sigpoll.diff	Fri Oct 16 06:57:08 2009 +0000
@@ -1,38 +1,20 @@
-commit dd045db4df68e618f82c364d471b401b32ae2c40
+commit b00450b3f9284d997e2e25fd470e7df7336f03ec
 Author: Halton Huo <[email protected]>
-Date:   Thu Oct 15 18:08:37 2009 +0800
+Date:   Fri Oct 16 11:10:37 2009 +0800
 
     Fix bug console-kit-daemon exit when receiving  SIGPOLL on Solaris.
     Refer to bug http://defect.opensolaris.org/bz/show_bug.cgi?id=11612
 
 diff --git a/src/ck-vt-monitor.c b/src/ck-vt-monitor.c
-index 17b8299..6c5c411 100644
+index 17b8299..67a1f49 100644
 --- a/src/ck-vt-monitor.c
 +++ b/src/ck-vt-monitor.c
-@@ -165,12 +165,14 @@ ck_vt_monitor_get_active (CkVtMonitor    *vt_monitor,
- 
- #if defined (__sun) && defined (HAVE_SYS_VT_H)
- static void
--handle_vt_active (void)
-+handle_vt_active (int s)
- {
-         struct vt_stat state;
-         guint          num;
-         CkVtMonitor   *vt_monitor = CK_VT_MONITOR (vt_object);
- 
-+        signal (SIGPOLL, handle_vt_active);
-+
-         g_return_if_fail (CK_IS_VT_MONITOR (vt_monitor));
- 
-       /*
-@@ -391,9 +393,7 @@ vt_add_watches (CkVtMonitor *vt_monitor)
-          * the S_MSG flag in an I_SETSIG STREAMS ioctl. Such processes
-          * receive a SIGPOLL signal when a VT switching succeeds.
+@@ -393,6 +393,8 @@ vt_add_watches (CkVtMonitor *vt_monitor)
           */
--        struct sigaction act;
--        act.sa_handler = handle_vt_active;
--        sigaction (SIGPOLL, &act, NULL);
-+        signal (SIGPOLL, handle_vt_active);
+         struct sigaction act;
+         act.sa_handler = handle_vt_active;
++        sigemptyset (&act.sa_mask);
++        act.sa_flags = 0;
+         sigaction (SIGPOLL, &act, NULL);
  
          ioctl (vt_monitor->priv->vfd, I_SETSIG, S_MSG);
- #else