Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Dear Release Team, pdns-recursor 3.6.2-2 contains only packaging changes, they are: * Set PACKAGEVERSION to identify the packages as coming from Debian for security polling support. This closes #767701 (important) * Fix smoke autopkgtest (correct stupid oversight from when the test has been added). * Set Vcs-Git and Vcs-Browser to the "correct" anonscm.d.o values, zapping lintian warnings for that. I'm attaching a debdiff from 3.6.2-1 (in jessie). Please unblock package pdns-recursor: unblock pdns-recursor/3.6.2-2 Thank you, Christian
diff -Nru pdns-recursor-3.6.2/debian/changelog pdns-recursor-3.6.2/debian/changelog
--- pdns-recursor-3.6.2/debian/changelog 2014-10-30 17:34:48.000000000 +0100
+++ pdns-recursor-3.6.2/debian/changelog 2014-11-15 18:06:05.000000000 +0100
@@ -1,3 +1,15 @@
+pdns-recursor (3.6.2-2) unstable; urgency=medium
+
+ * Set package vendor for security status polling.
+ Requires directly including buildflags.mk so d/rules can modify
+ CXXFLAGS. (Closes: #767701)
+ * d/control: Update Vcs-Git and Vcs-Browser
+ * Fix "smoke" autopkgtest.
+ The test definition was incorrectly copied from the pdns-server
+ package.
+
+ -- Christian Hofstaedtler <zeha@debian.org> Sat, 15 Nov 2014 17:42:26 +0100
+
pdns-recursor (3.6.2-1) unstable; urgency=high
* Imported Upstream version 3.6.2, a bugfix release (Closes: #767368)
diff -Nru pdns-recursor-3.6.2/debian/control pdns-recursor-3.6.2/debian/control
--- pdns-recursor-3.6.2/debian/control 2014-10-30 14:16:26.000000000 +0100
+++ pdns-recursor-3.6.2/debian/control 2014-11-15 17:28:23.000000000 +0100
@@ -4,9 +4,9 @@
Standards-Version: 3.9.6
Maintainer: Debian PowerDNS Maintainers <pkg-pdns-maintainers@lists.alioth.debian.org>
Uploaders: Matthijs Möhlmann <matthijs@cacholong.nl>, Marc Haber <mh+debian-packages@zugschlus.de>, Christian Hofstaedtler <zeha@debian.org>
-Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.10.17), libboost-dev, libboost-serialization-dev, liblua5.2-dev, pkg-config
-Vcs-Git: git://git.debian.org/pkg-pdns/pdns-recursor.git
-Vcs-Browser: http://git.debian.org/?p=pkg-pdns/pdns-recursor.git
+Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, pkg-config
+Vcs-Git: git://anonscm.debian.org/pkg-pdns/pdns-recursor.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-pdns/pdns-recursor.git
Homepage: http://www.powerdns.com/
Package: pdns-recursor
diff -Nru pdns-recursor-3.6.2/debian/rules pdns-recursor-3.6.2/debian/rules
--- pdns-recursor-3.6.2/debian/rules 2014-10-30 14:16:26.000000000 +0100
+++ pdns-recursor-3.6.2/debian/rules 2014-11-15 17:28:23.000000000 +0100
@@ -8,6 +8,13 @@
# Enable hardening features for daemons
# Note: blhc (build log hardening check) will find these false positivies: CPPFLAGS 2 missing, LDFLAGS 1 missing
export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow,+pie
+DPKG_EXPORT_BUILDFLAGS = 1
+# Include buildflags.mk so we can append to the vars it sets.
+include /usr/share/dpkg/buildflags.mk
+
+# Vendor and version (after buildflags.mk so we don't overwrite CXXFLAGS)
+version := $(shell dpkg-parsechangelog -SVersion).$(shell dpkg-vendor --query Vendor)
+CXXFLAGS += -DPACKAGEVERSION='"$(version)"'
# Use new build system
%:
diff -Nru pdns-recursor-3.6.2/debian/tests/smoke pdns-recursor-3.6.2/debian/tests/smoke
--- pdns-recursor-3.6.2/debian/tests/smoke 2014-10-30 14:16:26.000000000 +0100
+++ pdns-recursor-3.6.2/debian/tests/smoke 2014-11-15 18:06:05.000000000 +0100
@@ -2,8 +2,8 @@
exec 2>&1
set -ex
-cat <<EOF >/etc/powerdns/bindbackend.conf
-zone "example.org" { type master; file "/etc/powerdns/example.org.zone"; };
+cat <<EOF >>/etc/powerdns/recursor.conf
+auth-zones=example.org=/etc/powerdns/example.org.zone
EOF
cat <<EOF >/etc/powerdns/example.org.zone
@@ -12,7 +12,7 @@
smoke.example.org. 172800 IN A 127.0.0.123
EOF
-service pdns restart
+service pdns-recursor restart
TMPFILE=$(mktemp)
cleanup() {
Attachment:
signature.asc
Description: Digital signature