[gentoo-commits] gentoo-x86 commit in media-gfx/splashutils/files: splashutils-1.5.4.3-daemon-exit-signal.patch splashutils-1.5.4.3-openrc-effects.patch

[Michael Januszewski (spock)]

spock       10/04/04 15:20:23

  Added:                splashutils-1.5.4.3-daemon-exit-signal.patch
                        splashutils-1.5.4.3-openrc-effects.patch
  Log:
  Do not enable fadeout if it's not explicitly requested, make sure all signals are processed before exiting (bug #296152).
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-daemon-exit-signal.patch?rev=1.1&content-type=text/plain

Index: splashutils-1.5.4.3-daemon-exit-signal.patch
===================================================================
diff --git a/core/src/daemon.c b/core/src/daemon.c
index e3463fc..eae23ec 100644
--- a/core/src/daemon.c
+++ b/core/src/daemon.c
@@ -306,6 +306,35 @@ void handler_alarm(int unused)
 	return;
 }
 
+int process_switch_sig(int sig)
+{
+	/* Switch from silent to verbose. */
+	if (sig == SIGUSR1) {
+		pthread_mutex_lock(&mtx_paint);
+		pthread_mutex_lock(&mtx_tty);
+		ioctl(fd_tty[config.tty_s], VT_RELDISP, 1);
+		pthread_mutex_unlock(&mtx_tty);
+
+		ctty = CTTY_VERBOSE;
+		pthread_mutex_unlock(&mtx_paint);
+		return 1;
+	/* Switch back to silent. */
+	} else if (sig == SIGUSR2) {
+		pthread_mutex_lock(&mtx_paint);
+		pthread_mutex_lock(&mtx_tty);
+		ioctl(fd_tty[config.tty_s], VT_RELDISP, 2);
+		pthread_mutex_unlock(&mtx_tty);
+
+		ctty = CTTY_SILENT;
+		pthread_mutex_unlock(&mtx_paint);
+
+		switch_silent();
+		return 2;
+	}
+
+	return 0;
+}
+
 /*
  * Signal handler.
  *
@@ -315,7 +344,7 @@ void handler_alarm(int unused)
  */
 void* thf_sighandler(void *unusued)
 {
-	sigset_t sigset;
+	sigset_t sigset, sigset_switch;
 	int sig;
 
 	/* We don't handle SIGALRM. */
@@ -329,31 +358,39 @@ void* thf_sighandler(void *unusued)
 	sigaddset(&sigset, SIGTERM);
 	sigaddset(&sigset, SIGINT);
 
+	sigemptyset(&sigset_switch);
+	sigaddset(&sigset_switch, SIGUSR1);
+	sigaddset(&sigset_switch, SIGUSR2);
+
 	while (1) {
 		sigwait(&sigset, &sig);
 
-		/* Switch from silent to verbose. */
-		if (sig == SIGUSR1) {
-			pthread_mutex_lock(&mtx_paint);
-			pthread_mutex_lock(&mtx_tty);
-			ioctl(fd_tty[config.tty_s], VT_RELDISP, 1);
-			pthread_mutex_unlock(&mtx_tty);
-
-			ctty = CTTY_VERBOSE;
-			pthread_mutex_unlock(&mtx_paint);
-		/* Switch back to silent. */
-		} else if (sig == SIGUSR2) {
-			pthread_mutex_lock(&mtx_paint);
-			pthread_mutex_lock(&mtx_tty);
-			ioctl(fd_tty[config.tty_s], VT_RELDISP, 2);
-			pthread_mutex_unlock(&mtx_tty);
-
-			ctty = CTTY_SILENT;
-			pthread_mutex_unlock(&mtx_paint);
+		process_switch_sig(sig);
+
+		/* Internally generated terminate signal */
+		if (sig == SIGINT) {
+			struct timespec timeout;
+			timeout.tv_sec = 0;
+			timeout.tv_nsec = 0;
+			bool pending = true;
+
+			/*
+			 * Process any remaining signals.  There are no guarantees as to the
+			 * order in which the signals are delivered, so we have to make sure
+			 * all pending signals are processed before exiting.
+			 */
+			while (pending) {
+				sig = sigtimedwait(&sigset_switch, NULL, &timeout);
+
+				if (sig == -1) {
+					/* No more pending signals. */
+					if (errno == EAGAIN)
+						pending = false;
+				} else {
+					process_switch_sig(sig);
+				}
+			}
 
-			switch_silent();
-		} else if (sig == SIGINT) {
-			/* internally generated terminate signal */
 			do_cleanup();
 			pthread_exit(NULL);
 		} else if (sig == SIGTERM) {



1.1                  media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-openrc-effects.patch?rev=1.1&content-type=text/plain

Index: splashutils-1.5.4.3-openrc-effects.patch
===================================================================
commit 7cf5fd02bbc6422ddbc9af7185cc47657148deb0
Author: Michał Januszewski <spock@g.o>
Date:   Sun Apr 4 16:19:40 2010 +0200

    gentoo: only enable the effects that are actually selected.

diff --git a/gentoo/splash.c b/gentoo/splash.c
index 4b9a5b9..5220571 100644
--- a/gentoo/splash.c
+++ b/gentoo/splash.c
@@ -660,7 +660,7 @@ static int splash_start(const char *runlevel)
 			 (config->type == fbspl_reboot) ? "reboot" : ((config->type == fbspl_shutdown) ? "shutdown" : "bootup"),
 			 (config->kdmode == KD_GRAPHICS) ? "--kdgraphics" : "",
 			 (config->textbox_visible) ? "--textbox" : "",
-			 (config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" :
+			 ((config->effects & (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) == (FBSPL_EFF_FADEOUT | FBSPL_EFF_FADEIN)) ? "--effects=fadeout,fadein" :
 				 ((config->effects & FBSPL_EFF_FADEOUT) ? "--effects=fadeout" :
 					 ((config->effects & FBSPL_EFF_FADEIN) ? "--effects=fadein" : "")));
 
@@ -716,11 +716,7 @@ static int splash_stop(const char *runlevel)
 
 	/* If we don't get a runlevel argument, then we're being executed
 	 * because of a rc-abort event and we don't save any data. */
-	if (runlevel == NULL) {
-		return fbsplash_cache_cleanup(NULL);
-	} else {
-		return fbsplash_cache_cleanup(save);
-	}
+	return fbsplash_cache_cleanup(save);
 }
 
 int rc_plugin_hook(RC_HOOK hook, const char *name)

commit d711147fc835cf408a9a4e7432fc565a6b952183
Author: Michał Januszewski <spock@g.o>
Date:   Sun Apr 4 16:57:23 2010 +0200

    gentoo: add some comments in splash.conf

diff --git a/gentoo/splash.conf b/gentoo/splash.conf
index 4cf0a32..f056382 100644
--- a/gentoo/splash.conf
+++ b/gentoo/splash.conf
@@ -21,7 +21,10 @@ SPLASH_TEXTBOX="no"
 SPLASH_AUTOVERBOSE="0"
 
 # Name of the boot service starting X.  Useful in cases when X is started
-# by a custom initscript, other than the usual 'xdm'.
+# by a custom initscript, other than the usual 'xdm'.  If you are using a
+# custom X initscript and do not set this variable correctly, do not be
+# surprised if you end up at tty1 at the end of the boot process (instead of
+# in an X session).
 # SPLASH_XSERVICE="xdm"
 
 #########################################################################