[SCM] qxgedit/master: Fix hardening patch added, thanks to James Cowgill <james410 at cowgill.org.uk>.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sun May 31 21:18:30 UTC 2015


The following commit has been merged in the master branch:
commit c77999215460e95bb3a865ab13735edaa29019b1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun May 31 23:21:26 2015 +0200

    Fix hardening patch added, thanks to James Cowgill <james410 at cowgill.org.uk>.

diff --git a/debian/patches/03-fix_hardening.patch b/debian/patches/03-fix_hardening.patch
new file mode 100644
index 0000000..e4ed4d5
--- /dev/null
+++ b/debian/patches/03-fix_hardening.patch
@@ -0,0 +1,16 @@
+Description:  Fix hardening. Thanks to James Cowgill <james410 at cowgill.org.uk>
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: qxgedit/skulpture/skulpture.pri.in
+===================================================================
+--- qxgedit.orig/skulpture/skulpture.pri.in
++++ qxgedit/skulpture/skulpture.pri.in
+@@ -4,3 +4,7 @@ PREFIX  = @ac_prefix@
+ CONFIG += @ac_debug@
+ #INCLUDEPATH += @ac_incpath@
+ #LIBS += @ac_libs@
++
++# Extra optimization flags
++QMAKE_CXXFLAGS += @ac_cflags@
++QMAKE_LFLAGS += @ac_ldflags@
diff --git a/debian/patches/series b/debian/patches/series
index c1ff7d0..7e3ef8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-desktop.patch
 0002-fix_multiarch_dir.patch
+03-fix_hardening.patch
diff --git a/debian/rules b/debian/rules
index 1ec4ccc..c4f260a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
+
 %:
 	dh $@ --parallel --with autoreconf
 

-- 
qxgedit packaging



More information about the pkg-multimedia-commits mailing list