[med-svn] r14281 - in trunk/packages/mothur/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-07-30 19:32:08 +0000 (Tue, 30 Jul 2013)
New Revision: 14281

Added:
   trunk/packages/mothur/trunk/debian/patches/uchime_hardening.patch
Modified:
   trunk/packages/mothur/trunk/debian/changelog
   trunk/packages/mothur/trunk/debian/patches/series
Log:
Hardening for uchime


Modified: trunk/packages/mothur/trunk/debian/changelog
===================================================================
--- trunk/packages/mothur/trunk/debian/changelog	2013-07-30 18:07:17 UTC (rev 14280)
+++ trunk/packages/mothur/trunk/debian/changelog	2013-07-30 19:32:08 UTC (rev 14281)
@@ -10,6 +10,7 @@
      - cme fix dpkg-control
      - debhelper 9
      - use anonscm for Vcs fields
+  * debian/patches/uchime_hardening.patch: Hardening for uchime
 
  -- Andreas Tille <tille at debian.org>  Tue, 30 Jul 2013 14:32:44 +0200
 

Modified: trunk/packages/mothur/trunk/debian/patches/series
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/series	2013-07-30 18:07:17 UTC (rev 14280)
+++ trunk/packages/mothur/trunk/debian/patches/series	2013-07-30 19:32:08 UTC (rev 14281)
@@ -4,3 +4,4 @@
 catchall_fix.patch
 build_without_tty.patch
 uchime_link_dynamically
+uchime_hardening.patch

Added: trunk/packages/mothur/trunk/debian/patches/uchime_hardening.patch
===================================================================
--- trunk/packages/mothur/trunk/debian/patches/uchime_hardening.patch	                        (rev 0)
+++ trunk/packages/mothur/trunk/debian/patches/uchime_hardening.patch	2013-07-30 19:32:08 UTC (rev 14281)
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Tue, 30 Jul 2013 21:21:02 +0200
+Description: Propagate hardening options to uchime
+
+--- a/makefile
++++ b/makefile
+@@ -105,7 +105,9 @@ mothur : fortranSource $(OBJECTS) uchime
+ 	strip mothur
+  
+ uchime:
+-	cd uchime_src && ./mk && mv uchime .. && cd ..
++	echo ENV_GCC_OPTS="$(CPPFLAGS)"
++	echo ENV_LINK_OPTS="$(LDFLAGS)"
++	cd uchime_src && ENV_GCC_OPTS="$(CPPFLAGS)" ENV_LINK_OPTS="$(LDFLAGS)" ./mk && mv uchime .. && cd ..
+ 	
+ fortranSource:
+ 	${FORTAN_COMPILER} -c $(FORTRAN_FLAGS) *.f