diff options
Diffstat (limited to 'x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c')
| -rw-r--r-- | x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c index 7cdc766f794f..e3027efaa8d5 100644 --- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c @@ -20,12 +20,14 @@ "\n" #ifdef _AIX "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -668,7 +668,7 @@ +@@ -667,9 +667,7 @@ static const char def_session[] = + " */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; if (-f ~/.login) source ~/.login; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|_)=\"'`\n" -+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; /usr/bin/env | egrep -v \"^(TERM|SHLVL)=\"'`\n" - " set +a\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" +-" 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 export'`\n" " ;;\n" " *) # Plain sh, ksh, and anything we don't know.\n" + " [ -f /etc/profile ] && . /etc/profile\n" |