diff --git a/desktop/kde/plasma/sddm/actions.py b/desktop/kde/plasma/sddm/actions.py index 59ff9a2d69..18eccf9ba0 100644 --- a/desktop/kde/plasma/sddm/actions.py +++ b/desktop/kde/plasma/sddm/actions.py @@ -9,11 +9,6 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools def setup(): - shelltools.system("sed -e '/UPOWER_SERVICE)/ s:^://:' \ - -i src/daemon/PowerManager.cpp") - shelltools.system("sed -e 's/eval exec/& ck-launch-session /' \ - -i data/scripts/Xsession") - shelltools.makedirs("build") shelltools.cd("build") diff --git a/desktop/kde/plasma/sddm/files/sddm b/desktop/kde/plasma/sddm/files/sddm index b66e9367cc..f3bff58700 100644 --- a/desktop/kde/plasma/sddm/files/sddm +++ b/desktop/kde/plasma/sddm/files/sddm @@ -1,18 +1,6 @@ -# Begin /etc/pam.d/sddm +#%PAM-1.0 -auth required pam_unix.so try_first_pass nullok -auth optional pam_permit.so -auth required pam_env.so - -account required pam_unix.so -account optional pam_permit.so -account required pam_time.so - -password required pam_unix.so try_first_pass nullok sha512 shadow -password optional pam_permit.so - -session required pam_limits.so -session required pam_unix.so -session optional pam_permit.so - -# End /etc/pam.d/sddm \ No newline at end of file +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/desktop/kde/plasma/sddm/files/sddm-autologin b/desktop/kde/plasma/sddm/files/sddm-autologin index b24b3bf6cf..7cfd04f7be 100644 --- a/desktop/kde/plasma/sddm/files/sddm-autologin +++ b/desktop/kde/plasma/sddm/files/sddm-autologin @@ -1,16 +1,18 @@ -# Begin /etc/pam.d/sddm-autologin +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so -auth requisite pam_nologin.so -auth required pam_env.so +auth required pam_permit.so -auth required pam_succeed_if.so uid >= 1000 quiet -auth required pam_permit.so +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so -account include system-account +account required pam_access.so +account required pam_time.so -password required pam_deny.so +password required pam_deny.so -session required pam_limits.so -session include system-session - -# End /etc/pam.d/sddm-autologin \ No newline at end of file +session required pam_limits.so +session required pam_loginuid.so +session optional pam_keyinit.so revoke +session required pam_limits.so diff --git a/desktop/kde/plasma/sddm/files/sddm-greeter b/desktop/kde/plasma/sddm/files/sddm-greeter index b039ab5799..01381e4f8f 100644 --- a/desktop/kde/plasma/sddm/files/sddm-greeter +++ b/desktop/kde/plasma/sddm/files/sddm-greeter @@ -1,11 +1,17 @@ -# Begin /etc/pam.d/sddm-greeter +#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so +# Load environment from /etc/environment and ~/.pam_environment +auth required pam_env.so -account required pam_permit.so -password required pam_deny.so -session required pam_unix.so --session optional pam_systemd.so +# Always let the greeter start without authentication +auth required pam_permit.so -# End /etc/pam.d/sddm-greeter \ No newline at end of file +# No action required for account management +account required pam_permit.so + +# Can't change password +password required pam_deny.so + +# Setup session +session required pam_unix.so +-session optional pam_systemd.so diff --git a/desktop/kde/plasma/sddm/files/sddm_y b/desktop/kde/plasma/sddm/files/sddm_y deleted file mode 100644 index 0a76cc169d..0000000000 --- a/desktop/kde/plasma/sddm/files/sddm_y +++ /dev/null @@ -1,10 +0,0 @@ -# Begin /etc/pam.d/sddm -#%PAM-1.0 -auth substack system-auth -auth optional pam_gnome_keyring.so -account include system-auth -session optional pam_keyinit.so force revoke -session include system-auth -session optional pam_console.so -session optional pam_gnome_keyring.so auto_start -session optional pam_selinux.so diff --git a/desktop/kde/plasma/sddm/files/sddm_yedek b/desktop/kde/plasma/sddm/files/sddm_yedek deleted file mode 100644 index b66e9367cc..0000000000 --- a/desktop/kde/plasma/sddm/files/sddm_yedek +++ /dev/null @@ -1,18 +0,0 @@ -# Begin /etc/pam.d/sddm - -auth required pam_unix.so try_first_pass nullok -auth optional pam_permit.so -auth required pam_env.so - -account required pam_unix.so -account optional pam_permit.so -account required pam_time.so - -password required pam_unix.so try_first_pass nullok sha512 shadow -password optional pam_permit.so - -session required pam_limits.so -session required pam_unix.so -session optional pam_permit.so - -# End /etc/pam.d/sddm \ No newline at end of file diff --git a/desktop/kde/plasma/sddm/pspec.xml b/desktop/kde/plasma/sddm/pspec.xml index a50389668c..f11e91cbea 100644 --- a/desktop/kde/plasma/sddm/pspec.xml +++ b/desktop/kde/plasma/sddm/pspec.xml @@ -52,6 +52,7 @@ sddm.conf sddm + sddm-autologin System.Service @@ -60,6 +61,13 @@ + + 2016-05-18 + 0.13.0 + Fix session authorization issue + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + 2015-11-18 0.13.0