From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 13 May 2019 16:23:56 +0000 (+0200)
Subject: dnsdist: use correct user in debian packages
X-Git-Tag: auth-4.3.0-beta2~34^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7887cdb1607382e3275d0387939ef0563c339980;p=thirdparty%2Fpdns.git

dnsdist: use correct user in debian packages
---

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 9f49e0b6ce..8ff24d0a0e 100755
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -51,6 +51,8 @@ override_dh_auto_configure:
 	  --with-ebpf \
 	  --with-lua=luajit \
 	  --with-protobuf \
+	  --with-service-user='_dnsdist' \
+	  --with-service-group='_dnsdist' \
 	  $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -58,8 +60,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
 	dh_auto_install
-	echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-	perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
 	echo RestrictAddressFamilies is broken on 32bit, removing it from service file
 	perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service
diff --git a/builder-support/debian/dnsdist/debian-jessie/rules b/builder-support/debian/dnsdist/debian-jessie/rules
index e0f70b6c9a..1d80904bc5 100755
--- a/builder-support/debian/dnsdist/debian-jessie/rules
+++ b/builder-support/debian/dnsdist/debian-jessie/rules
@@ -47,6 +47,8 @@ override_dh_auto_configure:
 	  --with-ebpf \
 	  --with-lua=luajit \
 	  --with-protobuf \
+	  --with-service-user='_dnsdist' \
+	  --with-service-group='_dnsdist' \
 	  $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -54,8 +56,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
 	dh_install
-	echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-	perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
 	echo RestrictAddressFamilies is broken on 32bit, removing it from service file
 	perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service
diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index 4ae2ee8a81..c310e01700 100755
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -50,6 +50,8 @@ override_dh_auto_configure:
 	  --with-ebpf \
 	  --with-lua=luajit \
 	  --with-protobuf \
+	  --with-service-user='_dnsdist' \
+	  --with-service-group='_dnsdist' \
 	  $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -57,8 +59,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
 	dh_auto_install
-	echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-	perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
 	echo RestrictAddressFamilies is broken on 32bit, removing it from service file
 	perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service