Fri May 24 00:06:06 PDT 2013

3 files changed, 66 insertions, 24 deletions

diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 2f1f91bae..6c5b8036d 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $
+# $Id: PKGBUILD 91463 2013-05-23 00:34:07Z dwallace $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=21
+pkgrel=22
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/"
@@ -13,6 +13,7 @@ license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'xorg-server')
 makedepends=('intltool')
+optdepends=('librsvg: display the default background')
 install=${pkgname}.install
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
@@ -25,13 +26,27 @@ source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
 		lxdm-0.4.1-industrial-greeter-ui.patch
 		lxdm-0.4.1-modern-systems.patch
 		lxdm-0.4.1-nolang-show-sessions.patch
-		lxdm-0.4.1-pam-env-vars.patch)
+		lxdm-0.4.1-pam-env-vars.patch
+        lxdm-0.4.1-kill_user_processes.patch
+        )
+md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
+         '9cc734228696a3c6f06d91bba61b03c1'
+         'b86317143ae44d7ed38c150fe4f25502'
+         'd2e4a4a22ee2aa1a986be154c647b6c6'
+         'c50dd01b715b0a236407d48066191601'
+         'a1e3c46a8bef691bc544028f5b6cfe22'
+         '2c4afdbe3532be4f90d8f6240d352766'
+         'baed9055e8825a5511712bc095197519'
+         '28475239d0c8b4fd778ec49f5ec72962'
+         '4c1d43e81e9a256e8d1ea7686c24b3d3'
+         '3ac63085f9df9296dfa645fa623af0e2')
 
 prepare(){
     cd $srcdir/$pkgname-$pkgver
     patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch
     patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch
     patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch
+    patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch
 }
 
 build() {
@@ -65,14 +80,3 @@ package() {
     # avoid conflict with filesystem>=2012.06
     rm -r $pkgdir/var/run
 }
-
-md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'b86317143ae44d7ed38c150fe4f25502'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         'c50dd01b715b0a236407d48066191601'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         'baed9055e8825a5511712bc095197519'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3')
diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
new file mode 100644
index 000000000..f267b105a
--- /dev/null
+++ b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch
@@ -0,0 +1,35 @@
+diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c
+--- lxdm/src/xconn.c	2012-12-23 19:27:04.512531088 -0800
++++ lxdm/src/xconn.c	2012-12-23 19:28:31.659227448 -0800
+@@ -172,7 +172,7 @@
+ 	free(c);
+ }
+ 
+-#if 0
++//#if 0
+ static xcb_window_t xconn_get_root(xconn_t c)
+ {
+ 	const xcb_setup_t *setup;
+@@ -181,11 +181,11 @@
+ 	xcb_screen_t *screen = iter.data;
+ 	return screen->root;
+ }
+-#endif
++//#endif
+ 
+ void xconn_clean(xconn_t c)
+ {
+-#if 0
++//#if 0
+ 	xcb_query_tree_cookie_t wintree;
+ 	xcb_query_tree_reply_t *rep;
+ 	xcb_window_t *children;
+@@ -202,7 +202,7 @@
+ 		xcb_kill_client(c->c,children[i]);
+ 	free(rep);
+ 	xcb_flush(c->c);
+-#endif
++//#endif
+ }
+ 
+ #endif
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 4d1285dc5..875dc59e3 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -1,18 +1,21 @@
 post_install() {
-    if ! getent group lxdm > /dev/null ; then
-        groupadd --system lxdm
-        chgrp -R lxdm /var/lib/lxdm
-        chgrp lxdm /etc/lxdm/lxdm.conf
-        chmod +r /etc/lxdm/lxdm.conf
-    fi
+  getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm
+  getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm
+  chown -R 121:121 /var/lib/lxdm
+  chgrp 121 /etc/lxdm/lxdm.conf
+  chmod +r /etc/lxdm/lxdm.conf
 }
 
 post_upgrade() {
-    post_install $1
+  post_install $1
+  if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then
+    groupmod -g 121 lxdm
+    usermod -g 121 -u 121 lxdm
+  fi
 }
 
 post_remove() {
-    if ! getent group lxdm > /dev/null ; then
-        groupdel lxdm
-    fi
+  userdel -f lxdm
+  groupdel lxdm
+  true
 }