fix #1671 and #1580

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")    
 

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
+auth		include		system-auth
+account		include		system-auth
+password	include		system-auth
+session		include		system-auth

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
+session         required        pam_limits.so
+session         required        pam_loginuid.so
+session         optional        pam_keyinit.so revoke
+session         required        pam_limits.so

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 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

desktop/kde/plasma/sddm/files/sddm_y

@@ -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

desktop/kde/plasma/sddm/files/sddm_yedek

@@ -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

desktop/kde/plasma/sddm/pspec.xml

@@ -52,6 +52,7 @@
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/etc/sddm.conf">sddm.conf</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/pam.d/sddm">sddm</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/pam.d/sddm-autologin">sddm-autologin</AdditionalFile>
         </AdditionalFiles>
         <Provides>
             <COMAR script="service.py">System.Service</COMAR>
@@ -60,6 +61,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2016-05-18</Date>
+            <Version>0.13.0</Version>
+            <Comment>Fix session authorization issue</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2015-11-18</Date>
             <Version>0.13.0</Version>