[med-svn] r21987 - in trunk/packages/t-coffee/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2016-05-19 21:03:58 +0000 (Thu, 19 May 2016)
New Revision: 21987

Added:
   trunk/packages/t-coffee/trunk/debian/patches/stable-linking-inputs.patch
Modified:
   trunk/packages/t-coffee/trunk/debian/changelog
   trunk/packages/t-coffee/trunk/debian/control
   trunk/packages/t-coffee/trunk/debian/patches/hardening.patch
   trunk/packages/t-coffee/trunk/debian/patches/series
   trunk/packages/t-coffee/trunk/debian/rules
Log:
make reproducible, hardening, housekeeping


Modified: trunk/packages/t-coffee/trunk/debian/changelog
===================================================================
--- trunk/packages/t-coffee/trunk/debian/changelog	2016-05-19 14:55:26 UTC (rev 21986)
+++ trunk/packages/t-coffee/trunk/debian/changelog	2016-05-19 21:03:58 UTC (rev 21987)
@@ -1,3 +1,13 @@
+t-coffee (11.00.8cbe486-3) unstable; urgency=medium
+
+  * Team upload.
+  * Force stable linking order to make build reproducible.
+  * Bump Standards-Version.
+  * Enable full hardening.
+  * Use secure Vcs-Browser.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Thu, 19 May 2016 20:52:28 +0000
+
 t-coffee (11.00.8cbe486-2) unstable; urgency=medium
 
   * cme fix dpkg-control

Modified: trunk/packages/t-coffee/trunk/debian/control
===================================================================
--- trunk/packages/t-coffee/trunk/debian/control	2016-05-19 14:55:26 UTC (rev 21986)
+++ trunk/packages/t-coffee/trunk/debian/control	2016-05-19 21:03:58 UTC (rev 21987)
@@ -5,8 +5,8 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/t-coffee/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/t-coffee/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/t-coffee/trunk/
 Homepage: http://www.tcoffee.org/Projects_home_page/t_coffee_home_page.html
 

Modified: trunk/packages/t-coffee/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/t-coffee/trunk/debian/patches/hardening.patch	2016-05-19 14:55:26 UTC (rev 21986)
+++ trunk/packages/t-coffee/trunk/debian/patches/hardening.patch	2016-05-19 21:03:58 UTC (rev 21987)
@@ -4,7 +4,7 @@
 
 --- a/t_coffee_source/makefile
 +++ b/t_coffee_source/makefile
-@@ -1,11 +1,11 @@
+@@ -1,14 +1,14 @@
  CC=g++
 -CFLAGS=-O3 -Wno-write-strings
 +CFLAGS+=-O3 -Wno-write-strings
@@ -17,4 +17,8 @@
 +	@echo " Linking..."; $(CC) $^ -o t_coffee -lm $(LDFLAGS)
   
  %.o: %.c
- 	@echo " CC $<"; $(CC) $(CFLAGS) -I. -MD -MF $(@:.o=.deps) -c -o $@ $<
+-	@echo " CC $<"; $(CC) $(CFLAGS) -I. -MD -MF $(@:.o=.deps) -c -o $@ $<
++	@echo " CC $<"; $(CC) $(CPPFLAGS) $(CFLAGS) -I. -MD -MF $(@:.o=.deps) -c -o $@ $<
+  
+ -include $(DEPS)
+  

Modified: trunk/packages/t-coffee/trunk/debian/patches/series
===================================================================
--- trunk/packages/t-coffee/trunk/debian/patches/series	2016-05-19 14:55:26 UTC (rev 21986)
+++ trunk/packages/t-coffee/trunk/debian/patches/series	2016-05-19 21:03:58 UTC (rev 21987)
@@ -4,3 +4,4 @@
 hardening.patch
 set_proper_dir_permissions.patch
 mayhem.patch
+stable-linking-inputs.patch

Added: trunk/packages/t-coffee/trunk/debian/patches/stable-linking-inputs.patch
===================================================================
--- trunk/packages/t-coffee/trunk/debian/patches/stable-linking-inputs.patch	                        (rev 0)
+++ trunk/packages/t-coffee/trunk/debian/patches/stable-linking-inputs.patch	2016-05-19 21:03:58 UTC (rev 21987)
@@ -0,0 +1,13 @@
+Description: provide stable file order for linking
+ This makes the package reproducible.
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+--- a/t_coffee_source/makefile
++++ b/t_coffee_source/makefile
+@@ -1,6 +1,6 @@
+ CC=g++
+ CFLAGS+=-O3 -Wno-write-strings
+-SOURCES := $(shell find . -type f -name *.c)
++SOURCES := $(sort $(shell find . -type f -name *.c))
+ OBJECTS := $(SOURCES:.c=.o)
+ DEPS := $(OBJECTS:.o=.deps)
+  

Modified: trunk/packages/t-coffee/trunk/debian/rules
===================================================================
--- trunk/packages/t-coffee/trunk/debian/rules	2016-05-19 14:55:26 UTC (rev 21986)
+++ trunk/packages/t-coffee/trunk/debian/rules	2016-05-19 21:03:58 UTC (rev 21987)
@@ -4,6 +4,7 @@
 # Is messing with /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 FCC = gfortran $(shell dpkg-buildflags --get FFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --sourcedirectory=t_coffee_source