[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

2018-01-09 Thread Balló György via arch-commits 
Date: Tuesday, January 9, 2018 @ 20:10:53
  Author: bgyorgy
Revision: 280757

upgpkg: lxdm 0.5.3-5

Switch to systemd-sysusers

Modified:
  lxdm/trunk/PKGBUILD
Deleted:
  lxdm/trunk/lxdm.install

--+
 PKGBUILD |   20 +++-
 lxdm.install |   12 
 2 files changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-09 20:10:11 UTC (rev 280756)
+++ PKGBUILD2018-01-09 20:10:53 UTC (rev 280757)
@@ -7,16 +7,14 @@
 pkgbase=lxdm
 pkgname=(lxdm lxdm-gtk3)
 pkgver=0.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight X11 Display Manager'
 arch=('x86_64')
-url="http://lxde.org/";
+url="https://lxde.org/";
 license=('GPL')
 depends=('gtk2' 'gtk3' 'xorg-server')
 makedepends=('intltool' 'iso-codes')
-optdepends=('iso-codes: show language names in language chooser'
-'librsvg: display the default background')
-install=$pkgbase.install
+optdepends=('iso-codes: show language names in language chooser')
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
@@ -43,6 +41,8 @@
   # Use our custom pam and Xsession files
   cp ../lxdm.pam pam/lxdm
   cp ../Xsession data/Xsession
+
+  autoreconf -fi
 }
 
 build() {
@@ -70,6 +70,11 @@
   cd gtk2
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Setup system user and group
+  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+  echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > 
"$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
+  echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > 
"$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
 }
 
 package_lxdm-gtk3() {
@@ -81,4 +86,9 @@
   cd gtk3
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Setup system user and group
+  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+  echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > 
"$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
+  echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > 
"$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
 }

Deleted: lxdm.install
===
--- lxdm.install2018-01-09 20:10:11 UTC (rev 280756)
+++ lxdm.install2018-01-09 20:10:53 UTC (rev 280757)
@@ -1,12 +0,0 @@
-post_install() {
-  getent passwd lxdm > /dev/null 2>&1 && \
-usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s 
/sbin/nologin lxdm > /dev/null 2>&1 || \
-useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s 
/sbin/nologin lxdm
-  mkdir -p /var/lib/lxdm
-  chown lxdm:lxdm /var/lib/lxdm
-  chmod 700 /var/lib/lxdm
-}
-
-post_upgrade() {
-  post_install
-}

[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

2016-08-03 Thread Balló György 
Date: Wednesday, August 3, 2016 @ 13:04:53
  Author: bgyorgy
Revision: 184988

upgpkg: lxdm 0.5.3-3

Simplify user management

Modified:
  lxdm/trunk/PKGBUILD
  lxdm/trunk/lxdm.install

--+
 PKGBUILD |   12 +---
 lxdm.install |   11 +--
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-03 12:24:07 UTC (rev 184987)
+++ PKGBUILD2016-08-03 13:04:53 UTC (rev 184988)
@@ -7,7 +7,7 @@
 pkgbase=lxdm
 pkgname=(lxdm lxdm-gtk3)
 pkgver=0.5.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://lxde.org/";
@@ -70,11 +70,6 @@
   cd gtk2
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
 }
 
 package_lxdm-gtk3() {
@@ -86,9 +81,4 @@
   cd gtk3
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
 }

Modified: lxdm.install
===
--- lxdm.install2016-08-03 12:24:07 UTC (rev 184987)
+++ lxdm.install2016-08-03 13:04:53 UTC (rev 184988)
@@ -1,11 +1,10 @@
 post_install() {
-  getent group lxdm > /dev/null 2>&1 && \
-groupmod -g 121 lxdm > /dev/null 2>&1 || \
-groupadd -g 121 lxdm
   getent passwd lxdm > /dev/null 2>&1 && \
-usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d 
/var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d 
/var/lib/lxdm -s /sbin/nologin lxdm
-  passwd -l lxdm > /dev/null
+usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s 
/sbin/nologin lxdm > /dev/null 2>&1 || \
+useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s 
/sbin/nologin lxdm
+  mkdir -p /var/lib/lxdm
+  chown lxdm:lxdm /var/lib/lxdm
+  chmod 700 /var/lib/lxdm
 }
 
 post_upgrade() {

[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

2015-03-08 Thread Balló György 
Date: Sunday, March 8, 2015 @ 19:35:49
  Author: bgyorgy
Revision: 128929

upgpkg: lxdm 0.5.0-4

Do not remove user/group on package removal

Modified:
  lxdm/trunk/PKGBUILD
  lxdm/trunk/lxdm.install

--+
 PKGBUILD |2 +-
 lxdm.install |4 
 2 files changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-08 18:24:51 UTC (rev 128928)
+++ PKGBUILD2015-03-08 18:35:49 UTC (rev 128929)
@@ -6,7 +6,7 @@
 
 pkgname=lxdm
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="https://sourceforge.net/projects/lxdm/";

Modified: lxdm.install
===
--- lxdm.install2015-03-08 18:24:51 UTC (rev 128928)
+++ lxdm.install2015-03-08 18:35:49 UTC (rev 128929)
@@ -11,7 +11,3 @@
 post_upgrade() {
   post_install
 }
-
-post_remove() {
-  getent passwd lxdm > /dev/null 2>&1 && userdel lxdm
-}

[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

2013-09-08 Thread Balló György 
Date: Monday, September 9, 2013 @ 00:09:54
  Author: bgyorgy
Revision: 96929

upgpkg: lxdm 0.4.1-25

Set permissions in PKGBUILD, not in .install file (FS#36770)

Modified:
  lxdm/trunk/PKGBUILD
  lxdm/trunk/lxdm.install

--+
 PKGBUILD |8 
 lxdm.install |1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-08 18:40:39 UTC (rev 96928)
+++ PKGBUILD2013-09-08 22:09:54 UTC (rev 96929)
@@ -5,7 +5,7 @@
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=24
+pkgrel=25
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/";
@@ -35,9 +35,6 @@
   # Adjust Arch-specific settings
   patch -Np1 -i ../default-config.patch
 
-  # Fix sbin location
-  sed -i 's|/sbin/|/bin/|' data/lxdm.in systemd/lxdm.service
-
   # Fix version number
   sed -i 's/3.6.0/3.8/' gnome-shell/LXDM_User_Switch@dgod/metadata.json
 }
@@ -54,8 +51,11 @@
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Home directory
   install -dm 755 "$pkgdir/var/lib/lxdm"
   echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
+  chown -R 121:121 "$pkgdir/var/lib/lxdm"
 
   # GNOME Shell extension
   mkdir -p "$pkgdir/usr/share/gnome-shell/extensions"

Modified: lxdm.install
===
--- lxdm.install2013-09-08 18:40:39 UTC (rev 96928)
+++ lxdm.install2013-09-08 22:09:54 UTC (rev 96929)
@@ -6,7 +6,6 @@
 usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d 
/var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
 useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d 
/var/lib/lxdm -s /sbin/nologin lxdm
   passwd -l lxdm > /dev/null
-  chown -R lxdm:lxdm /var/lib/lxdm > /dev/null
 }
 
 post_upgrade() {

[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

2013-08-09 Thread Daniel Wallace 
Date: Saturday, August 10, 2013 @ 00:44:09
  Author: dwallace
Revision: 95337

upgpkg: lxdm 0.4.1-23

upgpkg: lxdm 0.4.1-23 FS#36427

Modified:
  lxdm/trunk/PKGBUILD
  lxdm/trunk/lxdm.install

--+
 PKGBUILD |8 
 lxdm.install |1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-09 21:25:54 UTC (rev 95336)
+++ PKGBUILD2013-08-09 22:44:09 UTC (rev 95337)
@@ -5,7 +5,7 @@
 
 pkgname=lxdm
 pkgver=0.4.1
-pkgrel=22
+pkgrel=23
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/lxdm/";
@@ -71,12 +71,12 @@
 
 install -m644 $srcdir/lxdm.pam $pkgdir/etc/pam.d/lxdm
 install -Dm644 $srcdir/lxdm.service 
$pkgdir/usr/lib/systemd/system/lxdm.service
-install -d $pkgdir/var/{lib,run}/lxdm
+install -d $pkgdir/var/lib/lxdm
+echo "GDK_CORE_DEVICE_EVENTS\t\t\tDEFAULT=1" > 
$pkgdir/var/lib/lxdm/.pam_environment
+chmod 644 $pkgdir/var/lib/lxdm/.pam_environment
 
 # fix the greeter location
 sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
sed -i 's:sbin:bin:' $pkgdir/usr/bin/lxdm
 
-# avoid conflict with filesystem>=2012.06
-rm -r $pkgdir/var/run
 }

Modified: lxdm.install
===
--- lxdm.install2013-08-09 21:25:54 UTC (rev 95336)
+++ lxdm.install2013-08-09 22:44:09 UTC (rev 95337)
@@ -4,6 +4,7 @@
   chown -R 121:121 /var/lib/lxdm
   chgrp 121 /etc/lxdm/lxdm.conf
   chmod +r /etc/lxdm/lxdm.conf
+  systemd-tmpfiles --create lxdm.conf
 }
 
 post_upgrade() {