[Pkg-samba-maint] [samba] 06/11: Ensure that dpkg-buildflags are passed, and enable all hardening

[Mathieu Parent]

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

sathieu pushed a commit to branch experimental
in repository samba.

commit 77a81834345034b5b6630dbf74ee886374e560d2
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat May 7 22:24:54 2016 +0200

    Ensure that dpkg-buildflags are passed, and enable all hardening
    
    This should fix (from buildd log scanner):
    
        W dpkg-buildflags-missing CPPFLAGS 1 (of 4034), CFLAGS 1161 (of 4033), LDFLAGS 943 (of 1855) missing (powerpc)
        W dpkg-buildflags-missing CPPFLAGS 1 (of 4038), CFLAGS 1165 (of 4037), LDFLAGS 946 (of 1858) missing (armel)
        W dpkg-buildflags-missing CPPFLAGS 1 (of 4043), CFLAGS 1170 (of 4042), LDFLAGS 945 (of 1857) missing (amd64, ppc64el, s390x)
        W dpkg-buildflags-missing CPPFLAGS 1 (of 4044), CFLAGS 1171 (of 4043), LDFLAGS 944 (of 1856) missing (arm64)
    
    This should also enable PIE and bindnow hardenings
    
    This should also enable the --as-needed flag
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 15e5423..ad0270d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,10 @@
 #
 DESTDIR = $(CURDIR)/debian/tmp
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 PYVERS=$(shell pyversions -vr)
 
@@ -72,8 +75,7 @@ conf_args = \
 	dh $* --with python2 --with systemd
 
 override_dh_auto_configure:
-	$(shell dpkg-buildflags --export=configure) $(WAF) configure \
-		$(conf_args)
+	$(WAF) configure $(conf_args)
 
 override_dh_auto_clean:
 	-$(WAF) clean

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