SOURCES: entrance-conf.in.patch, entrance-use_bash.patch - updated...

qboosh qboosh at pld-linux.org
Sun Sep 9 19:32:09 CEST 2007 

Author: qboosh                       Date: Sun Sep  9 17:32:09 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.9.0.009

---- Files affected:
SOURCES:
   entrance-conf.in.patch (1.3 -> 1.4) , entrance-use_bash.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/entrance-conf.in.patch
diff -u SOURCES/entrance-conf.in.patch:1.3 SOURCES/entrance-conf.in.patch:1.4
--- SOURCES/entrance-conf.in.patch:1.3	Sat Jan 14 20:21:08 2006
+++ SOURCES/entrance-conf.in.patch	Sun Sep  9 19:32:04 2007
@@ -1,26 +1,45 @@
---- entrance/data/config/build_config.sh.in	2004-04-11 00:23:16.000000000 +0200
-+++ entrance/data/config/build_config.sh.in.new	2005-01-08 15:49:36.768610184 +0100
-@@ -1,5 +1,5 @@
- #!/bin/sh -e
+--- entrance-0.9.0.009/data/config/build_config.sh.in.orig	2006-09-05 02:36:29.000000000 +0200
++++ entrance-0.9.0.009/data/config/build_config.sh.in	2007-09-09 18:35:23.325602997 +0200
+@@ -19,7 +19,7 @@
+ }
+ 
+ SESSION_DIR=""
 -DB="./entrance_config.cfg"
 +DB="/var/lib/entrance/entrance_config.cfg"
- rm -f $DB
  
- # set auth to 1 for pam, 2 for shadow
-@@ -19,6 +19,8 @@
- #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
+ while [ -n "$1" ] ; do
+ 	case $1 in
+@@ -61,10 +61,10 @@
  ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
  ecore_config -c $DB -k /entrance/greeting/after -s ""
-+
-+dont_run() {
- ecore_config -c $DB -k /entrance/session/count -i 7
- ecore_config -c $DB -k /entrance/session/0/session -s "default"
- ecore_config -c $DB -k /entrance/session/0/title -s "Default"
-@@ -41,6 +43,23 @@
- ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
- ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
- ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
-+}
+ 
+-count=0
+-ecore_config -c $DB -k /entrance/session/0/session -s "default"
+-ecore_config -c $DB -k /entrance/session/0/title -s "Default"
+-ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
++#count=0
++#ecore_config -c $DB -k /entrance/session/0/session -s "default"
++#ecore_config -c $DB -k /entrance/session/0/title -s "Default"
++#ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
+ #if [ -z "$SESSION_DIR" ] ; then
+ #	count=`(expr $count + 6)`
+ #	ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
+@@ -91,12 +91,27 @@
+ #		ecore_config -c $DB -k /entrance/session/$count/icon -s "$s.png"
+ #	done
+ #fi
+-count=`(expr $count + 1)`
+-ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
+-ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
+-ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
+-count=`(expr $count + 1)`
+-ecore_config -c $DB -k /entrance/session/count -i $count
++#count=`(expr $count + 1)`
++#ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
++#ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
++#ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
++#count=`(expr $count + 1)`
++#ecore_config -c $DB -k /entrance/session/count -i $count
 +
 +ecore_config -c $DB -k /entrance/session/count -i @COUNT@
 +# lines starting with ^#session: will be parsed for each .desktop file
@@ -35,25 +54,13 @@
 +#session:ecore_config -c $DB -k /entrance/session/@NUM@/title -s "@TITLE@"
 +#session:ecore_config -c $DB -k /entrance/session/@NUM@/icon -s "@ICON@"
 +
-+. /tmp/sessions
-+
++. /var/lib/entrance/sessions
+ 
  ecore_config -c $DB -k /entrance/system/reboot -i 1
  ecore_config -c $DB -k /entrance/system/halt -i 1
- ecore_config -c $DB -k /entrance/user/remember -i 1
 --- entrance/data/Makefile.am	2003-10-22 13:29:59.000000000 +0200
 +++ entrance/data/Makefile.am.new	2005-01-08 15:50:12.962107936 +0100
 @@ -1,2 +1,2 @@
 -SUBDIRS = config images themes fonts users
 +SUBDIRS = images themes fonts users
 
---- entrance-0.9.0.005/data/Makefile.in~	2006-01-14 19:13:50.000000000 +0000
-+++ entrance-0.9.0.005/data/Makefile.in	2006-01-14 19:17:52.000000000 +0000
-@@ -123,7 +123,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- xsession = @xsession@
--SUBDIRS = config images themes fonts users
-+SUBDIRS = images themes fonts users
- subdir = data
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

================================================================
Index: SOURCES/entrance-use_bash.patch
diff -u SOURCES/entrance-use_bash.patch:1.1 SOURCES/entrance-use_bash.patch:1.2
--- SOURCES/entrance-use_bash.patch:1.1	Sat Mar 18 20:18:03 2006
+++ SOURCES/entrance-use_bash.patch	Sun Sep  9 19:32:04 2007
@@ -1,33 +1,20 @@
-diff -Nur entrance-0.9.0.006/src/client/entrance_session.c entrance-0.9.0.006.bash/src/client/entrance_session.c
---- entrance-0.9.0.006/src/client/entrance_session.c	2006-01-24 04:45:27.000000000 +0100
-+++ entrance-0.9.0.006.bash/src/client/entrance_session.c	2006-03-18 20:03:58.000000000 +0100
-@@ -480,7 +480,7 @@
-            snprintf(buf, sizeof(buf), "%s/entrance_login %i", PACKAGE_BIN_DIR,
-                     (int) pid);
-         }
--        shell = strdup("/bin/sh");
-+        shell = strdup("/bin/bash");
-         /* this bypasses a race condition where entrance loses its x
-            connection before the wm gets it and x goes and resets itself */
-         sleep(10);
-@@ -495,7 +495,7 @@
-    entrance_session_free(e);
-    /* replace this process with a clean small one that just waits for its */
-    /* child to exit.. passed on the cmd-line */
--   execl("/bin/sh", "/bin/sh", "-l", "-c", buf, NULL);
-+   execl("/bin/bash", "/bin/bash", "-l", "-c", buf, NULL);
- }
+--- entrance-0.9.0.009/src/client/entrance_session.c.orig	2007-04-03 13:36:51.000000000 +0200
++++ entrance-0.9.0.009/src/client/entrance_session.c	2007-09-09 18:38:09.567076559 +0200
+@@ -854,7 +854,7 @@
+    if (shell && (strlen(shell) > 0))
+       shell_cmd = shell;
+    else
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
  
+    if (session_name)
+       snprintf(buf, sizeof(buf), "%s %s", session_cmd, session_name);
+@@ -871,7 +871,7 @@
+       syslog(LOG_NOTICE,
+              "Neither '%s' or '/bin/sh' are working login shells for user '%s'. Your session may not function properly. ",
+              shell, user);
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
+    
+    res = execlp(shell_cmd, shell_cmd, "-c", buf, NULL);
  
-diff -Nur entrance-0.9.0.006/src/daemon/spawner.c entrance-0.9.0.006.bash/src/daemon/spawner.c
---- entrance-0.9.0.006/src/daemon/spawner.c	2006-01-24 04:45:27.000000000 +0100
-+++ entrance-0.9.0.006.bash/src/daemon/spawner.c	2006-03-18 20:02:18.000000000 +0100
-@@ -162,7 +162,7 @@
-         sigaction(SIGUSR1, &_entrance_x_sa, NULL);
-       /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
-       /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
--        execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
-+        execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
-         syslog(LOG_WARNING, "Could not execute X server.");
-         exit(1);
-      default:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/entrance-conf.in.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/entrance-use_bash.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list