From: Pieter Lexis Date: Thu, 25 Oct 2018 11:49:45 +0000 (+0200) Subject: builder: Re-enable secpoll in packages X-Git-Tag: dnsdist-1.3.3~12^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a85baf8155079a45358edd1b4c052a12ed98644;p=thirdparty%2Fpdns.git builder: Re-enable secpoll in packages Closes #7105 --- diff --git a/builder-support/debian/authoritative/debian-jessie/rules b/builder-support/debian/authoritative/debian-jessie/rules index 50d330c74b..721a0b70b7 100755 --- a/builder-support/debian/authoritative/debian-jessie/rules +++ b/builder-support/debian/authoritative/debian-jessie/rules @@ -58,7 +58,6 @@ override_dh_install: -e 's!# launch=.*!&\nlaunch=!' \ -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/pdns-server/etc/powerdns/pdns.conf ifeq ($(DEB_HOST_ARCH_BITS),32) echo RestrictAddressFamilies is broken on 32bit, removing it from service file diff --git a/builder-support/debian/authoritative/debian-stretch/rules b/builder-support/debian/authoritative/debian-stretch/rules index c75df73be4..cc198be3c7 100755 --- a/builder-support/debian/authoritative/debian-stretch/rules +++ b/builder-support/debian/authoritative/debian-stretch/rules @@ -57,7 +57,6 @@ override_dh_install: -e 's!# launch=.*!&\nlaunch=!' \ -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/pdns-server/etc/powerdns/pdns.conf ifeq ($(DEB_HOST_ARCH_BITS),32) echo RestrictAddressFamilies is broken on 32bit, removing it from service file diff --git a/builder-support/debian/authoritative/ubuntu-trusty/rules b/builder-support/debian/authoritative/ubuntu-trusty/rules index 963f72b87d..013b6e09a5 100755 --- a/builder-support/debian/authoritative/ubuntu-trusty/rules +++ b/builder-support/debian/authoritative/ubuntu-trusty/rules @@ -47,7 +47,6 @@ override_dh_install: -e 's!# launch=.*!&\nlaunch=!' \ -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/pdns-server/etc/powerdns/pdns.conf # Verbose tests (shows used compiler/linker and their flags) diff --git a/builder-support/debian/recursor/debian-jessie/rules b/builder-support/debian/recursor/debian-jessie/rules index d5e29dc77f..7bbb5ad207 100755 --- a/builder-support/debian/recursor/debian-jessie/rules +++ b/builder-support/debian/recursor/debian-jessie/rules @@ -44,7 +44,6 @@ override_dh_auto_install: -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/tmp/etc/powerdns/recursor.conf override_dh_strip: diff --git a/builder-support/debian/recursor/debian-stretch/rules b/builder-support/debian/recursor/debian-stretch/rules index 6857672285..bf65710c1e 100755 --- a/builder-support/debian/recursor/debian-stretch/rules +++ b/builder-support/debian/recursor/debian-stretch/rules @@ -44,7 +44,6 @@ override_dh_auto_install: -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/pdns-recursor/etc/powerdns/recursor.conf override_dh_strip: diff --git a/builder-support/debian/recursor/ubuntu-trusty/rules b/builder-support/debian/recursor/ubuntu-trusty/rules index 128b820953..3134815a95 100755 --- a/builder-support/debian/recursor/ubuntu-trusty/rules +++ b/builder-support/debian/recursor/ubuntu-trusty/rules @@ -34,7 +34,6 @@ override_dh_auto_install: -e 's!# setgid=.*!setgid=pdns!' \ -e 's!# setuid=.*!setuid=pdns!' \ -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \ - -e 's!# security-poll-suffix=.*!&\nsecurity-poll-suffix=!' \ > debian/tmp/etc/powerdns/recursor.conf override_dh_strip: