[gentoo-commits] gentoo-x86 commit in media-gfx/splashutils/files: splashutils-1.5.4.3-splash-functions.patch splashutils-1.5.4.3-splash_util.patch

[Michael Januszewski (spock)]

spock       10/10/10 12:52:04

  Added:                splashutils-1.5.4.3-splash-functions.patch
                        splashutils-1.5.4.3-splash_util.patch
  Log:
  Add two patches to fix bug #339767.
  
  (Portage version: 2.1.9.14/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch?rev=1.1&content-type=text/plain

Index: splashutils-1.5.4.3-splash-functions.patch
===================================================================
commit 7077483874a842c607d6e877696891ba4d5f1dd7
Author: Michał Januszewski <spock@g.o>
Date:   Sat Oct 9 21:07:37 2010 +0200

    Fix a bug in splash-functions.sh.
    
    This problem was reported in Gentoo bug #339767.

diff --git a/core/scripts/splash-functions.sh.in b/core/scripts/splash-functions.sh.in
index 1a89486..2c39c6a 100644
--- a/core/scripts/splash-functions.sh.in
+++ b/core/scripts/splash-functions.sh.in
@@ -341,7 +341,7 @@ splash_comm_send() {
 
 # Returns the current splash mode.
 splash_get_mode() {
-	local ctty="${spl_bindir}/fgconsole"
+	local ctty="$({spl_bindir}/fgconsole)"
 	local mode="$(${spl_util})"
 
 	if [ "${mode}" = "silent" ]; then



1.1                  media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch?rev=1.1&content-type=text/plain

Index: splashutils-1.5.4.3-splash_util.patch
===================================================================
diff -Naurp splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in splashutils-1.5.4.3/scripts/splash-functions.sh.in
--- splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in	2010-10-09 21:44:39.127691474 +0200
+++ splashutils-1.5.4.3/scripts/splash-functions.sh.in	2010-10-09 21:44:54.678690080 +0200
@@ -26,7 +26,7 @@ export spl_cachedir="@libdir@/splash/cac
 export spl_tmpdir="@libdir@/splash/tmp"
 export spl_fifo="${spl_cachedir}/.splash"
 export spl_pidfile="${spl_cachedir}/daemon.pid"
-export spl_util="@bindir@/splash_util.static"
+export spl_util="@sbindir@/splash_util.static"
 export spl_daemon="@sbindir@/fbsplashd.static"
 export spl_decor="@sbindir@/fbcondecor_ctl.static"
 export spl_bindir="@libdir@/splash/bin"
diff -Naurp splashutils-1.5.4.3-orig//src/Makefile.am splashutils-1.5.4.3/src/Makefile.am
--- splashutils-1.5.4.3-orig//src/Makefile.am	2010-10-09 21:44:39.121691920 +0200
+++ splashutils-1.5.4.3/src/Makefile.am	2010-10-09 21:45:10.934689775 +0200
@@ -166,7 +166,7 @@ if CONFIG_FBCON_DECOR
 sbin_PROGRAMS += fbcondecor_ctl
 endif
 sbin_PROGRAMS += fbsplashd
-bin_PROGRAMS  += splash_util
+sbin_PROGRAMS += fbsplashd splash_util
 eexecsbin_PROGRAMS += fbsplashctl
 
 fbcondecor_ctl_SOURCES      = fbcon_decor_ctl.c fbcon_decor.h ../include/console_decor.h ../include/fbcondecor.h common.h fbsplash.h