diff options
Diffstat (limited to 'x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c')
| -rw-r--r-- | x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c index c845a8cbf236..4a3ac236fe1d 100644 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c @@ -1,5 +1,5 @@ ---- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004 -+++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004 +--- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004 ++++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004 @@ -578,7 +578,7 @@ "# by Xsetup usually.\n" "# This is not required if you use PAM with the pam_console module.\n" @@ -20,12 +20,14 @@ "\n" #ifdef _AIX "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -668,7 +668,7 @@ +@@ -667,7 +667,9 @@ + " */csh|*/tcsh)\n" " # [t]cshrc is always sourced automatically.\n" " # Note that sourcing csh.login after .cshrc is non-standard.\n" - " set -a\n" --" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n" +-" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n" ++" set -a\n" +" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n" - " set +a\n" ++" set +a\n" " ;;\n" " *) # Plain sh, ksh, and anything we don't know.\n" + " [ -f /etc/profile ] && . /etc/profile\n" |