[Pkg-ganeti-devel] [ganeti] 01/01: Patch Makefile.in to pass linker flags

[Apollon Oikonomopoulos]

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

apoikos-guest pushed a commit to branch master
in repository ganeti.

commit 7895531075fcc35ee72d7e44d38bd6a7bad95b4e
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Fri Nov 1 18:53:53 2013 +0200

    Patch Makefile.in to pass linker flags
    
    Pass -Wl,-z,relro and -Wl,--as-needed.
    
    Also remove the lintian overrides for no-relro
---
 debian/ganeti-haskell.lintian-overrides    |    4 ----
 debian/ganeti-htools.lintian-overrides     |    1 -
 debian/patches/pass-ghc-linker-flags.patch |   16 ++++++++++++++++
 debian/patches/series                      |    1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/ganeti-haskell.lintian-overrides b/debian/ganeti-haskell.lintian-overrides
index 19079dd..8e97075 100644
--- a/debian/ganeti-haskell.lintian-overrides
+++ b/debian/ganeti-haskell.lintian-overrides
@@ -1,7 +1,3 @@
-ganeti-haskell binary: hardening-no-relro usr/lib/ganeti/mon-collector
-ganeti-haskell binary: hardening-no-relro usr/sbin/ganeti-confd
-ganeti-haskell binary: hardening-no-relro usr/sbin/ganeti-luxid
-ganeti-haskell binary: hardening-no-relro usr/sbin/ganeti-mond
 ganeti-haskell binary: hardening-no-fortify-functions usr/lib/ganeti/mon-collector
 ganeti-haskell binary: hardening-no-fortify-functions usr/sbin/ganeti-confd
 ganeti-haskell binary: hardening-no-fortify-functions usr/sbin/ganeti-luxid
diff --git a/debian/ganeti-htools.lintian-overrides b/debian/ganeti-htools.lintian-overrides
index 529853b..41f13a8 100644
--- a/debian/ganeti-htools.lintian-overrides
+++ b/debian/ganeti-htools.lintian-overrides
@@ -1,3 +1,2 @@
-ganeti-htools binary: hardening-no-relro usr/bin/htools
 ganeti-htools binary: hardening-no-fortify-functions usr/bin/htools
 ganeti-htools binary: hyphen-used-as-minus-sign
diff --git a/debian/patches/pass-ghc-linker-flags.patch b/debian/patches/pass-ghc-linker-flags.patch
new file mode 100644
index 0000000..65b14ab
--- /dev/null
+++ b/debian/patches/pass-ghc-linker-flags.patch
@@ -0,0 +1,16 @@
+Author: Apollon Oikonomopoulos <apoikos at gmail.com>
+Description: Pass linker flags to GHC
+ Enable hardening (relro) and as-needed
+
+Forwarded: no
+Last-Update: 2013-11-01
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -801,6 +801,7 @@
+ 	-O -Wall -Werror -isrc \
+ 	-fwarn-monomorphism-restriction \
+ 	-fwarn-tabs \
++        -optl -Wl,-z,relro -optl -Wl,--as-needed \
+ 	$(GHC_BYVERSION_FLAGS)
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7011cb7..e82830b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
+pass-ghc-linker-flags.patch

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