dnsdist-git: Move to dnsdist user via sysusers, drop i686, cleanup

3 files changed, 19 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index feb138f80560..4f127e3695f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Aug  1 13:03:19 UTC 2017
+# Sun Dec  3 21:55:18 UTC 2017
 pkgbase = dnsdist-git
 	pkgdesc = Highly DNS-, DoS- and abuse-aware loadbalancer
-	pkgver = r12686.638dd3d9f
+	pkgver = r13393.4461bb7c3
 	pkgrel = 1
-	url = http://dnsdist.org/
-	arch = i686
+	url = https://dnsdist.org/
 	arch = x86_64
 	license = GPL2
 	makedepends = boost
@@ -24,7 +23,9 @@ pkgbase = dnsdist-git
 	provides = dnsdist
 	conflicts = dnsdist
 	source = dnsdist-git::git+https://github.com/PowerDNS/pdns
+	source = sysusers.conf
 	sha512sums = SKIP
+	sha512sums = d55ccd612cbe08b353815027d30a3b0f0ec7bf6b0d74a0a634939be53ce6e6b41d23e54c2328946f00738c03e9f306ce4f2dabe5e4b11d9fb28d0abf49917893
 
 pkgname = dnsdist-git
 
diff --git a/PKGBUILD b/PKGBUILD
index dc1ba1aa6c9e..e3e804ff3087 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Remi Gacogne <rgacogne at archlinux dot org>
 pkgname=dnsdist-git
-pkgver=r12686.638dd3d9f
+pkgver=r13393.4461bb7c3
 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=("${pkgname}::git+https://github.com/PowerDNS/pdns")
-sha512sums=('SKIP')
+source=("${pkgname}::git+https://github.com/PowerDNS/pdns"
+        sysusers.conf)
+sha512sums=('SKIP'
+            'd55ccd612cbe08b353815027d30a3b0f0ec7bf6b0d74a0a634939be53ce6e6b41d23e54c2328946f00738c03e9f306ce4f2dabe5e4b11d9fb28d0abf49917893')
 makedepends=('boost' 'git' 'pandoc' 'python-virtualenv' 'ragel' 'systemd')
 depends=('libedit' 'libsodium' 'libsystemd' 'lua' 'net-snmp' 'protobuf' 're2')
 provides=('dnsdist')
@@ -19,7 +21,7 @@ pkgver() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}/pdns/dnsdistdist"
+  cd "${pkgname}/pdns/dnsdistdist"
   autoreconf -i
   ./configure \
     --prefix=/usr \
@@ -29,11 +31,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}/pdns/dnsdistdist/"
-  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}/pdns/dnsdistdist/"
   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/dnsdist.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" -