Bump to v0.15.0.0 + install cleanup

- Removes install file, replaced with sysusers and tmpfiles

5 files changed, 8 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bff01de3d21e..e26e996cfcbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = monero
 	pkgdesc = Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)
-	pkgver = 0.14.1.2
+	pkgver = 0.15.0.0
 	pkgrel = 1
 	url = https://getmonero.org/
 	arch = x86_64
@@ -24,11 +24,10 @@ pkgbase = monero
 	provides = libmonero-wallet
 	conflicts = bitmonero-git
 	conflicts = libmonero-wallet-git
-	source = monero::git+https://github.com/monero-project/monero#tag=v0.14.1.2
+	source = monero::git+https://github.com/monero-project/monero#tag=v0.15.0.0
 	sha256sums = SKIP
 
 pkgname = monero
-	install = monero.install
 	backup = etc/monerod.conf
 
 pkgname = libmonero-wallet
diff --git a/PKGBUILD b/PKGBUILD
index 224f847c074a..3a4c146a9b78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase="monero"
 pkgname=('monero' 'libmonero-wallet')
-pkgver=0.14.1.2
+pkgver=0.15.0.0
 pkgrel=1
 pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)"
 license=('custom:Cryptonote')
@@ -56,7 +56,6 @@ build() {
 
 package_monero() {
   backup=('etc/monerod.conf')
-  install=monero.install
 
   # Uncomment for a debug build
   # options=(!strip debug)
@@ -64,6 +63,8 @@ package_monero() {
 
   install -Dm644 "${srcdir}/${_monero}/utils/conf/monerod.conf" "${pkgdir}/etc/monerod.conf"
   install -Dm644 "${srcdir}/${_monero}/utils/systemd/monerod.service" "${pkgdir}/usr/lib/systemd/system/monerod.service"
+  install -Dm644 "${srcdir}/../monero.sysusers" "${pkgdir}/usr/lib/sysusers.d/monero.conf"
+  install -Dm644 "${srcdir}/../monero.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/monero.conf"
 
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-ancestry" "${pkgdir}/usr/bin/monero-blockchain-ancestry"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-depth" "${pkgdir}/usr/bin/monero-blockchain-depth"
@@ -74,6 +75,7 @@ package_monero() {
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-prune-known-spent-data" "${pkgdir}/usr/bin/monero-blockchain-prune-known-spent-data"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-stats" "${pkgdir}/usr/bin/monero-blockchain-stats"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-blockchain-usage" "${pkgdir}/usr/bin/monero-blockchain-usage"
+  install -Dm755 "${srcdir}/${_monero}/build/bin/monero-gen-ssl-cert" "${pkgdir}/usr/bin/monero-gen-ssl-cert"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-gen-trusted-multisig" "${pkgdir}/usr/bin/monero-gen-trusted-multisig"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-cli" "${pkgdir}/usr/bin/monero-wallet-cli"
   install -Dm755 "${srcdir}/${_monero}/build/bin/monero-wallet-rpc" "${pkgdir}/usr/bin/monero-wallet-rpc"
diff --git a/monero.install b/monero.install
deleted file mode 100644
index 504bdf0c7cdc..000000000000
--- a/monero.install
+++ /dev/null
@@ -1,33 +0,0 @@
-create_user() {
-  _lib="/var/lib/monero"
-  _log="/var/log/monero"
-
-  getent passwd monero &>/dev/null || {
-    echo -n ">>> Creating monero user... "
-    useradd --system --user-group -m --home "$_lib" monero
-    echo "done"
-  } # NOTE: we do not autoremove user due to security concerns (Arch policy)
-
-  # If data dir was removed after adding user
-  if [[ ! -d "$_lib" ]]; then
-    mkdir "$_lib" && chown monero:monero "$_lib" && chmod go-rwx "$_lib"
-  fi
-
-  # Ensure log dir
-  mkdir -p "$_log" && chown -R monero:monero "$_log" && chmod -R go-rwx "$_log"
-}
-
-post_install() {
-  create_user
-}
-
-post_upgrade() {
-  create_user
-  echo ">>> IMPORANT NOTICE:"
-  echo ">>> If you were previously using bitmonero-git, please perform"
-  echo ">>> the following before starting monerod or monerod systemd unit:"
-  echo ""
-  echo "$ sudo mv /var/lib/bitmonero /var/lib/monero/"
-  echo "$ sudo chown -R monero:monero  /var/lib/monero/"
-  echo ""
-}
diff --git a/monero.sysusers b/monero.sysusers
new file mode 100644
index 000000000000..19bea8d10ba3
--- /dev/null
+++ b/monero.sysusers
@@ -0,0 +1 @@
+u monero - - /var/lib/monero
diff --git a/monero.tmpfiles b/monero.tmpfiles
new file mode 100644
index 000000000000..f4fc2f0abb25
--- /dev/null
+++ b/monero.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/monero 0700 monero monero - -