Update 4.0.0 alpha 3

.gitignore

@@ -22,3 +22,4 @@ pdns-2.9.22.tar.gz
 /pdns-3.4.7.tar.bz2
 /pdns-4.0.0-alpha1.tar.bz2
 /pdns-4.0.0-alpha2.tar.bz2
+/pdns-4.0.0-alpha3.tar.bz2

pdns-default-config.patch

@@ -1,9 +0,0 @@
---- pdns-3.4.0-rc1/pdns/pdns.conf-dist.orig	2014-07-31 21:42:05.000000000 +0200
-+++ pdns-3.4.0-rc1/pdns/pdns.conf-dist	2014-08-01 14:02:00.238999673 +0200
-@@ -1,3 +1,6 @@
-+setuid=pdns
-+setgid=pdns
-+launch=bind
- # Autogenerated configuration file template
- #################################
- # allow-axfr-ips	Allow zonetransfers only to these subnets

pdns-disable-secpoll.patch

@@ -1,11 +1,11 @@
---- pdns-4.0.0-alpha1/pdns/common_startup.cc.orig	2015-12-24 16:28:55.000000000 +0100
-+++ pdns-4.0.0-alpha1/pdns/common_startup.cc	2015-12-24 23:57:54.052592322 +0100
-@@ -175,7 +175,7 @@ void declareArguments()
+--- pdns-4.0.0-alpha3/pdns/common_startup.cc.orig	2016-05-11 10:53:40.000000000 +0200
++++ pdns-4.0.0-alpha3/pdns/common_startup.cc	2016-05-13 15:20:11.492746860 +0200
+@@ -182,7 +182,7 @@ void declareArguments()
    ::arg().set("max-nsec3-iterations","Limit the number of NSEC3 hash iterations")="500"; // RFC5155 10.3
  
    ::arg().set("include-dir","Include *.conf files from this directory");
 -  ::arg().set("security-poll-suffix","Domain name from which to query security update notifications")="secpoll.powerdns.com.";
 +  ::arg().set("security-poll-suffix","Domain name from which to query security update notifications")="";
- }
  
- static time_t s_start=time(0);
+   ::arg().setSwitch("outgoing-axfr-expand-alias", "Expand ALIAS records during outgoing AXFR")="no";
+ }

pdns.spec

@@ -1,21 +1,19 @@
 %global _hardened_build 1
 %global backends %{nil}
-%global prever alpha2
+%global prever alpha3
 
 Name: pdns
 Version: 4.0.0
-Release: 0.5.%{?prever}%{?dist}
+Release: 0.6.%{?prever}%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
 URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
 Source1: pdns.service
-Patch0: pdns-default-config.patch
-Patch1: pdns-disable-secpoll.patch
+Patch0: pdns-disable-secpoll.patch
 
 Requires(pre): shadow-utils
-Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -150,9 +148,8 @@ BuildRequires: tinycdb-devel
 This package contains the TinyDNS backend for %{name}
 
 %prep
-%setup -q -n %{name}-%{version}-%{?prever} 
-%patch0 -p1 -b .default-config-patch
-%patch1 -p1 -b .disable-secpoll
+%setup -q -n %{name}-%{version}-%{?prever}
+%patch0 -p1 -b .disable-secpoll
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
@@ -186,6 +183,14 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 # Copy systemd service file
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pdns.service
 
+# change user/group to pdns
+# change default backend to bind
+sed -i \
+    -e 's/# setuid=/setuid=pdns/' \
+    -e 's/# setgid=/setgid=pdns/' \
+    -e 's/# launch=/launch=bind/' \
+    %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
+
 %check
 make %{?_smp_mflags} -C pdns check
 
@@ -205,16 +210,6 @@ exit 0
 %postun
 %systemd_postun_with_restart pdns.service
 
-%triggerun -- pdns < 3.0-rc3
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply pdns
-# to migrate them to systemd targets
-%{_bindir}/systemd-sysv-convert --save pdns &>/dev/null ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del pdns &>/dev/null || :
-/bin/systemctl try-restart pdns.service &>/dev/null || :
-
 %files
 %doc COPYING README
 %{_bindir}/pdns_control
@@ -243,6 +238,10 @@ exit 0
 %{_mandir}/man1/pdnsutil.1.gz
 %{_mandir}/man1/saxfr.1.gz
 %{_mandir}/man1/sdig.1.gz
+%{_mandir}/man1/calidns.1.gz
+%{_mandir}/man1/dumresp.1.gz
+%{_mandir}/man1/notify.1.gz
+%{_mandir}/man1/nproxy.1.gz
 %{_unitdir}/pdns.service
 %dir %{_libdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/
@@ -307,6 +306,9 @@ exit 0
 %{_libdir}/%{name}/libtinydnsbackend.so
 
 %changelog
+* Fri May 13 2016 Morten Stevens <mstevens@fedoraproject.org> - 4.0.0-0.6.alpha3
+- Update to 4.0.0 alpha 3
+
 * Wed Mar 02 2016 Morten Stevens <mstevens@fedoraproject.org> - 4.0.0-0.5.alpha2
 - Added mariadb-devel build dependency
 - Added own systemd unit file

sources

@@ -1 +1 @@
-96791b942b53d2880a3346d975147a65  pdns-4.0.0-alpha2.tar.bz2
+c7404e3c7fbcdac11ed9ff7863787592  pdns-4.0.0-alpha3.tar.bz2