Merge version 4.1.3-1+rpi1 and 4.1.3-5 to produce 4.1.3-5+rpi1

diff --cc debian/changelog
index 3525d8c674e2f1339c787274026c09499404a92c,d5817c835546488eceaa37fc6064dacd5386ec0c..6187eafcbed682d41c9c7abd60f0df4b95f75235
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,46 +1,53 @@@
- pdns (4.1.3-1+rpi1) buster-staging; urgency=medium
++pdns (4.1.3-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 31 Dec 2017 14:27:56 +0000]
 +  * Add -latomic to ldflags.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jun 2018 04:26:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Aug 2018 16:24:49 +0000
++
+ pdns (4.1.3-5) unstable; urgency=medium
+ 
+   * Tests: cleanup leftovers
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Wed, 01 Aug 2018 19:49:32 +0000
+ 
+ pdns (4.1.3-4) unstable; urgency=medium
+ 
+   * Remove automatic database configuration.
+     Some database backends previously used dbconfig-common as a convenient
+     way of setting up the respective database server automatically,
+     including upgrades of the database schema. This has caused numerous
+     issues over the years, and has now been removed.
+     As we no longer know the database server credentials, drop generation
+     of configuration files.
+     Closer to the upstream packages, too.
+   * Reenable RestrictAddressFamilies on all architectures
+   * Tests: Disable ipv6-requiring tests.
+     The docker runners on salsa.d.o do not have working ::1.
+   * Tests: Remove check for ECC-GOST
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Tue, 31 Jul 2018 07:42:26 +0000
+ 
+ pdns (4.1.3-3) unstable; urgency=medium
+ 
+   * d/rules: print make check logfile on failure
+   * d/rules: Reenable -Wall
+   * d/rules: turn on all hardening flags
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Thu, 26 Jul 2018 10:06:56 +0000
+ 
+ pdns (4.1.3-2) unstable; urgency=medium
+ 
+   The yearly packaging cleanup release, from DebConf18.
+ 
+   * Bump Standards-Version to 4.1.5
+   * Use dh compat level 10, drop B-D on dh-autoreconf, dh-systemd,
+     autotools-dev
+   * d/rules: avoid directly calling $(shell ...)
+   * Set Rules-Requires-Root: no
+   * Honor nocheck build option
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Thu, 26 Jul 2018 06:51:59 +0000
  
  pdns (4.1.3-1) unstable; urgency=medium
  

diff --cc debian/rules
index 80ef6cad8a42a7f487d866ab660ef3da59325261,7cfe69482f4f0f9d21fc3d081b16d40638a9cb3b..23ae98cdd118f924bcf3bc7a5602921ac6f73624
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,21 +1,22 @@@
  #!/usr/bin/make -f
- DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
- DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ include /usr/share/dpkg/architecture.mk
+ include /usr/share/dpkg/pkg-info.mk
+ include /usr/share/dpkg/vendor.mk
  
  # Vendor and version
- version := $(shell dpkg-parsechangelog -SVersion).$(shell dpkg-vendor --query Vendor)
+ version := $(DEB_VERSION).$(DEB_VENDOR)
  CXXFLAGS += -DPACKAGEVERSION='"$(version)"'
 +LDFLAGS += -latomic
  
+ # (Re-)Enable warnings
+ CXXFLAGS += -Wall
+ 
+ # Turn on all hardening flags, as we're a networked daemon.
+ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+ 
+ # Avoid test failure in docker.
+ export PDNS_TEST_NO_IPV6=1
+ 
  # Backends
  backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns