lxde-base/lxdm: Version bump

Package-Manager: portage-2.3.0

2 files changed, 87 insertions, 0 deletions

diff --git a/lxde-base/lxdm/files/Xsession b/lxde-base/lxdm/files/Xsession
new file mode 100644
index 000000000000..d5df36fbb66d
--- /dev/null
+++ b/lxde-base/lxdm/files/Xsession
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# LXDM wrapper to run around X sessions.
+# Copied form lightdm
+
+echo "Running X session wrapper"
+
+#Convert MATE to lower case util MATE scripts are fixed
+[ "$DESKTOP_SESSION" = "MATE" ] && DESKTOP_SESSION=mate
+export DESKTOP_SESSION
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -nocpp -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command="$@"
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Load Xsession scripts
+xsessionddir="/etc/X11/Xsession.d"
+if [ -d "$xsessionddir" ]; then
+    for i in `ls $xsessionddir`; do
+        script="$xsessionddir/$i"
+        echo "Loading X session script $script"
+        if [ -r "$script"  -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            . "$script"
+        fi
+    done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $command
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
new file mode 100644
index 000000000000..8fb8cb4d3882
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-pam_console-disable.patch
@@ -0,0 +1,8 @@
+--- lxdm-0.4.0.orig/pam/lxdm
++++ lxdm-0.4.0/pam/lxdm
+@@ -5,4 +5,4 @@ account    include	system-auth
+ session    optional	pam_keyinit.so force revoke
+ session    include	system-auth
+-session    optional	pam_console.so
++#session    optional	pam_console.so
+ session    optional	pam_gnome_keyring.so auto_start