Merge branch 'master' into epel8

.gitignore

@@ -45,3 +45,4 @@ pdns-2.9.22.tar.gz
 /pdns-4.1.10.tar.bz2
 /pdns-4.1.11.tar.bz2
 /pdns-4.1.13.tar.bz2
+/pdns-4.2.0.tar.bz2

pdns.spec

@@ -2,7 +2,7 @@
 %global backends %{nil}
 
 Name: pdns
-Version: 4.1.13
+Version: 4.2.0
 Release: 1%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 License: GPLv2
@@ -19,11 +19,20 @@ BuildRequires: bison
 BuildRequires: boost-devel
 BuildRequires: gcc-c++
 BuildRequires: krb5-devel
+BuildRequires: libcurl-devel
 BuildRequires: libsodium-devel
+%ifarch aarch64
 BuildRequires: lua-devel
+%define lua_implementation lua
+%else
+BuildRequires: luajit-devel
+%define lua_implementation luajit
+%endif
 BuildRequires: openssl-devel
+BuildRequires: p11-kit-devel
 BuildRequires: protobuf-compiler
 BuildRequires: protobuf-devel
+BuildRequires: libcurl-devel
 BuildRequires: systemd-devel
 BuildRequires: systemd-units
 Provides: powerdns = %{version}-%{release}
@@ -94,6 +103,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description backend-lua
 This package contains the lua backend for %{name}
 
+%package backend-lua2
+Summary: LUA2 backend for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%global backends %{backends} lua2
+
+%description backend-lua2
+This package contains the lua2 backend for %{name}
+
 %package backend-sqlite
 Summary: SQLite backend for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -120,6 +137,13 @@ BuildRequires: tinycdb-devel
 %description backend-tinydns
 This package contains the TinyDNS backend for %{name}
 
+%package ixfrdist
+Summary: A program to redistribute zones over AXFR and IXFR
+BuildRequires: yaml-cpp-devel
+
+%description ixfrdist
+This package contains the ixfrdist program.
+
 %prep
 %setup -q
 %patch0 -p1 -b .disable-secpoll
@@ -128,18 +152,22 @@ This package contains the TinyDNS backend for %{name}
 export CPPFLAGS="-DLDAP_DEPRECATED"
 
 %configure \
+	--enable-option-checking=fatal \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--disable-static \
 	--disable-dependency-tracking \
 	--disable-silent-rules \
 	--with-modules='' \
-	--with-lua \
+	--with-lua=%{lua_implementation} \
 	--with-dynmodules='%{backends}' \
 	--enable-tools \
-	--enable-libsodium \
+	--with-libsodium \
 	--enable-unit-tests \
+	--enable-lua-records \
 	--enable-reproducible \
-	--enable-systemd
+	--enable-experimental-pkcs11 \
+	--enable-systemd \
+	--enable-ixfrdist
 
 %make_build
 
@@ -210,6 +238,7 @@ exit 0
 %{_bindir}/calidns
 %{_bindir}/dnsbulktest
 %{_bindir}/dnsgram
+%{_bindir}/dnspcap2calidns
 %{_bindir}/dnspcap2protobuf
 %{_bindir}/dnsreplay
 %{_bindir}/dnsscan
@@ -226,6 +255,7 @@ exit 0
 %{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
+%{_mandir}/man1/dnspcap2calidns.1.gz
 %{_mandir}/man1/dnspcap2protobuf.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
 %{_mandir}/man1/dnsscan.1.gz
@@ -245,6 +275,7 @@ exit 0
 %{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.mysql.sql
 %{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.mysql.sql
 %{_pkgdocdir}/3.4.0_to_4.1.0_schema.mysql.sql
+%{_pkgdocdir}/4.1.0_to_4.2.0_schema.mysql.sql
 %{_libdir}/%{name}/libgmysqlbackend.so
 
 %files backend-postgresql
@@ -252,7 +283,7 @@ exit 0
 %{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.pgsql.sql
 %{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
 %{_pkgdocdir}/3.4.0_to_4.1.0_schema.pgsql.sql
-%{_pkgdocdir}/4.1.10_to_4.1.11.schema.pgsql.sql
+%{_pkgdocdir}/4.1.0_to_4.2.0_schema.pgsql.sql
 %{_libdir}/%{name}/libgpgsqlbackend.so
 
 %files backend-pipe
@@ -269,10 +300,15 @@ exit 0
 %files backend-lua
 %{_libdir}/%{name}/libluabackend.so
 
+%files backend-lua2
+%{_libdir}/%{name}/liblua2backend.so
+
 %files backend-sqlite
 %{_pkgdocdir}/schema.sqlite3.sql
 %{_pkgdocdir}/dnssec-3.x_to_3.4.0_schema.sqlite3.sql
 %{_pkgdocdir}/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql
+%{_pkgdocdir}/3.4.0_to_4.0.0_schema.sqlite3.sql
+%{_pkgdocdir}/4.0.0_to_4.2.0_schema.sqlite3.sql
 %{_libdir}/%{name}/libgsqlite3backend.so
 
 %files backend-mydns
@@ -282,7 +318,23 @@ exit 0
 %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
+
 %changelog
+* Fri Aug 30 2019 Morten Stevens <mstevens@fedoraproject.org> - 4.2.0-1
+- Update to 4.2.0
+- Enable LUA records
+- Enable lua2 backend
+- Enable luajit
+- Enable experimental pkcs11 support
+- Added ixfrdist subpackage
+
 * Thu Aug 08 2019 Morten Stevens <mstevens@fedoraproject.org> - 4.1.13-1
 - Update to 4.1.13
 

sources

@@ -1 +1 @@
-SHA512 (pdns-4.1.13.tar.bz2) = 94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
+SHA512 (pdns-4.2.0.tar.bz2) = ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624