Imported Debian patch 3.0.1-3

debian/rules

@@ -3,21 +3,34 @@
 # newer dpkg set this by default.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+CFLAGS += $(CPPFLAGS)
+
+export AUTOHEADER=true
 
 %:
-	    dh $@ --with dpatch,autotools_dev
+	    dh $@ --with autoreconf,systemd --parallel
 
 override_dh_auto_configure:
-	./configure \
+	# Save deterministic "openssl dhparam" output.
+	cp include/dh.h include/dh.h.orig
+
+	dh_auto_configure -- \
 		--prefix=/usr \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib/nagios \
+		--libexecdir=/usr/lib/nagios/plugins \
+		--localstatedir=/var \
 		--enable-ssl \
 		--with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/nagios/plugins \
-		--libdir=/usr/lib/nagios \
-		--enable-command-args
+		--with-piddir=/var/run/nagios
+
+	# Restore deterministic "openssl dhparam" output.
+	cp include/dh.h.orig include/dh.h
+
+override_dh_auto_build:
+	dh_auto_build -- all
 
 override_dh_auto_install: