[med-svn] [clonalframeml] 02/02: Try to propagate hardening options

[Andreas Tille]

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

tille pushed a commit to branch master
in repository clonalframeml.

commit cba75219649babb3a236f5c201317b1a19c6107f
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 21 11:23:37 2017 +0200

    Try to propagate hardening options
---
 debian/patches/hardening.patch                      | 15 +++++++++++++++
 debian/patches/series                               |  2 ++
 debian/patches/use_debian_revision_as_version.patch | 20 ++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..7fc2888
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 21 Sep 2017 10:30:54 +0200
+Description: Propagate hardening options
+
+--- a/src/makefile
++++ b/src/makefile
+@@ -1,7 +1,6 @@
+ # Make file for ClonalFrameML
+ CC = g++
+-CFLAGS = -O3 -I./ -I./myutils -I./coalesce
+-LDFLAGS = 
++CFLAGS += -O3 -I./ -I./myutils -I./coalesce
+ OBJECTS = main.o
+ HEADERS = main.h brent.h powell.h version.h
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3dd6a58..1e9b040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 fix_clean_target.patch
+use_debian_revision_as_version.patch
+hardening.patch
diff --git a/debian/patches/use_debian_revision_as_version.patch b/debian/patches/use_debian_revision_as_version.patch
new file mode 100644
index 0000000..b7927bb
--- /dev/null
+++ b/debian/patches/use_debian_revision_as_version.patch
@@ -0,0 +1,20 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 21 Sep 2017 10:30:54 +0200
+Description: Prevent a useless call to Git since we need to use
+ the Debian revision as version mark anyway since we do not build
+ out of the Git repository
+
+--- a/src/makefile
++++ b/src/makefile
+@@ -15,8 +15,9 @@ ClonalFrameML: $(OBJECTS)
+ main.o: main.cpp $(HEADERS)
+ 	$(CC) $(CFLAGS) -c -o main.o main.cpp
+ 
+-version:
+-	/bin/echo "#define ClonalFrameML_GITRevision \"`git describe --tags`\"" > version.h
++version: version.h
++	# /bin/echo "#define ClonalFrameML_GITRevision \"`git describe --tags`\"" > version.h
++	cat version.h
+ 
+ clean:
+ 	rm -f $(OBJECTS)

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