[SCM] vlevel/master: Enable all hardening build flags

[abe at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 05c32f81aa060f5b9fac7dab5d024ee6df27d221
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Oct 30 00:31:55 2017 +0100

    Enable all hardening build flags
    
    Extend fix-hardcoded-makefile-variables.patch to also fix
    vlevel-jack/Makefile.

diff --git a/debian/changelog b/debian/changelog
index f738085..9df13e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ vlevel (0.5.1-2) UNRELEASED; urgency=medium
 
   * Remove trailing whitespace from debian/rules.
   * Switch Vcs-* header and DEP5 format URL to HTTPS.
+  * Enable all hardening build flags.
+    + Extend fix-hardcoded-makefile-variables.patch to also fix
+      vlevel-jack/Makefile.
 
  -- Axel Beckert <abe at debian.org>  Mon, 30 Oct 2017 00:20:59 +0100
 
diff --git a/debian/patches/fix-hardcoded-makefile-variables.patch b/debian/patches/fix-hardcoded-makefile-variables.patch
index 8a0232e..b551498 100644
--- a/debian/patches/fix-hardcoded-makefile-variables.patch
+++ b/debian/patches/fix-hardcoded-makefile-variables.patch
@@ -1,18 +1,16 @@
 Description: Fix hardcoded Makefile variables
  Needed for proper installation paths as well as compiler flags
 Author: Axel Beckert <abe at debian.org>
-Last-Update: 2015-Feb-20
+Last-Update: 2017-Oct-30
 
-Index: vlevel/Makefile
-===================================================================
---- vlevel.orig/Makefile	2015-02-20 12:53:54.811087786 +0100
-+++ vlevel/Makefile	2015-02-20 12:53:54.811087786 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -27,7 +27,7 @@
  # on my system, it makes it a bit worse.
  
  #export CXXFLAGS = -Wall -O3 -fPIC -DPIC -g -march=pentium4
 -export CXXFLAGS = -Wall -O3 -fPIC -DPIC
-+export CXXFLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -DPIC
++export CXXFLAGS += $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -DPIC
  
  # On my system, ICC is quite a bit faster, with these options:
  #export CC=icc
@@ -26,3 +24,18 @@ Index: vlevel/Makefile
  export LADSPA_PATH = $(PREFIX)/lib/ladspa/
  
  # End of user-editable options.
+--- a/vlevel-jack/Makefile
++++ b/vlevel-jack/Makefile
+@@ -22,10 +22,10 @@
+ # This is evil, but it makes implicit link rules use g++, not gcc
+ CC = $(CXX)
+ #LDFLAGS = -L/opt/local/lib
+-LDFLAGS = ` pkg-config --libs-only-L jack `
++LDFLAGS += ` pkg-config --libs-only-L jack `
+ #LDLIBS = -ljack -lpthread -framework CoreAudio -framework CoreServices -framework AudioUnit
+ LDLIBS = ` pkg-config --libs-only-l jack `
+-CXXFLAGS = ` pkg-config --cflags jack `
++CXXFLAGS += ` pkg-config --cflags jack `
+ #CXXFLAGS= -I/opt/local/include -g -v
+ CFLAGS = $(CXXFLAGS)
+ 
diff --git a/debian/rules b/debian/rules
index 62394fd..9570c06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@
 

-- 
vlevel packaging