From 7a76f1e3197504921226f6ea373203c8042b7843 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 3 Apr 2018 10:34:58 +0200 Subject: [PATCH] deb: Split ixfrdist into it's own package --- .../debian/authoritative/debian-jessie/control | 14 ++++++++++++++ .../debian-jessie/pdns-ixfrdist.install | 2 ++ .../debian-jessie/pdns-ixfrdist.manpages | 1 + .../authoritative/debian-jessie/pdns-tools.install | 2 -- .../debian-jessie/pdns-tools.manpages | 1 - .../debian/authoritative/debian-stretch/control | 14 ++++++++++++++ .../debian-stretch/pdns-ixfrdist.install | 2 ++ .../debian-stretch/pdns-ixfrdist.manpages | 2 ++ .../debian-stretch/pdns-tools.install | 2 -- .../debian-stretch/pdns-tools.manpages | 1 - .../debian/authoritative/ubuntu-trusty/control | 14 ++++++++++++++ .../ubuntu-trusty/pdns-ixfrdist.install | 2 ++ .../ubuntu-trusty/pdns-ixfrdist.manpages | 2 ++ .../authoritative/ubuntu-trusty/pdns-tools.install | 1 - .../ubuntu-trusty/pdns-tools.manpages | 1 - builder-support/dockerfiles/Dockerfile.debbuild | 6 +++--- 16 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install create mode 100644 builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages create mode 100644 builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install create mode 100644 builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages create mode 100644 builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install create mode 100644 builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages diff --git a/builder-support/debian/authoritative/debian-jessie/control b/builder-support/debian/authoritative/debian-jessie/control index a39be1f3d5..35bbc1a833 100644 --- a/builder-support/debian/authoritative/debian-jessie/control +++ b/builder-support/debian/authoritative/debian-jessie/control @@ -84,6 +84,20 @@ Description: Tools for DNS debugging by PowerDNS * nsec3dig: Calculate the correctness of NSEC3 proofs * saxfr: AXFR zones and show extra information +Package: pdns-ixfrdist +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Redistribute zones via AXFR and IXFR + PowerDNS is a versatile nameserver which supports a large number + of different backends ranging from simple zonefiles to relational + databases and load balancing/failover algorithms. + PowerDNS tries to emphasize speed and security. + . + This package contains the ixfrdist tool that can redistribute multiple versions + of zones over AXFR and IXFR. This tool does not require any part of the + PowerDNS server components to work. + Package: pdns-backend-bind Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install new file mode 100644 index 0000000000..86c3d41c03 --- /dev/null +++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install @@ -0,0 +1,2 @@ +usr/bin/ixfrdist +lib/systemd/system/ixfrdist.service diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages new file mode 100644 index 0000000000..c196430e4e --- /dev/null +++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/ixfrdist.1 diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-tools.install b/builder-support/debian/authoritative/debian-jessie/pdns-tools.install index b9eaaa9b4f..6ca38a9e43 100644 --- a/builder-support/debian/authoritative/debian-jessie/pdns-tools.install +++ b/builder-support/debian/authoritative/debian-jessie/pdns-tools.install @@ -8,11 +8,9 @@ usr/bin/dnsscope usr/bin/dnstcpbench usr/bin/dnswasher usr/bin/dumresp -usr/bin/ixfrdist usr/bin/ixplore usr/bin/nproxy usr/bin/nsec3dig usr/bin/pdns_notify usr/bin/saxfr usr/bin/sdig -lib/systemd/system/ixfrdist.service diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages b/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages index 67b6f7d95f..b8b70a83da 100644 --- a/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages +++ b/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages @@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1 debian/tmp/usr/share/man/man1/dnstcpbench.1 debian/tmp/usr/share/man/man1/dnswasher.1 debian/tmp/usr/share/man/man1/dumresp.1 -debian/tmp/usr/share/man/man1/ixfrdist.1 debian/tmp/usr/share/man/man1/ixplore.1 debian/tmp/usr/share/man/man1/nproxy.1 debian/tmp/usr/share/man/man1/nsec3dig.1 diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control index f0daf1c20a..790e915784 100644 --- a/builder-support/debian/authoritative/debian-stretch/control +++ b/builder-support/debian/authoritative/debian-stretch/control @@ -84,6 +84,20 @@ Description: Tools for DNS debugging by PowerDNS * nsec3dig: Calculate the correctness of NSEC3 proofs * saxfr: AXFR zones and show extra information +Package: pdns-ixfrdist +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Redistribute zones via AXFR and IXFR + PowerDNS is a versatile nameserver which supports a large number + of different backends ranging from simple zonefiles to relational + databases and load balancing/failover algorithms. + PowerDNS tries to emphasize speed and security. + . + This package contains the ixfrdist tool that can redistribute multiple versions + of zones over AXFR and IXFR. This tool does not require any part of the + PowerDNS server components to work. + Package: pdns-backend-bind Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install new file mode 100644 index 0000000000..86c3d41c03 --- /dev/null +++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install @@ -0,0 +1,2 @@ +usr/bin/ixfrdist +lib/systemd/system/ixfrdist.service diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages new file mode 100644 index 0000000000..6858f3996e --- /dev/null +++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/ixfrdist.1 + diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-tools.install b/builder-support/debian/authoritative/debian-stretch/pdns-tools.install index b9eaaa9b4f..6ca38a9e43 100644 --- a/builder-support/debian/authoritative/debian-stretch/pdns-tools.install +++ b/builder-support/debian/authoritative/debian-stretch/pdns-tools.install @@ -8,11 +8,9 @@ usr/bin/dnsscope usr/bin/dnstcpbench usr/bin/dnswasher usr/bin/dumresp -usr/bin/ixfrdist usr/bin/ixplore usr/bin/nproxy usr/bin/nsec3dig usr/bin/pdns_notify usr/bin/saxfr usr/bin/sdig -lib/systemd/system/ixfrdist.service diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages b/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages index 67b6f7d95f..b8b70a83da 100644 --- a/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages +++ b/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages @@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1 debian/tmp/usr/share/man/man1/dnstcpbench.1 debian/tmp/usr/share/man/man1/dnswasher.1 debian/tmp/usr/share/man/man1/dumresp.1 -debian/tmp/usr/share/man/man1/ixfrdist.1 debian/tmp/usr/share/man/man1/ixplore.1 debian/tmp/usr/share/man/man1/nproxy.1 debian/tmp/usr/share/man/man1/nsec3dig.1 diff --git a/builder-support/debian/authoritative/ubuntu-trusty/control b/builder-support/debian/authoritative/ubuntu-trusty/control index c44df8d900..55a035a3fe 100644 --- a/builder-support/debian/authoritative/ubuntu-trusty/control +++ b/builder-support/debian/authoritative/ubuntu-trusty/control @@ -81,6 +81,20 @@ Description: Tools for DNS debugging by PowerDNS * nsec3dig: Calculate the correctness of NSEC3 proofs * saxfr: AXFR zones and show extra information +Package: pdns-ixfrdist +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Redistribute zones via AXFR and IXFR + PowerDNS is a versatile nameserver which supports a large number + of different backends ranging from simple zonefiles to relational + databases and load balancing/failover algorithms. + PowerDNS tries to emphasize speed and security. + . + This package contains the ixfrdist tool that can redistribute multiple versions + of zones over AXFR and IXFR. This tool does not require any part of the + PowerDNS server components to work. + Package: pdns-backend-bind Architecture: any Depends: pdns-server (= ${binary:Version}), diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install new file mode 100644 index 0000000000..7894b5caea --- /dev/null +++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install @@ -0,0 +1,2 @@ +usr/bin/ixfrdist + diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages new file mode 100644 index 0000000000..6858f3996e --- /dev/null +++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man1/ixfrdist.1 + diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install index 8ac4829ce7..6ca38a9e43 100644 --- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install +++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install @@ -8,7 +8,6 @@ usr/bin/dnsscope usr/bin/dnstcpbench usr/bin/dnswasher usr/bin/dumresp -usr/bin/ixfrdist usr/bin/ixplore usr/bin/nproxy usr/bin/nsec3dig diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages index 67b6f7d95f..b8b70a83da 100644 --- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages +++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages @@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1 debian/tmp/usr/share/man/man1/dnstcpbench.1 debian/tmp/usr/share/man/man1/dnswasher.1 debian/tmp/usr/share/man/man1/dumresp.1 -debian/tmp/usr/share/man/man1/ixfrdist.1 debian/tmp/usr/share/man/man1/ixplore.1 debian/tmp/usr/share/man/man1/nproxy.1 debian/tmp/usr/share/man/man1/nsec3dig.1 diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild index ea2ea8cdf8..aa391f24dc 100644 --- a/builder-support/dockerfiles/Dockerfile.debbuild +++ b/builder-support/dockerfiles/Dockerfile.debbuild @@ -6,17 +6,17 @@ fi RUN PDNS_TEST_NO_IPV6=1 builder/helpers/build-debs.sh pdns-${BUILDER_VERSION} -RUN mv pdns*${BUILDER_VERSION}*.deb /dist +RUN mv pdns*.deb /dist @ENDIF @IF [ ! -z "$M_recursor" ] RUN builder/helpers/build-debs.sh pdns-recursor-${BUILDER_VERSION} -RUN mv pdns-recursor*${BUILDER_VERSION}*.deb /dist +RUN mv pdns-recursor*.deb /dist @ENDIF @IF [ ! -z "$M_dnsdist" ] RUN builder/helpers/build-debs.sh dnsdist-${BUILDER_VERSION} -RUN mv dnsdist*${BUILDER_VERSION}*.deb /dist +RUN mv dnsdist*.deb /dist @ENDIF -- 2.47.2