aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2004-11-12 10:45:40 +0800
committerlofi <lofi@FreeBSD.org>2004-11-12 10:45:40 +0800
commitd2561b322ca2c1fbe5bc8f5976b4293a25ce0cb4 (patch)
tree5032763ecea76224ef6cb0f67ce9ff358cb0a41e
parent9a3ddf1583d0533044c355f8c35c4e82765fa81e (diff)
downloadfreebsd-ports-gnome-d2561b322ca2c1fbe5bc8f5976b4293a25ce0cb4.tar.gz
freebsd-ports-gnome-d2561b322ca2c1fbe5bc8f5976b4293a25ce0cb4.tar.zst
freebsd-ports-gnome-d2561b322ca2c1fbe5bc8f5976b4293a25ce0cb4.zip
Fix some more environment nits in the kdm configuration templates, and
default to shutdown -p now for halting instead of shutdown -h now. No PORTREVISION bump since manual regeneration of kdm configuration would be required anyway. PR: 73844 Submitted by: Jose M Rodriguez <josemi@freebsd.jazztel.es>
-rw-r--r--x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kde4-runtime/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase3/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c14
-rw-r--r--x11/kdebase4/files/patch-kdm-kfrontend-config.def11
-rw-r--r--x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c14
14 files changed, 119 insertions, 56 deletions
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def b/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def b/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 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 Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-config.def b/x11/kdebase3/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kdebase3/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-config.def b/x11/kdebase4/files/patch-kdm-kfrontend-config.def
new file mode 100644
index 000000000000..3776abd3beae
--- /dev/null
+++ b/x11/kdebase4/files/patch-kdm-kfrontend-config.def
@@ -0,0 +1,11 @@
+--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004
++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004
+@@ -10,7 +10,7 @@
+ # define HALT_CMD "/usr/sbin/shutdown -h now"
+ # define REBOOT_CMD "/usr/sbin/shutdown -r now"
+ #elif defined(BSD)
+-# define HALT_CMD "/sbin/shutdown -h now"
++# define HALT_CMD "/sbin/shutdown -p now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ #elif defined(__SVR4)
+ # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
index e3027efaa8d5..c845a8cbf236 100644
--- a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004
-+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004
+--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004
++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004
@@ -578,7 +578,7 @@
"# by Xsetup usually.\n"
"# This is not required if you use PAM with the pam_console module.\n"
@@ -20,14 +20,12 @@
"\n"
#ifdef _AIX
"if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,9 +667,7 @@ static const char def_session[] =
- " */csh|*/tcsh)\n"
+@@ -668,7 +668,7 @@
" # [t]cshrc is always sourced automatically.\n"
" # Note that sourcing csh.login after .cshrc is non-standard.\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"
++" 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"
" ;;\n"
" *) # Plain sh, ksh, and anything we don't know.\n"
- " [ -f /etc/profile ] && . /etc/profile\n"