[med-svn] [harvest-tools] 02/02: Hardening

[Andreas Tille]

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

tille pushed a commit to branch master
in repository harvest-tools.

commit e5cea0a6ee9cbc1fe6db54e4598df874b875c5ff
Author: Andreas Tille <tille at debian.org>
Date:   Sat Apr 9 20:18:44 2016 +0200

    Hardening
---
 debian/patches/hardening.patch | 15 +++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..d586124
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Mar 2016 11:08:15 +0100
+Description: Propagate hardening options
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -26,7 +26,7 @@ OBJECTS=$(SOURCES:.cpp=.o) src/harvest/p
+ all : harvesttools libharvest.a
+ 
+ harvesttools : libharvest.a src/harvest/memcpyWrap.o
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o harvesttools src/harvest/memcpyWrap.o libharvest.a -lprotobuf -lcapnp -lkj -lstdc++ -lz -lm -lpthread
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o harvesttools src/harvest/memcpyWrap.o libharvest.a -lprotobuf -lcapnp -lkj -lstdc++ -lz -lm -lpthread $(LDFLAGS)
+ 
+ libharvest.a : $(OBJECTS)
+ 	ar -cr libharvest.a $(OBJECTS)
diff --git a/debian/patches/series b/debian/patches/series
index 7299241..cc43886 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_readme_in_setup.patch
 dynamic_linking.patch
+hardening.patch
diff --git a/debian/rules b/debian/rules
index c2af8b3..1ff9e4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 # DH_VERBOSE := 1
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/harvest-tools.git