increment pkgrel to 2; systemd-sysusers

4 files changed, 14 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a26e831e924..a82b9d2f8497 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar  1 06:32:38 UTC 2018
+# Tue Mar 20 20:51:22 UTC 2018
 pkgbase = bitcoin-core
 	pkgdesc = Bitcoin Core headless P2P node
 	pkgver = 0.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitcoin.org
 	install = bitcoin.install
 	arch = armv6h
@@ -36,11 +36,13 @@ pkgbase = bitcoin-core
 	source = bitcoin.logrotate
 	source = bitcoin.service
 	source = bitcoin-reindex.service
+	source = bitcoin-sysusers.conf
 	sha256sums = 8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40
 	sha256sums = b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35
 	sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
 	sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880
 	sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679
+	sha256sums = f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a
 
 pkgname = bitcoin-core
 
diff --git a/PKGBUILD b/PKGBUILD
index 68685b88a791..e8aff6789c74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitcoin-core
 pkgver=0.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Bitcoin Core headless P2P node"
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
 url="https://bitcoin.org"
@@ -22,12 +22,14 @@ source=(https://bitcoin.org/bin/bitcoin-core-$pkgver/bitcoin-$pkgver.tar.gz
         bitcoin.conf
         bitcoin.logrotate
         bitcoin.service
-        bitcoin-reindex.service)
+        bitcoin-reindex.service
+        bitcoin-sysusers.conf)
 sha256sums=('8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40'
             'b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35'
             '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
             '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880'
-            '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679')
+            '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679'
+            'f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a')
 backup=('etc/bitcoin/bitcoin.conf'
         'etc/logrotate.d/bitcoin')
 provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx')
@@ -98,6 +100,10 @@ package() {
   install -Dm 644 "$srcdir/bitcoin-reindex.service" \
     -t "$pkgdir/usr/lib/systemd/system"
 
+  msg2 'Installing bitcoin-sysusers.conf...'
+  install -Dm 644 "$srcdir/bitcoin-sysusers.conf" \
+    "$pkgdir/usr/lib/sysusers.d/bitcoin.conf"
+
   msg2 'Installing bitcoin.logrotate...'
   install -Dm 644 "$srcdir/bitcoin.logrotate" "$pkgdir/etc/logrotate.d/bitcoin"
 
diff --git a/bitcoin-sysusers.conf b/bitcoin-sysusers.conf
new file mode 100644
index 000000000000..7d1beba616e7
--- /dev/null
+++ b/bitcoin-sysusers.conf
@@ -0,0 +1 @@
+u bitcoin - "Bitcoin daemon user" /etc/bitcoin -
diff --git a/bitcoin.install b/bitcoin.install
index 9f89c61570eb..88bb26a29b72 100644
--- a/bitcoin.install
+++ b/bitcoin.install
@@ -2,37 +2,19 @@ _bc_user=bitcoin
 _bc_group=bitcoin
 
 post_install() {
-  _mkuser
   chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin
   printf "%b\n" "$bitcoin"
 }
 
 post_upgrade() {
-  _mkuser
   chown -R $_bc_user:$_bc_group /etc/bitcoin /srv/bitcoin
   printf "%b\n" "$bitcoin"
 }
 
 post_remove() {
-  _rmuser
   rm -rf /srv/bitcoin
 }
 
-_mkuser() {
-  getent passwd $_bc_user &>/dev/null || {
-    echo -n "Creating bitcoin user... "
-    grep -E "^$_bc_group:" /etc/group >/dev/null || groupadd $_bc_group
-    useradd -m -d /etc/bitcoin -g $_bc_group -s /usr/bin/nologin $_bc_user 2>/dev/null
-    echo "done"
-  }
-}
-
-_rmuser() {
-  echo -n "Removing bitcoin user... "
-  userdel -rf $_bc_user 2>/dev/null
-  echo "done"
-}
-
 read -d '' bitcoin <<'EOF'
 ########################################################################
 ########################################################################