From 4638fd39d73b7c1e4f10a0967c408e33e3b45d60 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 10 May 2019 18:06:08 -0700
Subject: Redo sysusers and tmpfiles

---
 PKGBUILD                | 8 ++++----
 dnscrypt-proxy.sysusers | 2 ++
 dnscrypt-proxy.tmpfiles | 1 +
 sysusers.d              | 2 --
 tmpfiles.d              | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 dnscrypt-proxy.sysusers
 create mode 100644 dnscrypt-proxy.tmpfiles
 delete mode 100644 sysusers.d
 delete mode 100644 tmpfiles.d

diff --git a/PKGBUILD b/PKGBUILD
index 57b7995..74c402d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,8 +26,8 @@ backup=("etc/${pkgname}/${pkgname}.toml"
         "etc/${pkgname}/whitelist.txt"
 )
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jedisct1/${pkgname}/archive/${pkgver}.tar.gz"
-        'sysusers.d'
-        'tmpfiles.d'
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles"
         'configuration.diff'
         'blacklist.txt'
         'cloaking-rules.txt'
@@ -78,10 +78,10 @@ package() {
   install -vDm 644 "${srcdir}/whitelist.txt" \
     "${pkgdir}/etc/${pkgname}/whitelist.txt"
   # sysusers.d
-  install -vDm 644 "${srcdir}/sysusers.d" \
+  install -vDm 644 "${srcdir}/${pkgname}.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
   # tmpfiles.d
-  install -vDm 644 "${srcdir}/tmpfiles.d" \
+  install -vDm 644 "${srcdir}/${pkgname}.tmpfiles" \
     "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
   # license
   install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/dnscrypt-proxy.sysusers b/dnscrypt-proxy.sysusers
new file mode 100644
index 0000000..a2f1453
--- /dev/null
+++ b/dnscrypt-proxy.sysusers
@@ -0,0 +1,2 @@
+u dnscrypt-proxy - "DNSCrypt-proxy user" /var/lib/dnscrypt-proxy /bin/false
+g dnscrypt-proxy - - -
diff --git a/dnscrypt-proxy.tmpfiles b/dnscrypt-proxy.tmpfiles
new file mode 100644
index 0000000..40187aa
--- /dev/null
+++ b/dnscrypt-proxy.tmpfiles
@@ -0,0 +1 @@
+f /run/dnscrypt-proxy.pid - dnscrypt-proxy dnscrypt-proxy
diff --git a/sysusers.d b/sysusers.d
deleted file mode 100644
index a2f1453..0000000
--- a/sysusers.d
+++ /dev/null
@@ -1,2 +0,0 @@
-u dnscrypt-proxy - "DNSCrypt-proxy user" /var/lib/dnscrypt-proxy /bin/false
-g dnscrypt-proxy - - -
diff --git a/tmpfiles.d b/tmpfiles.d
deleted file mode 100644
index 40187aa..0000000
--- a/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-f /run/dnscrypt-proxy.pid - dnscrypt-proxy dnscrypt-proxy
-- 
cgit v1.2.1