[pkg-bacula-commits] [bacula] 02/02: Bump debhelper compat level to 9 and enable hardening for bat (Closes: #736461)

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit c05b73e4e42cdb08afdbf0c8e523218318bac0b7
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Nov 15 16:01:24 2015 +0100

    Bump debhelper compat level to 9 and enable hardening for bat
    (Closes: #736461)
---
 debian/changelog                              |  2 ++
 debian/compat                                 |  2 +-
 debian/control                                |  2 +-
 debian/patches/enable-hardening-for-bat.patch | 15 +++++++++++++++
 debian/patches/series                         |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36f5da5..1f5b1fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ bacula (7.0.5+dfsg-3) unstable; urgency=low
   * Corrected logrotate configuration. (Closes: #694046, #716666)
   * Stop daemon in bacula-director-*.prerm unconditionally to fix issue on
     kfreebsd where the old daemon would keep running
+  * Bump debhelper compat level to 9 and enable hardening for bat
+    (Closes: #736461)
 
  --
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 34d66d5..6955876 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  autoconf,
  autotools-dev,
  bc,
- debhelper (>= 8.1.3),
+ debhelper (>= 9),
  libacl1-dev,
  libcap-dev [linux-any],
  libgnome2-dev,
diff --git a/debian/patches/enable-hardening-for-bat.patch b/debian/patches/enable-hardening-for-bat.patch
new file mode 100644
index 0000000..8561224
--- /dev/null
+++ b/debian/patches/enable-hardening-for-bat.patch
@@ -0,0 +1,15 @@
+Description: Enable hardening for bat
+Origin: https://wiki.debian.org/Hardening#Notes_for_packages_using_QMake
+Bug-Debian: 736461
+--- a/src/qt-console/bat.pro.in
++++ b/src/qt-console/bat.pro.in
+@@ -183,3 +183,9 @@
+ QMAKE_EXTRA_TARGETS += depend
+ 
+ TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts
++
++### See https://wiki.debian.org/Hardening#Notes_for_packages_using_QMake
++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)
diff --git a/debian/patches/series b/debian/patches/series
index deef816..7e9006a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-src-tools-make-clean.patch
 fix-systemd-tmpfiles.d-location.patch
 add-basic-kfreebsd-support.patch
 fix-update-sqlite3-12to14.patch
+enable-hardening-for-bat.patch

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