rpms/rhgb/F-8 rhgb-0.17.7-strict-exit.patch, 1.2, 1.3 rhgb.spec, 1.87, 1.88
Ray Strode (rstrode)
fedora-extras-commits at redhat.com
Wed Apr 9 14:36:31 UTC 2008
- Previous message (by thread): rpms/yum/devel yum-big-head.patch, NONE, 1.1 yum.spec, 1.204, 1.205 yum-3.2.5-close.patch, 1.1, NONE yum-3.2.8-livecd-work.patch, 1.1, NONE yum-comps-write.patch, 1.1, NONE yum-mutual-obsoletes-providers.patch, 1.1, NONE yum-showasdep.patch, 1.1, NONE yum-trans-display-object.patch, 1.1, NONE yum-tsts.patch, 1.1, NONE
- Next message (by thread): rpms/rsync/F-8 rsync-3.0.1-xattr-alloc.diff, 1.1, 1.2 rsync.spec, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/pkgs/rpms/rhgb/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17857
Modified Files:
rhgb.spec
Added Files:
rhgb-0.17.7-strict-exit.patch
Log Message:
- Add strict-exit patch from Adam Jackson and Linus Torvalds
to prevent race condition between rhgb X shutdown and gdm
X startup
rhgb-0.17.7-strict-exit.patch:
Index: rhgb-0.17.7-strict-exit.patch
===================================================================
RCS file: rhgb-0.17.7-strict-exit.patch
diff -N rhgb-0.17.7-strict-exit.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rhgb-0.17.7-strict-exit.patch 9 Apr 2008 14:35:56 -0000 1.3
@@ -0,0 +1,82 @@
+diff -up rhgb-0.17.7/src/rhgb-client.c.jx rhgb-0.17.7/src/rhgb-client.c
+--- rhgb-0.17.7/src/rhgb-client.c.jx 2004-09-14 13:02:57.000000000 -0400
++++ rhgb-0.17.7/src/rhgb-client.c 2007-10-09 16:02:24.000000000 -0400
+@@ -107,7 +107,7 @@ quit_watcher (GIOChannel *source,
+ case G_IO_STATUS_NORMAL:
+ if (bytes_read >= 20)
+ goto done;
+- if (strcmp (buffer, "done"))
++ if (!strcmp (buffer, "done"))
+ g_main_loop_quit (loop);
+ return TRUE;
+ case G_IO_STATUS_AGAIN:
+diff -up rhgb-0.17.7/src/main.c.jx rhgb-0.17.7/src/main.c
+--- rhgb-0.17.7/src/main.c.jx 2007-10-01 10:00:38.000000000 -0400
++++ rhgb-0.17.7/src/main.c 2007-10-09 15:09:30.000000000 -0400
+@@ -164,18 +164,24 @@ DEBUG_MESSAGE (const char *message, ...)
+ g_free (full_message);
+ }
+
+-/*
+- * The shutdown function. Kill the specific X process, and umount
+- * the special filesystem
+- */
+ static void
+-rhgb_shutdown(void)
++do_quit(void)
+ {
+ if (child_pid > 0) {
+ kill (child_pid, SIGTERM);
+ waitpid(child_pid, NULL, 0);
+ child_pid = 0;
+ }
++}
++
++/*
++ * The shutdown function. Kill the specific X process, and umount
++ * the special filesystem
++ */
++static void
++rhgb_shutdown(void)
++{
++ do_quit();
+ if (socket_fd >= 0) {
+ close(socket_fd);
+ socket_fd = -1;
+@@ -198,11 +204,7 @@ rhgb_shutdown(void)
+ */
+ static void
+ got_signal(int no ATTRIBUTE_UNUSED) {
+- if (child_pid > 0) {
+- kill (child_pid, SIGTERM);
+- waitpid(child_pid, NULL, 0);
+- child_pid = 0;
+- }
++ do_quit();
+ if (socket_fd >= 0) {
+ close(socket_fd);
+ }
+@@ -381,11 +383,7 @@ static void
+ setup_failed (void)
+ {
+ /* Do something */
+- if (child_pid > 0) {
+- kill (child_pid, SIGTERM);
+- waitpid(child_pid, NULL, 0);
+- child_pid = 0;
+- }
++ do_quit();
+ close(socket_fd);
+ close(pipe_fd);
+ unlink(SOCKET_NAME);
+@@ -655,8 +653,9 @@ handle_command (char *command, gint retu
+ if (! strcmp (command, "quit"))
+ {
+ gtk_main_quit ();
+- write (return_fd, "done", strlen("done") + 1);
+ update_progress_bar("loginscreen");
++ do_quit();
++ write (return_fd, "done", strlen("done") + 1);
+ }
+ else if (! strcmp (command, "ping"))
+ {
Index: rhgb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/F-8/rhgb.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- rhgb.spec 2 Nov 2007 01:43:58 -0000 1.87
+++ rhgb.spec 9 Apr 2008 14:35:56 -0000 1.88
@@ -3,7 +3,7 @@
Summary: Red Hat Graphical Boot
Name: rhgb
Version: 0.17.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
URL: http://www.redhat.com/
Source0: %{name}-%{version}.tar.gz
@@ -17,12 +17,14 @@
BuildRequires: libxf86config-devel >= 1.1.1-7
Requires: initscripts >= 7.22-1
Requires: system-logos
+Patch0: rhgb-0.17.7-strict-exit.patch
%description
Red Hat Graphical Boot provides a clean and simple interface to the boot process
%prep
%setup -q
+%patch0 -p1 -b .strict-exit
%build
%configure
@@ -52,6 +54,11 @@
%dir %{_sysconfdir}/rhgb/temp
%changelog
+* Wed Apr 09 2008 Ray Strode <rstrode at redhat.com> 0.17.7-4
+- Add strict-exit patch from Adam Jackson and Linus Torvalds
+ to prevent race condition between rhgb X shutdown and gdm
+ X startup
+
* Thu Nov 01 2007 Ray Strode <rstrode at redhat.com> 0.17.7-3
- Downgrade rhgb for F-8 release, since 8.0.2 is causing
problems on some machines.
- Previous message (by thread): rpms/yum/devel yum-big-head.patch, NONE, 1.1 yum.spec, 1.204, 1.205 yum-3.2.5-close.patch, 1.1, NONE yum-3.2.8-livecd-work.patch, 1.1, NONE yum-comps-write.patch, 1.1, NONE yum-mutual-obsoletes-providers.patch, 1.1, NONE yum-showasdep.patch, 1.1, NONE yum-trans-display-object.patch, 1.1, NONE yum-tsts.patch, 1.1, NONE
- Next message (by thread): rpms/rsync/F-8 rsync-3.0.1-xattr-alloc.diff, 1.1, 1.2 rsync.spec, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list