[xml/sgml-commit] [linuxdoc-tools] 03/08: debian/{rules, control}: Improve hardening of build flags.

[Agustín Martín Domingo]

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

agmartin pushed a commit to branch master
in repository linuxdoc-tools.

commit 449069dafb2a52637aa53fa67c2da53f39244443
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Wed May 4 19:16:36 2016 +0200

    debian/{rules,control}: Improve hardening of build flags.
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 debian/changelog |  1 +
 debian/control   |  1 +
 debian/rules     | 13 +++++--------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2757c26..f63faf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linuxdoc-tools (0.9.72-1) unstable; urgency=medium
 
   * New upstream 0.9.72 release.
+  * debian/{rules,control}: Improve hardening of build flags.
 
  -- Agustin Martin Domingo <agmartin at debian.org>  Wed, 04 May 2016 19:11:58 +0200
 
diff --git a/debian/control b/debian/control
index cbee0d1..105cb75 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Homepage: https://gitlab.com/agmartin/linuxdoc-tools
 Vcs-Git: git://anonscm.debian.org/debian-xml-sgml/linuxdoc-tools.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-xml-sgml/linuxdoc-tools.git;a=summary
 Build-Depends: debhelper (>= 7 ),
+	       dpkg-dev (>= 1.16.1.1),
 	       perl,
 	       flex,
 	       gawk | mawk,
diff --git a/debian/rules b/debian/rules
index 397a45d..ac4692b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 #
 # Rules makefile for linuxdoc-tools package
 #
-# Copyright (C) 2007-2008 Agustin Martin <agmartin at debian.org>
+# Copyright (C) 2007-2016 Agustin Martin <agmartin at debian.org>
 #
 # Based on debhelper examples by Joey Hess and former Debian/rules
 # by Taketoshi Sano and Sven Rudolph
@@ -17,13 +17,10 @@ DESTDIR   = $(CURDIR)/debian/tmp
 # -- For FHS transition
 MANDIR    = /usr/share/man
 
-# Get default build flags
-
-CFLAGS    = $(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS  = $(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS   = $(shell dpkg-buildflags --get LDFLAGS)
-
-export CFLAGS LDFLAGS
+# Get default build flags for maximum hardening (Needs dpkg-dev >= 1.16.1.1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 # -- Create linuxdoc-tools copyright file by merging some files
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/linuxdoc-tools.git