[SCM] cmus/master: Enable build hardening by also using CPPFLAGS; 03_cppflags.diff

[rak at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a3ef4dff729c736de42c2b5755c2ecb983dd909
Author: Ryan Kavanagh <rak at debian.org>
Date:   Thu Aug 29 13:36:04 2013 -0400

    Enable build hardening by also using CPPFLAGS; 03_cppflags.diff

diff --git a/debian/changelog b/debian/changelog
index a88ffdd..6ba2f7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cmus (2.5.0-3) UNRELEASED; urgency=low
+
+  * Don't FTBFS due to missing config.mk (Closes: #720781), 01_config.mk.diff
+  * Bump standards version to 3.9.4
+  * Used debhelper 9.0.0 to enable hardening
+  * Switch to canonical Vcs-* fields
+  * Fix typo in cmus binary, 02_fix_typo.diff
+
+ -- Ryan Kavanagh <rak at debian.org>  Wed, 28 Aug 2013 11:36:51 -0400
+
 cmus (2.5.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/03_cppflags.diff b/debian/patches/03_cppflags.diff
new file mode 100644
index 0000000..fa38474
--- /dev/null
+++ b/debian/patches/03_cppflags.diff
@@ -0,0 +1,43 @@
+Description: Use CPPFLAGS to enable function fortification / hardening
+ Based off of GNU Make's implicit rule
+Author: Ryan Kavanagh <rak at debian.org>
+Origin: vendor
+Forwarded: yes
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: cmus/scripts/lib.mk
+===================================================================
+--- cmus.orig/scripts/lib.mk	2013-08-29 13:27:50.000000000 -0400
++++ cmus/scripts/lib.mk	2013-08-29 13:31:39.852947960 -0400
+@@ -83,7 +83,7 @@
+ 
+ # CC for program object files (.o)
+ quiet_cmd_cc    = CC     $@
+-      cmd_cc    = $(CC) -c $(CFLAGS) -o $@ $<
++      cmd_cc    = $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+ 
+ # HOSTCC for program object files (.o)
+ quiet_cmd_hostcc    = HOSTCC     $@
+@@ -91,7 +91,7 @@
+ 
+ # CC for shared library and dynamically loadable module objects (.lo)
+ quiet_cmd_cc_lo = CC     $@
+-      cmd_cc_lo = $(CC) -c $(CFLAGS) $(SOFLAGS) -o $@ $<
++      cmd_cc_lo = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(SOFLAGS) -o $@ $<
+ 
+ # LD for programs, optional parameter: libraries
+ quiet_cmd_ld = LD     $@
+@@ -111,11 +111,11 @@
+ 
+ # CXX for program object files (.o)
+ quiet_cmd_cxx    = CXX    $@
+-      cmd_cxx    = $(CXX) -c $(CXXFLAGS) -o $@ $<
++      cmd_cxx    = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+ 
+ # CXX for shared library and dynamically loadable module objects (.lo)
+ quiet_cmd_cxx_lo = CXX    $@
+-      cmd_cxx_lo = $(CXX) -c $(CXXFLAGS) $(SOFLAGS) -o $@ $<
++      cmd_cxx_lo = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SOFLAGS) -o $@ $<
+ 
+ # CXXLD for programs, optional parameter: libraries
+ quiet_cmd_cxxld = CXXLD  $@
diff --git a/debian/patches/series b/debian/patches/series
index 1e89b60..95f6553 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_config.mk.diff
 02_fix_typo.diff
+03_cppflags.diff

-- 
cmus packaging