summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJauhien Piatlicki <jauhien@gentoo.org>2014-05-26 21:58:35 +0000
committerJauhien Piatlicki <jauhien@gentoo.org>2014-05-26 21:58:35 +0000
commitc02bbd609496f45474f457c98d9319fda653b392 (patch)
tree4c92d221eb2690684d5cfcd9452c6cd9cf9c79a2 /x11-misc/sddm/files
parentVersion bump, bug #508932 (diff)
downloadgentoo-2-c02bbd609496f45474f457c98d9319fda653b392.tar.gz
gentoo-2-c02bbd609496f45474f457c98d9319fda653b392.tar.bz2
gentoo-2-c02bbd609496f45474f457c98d9319fda653b392.zip
temporary fix for bug #511484, thanks to Samuli Suominen
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)
Diffstat (limited to 'x11-misc/sddm/files')
-rw-r--r--x11-misc/sddm/files/sddm-0.1.0-consolekit.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
new file mode 100644
index 000000000000..42ebf67671d0
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
@@ -0,0 +1,36 @@
+diff -r -u sddm-0.1.0/data/scripts/Xsession sddm-0.1.0.patched/data/scripts/Xsession
+--- sddm-0.1.0/data/scripts/Xsession 2013-03-19 21:23:36.000000000 +0100
++++ sddm-0.1.0.patched/data/scripts/Xsession 2014-05-26 23:40:09.654374811 +0200
+@@ -74,13 +74,13 @@
+ exec xterm -geometry 80x24-0-0
+ ;;
+ custom)
+- exec $HOME/.xsession
++ exec ck-launch-session $HOME/.xsession
+ ;;
+ default)
+- exec /usr/bin/startkde
++ exec ck-launch-session /usr/bin/startkde
+ ;;
+ *)
+- eval exec "$session"
++ eval ck-launch-session "$session"
+ ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
+diff -r -u sddm-0.1.0/services/sddm.pam sddm-0.1.0.patched/services/sddm.pam
+--- sddm-0.1.0/services/sddm.pam 2013-03-19 21:23:36.000000000 +0100
++++ sddm-0.1.0.patched/services/sddm.pam 2014-05-26 23:39:52.484616252 +0200
+@@ -3,4 +3,11 @@
+ auth include system-login
+ account include system-login
+ password include system-login
+-session include system-login
++
++session optional pam_loginuid.so
++session required pam_env.so
++session optional pam_lastlog.so silent
++session include system-auth
++-session optional pam_ck_connector.so
++session optional pam_motd.so motd=/etc/motd
++session optional pam_mail.so