increment pkgrel; harden *.service

credit: https://github.com/bitcoin/bitcoin/pull/12769

4 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 583f7bacc363..9a35322cc477 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitcoin-core
 	pkgdesc = Bitcoin Core headless P2P node
 	pkgver = 0.16.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://bitcoin.org
 	install = bitcoin.install
 	arch = armv6h
@@ -43,8 +43,8 @@ pkgbase = bitcoin-core
 	sha256sums = 8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40
 	sha256sums = b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35
 	sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
-	sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880
-	sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679
+	sha256sums = e56dc913b82097acdc20374a2ae1b08323af74ccbbf63c829d4d13c9cb63ad8d
+	sha256sums = 4d5053ba94fa647abc6abe8b90f46d4c61d706de8fb0151f6aefed772adf317e
 	sha256sums = f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a
 	sha256sums = 0b4f7ec41cf88aa1278d089a03f116c33bac62dec038903f4ced58da67afb980
 	sha256sums = f1c3727220df06993a61cc9f4ef25c83cdaf3624179b5ead8383bc9ef7109e70
diff --git a/PKGBUILD b/PKGBUILD
index aefd71a4a500..87dfbbd053bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitcoin-core
 pkgver=0.16.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Bitcoin Core headless P2P node"
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
 url="https://bitcoin.org"
@@ -32,8 +32,8 @@ source=(https://bitcoin.org/bin/bitcoin-core-$pkgver/bitcoin-$pkgver.tar.gz
 sha256sums=('8cbec0397d932cab7297a8c23c918392f6eebd410646b4b954787de9f4a3ee40'
             'b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35'
             '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f'
-            '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880'
-            '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679'
+            'e56dc913b82097acdc20374a2ae1b08323af74ccbbf63c829d4d13c9cb63ad8d'
+            '4d5053ba94fa647abc6abe8b90f46d4c61d706de8fb0151f6aefed772adf317e'
             'f126b4824e43d9760ab2021460a37d859986f07e1ac9245ee4938e832739f73a'
             '0b4f7ec41cf88aa1278d089a03f116c33bac62dec038903f4ced58da67afb980'
             'f1c3727220df06993a61cc9f4ef25c83cdaf3624179b5ead8383bc9ef7109e70'
diff --git a/bitcoin-reindex.service b/bitcoin-reindex.service
index 236a24d05e54..3fea38690795 100644
--- a/bitcoin-reindex.service
+++ b/bitcoin-reindex.service
@@ -4,16 +4,25 @@ Conflicts=bitcoin.service
 After=network.target
 
 [Service]
+Type=forking
 User=bitcoin
 Group=bitcoin
-ExecStart=/usr/bin/bitcoind -daemon=0                       \
+ExecStart=/usr/bin/bitcoind -daemon                         \
                             -conf=/etc/bitcoin/bitcoin.conf \
                             -datadir=/srv/bitcoin           \
                             -reindex                        \
-                            -pid=/run/bitcoind.pid
+                            -pid=/run/bitcoin/bitcoind.pid
 ExecReload=/usr/bin/kill -HUP $MAINPID
 ExecStop=/usr/bin/bitcoind stop
+Restart=on-failure
+RuntimeDirectory=bitcoin
+PIDFile=/run/bitcoin/bitcoind.pid
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+PrivateDevices=true
 PrivateTmp=true
+ProtectSystem=full
+SystemCallArchitectures=native
 
 [Install]
 WantedBy=multi-user.target
diff --git a/bitcoin.service b/bitcoin.service
index abb6da86942d..58197742fb28 100644
--- a/bitcoin.service
+++ b/bitcoin.service
@@ -4,15 +4,24 @@ Conflicts=bitcoin-reindex.service
 After=network.target
 
 [Service]
+Type=forking
 User=bitcoin
 Group=bitcoin
-ExecStart=/usr/bin/bitcoind -daemon=0                       \
+ExecStart=/usr/bin/bitcoind -daemon                         \
                             -conf=/etc/bitcoin/bitcoin.conf \
                             -datadir=/srv/bitcoin           \
-                            -pid=/run/bitcoind.pid
+                            -pid=/run/bitcoin/bitcoind.pid
 ExecReload=/usr/bin/kill -HUP $MAINPID
 ExecStop=/usr/bin/bitcoind stop
+Restart=on-failure
+RuntimeDirectory=bitcoin
+PIDFile=/run/bitcoin/bitcoind.pid
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+PrivateDevices=true
 PrivateTmp=true
+ProtectSystem=full
+SystemCallArchitectures=native
 
 [Install]
 WantedBy=multi-user.target