[Pkg-privacy-commits] [vidalia] 09/26: Enable hardening flags.

[Ximin Luo]

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

infinity0 pushed a commit to branch experimental
in repository vidalia.

commit 7c73500cceeacc6c5878261431f24759b51eb0c7
Author: intrigeri <intrigeri at boum.org>
Date:   Sun Jun 10 18:43:08 2012 +0200

    Enable hardening flags.
---
 debian/control | 2 +-
 debian/rules   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 93ae7d1..5f92b21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: Ulises Vitulli <dererk at debian.org>
 Uploaders: Vern Sun <s5unty at gmail.com>
-Build-Depends: debhelper (>= 6.0.7~), dh-apparmor, autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g)
+Build-Depends: debhelper (>= 6.0.7~), dh-apparmor, autotools-dev, libqt4-dev (>= 4.1.0), po-debconf (>= 1.0), cmake (>= 2.4.8), libssl-dev (>= 0.9.8g), dpkg-dev (>= 1.16.1.1~)
 Standards-Version: 3.9.3
 Homepage: https://www.torproject.org/projects/vidalia
 Vcs-Git: git://git.debian.org/collab-maint/vidalia.git/
diff --git a/debian/rules b/debian/rules
index 3a9050f..92d68c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -22,6 +26,9 @@ else
 	CFLAGS += -O2
 endif
 
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir

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