[qrouter] 02/06: Only add the missing hardening option

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository qrouter.

commit 0d881ce7e53f622e9c1f4b9e06d91160a47372f2
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Feb 20 19:50:31 2015 +0100

    Only add the missing hardening option
---
 debian/changelog | 1 +
 debian/rules     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 434917d..d3cb77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qrouter (1.3.7-1) experimental; urgency=low
   * Refreshed patches
   * Added d/qrouter.lintian-overrides in order to ignore shlib-calls-exit
     for qrouter.so
+  * Enabled full hardening (d/rules)
 
  -- Ruben Undheim <ruben.undheim at gmail.com>  Fri, 20 Feb 2015 18:37:06 +0100
 
diff --git a/debian/rules b/debian/rules
index daf20c6..ef1140e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,9 @@
 #export DH_VERBOSE=1
 
 # The build script crashes if "-pie" is given to the build command. Therefore
-# enabling hardening with LDFLAGS_MAINT_APPEND (together with the --as-needed
-# option):
-export DEB_LDFLAGS_MAINT_APPEND = -fPIE -Wl,-z,relro -Wl,-z,now -Wl,--as-needed
+# enabling the missing hardening options with LDFLAGS_MAINT_APPEND (together
+# with the --as-needed option):
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,now -Wl,--as-needed
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qrouter.git