dnsdist: Move to dnsdist users via sysusers, drop i686, cleanup

3 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f95bd739b01..fcf7541982d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Aug 21 15:18:25 UTC 2017
+# Sun Dec  3 21:57:24 UTC 2017
 pkgbase = dnsdist
 	pkgdesc = Highly DNS-, DoS- and abuse-aware loadbalancer
 	pkgver = 1.2.0
 	pkgrel = 1
-	url = http://dnsdist.org/
-	arch = i686
+	url = https://dnsdist.org/
 	arch = x86_64
 	license = GPL2
 	makedepends = boost
@@ -20,12 +19,12 @@ pkgbase = dnsdist
 	depends = net-snmp
 	depends = protobuf
 	depends = re2
-	provides = dnsdist
-	conflicts = dnsdist
 	source = https://downloads.powerdns.com/releases/dnsdist-1.2.0.tar.bz2
 	source = https://downloads.powerdns.com/releases/dnsdist-1.2.0.tar.bz2.asc
+	source = sysusers.conf
 	sha512sums = 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237
 	sha512sums = SKIP
+	sha512sums = d55ccd612cbe08b353815027d30a3b0f0ec7bf6b0d74a0a634939be53ce6e6b41d23e54c2328946f00738c03e9f306ce4f2dabe5e4b11d9fb28d0abf49917893
 
 pkgname = dnsdist
 
diff --git a/PKGBUILD b/PKGBUILD
index 98191fbc7570..3883cda05312 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@ pkgname=dnsdist
 pkgver=1.2.0
 pkgrel=1
 pkgdesc='Highly DNS-, DoS- and abuse-aware loadbalancer'
-arch=('i686' 'x86_64')
-url='http://dnsdist.org/'
+arch=('x86_64')
+url='https://dnsdist.org/'
 license=('GPL2')
-source=(https://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2{,.asc})
+source=(https://downloads.powerdns.com/releases/${pkgname}-${pkgver}.tar.bz2{,.asc}
+        sysusers.conf)
 sha512sums=('93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237'
-            'SKIP')
+            'SKIP'
+            'd55ccd612cbe08b353815027d30a3b0f0ec7bf6b0d74a0a634939be53ce6e6b41d23e54c2328946f00738c03e9f306ce4f2dabe5e4b11d9fb28d0abf49917893')
 validpgpkeys=('D6300CABCBF469BBE392E503A208ED4F8AF58446') # Remi Gacogne <remi.gacogne@powerdns.com>
 makedepends=('boost' 'pandoc' 'python-virtualenv' 'ragel' 'systemd')
 depends=('libedit' 'libsodium' 'libsystemd' 'lua' 'net-snmp' 'protobuf' 're2')
-provides=('dnsdist')
-conflicts=('dnsdist')
 
 build() {
   cd "${pkgname}-${pkgver}"
@@ -25,11 +25,13 @@ build() {
     --enable-dnscrypt \
     --enable-re2
   make
+  sed -i 's,ExecStart=/usr/bin/dnsdist --supervised --disable-syslog,ExecStart=/usr/bin/dnsdist --supervised --disable-syslog -u dnsdist,' dnsdist.service
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's,ExecStart=/usr/bin/dnsdist --supervised --disable-syslog,ExecStart=/usr/bin/dnsdist --supervised --disable-syslog -u nobody -g nobody,' dnsdist.service
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  cd "${srcdir}"
+  install -D -m644 sysusers.conf "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 }
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 000000000000..a9dd52ff56a6
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1 @@
+u dnsdist - "DNSDist" -