Mon Mar 18 00:04:36 PDT 2013

3 files changed, 24 insertions, 14 deletions

diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 2fc41c651..9ad4762cc 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86397 2013-03-16 08:12:38Z alucryd $
+# $Id: PKGBUILD 86471 2013-03-17 21:36:08Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4')
 pkgver=1.4.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ source=("https://launchpad.net/lightdm/1.4/${pkgver}/+download/${pkgbase}-${pkgv
         'xsession')
 sha256sums=('3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43'
             '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
-            'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
+            'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
             '33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
@@ -45,7 +45,7 @@ build() {
 }
 
 package_lightdm() {
-depends=('libxklavier' 'pam')
+depends=('libxklavier' 'systemd')
 optdepends=('xorg-server-xephyr: LightDM test mode'
             'accountsservice: limit visible accounts')
 backup=('etc/apparmor.d/lightdm-guest-session'
@@ -59,9 +59,17 @@ install=${pkgbase}.install
 # Install
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
-  install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
   rm -rf "${pkgdir}"/etc/init
 
+# Persistent home
+  install -dm 770 "${pkgdir}"/var/lib/lightdm
+  chmod +t "${pkgdir}"/var/lib/lightdm
+  echo 'GDK_CORE_DEVICE_EVENTS=true' > "${pkgdir}"/var/lib/lightdm/.pam_environment
+  chmod 644 "${pkgdir}"/var/lib/lightdm/.pam_environment
+
+# Session wrapper
+  install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
+
 # PAM
   install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
   install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install
index 154d93e10..7d9d99a26 100755
--- a/community/lightdm/lightdm.install
+++ b/community/lightdm/lightdm.install
@@ -1,15 +1,18 @@
 post_install() {
-    getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
-    getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /run/lightdm -s /sbin/nologin lightdm
-    passwd -l lightdm > /dev/null
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
+  getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+  getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /var/lib/lightdm -s /sbin/nologin lightdm
+  passwd -l lightdm > /dev/null
+  chown -R lightdm:lightdm /var/lib/lightdm > /dev/null
+  systemd-tmpfiles --create lightdm.conf
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
 
 post_remove() {
-    getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
-    getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+  getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+  getent group lightdm > /dev/null 2>&1 && groupdel lightdm
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm.tmpfiles b/community/lightdm/lightdm.tmpfiles
index 5199f5327..d8ef132d3 100755
--- a/community/lightdm/lightdm.tmpfiles
+++ b/community/lightdm/lightdm.tmpfiles
@@ -1,2 +1 @@
-d /run/lightdm 0775 lightdm lightdm
-f /run/lightdm/.pam_environment 0644 lightdm lightdm - GDK_CORE_DEVICE_EVENTS=true
+d /run/lightdm 0711 lightdm lightdm