Update to 3.3.3

.gitignore

@@ -10,3 +10,5 @@ pdns-2.9.22.tar.gz
 /pdns-3.3-rc2.tar.gz
 /pdns-3.3.tar.gz
 /pdns-3.3.1.tar.gz
+/pdns-3.3.2.tar.gz
+/pdns-3.3.3.tar.gz

pdns-disable-secpoll.patch

@@ -0,0 +1,11 @@
+--- pdns-3.3.3/pdns/common_startup.cc.orig	2015-06-08 13:59:02.000000000 +0200
++++ pdns-3.3.3/pdns/common_startup.cc	2015-06-10 14:11:35.253756981 +0200
+@@ -149,7 +149,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")="";
+ }
+ 
+ void declareStats(void)

pdns.spec

@@ -2,8 +2,8 @@
 %global backends %{nil}
 
 Name: pdns
-Version: 3.3.1
-Release: 2%{?dist}
+Version: 3.3.3
+Release: 1%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
@@ -11,6 +11,7 @@ URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Source1: pdns.service
 Patch0: pdns-default-config.patch
+Patch1: pdns-disable-secpoll.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -23,7 +24,6 @@ BuildRequires: boost-devel
 BuildRequires: lua-devel
 BuildRequires: cryptopp-devel
 BuildRequires: bison
-BuildRequires: polarssl-devel
 Provides: powerdns = %{version}-%{release}
 
 %description
@@ -131,9 +131,7 @@ This package contains the opendbx backend for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .default-config-patch
-
-# No inclusion of pre-built binaries or libraries
-rm -rf pdns/ext/polarssl-*
+%patch1 -p1 -b .disable-secpoll
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
@@ -142,13 +140,15 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--libdir=%{_libdir}/%{name} \
 	--disable-static \
+	--disable-dependency-tracking \
+	--disable-silent-rules \
 	--with-modules='' \
-        --with-system-polarssl \
 	--with-lua \
 	--with-dynmodules='%{backends}' \
 	--enable-cryptopp \
 	--enable-tools \
-	--enable-remotebackend-http
+	--enable-remotebackend-http \
+	--enable-unit-tests
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -166,6 +166,9 @@ chmod 600 %{buildroot}%{_sysconfdir}/%{name}/pdns.conf
 # Copy systemd service file
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/pdns.service
 
+%check
+make %{?_smp_mflags} -C pdns check
+
 %pre
 getent group pdns >/dev/null || groupadd -r pdns
 getent passwd pdns >/dev/null || \
@@ -260,6 +263,18 @@ exit 0
 %{_libdir}/%{name}/libopendbxbackend.so
 
 %changelog
+* Wed Jun 10 2015 Morten Stevens <mstevens@imt-systems.com> - 3.3.3-1
+- Update to 3.3.3
+- Disable security status polling by default
+
+* Fri May 01 2015 Morten Stevens <mstevens@imt-systems.com> - 3.3.2-1
+- Update to latest upstream release 3.3.2
+
+* Mon Apr 27 2015 Morten Stevens <mstevens@imt-systems.com> - 3.3.1-3
+- CVE-2015-1868
+- Run the unit tests during check
+- Remove polarssl-devel as build dependency
+
 * Mon Mar 17 2014 Morten Stevens <mstevens@imt-systems.com> - 3.3.1-2
 - Enable OpenDBX backend, thanks to Jean-Eudes Onfray (rhbz#1075490)
 

sources

@@ -1 +1 @@
-074e2ff211fd12ecad25b5c1cc190dd4  pdns-3.3.1.tar.gz
+4cc9ce7d63c0f78d57b1f337c023906c  pdns-3.3.3.tar.gz