pdns-builder: LUA records support, ixfrdist pkgs

diff --git a/builder-support/debian/authoritative/debian-jessie/control b/builder-support/debian/authoritative/debian-jessie/control
index 35bbc1a8330288964901913363a4da943ae069ce..603379282088e7b0afdc273c58288d296c1aae7e 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/control
+++ b/builder-support/debian/authoritative/debian-jessie/control
@@ -19,6 +19,7 @@ Build-Depends: autoconf,
                libboost-serialization-dev,
                libboost-test-dev,
                libcdb-dev,
+               libcurl4-openssl-dev,
                libgeoip-dev,
                libkrb5-dev,
                libldap2-dev,

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install
index 86c3d41c032ea6353019bed5e51205665d101109..b2003c1debe5d9b4b14ef03fa21948c0eed1d817 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install
@@ -1,2 +1,4 @@
 usr/bin/ixfrdist
+etc/powerdns/ixfrdist.example.yml
 lib/systemd/system/ixfrdist.service
+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
index c196430e4ed0e451889f73a9470e5865a54cd60a..067537cdf674f1267957ffaad7144b39193ad7d8 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages
@@ -1 +1,2 @@
 debian/tmp/usr/share/man/man1/ixfrdist.1
+debian/tmp/usr/share/man/man5/ixfrdist.yml.5

diff --git a/builder-support/debian/authoritative/debian-jessie/rules b/builder-support/debian/authoritative/debian-jessie/rules
index 415321dd3bc8e0f5ff41f1c0a45e29f11d88bb97..50d330c74bdfaeb5c8811c87be68e2829589f918 100755 (executable)
--- a/builder-support/debian/authoritative/debian-jessie/rules
+++ b/builder-support/debian/authoritative/debian-jessie/rules
@@ -29,10 +29,12 @@ override_dh_auto_configure:
                --with-modules="" \
                --enable-tools \
                --enable-libsodium \
-               --with-luajit \
+               --with-lua=luajit \
                --with-protobuf \
                --enable-unit-tests \
                --enable-experimental-pkcs11 \
+               --enable-lua-records \
+               --enable-ixfrdist \
                $(CONFIGURE_ARGS)
 
 # pdns-server has a debug package

diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control
index 790e9157844baee28cc57f08075fa817e8eea84a..d39fb13b4dae932dbbb82b366fcb51fbd6907fd3 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/control
+++ b/builder-support/debian/authoritative/debian-stretch/control
@@ -20,10 +20,12 @@ Build-Depends: autoconf,
                libboost-serialization-dev,
                libboost-test-dev,
                libcdb-dev,
+               libcurl4-openssl-dev,
                libgeoip-dev,
                libkrb5-dev,
                libldap2-dev,
                libluajit-5.1-dev,
+               libmaxminddb-dev,
                libopendbx1-dev,
                libp11-kit-dev,
                libpq-dev,

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install
index 86c3d41c032ea6353019bed5e51205665d101109..b2003c1debe5d9b4b14ef03fa21948c0eed1d817 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install
@@ -1,2 +1,4 @@
 usr/bin/ixfrdist
+etc/powerdns/ixfrdist.example.yml
 lib/systemd/system/ixfrdist.service
+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
index 6858f3996ef4b8d707c28e10a3020bd52c35e14b..4b13ce279378b5782cf44ee1dac721172812dff8 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages
@@ -1,2 +1,3 @@
 debian/tmp/usr/share/man/man1/ixfrdist.1
+debian/tmp/usr/share/man/man5/ixfrdist.yml.5
 

diff --git a/builder-support/debian/authoritative/debian-stretch/rules b/builder-support/debian/authoritative/debian-stretch/rules
index fb25ebb388417f3947f439f6b220959a24a60954..23756da07a49ceb3c52c49930fa98d9910e08ce8 100755 (executable)
--- a/builder-support/debian/authoritative/debian-stretch/rules
+++ b/builder-support/debian/authoritative/debian-stretch/rules
@@ -33,6 +33,8 @@ override_dh_auto_configure:
                --with-protobuf \
                --enable-unit-tests \
                --enable-experimental-pkcs11 \
+               --enable-lua-records \
+               --enable-ixfrdist \
                $(CONFIGURE_ARGS)
 
 override_dh_strip:

diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index d202333fde6a1b2800553eb06d78eab3064ffa90..c5d83a19ba36a789ebdfe73553902d38543088ae 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -15,8 +15,9 @@ WORKDIR /pdns-authoritative/
 RUN mkdir /sdist
 
 ARG BUILDER_VERSION
+RUN rm -rf /pdns-authoritative/docs/.venv
 RUN /pdns-authoritative/builder/helpers/set-configure-ac-version.sh && \
      autoreconf -v -i --force && \
-    ./configure --without-modules --without-dynmodules --disable-dependency-tracking && \
+    ./configure --disable-lua-records --disable-ixfrdist --without-modules --without-dynmodules --disable-dependency-tracking && \
     make dist
 RUN cp pdns-${BUILDER_VERSION}.tar.bz2 /sdist/

diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 837a9aa81e6d192468a7b964df7c056a52a42d43..2c98787467c7725fb16052fc61221ce6602c2fe4 100644 (file)
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -29,6 +29,7 @@ BuildRequires: systemd-devel
 BuildRequires: protobuf-devel
 BuildRequires: protobuf-compiler
 BuildRequires: p11-kit-devel
+BuildRequires: libcurl-devel
 %endif
 
 Requires(pre): shadow-utils
@@ -54,13 +55,6 @@ Group: System Environment/Daemons
 %description tools
 This package contains the extra tools for %{name}
 
-%package ixfrdist
-Summary: A progrm to redistribute zones over AXFR and IXFR
-Group: System Environment/Daemons
-
-%description ixfrdist
-This package contains the ixfrdist program.
-
 %package backend-mysql
 Summary: MySQL backend for %{name}
 Group: System Environment/Daemons
@@ -179,6 +173,14 @@ BuildRequires: tinycdb-devel
 
 %description backend-tinydns
 This package contains the TinyDNS backend for %{name}
+
+%package ixfrdist
+BuildRequires: yaml-cpp-devel
+Summary: A progrm to redistribute zones over AXFR and IXFR
+Group: System Environment/Daemons
+
+%description ixfrdist
+This package contains the ixfrdist program.
 %endif
 
 %prep
@@ -197,19 +199,21 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
   --disable-dependency-tracking \
   --disable-silent-rules \
   --with-modules='' \
-  --with-luajit \
+  --with-lua=luajit \
   --with-dynmodules='%{backends} random' \
   --enable-tools \
   --enable-libsodium \
   --enable-unit-tests \
 %if 0%{?rhel} >= 7
+  --enable-lua-records \
   --enable-experimental-pkcs11 \
-  --enable-systemd
+  --enable-systemd \
+  --enable-ixfrdist
 %else
+  --disable-lua-records \
   --without-protobuf
 %endif
 
-
 make %{?_smp_mflags}
 
 %install
@@ -291,7 +295,6 @@ fi
 %{_mandir}/man1/pdnsutil.1.gz
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/librandombackend.so
-%dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/pdns.conf
 
 %if 0%{?rhel} >= 7
@@ -335,19 +338,14 @@ fi
 %if 0%{?rhel} >= 7
 %{_bindir}/dnsbulktest
 %{_bindir}/dnspcap2protobuf
+%{_bindir}/dnspcap2calidns
 %{_bindir}/dnstcpbench
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnspcap2protobuf.1.gz
+%{_mandir}/man1/dnspcap2calidns.1.gz
 %{_mandir}/man1/dnstcpbench.1.gz
 %endif
 
-%files ixfrdist
-%{_bindir}/ixfrdist
-%{_mandir}/man1/ixfrdist.1.gz
-%if 0%{?rhel} >= 7
-%{_unitdir}/ixfrdist.service
-%endif
-
 %files backend-mysql
 %doc modules/gmysqlbackend/schema.mysql.sql
 %doc modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql
@@ -398,4 +396,12 @@ fi
 
 %files backend-tinydns
 %{_libdir}/%{name}/libtinydnsbackend.so
+
+%files ixfrdist
+%{_bindir}/ixfrdist
+%{_mandir}/man1/ixfrdist.1.gz
+%{_mandir}/man5/ixfrdist.yml.5.gz
+%{_sysconfdir}/%{name}/ixfrdist.example.yml
+%{_unitdir}/ixfrdist.service
+%{_unitdir}/ixfrdist@.service
 %endif