[med-svn] r12967 - in trunk/packages/soap/soapdenovo2/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2013-02-09 11:55:44 +0000 (Sat, 09 Feb 2013)
New Revision: 12967

Added:
   trunk/packages/soap/soapdenovo2/trunk/debian/patches/add_hardening
Modified:
   trunk/packages/soap/soapdenovo2/trunk/debian/changelog
   trunk/packages/soap/soapdenovo2/trunk/debian/patches/series
   trunk/packages/soap/soapdenovo2/trunk/debian/rules
Log:
add hardening flags to Makefile

Modified: trunk/packages/soap/soapdenovo2/trunk/debian/changelog
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/changelog	2013-02-09 11:10:48 UTC (rev 12966)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/changelog	2013-02-09 11:55:44 UTC (rev 12967)
@@ -1,4 +1,4 @@
-soapdenovo2 (223-1) UNRELEASED; urgency=low
+soapdenovo2 (223-1) unstable; urgency=low
 
   * Initial release (Closes: #700160)
 

Added: trunk/packages/soap/soapdenovo2/trunk/debian/patches/add_hardening
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/patches/add_hardening	                        (rev 0)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/patches/add_hardening	2013-02-09 11:55:44 UTC (rev 12967)
@@ -0,0 +1,30 @@
+Subject: add fortify flags
+Description: Makefile does not load CFLAGS
+ from env, add extra flags for debian fortify
+Forwarded: no
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2013-02-09
+--- a/standardPregraph/Makefile
++++ b/standardPregraph/Makefile
+@@ -8,7 +8,11 @@
+ CC=             gcc #gcc
+ GCCVERSIONMAJOR := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 4)
+ GCCVERSIONMINOR := $(shell expr `$(CC) -dumpversion | cut -f2 -d.` \>= 4)
+-CFLAGS=         -O4 -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
++CFLAGS=        -O4 -fomit-frame-pointer #-static #-mcrc32 -march=core2 -msse4.1 -msse4.2
++CFLAGS += `dpkg-buildflags --get CFLAGS`
++CFLAGS+=$(HARDENING_CFLAGS)
++LDFLAGS = `dpkg-buildflags --get LDFLAGS`
++LDFLAGS+=$(HARDENING_LDFLAGS)
+ DFLAGS=         
+ OBJS=		arc.o attachPEinfo.o bubble.o check.o compactEdge.o \
+ 		concatenateEdge.o connect.o contig.o cutTipPreGraph.o cutTip_graph.o \
+@@ -81,7 +85,7 @@
+ 
+ SOAPdenovo:	envTest $(OBJS)
+ 		@printf "Linking...                                                \r"
+-		@$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
++		@$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBPATH) $(LIBS) $(ENTRAFLAGS)
+ 		@printf "$(PROG) compilation done.\n";
+ 
+ clean:

Modified: trunk/packages/soap/soapdenovo2/trunk/debian/patches/series
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/patches/series	2013-02-09 11:10:48 UTC (rev 12966)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/patches/series	2013-02-09 11:55:44 UTC (rev 12967)
@@ -1,2 +1,3 @@
 fix_gcc_path
 fix_usage_name
+add_hardening

Modified: trunk/packages/soap/soapdenovo2/trunk/debian/rules
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/rules	2013-02-09 11:10:48 UTC (rev 12966)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/rules	2013-02-09 11:55:44 UTC (rev 12967)
@@ -1,12 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 export DEB_BUILD_HARDENING=1
+export DEB_BUILD_HARDENING_FORTIFY=1
 
 include /usr/share/hardening-includes/hardening.make
 
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS+=$(HARDENING_CFLAGS)
+CXXFLAGS+=$(HARDENING_CXXFLAGS)
 LDFLAGS+=$(HARDENING_LDFLAGS)