[med-svn] r10565 - in trunk/packages/bowtie/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-24 11:34:41 +0000 (Tue, 24 Apr 2012)
New Revision: 10565

Added:
   trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch
Modified:
   trunk/packages/bowtie/trunk/debian/changelog
   trunk/packages/bowtie/trunk/debian/patches/series
Log:
Support hardening flags


Modified: trunk/packages/bowtie/trunk/debian/changelog
===================================================================
--- trunk/packages/bowtie/trunk/debian/changelog	2012-04-24 09:05:18 UTC (rev 10564)
+++ trunk/packages/bowtie/trunk/debian/changelog	2012-04-24 11:34:41 UTC (rev 10565)
@@ -1,3 +1,12 @@
+bowtie (0.12.7-3) UNRELEASED; urgency=low
+
+  * debian/patches/use-dpkg-buildflags.patch: Regard LDFLAGS/CPPFLAGS
+    hardening flags (thanks for the patch to Simon Ruderich
+    <simon at ruderich.org>)
+    Closes: #670230
+
+ -- Andreas Tille <tille at debian.org>  Tue, 24 Apr 2012 13:21:32 +0200
+
 bowtie (0.12.7-2) unstable; urgency=low
 
   * Do not give a pointer to non existing info pages in manpages

Modified: trunk/packages/bowtie/trunk/debian/patches/series
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/series	2012-04-24 09:05:18 UTC (rev 10564)
+++ trunk/packages/bowtie/trunk/debian/patches/series	2012-04-24 11:34:41 UTC (rev 10565)
@@ -1 +1,2 @@
 gcc-4.7.patch
+use-dpkg-buildflags.patch

Added: trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch	                        (rev 0)
+++ trunk/packages/bowtie/trunk/debian/patches/use-dpkg-buildflags.patch	2012-04-24 11:34:41 UTC (rev 10565)
@@ -0,0 +1,17 @@
+Description: Use build flags from environment (dpkg-buildflags).
+ Necessary for hardening flags.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-04-24
+Bug-Closed: http://bugs.debian.org/670230
+
+--- bowtie-0.12.7.orig/Makefile
++++ bowtie-0.12.7/Makefile
+@@ -177,7 +177,7 @@
+   cat $^ | md5sum | awk '{print $$1}' > .$@.md5
+ endef
+ 
+-ALL_FLAGS=$(EXTRA_FLAGS) $(CFLAGS) $(CXXFLAGS)
++ALL_FLAGS=$(EXTRA_FLAGS) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(LDFLAGS)
+ DEBUG_DEFS = -DCOMPILER_OPTIONS="\"$(DEBUG_FLAGS) $(ALL_FLAGS)\""
+ RELEASE_DEFS = -DCOMPILER_OPTIONS="\"$(RELEASE_FLAGS) $(ALL_FLAGS)\""
+