rpms/rhgb/devel rhgb-0.17.7-dri.patch, NONE, 1.1 rhgb-0.17.7-strict-exit.patch, 1.2, 1.3 rhgb.spec, 1.86, 1.87

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/rhgb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1186

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-0.17.7-dri.patch rhgb-0.17.7-strict-exit.patch 
Log Message:
* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 0.17.7-4
- rhgb-0.17.7-strict-exit.patch: Re-add, dropped during the epoch.
- rhgb-0.17.7-dri.patch: Don't disable DRI durign rhgb.


rhgb-0.17.7-dri.patch:

--- NEW FILE rhgb-0.17.7-dri.patch ---
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	2008-01-22 13:50:19.000000000 -0500
+++ rhgb-0.17.7/src/main.c	2008-01-22 13:50:49.000000000 -0500
@@ -50,10 +50,9 @@
 #define X_CONFIG "/etc/rhgb/xorg.conf"
 #define XLOGFILE TMPPATH"/xorg.log"
 #define DEBUGFILE TMPPATH"/rhgb.debug"
-#define X_NO_DRI "-extension XFree86-DRI"
 #define VT_NAME "/dev/tty8"
-#define X_COMMAND1 "/usr/bin/Xorg -br -s off -dpms -v -nolock -logfile " XLOGFILE " " X_NO_DRI " " DISPLAY_NO " vt8"
-#define X_COMMAND2 "/usr/bin/Xorg -br -config " X_CONFIG " -s off -dpms -v -nolock -logfile " XLOGFILE " " X_NO_DRI " " DISPLAY_NO " vt8"
+#define X_COMMAND1 "/usr/bin/Xorg -br -s off -dpms -v -nolock -logfile " XLOGFILE " " DISPLAY_NO " vt8"
+#define X_COMMAND2 "/usr/bin/Xorg -br -config " X_CONFIG " -s off -dpms -v -nolock -logfile " XLOGFILE " " DISPLAY_NO " vt8"
 #define NETWORK_COMMAND "/sbin/ifconfig lo " LOCALHOST " up"
 #define DISPLAY_ENV "DISPLAY=" DISPLAY_STRING
 #define FIX_INIT_COMMAND "/sbin/change_console -r"

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	22 Jan 2008 18:52:50 -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/devel/rhgb.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- rhgb.spec	12 Nov 2007 16:33:37 -0000	1.86
+++ rhgb.spec	22 Jan 2008 18:52:50 -0000	1.87
@@ -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,16 @@
 BuildRequires: libxf86config-devel >= 1.1.1-7
 Requires: initscripts >= 7.22-1
 Requires: system-logos
+Patch0: rhgb-0.17.7-strict-exit.patch
+Patch1: rhgb-0.17.7-dri.patch
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
 
 %prep
 %setup -q
+%patch0 -p1 -b .strict-exit
+%patch1 -p1 -b .dri
 
 %build
 %configure
@@ -52,6 +56,10 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 0.17.7-4
+- rhgb-0.17.7-strict-exit.patch: Re-add, dropped during the epoch.
+- rhgb-0.17.7-dri.patch: Don't disable DRI durign rhgb.
+
 * Mon Nov 12 2007 Ray Strode <rstrode at redhat.com> 0.17.7-3
 - downgrade rhgb to 0.17.7 to work around some problems that 
   aren't going to be fixed for a while (if at all).