[med-svn] [ffindex] 06/08: Pass CPPFLAGS and LDFLAGS for hardening

[Graham Inggs]

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

ginggs pushed a commit to branch master
in repository ffindex.

commit cc4c2aa4011f1af2bf7a8f8d1740b8807f669ca6
Author: Graham Inggs <ginggs at debian.org>
Date:   Thu Jun 29 16:07:18 2017 +0200

    Pass CPPFLAGS and LDFLAGS for hardening
---
 debian/changelog              |  1 +
 debian/patches/Makefile.patch | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a08093..816792b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ffindex (0.9.9.7-4) UNRELEASED; urgency=medium
   * Drop debian/libffindex0.lintian-overrides and
     debian/README.source, no longer required
   * Generate manpages for ffindex_apply_mpi and ffindex_from_tsv
+  * Pass CPPFLAGS and LDFLAGS for hardening
 
  -- Graham Inggs <ginggs at debian.org>  Thu, 29 Jun 2017 14:11:49 +0200
 
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
index d42ceeb..25609dc 100644
--- a/debian/patches/Makefile.patch
+++ b/debian/patches/Makefile.patch
@@ -1,15 +1,18 @@
-From: Laszlo Kajan <lkajan at rostlab.org>
-Subject: Makefile fixes
+Description: Makefile fixes
   * make Makefile DESTDIR-aware
   * other changes to allow help2man to work better.
   * deinstall -> uninstall
+  * pass CPPFLAGS and LDFLAGS for hardening
   .
   Upstream is aware but not interested in DESTDIR.
 Forwarded: yes
+Author: Laszlo Kajan <lkajan at debian.org>
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2017-06-29
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -1,5 +1,6 @@
+@@ -1,17 +1,22 @@
 -INSTALL_DIR?=..
 -libdir=`([ -d /usr/lib64 ] && echo lib64) || echo lib`
 +PREFIX?=/usr
@@ -18,11 +21,12 @@ Forwarded: yes
  LANG=C
  #CC=musl-gcc
  #OMPI_CC=musl-gcc
-@@ -7,11 +8,15 @@ LANG=C
+ #CC=gcc
  #CC=icc
  #CC=clang
- CFLAGS+=-std=c99 -O2 -g -fPIC -Wall -pedantic -D_GNU_SOURCE=1 -I.
+-CFLAGS+=-std=c99 -O2 -g -fPIC -Wall -pedantic -D_GNU_SOURCE=1 -I.
 -LDFLAGS=-lffindex -L.
++CFLAGS+=-std=c99 -O2 -g -fPIC -Wall -pedantic -D_GNU_SOURCE=1 -I. $(CPPFLAGS)
 +SOCURRENT=2
 +SOREVISION=0
 +SOAGE=2
@@ -36,7 +40,7 @@ Forwarded: yes
  
  FFINDEX_HEADERS=ffindex.h ffindex_posix_search.h ffutil.h
  FFINDEX_OBJECTS=$(FFINDEX_HEADERS:.h=.o)
-@@ -34,30 +39,30 @@ libffindex.a: $(FFINDEX_OBJECTS)
+@@ -34,30 +39,30 @@
  	ar rcs libffindex.a $^
  
  ifeq ($(OS), Darwin)
@@ -53,7 +57,7 @@ Forwarded: yes
 -libffindex.so.0.1: $(FFINDEX_OBJECTS)
 -		$(CC) -Wl,-z,defs -Wl,-soname,libffindex.so.0.1 -shared -o libffindex.so.0.1 $^
 +libffindex.so.$(SOVERSION): $(FFINDEX_OBJECTS)
-+		$(CC) -Wl,-z,defs -Wl,-soname,libffindex.so.$(SOVERSION) -shared -o libffindex.so.$(SOVERSION) $^
++		$(CC) $(LDFLAGS) -Wl,-z,defs -Wl,-soname,libffindex.so.$(SOVERSION) -shared -o libffindex.so.$(SOVERSION) $^
  
  endif
  
@@ -75,7 +79,7 @@ Forwarded: yes
  
  ffindex_apply_mpi.o: ffindex_apply_mpi.c $(FFINDEX_HEADERS)
  	mpicc $(CFLAGS) -DHAVE_MPI -c ffindex_apply_mpi.c -o $@ 
-@@ -69,24 +74,24 @@ ffindex_apply_mpi_spawn.o: ffindex_apply
+@@ -69,24 +74,24 @@
  	mpicc $(CFLAGS) -c ffindex_apply_mpi_spawn.c -o $@ 
  
  ffindex_from_fasta: ffindex_from_fasta.o $(FFINDEX_LIBS)
@@ -107,7 +111,7 @@ Forwarded: yes
  	rm -f /tmp/test.data /tmp/test.ffindex
  	LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" ./ffindex_build -s /tmp/test.data /tmp/test.ffindex ../test/data ../test/data2
  	LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" ./ffindex_get  /tmp/test.data /tmp/test.ffindex a b foo | tee /tmp/test.out
-@@ -107,9 +112,10 @@ time:
+@@ -107,9 +112,10 @@
  
  clean:
  	rm -f $(FFINDEX_PROGRAMS) $(FFINDEX_OBJECTS) $(FFINDEX_LIBS) \
@@ -120,7 +124,7 @@ Forwarded: yes
  
  install:
  	mkdir -p $(INSTALL_DIR)/bin
-@@ -122,9 +128,10 @@ install:
+@@ -122,9 +128,10 @@
  	install ffindex_from_tsv $(INSTALL_DIR)/bin/ffindex_from_tsv
  	install ffindex_apply $(INSTALL_DIR)/bin/ffindex_apply
  	install ffindex_unpack $(INSTALL_DIR)/bin/ffindex_unpack
@@ -133,7 +137,7 @@ Forwarded: yes
  	install ffindex.h $(INSTALL_DIR)/include/ffindex.h
  	install ffutil.h $(INSTALL_DIR)/include/ffutil.h
  	install ffindex_posix_search.h $(INSTALL_DIR)/include/ffindex_posix_search.h
-@@ -134,7 +141,7 @@ endif
+@@ -134,7 +141,7 @@
  
  deinstall:
  	rm -f $(INSTALL_DIR)/bin/ffindex_get $(INSTALL_DIR)/bin/ffindex_build $(INSTALL_DIR)/bin/ffindex_modify \

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