[Pkg-nagios-changes] [pkg-monitoring-plugins] 10/11: Drop hardening-wrapper, use dpkg-buildflags instead

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit 093d9a4707bc70a20bf6691a6d15a5f8847a65e8
Author: Jan Wagner <waja at cyconet.org>
Date:   Mon Nov 16 18:56:11 2015 +0100

    Drop hardening-wrapper, use dpkg-buildflags instead
---
 debian/control | 1 -
 debian/rules   | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 2b6f392..905338e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian
 Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>
 Build-Depends: autotools-dev,
                debhelper (>= 5),
-               hardening-wrapper,
                libdbi-dev,
                libfreeradius-client-dev | libradiusclient-ng-dev,
                libkrb5-dev,
diff --git a/debian/rules b/debian/rules
index 56ac34c..9d8267a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# enable hardnening
-export DEB_BUILD_HARDENING=1
+# for hardening
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 PACKAGE = monitoring-plugins
 
@@ -79,8 +80,9 @@ config.status: configure
 	rm -f config.cache
 	
 	# Add here commands to configure the package.
+	# Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags
+	CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \
 	PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \
-	CFLAGS="$(CFLAGS)" \
 	./configure \
 		--disable-maintainer-mode \
 		--host=$(DEB_HOST_GNU_TYPE) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git