Enable hardening buildflags

diff --git a/debian/changelog b/debian/changelog
index 65c32816299b5bbbf6f983c27209e7c75455c2de..02bc32b92ba3464d3fd0a17d410b1f5808658dec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glabels (3.0.0-4) UNRELEASED; urgency=low
+
+  * Enable hardening buildflags
+
+ -- Jakob Haufe <sur5r@sur5r.net>  Thu, 05 Jul 2012 00:07:37 +0200
+
 glabels (3.0.0-3) unstable; urgency=low
 
   * Remove obsolete configure options

diff --git a/debian/rules b/debian/rules
index df99e583df3ef28be0ba4468c24d03486b6039cf..429d75ea04d074921e83deffd833490bdd1f8417 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,14 @@
 # $Id: rules 23938 2010-04-21 17:43:11Z didrocks-guest $
 # ====================================================================
 
+# Remove excess dependencies
+export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
+
+# Hardening flags
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall
+include /usr/share/dpkg/buildflags.mk
+
 # CDBS classes & rules
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -16,9 +24,6 @@ include /usr/share/cdbs/1/rules/utils.mk
 # Compilation options
 DEB_CONFIGURE_EXTRA_FLAGS := --with-libebook
 
-# Remove excess dependencies
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=-Wl,--as-needed
-
 # Debhelper arguments
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp --list-missing