[SCM] qtractor/master: Fix hardening.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 927dc1980c2d35cfa85c810529ffe06055a86855
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 16 21:29:48 2016 +0200

    Fix hardening.

diff --git a/debian/patches/01-hardening.patch b/debian/patches/01-hardening.patch
new file mode 100644
index 0000000..d422bb6
--- /dev/null
+++ b/debian/patches/01-hardening.patch
@@ -0,0 +1,30 @@
+Description: Fix hardening by passing flags corectly. 
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: qtractor/src/src.pri.in
+===================================================================
+--- qtractor.orig/src/src.pri.in
++++ qtractor/src/src.pri.in
+@@ -7,5 +7,6 @@ INCLUDEPATH += @ac_incpath@
+ LIBS += @ac_libs@
+ 
+ # Extra optimization flags
+-QMAKE_CXXFLAGS += @ac_cflags@
+-QMAKE_LFLAGS += @ac_ldflags@
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
++QMAKE_CFLAGS += $(CPPFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS)
+Index: qtractor/src/qtractor_vst_scan.pri.in
+===================================================================
+--- qtractor.orig/src/qtractor_vst_scan.pri.in
++++ qtractor/src/qtractor_vst_scan.pri.in
+@@ -3,3 +3,8 @@
+ PREFIX  = @ac_prefix@
+ CONFIG += @ac_debug@
+ INCLUDEPATH += @ac_incpath@
++
++# Extra optimization flags
++QMAKE_CXXFLAGS += $(CPPFLAGS) @ac_cflags@
++QMAKE_CFLAGS += $(CPPFLAGS)
++QMAKE_LFLAGS += $(LDFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index f51d2a4..95cb735 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+01-hardening.patch
 04-q_atomic_ftbfs.patch
 06-desktop.patch
diff --git a/debian/rules b/debian/rules
index 47227f5..d6ffe71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 LDFLAGS+=-Wl,--as-needed
 

-- 
qtractor packaging