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 50d330c74bdfaeb5c8811c87be68e2829589f918..721a0b70b7094a47a6bca7de8e33bd8e411b6cc9 100755 (executable)
--- 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 c75df73be482862f16bb161d3b6076f2af1d7242..cc198be3c709b6c100f01d927b773d196fd8164c 100755 (executable)
--- 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 963f72b87de2997da9c8582052c56a59830e8214..013b6e09a5ce6226f4e67ef75db4174ce781f1dd 100755 (executable)
--- 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 d5e29dc77fb4d01f95a57390d02687da317f5988..7bbb5ad207d1a73f333351bcfbacb975965bdade 100755 (executable)
--- 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 6857672285923281d9ed5cc01198aef4b09ee8f7..bf65710c1e03bc2807ff45e475ea58ad21345d14 100755 (executable)
--- 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 128b8209537016c8338fa93dedecf7c117dce1d3..3134815a95187a209f189f69e4657657a48deb2b 100755 (executable)
--- 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: