[arch-commits] Commit in lightdm/trunk (4 files)

[Maxime Gauduin]

    Date: Wednesday, March 13, 2013 @ 19:30:11
  Author: alucryd
Revision: 86226

upgpkg: lightdm 1.5.1-5

Modified:
  lightdm/trunk/PKGBUILD
  lightdm/trunk/Xsession
  lightdm/trunk/lightdm-autologin.pam
  lightdm/trunk/lightdm.pam

-----------------------+
 PKGBUILD              |   22 ++++++++++------------
 Xsession              |    6 +++++-
 lightdm-autologin.pam |   29 ++++++++++-------------------
 lightdm.pam           |   17 ++++++-----------
 4 files changed, 31 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-13 15:08:23 UTC (rev 86225)
+++ PKGBUILD	2013-03-13 18:30:11 UTC (rev 86226)
@@ -5,7 +5,7 @@
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
 pkgver=1.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/lightdm"
@@ -25,13 +25,13 @@
 sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
             '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
             'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
-            'db5526d0a76be0d2ed39d19c83a83e1a4774b93e9651aa4f5d1feadcd4fe4c34'
-            '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2'
+            'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
+            'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
             '4bb044fc1d0524535e108627197facf95687dc21acde5ad77799d97ad16bb3eb'
             '8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
             '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-            'fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9')
+            '66e12ef7ed34df78f8c17fb211b9e25f33446a2a702c34141f4917d6413ce883')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -48,14 +48,12 @@
 
 package_lightdm() {
 depends=('libgcrypt' 'libxklavier' 'pam')
-optdepends=('xorg-server-xephyr: run lightdm in test mode'
-            'accountsservice: limit account shown by the greeter')
-backup=(etc/apparmor.d/lightdm-guest-session
-        etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
-        etc/lightdm/keys.conf
-        etc/lightdm/lightdm.conf
-        etc/lightdm/users.conf
-        etc/pam.d/lightdm)
+optdepends=('xorg-server-xephyr: LightDM test mode'
+            'accountsservice: limit visible accounts')
+backup=('etc/apparmor.d/lightdm-guest-session'
+        'etc/lightdm/keys.conf'
+        'etc/lightdm/lightdm.conf'
+        'etc/lightdm/users.conf')
 install=${pkgbase}.install
 
   cd "${srcdir}"/${pkgbase}-${pkgver}

Modified: Xsession
===================================================================
--- Xsession	2013-03-13 15:08:23 UTC (rev 86225)
+++ Xsession	2013-03-13 18:30:11 UTC (rev 86226)
@@ -27,7 +27,7 @@
         setxkbmap `cat "$file"`
         XKB_IN_USE=yes
     fi
-done    
+done
 
 # Load xmodmap if not using XKB
 if [ -z "$XKB_IN_USE" ]; then
@@ -63,6 +63,10 @@
         fi
     done
 fi
+if [ -x "$HOME/.Xsession" -a -f "$HOME/.Xsession" ]; then
+    echo "Loading user X session script"
+        . "$HOME/.Xsession"
+fi
 
 echo "X session wrapper complete, running session $@"
 

Modified: lightdm-autologin.pam
===================================================================
--- lightdm-autologin.pam	2013-03-13 15:08:23 UTC (rev 86225)
+++ lightdm-autologin.pam	2013-03-13 18:30:11 UTC (rev 86226)
@@ -1,20 +1,11 @@
 #%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
+auth        required    pam_env.so$
+auth        required    pam_tally.so file=/var/log/faillog onerr=succeed$
+auth        required    pam_shells.so$
+auth        required    pam_nologin.so$
+auth        required    pam_permit.so$
+-auth       optional    pam_gnome_keyring.so$
+account     include     system-local-login$
+password    include     system-local-login$
+session     include     system-local-login$
+-session    optional    pam_gnome_keyring.so auto_start

Modified: lightdm.pam
===================================================================
--- lightdm.pam	2013-03-13 15:08:23 UTC (rev 86225)
+++ lightdm.pam	2013-03-13 18:30:11 UTC (rev 86226)
@@ -1,12 +1,7 @@
 #%PAM-1.0
-auth requisite pam_nologin.so
-auth required pam_env.so
-auth required pam_unix.so
--auth optional pam_gnome_keyring.so
-account required pam_unix.so
-session required pam_limits.so
-session required pam_unix.so
-password required pam_unix.so
--session optional pam_loginuid.so
--session optional pam_systemd.so
--session optional pam_gnome_keyring.so auto_start
\ No newline at end of file
+auth        include     system-login
+-auth       optional    pam_gnome_keyring.so
+account     include     system-login
+password    include     system-login
+session     include     system-login
+-session    optional    pam_gnome_keyring.so auto_start