[med-svn] r10601 - in trunk/packages/cd-hit/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-26 06:44:01 +0000 (Thu, 26 Apr 2012)
New Revision: 10601

Added:
   trunk/packages/cd-hit/trunk/debian/patches/
   trunk/packages/cd-hit/trunk/debian/patches/series
   trunk/packages/cd-hit/trunk/debian/patches/use-dpkg-buildflags.patch
Modified:
   trunk/packages/cd-hit/trunk/debian/changelog
   trunk/packages/cd-hit/trunk/debian/docs
Log:
Make sure hardening flags are propagated


Modified: trunk/packages/cd-hit/trunk/debian/changelog
===================================================================
--- trunk/packages/cd-hit/trunk/debian/changelog	2012-04-26 05:57:43 UTC (rev 10600)
+++ trunk/packages/cd-hit/trunk/debian/changelog	2012-04-26 06:44:01 UTC (rev 10601)
@@ -2,6 +2,8 @@
 
   * New upstream version incorporating the previous patches as
     well as the LaTeX source of the documentation
+  * debian/patches/use-dpkg-buildflags.patch: Make sure hardening
+    flags will really propagate
 
  -- Andreas Tille <tille at debian.org>  Thu, 26 Apr 2012 07:54:23 +0200
 

Modified: trunk/packages/cd-hit/trunk/debian/docs
===================================================================
--- trunk/packages/cd-hit/trunk/debian/docs	2012-04-26 05:57:43 UTC (rev 10600)
+++ trunk/packages/cd-hit/trunk/debian/docs	2012-04-26 06:44:01 UTC (rev 10601)
@@ -1 +1 @@
-cdhit-user-guide.pdf
+doc/cdhit-user-guide.pdf

Added: trunk/packages/cd-hit/trunk/debian/patches/series
===================================================================
--- trunk/packages/cd-hit/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/cd-hit/trunk/debian/patches/series	2012-04-26 06:44:01 UTC (rev 10601)
@@ -0,0 +1 @@
+use-dpkg-buildflags.patch

Added: trunk/packages/cd-hit/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/cd-hit/trunk/debian/patches/use-dpkg-buildflags.patch	                        (rev 0)
+++ trunk/packages/cd-hit/trunk/debian/patches/use-dpkg-buildflags.patch	2012-04-26 06:44:01 UTC (rev 10601)
@@ -0,0 +1,17 @@
+--- cd-hit-v4.6-2012-04-25.orig/Makefile
++++ cd-hit-v4.6-2012-04-25/Makefile
+@@ -28,10 +28,13 @@
+ endif
+ 
+ #LDFLAGS = -static -o
+-LDFLAGS = -o
++LDFLAGS += -o
+ 
+ PROGS = cd-hit cd-hit-est cd-hit-2d cd-hit-est-2d cd-hit-div cd-hit-454
+ 
++# Propagate hardening flags
++CCFLAGS := $(CPPFLAGS) $(CCFLAGS) $(CXXFLAGS)
++
+ .c++.o:
+ 	$(CC) $(CCFLAGS) -c $<
+