[SCM] qsampler/master: Fix hardening.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Jun 17 09:22:56 UTC 2016


The following commit has been merged in the master branch:
commit 7982d9cbb77f57d2310f617ad4f0dc84d2bd8788
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Jun 17 11:09:05 2016 +0200

    Fix hardening.

diff --git a/debian/patches/0001-hardening.patch b/debian/patches/0001-hardening.patch
new file mode 100644
index 0000000..6c6d039
--- /dev/null
+++ b/debian/patches/0001-hardening.patch
@@ -0,0 +1,17 @@
+Description: Fix hardening by passing flags
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: qsampler/src/src.pri.in
+===================================================================
+--- qsampler.orig/src/src.pri.in
++++ qsampler/src/src.pri.in
+@@ -6,5 +6,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)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..56aa973
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-hardening.patch
diff --git a/debian/rules b/debian/rules
index 52ad1ff..ae45c55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-export QT_CFLAGS := $(CFLAGS)
-export QT_CXXFLAGS := $(CXXFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export QT_SELECT=qt5
 

-- 
qsampler packaging



More information about the pkg-multimedia-commits mailing list