[cb2bib] 12/14: debian/patches/hardening-rules.patch: fix patch to have the variables set correctly. Add title to patch.

[Filippo Rusconi]

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

lopippo pushed a commit to branch master
in repository cb2bib.

commit bbeaeed5ef5cea856162c266dacdab9b1d19197a
Author: Filippo Rusconi (Uploading Debian Developer) <lopippo at debian.org>
Date:   Mon Aug 17 13:32:19 2015 +0200

    debian/patches/hardening-rules.patch: fix patch to have the variables set correctly. Add title to patch.
---
 debian/patches/hardening-rules.patch | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/patches/hardening-rules.patch b/debian/patches/hardening-rules.patch
index 828dbad..196cf0b 100644
--- a/debian/patches/hardening-rules.patch
+++ b/debian/patches/hardening-rules.patch
@@ -1,18 +1,20 @@
-Patch to tell qmake the flags to harden the binary
-
-diff --git a/cb2bib.pro b/cb2bib.pro
-index e47b655..7cd7b8e 100644
---- a/cb2bib.pro
-+++ b/cb2bib.pro
-@@ -3,3 +3,11 @@ win32 {
- SUBDIRS += src/win
+Patch to implement the hardening rules as defined by Debian
+diff --git a/src/src.pro b/src/src.pro
+index 6450fa5..48378a2 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -211,3 +211,14 @@ macx {
+ #   Set Library data
+ #   QMAKE_BUNDLE_DATA += externtools
  }
- TEMPLATE = subdirs 
 +
 +# Addition by FRusconi <lopippo at debian.org> to security-harden the
 +# binary.
 +
-+QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
-+QMAKE_CFLAGS   *= $(shell dpkg-buildflags --get CFLAGS)
-+QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
-+QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
++QMAKE_CPPFLAGS *= $$system(dpkg-buildflags --get CPPFLAGS)
++QMAKE_CFLAGS   *= $$system(dpkg-buildflags --get CFLAGS)
++QMAKE_CXXFLAGS *= $$system(dpkg-buildflags --get CXXFLAGS)
++
++message($$QMAKE_CPPFLAGS)
++message($$QMAKE_CFLAGS)
++message($$QMAKE_CXXFLAGS)

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