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

[Daniel M. Capella]

    Date: Wednesday, January 23, 2019 @ 18:59:19
  Author: polyzen
Revision: 427304

Switch to systemd-sysusers

Added:
  bitlbee/trunk/bitlbee.sysusers.conf
Modified:
  bitlbee/trunk/PKGBUILD
  bitlbee/trunk/bitlbee.tmpfiles
Deleted:
  bitlbee/trunk/bitlbee.install

-----------------------+
 PKGBUILD              |   24 +++++++++++++-----------
 bitlbee.install       |   12 ------------
 bitlbee.sysusers.conf |    1 +
 bitlbee.tmpfiles      |    2 +-
 4 files changed, 15 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-23 18:33:00 UTC (rev 427303)
+++ PKGBUILD	2019-01-23 18:59:19 UTC (rev 427304)
@@ -1,4 +1,5 @@
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Dave Reisner <dreisner at archlinux.org>
 # Contributor: Gaetan Bisson <bisson at archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
@@ -9,22 +10,23 @@
 pkgver=3.5.1
 pkgrel=4
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
+url=http://www.bitlbee.org/
 license=('GPL')
 arch=('x86_64')
-depends=('gnutls' 'glib2')
-makedepends=('python' 'libotr')
+depends=('glib2' 'gnutls')
+makedepends=('libotr' 'python')
 optdepends=('libotr: for OTR encryption support')
 source=("https://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz"
+        'bitlbee.sysusers.conf'
         'bitlbee.tmpfiles')
-sha1sums=('de0767facdb7729253ae4d6ef6e3637ebd54939a'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+sha512sums=('4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3'
+            '0a0a0af34144b500fdb4c944e56baf9387e0031a028b80888bfcbde40c3c4e542b4f5079b2ac4890078757cc1dcdcd40dd27ee56b73af7a8df5751308a00ac80'
+            'b073dad94e33e1599d114e2c5bbdd4950119006dac7507ad5646b73c20a471709aa8acc7b92284267c0503a6fb614462bb0a34ae38df9580b8dcea18e4c5b76e')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt')
-install=bitlbee.install
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
@@ -41,8 +43,8 @@
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
+  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
 
-  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+  install -o65 -g65 -dm770 "$pkgdir"/var/lib/bitlbee
+  install -Dm644 bitlbee.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/bitlbee.conf
 }

Deleted: bitlbee.install
===================================================================
--- bitlbee.install	2019-01-23 18:33:00 UTC (rev 427303)
+++ bitlbee.install	2019-01-23 18:59:19 UTC (rev 427304)
@@ -1,12 +0,0 @@
-post_install() {
-  if ! getent group bitlbee &>/dev/null; then
-    groupadd -r -g 65 bitlbee >/dev/null
-  fi
-  if ! getent passwd bitlbee &>/dev/null; then
-    useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install
-}

Added: bitlbee.sysusers.conf
===================================================================
--- bitlbee.sysusers.conf	                        (rev 0)
+++ bitlbee.sysusers.conf	2019-01-23 18:59:19 UTC (rev 427304)
@@ -0,0 +1 @@
+u bitlbee 65 "BitlBee user" /var/lib/bitlbee

Modified: bitlbee.tmpfiles
===================================================================
--- bitlbee.tmpfiles	2019-01-23 18:33:00 UTC (rev 427303)
+++ bitlbee.tmpfiles	2019-01-23 18:59:19 UTC (rev 427304)
@@ -1 +1 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
+d /run/bitlbee 0755 bitlbee bitlbee -