[med-svn] r21954 - in trunk/packages/parsinsert/trunk/debian: . patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2016-05-14 15:31:48 +0000 (Sat, 14 May 2016)
New Revision: 21954

Added:
   trunk/packages/parsinsert/trunk/debian/patches/fix-gcc6.patch
Modified:
   trunk/packages/parsinsert/trunk/debian/changelog
   trunk/packages/parsinsert/trunk/debian/control
   trunk/packages/parsinsert/trunk/debian/patches/hardening.patch
   trunk/packages/parsinsert/trunk/debian/patches/series
   trunk/packages/parsinsert/trunk/debian/rules
Log:
bug fix and housekeeping


Modified: trunk/packages/parsinsert/trunk/debian/changelog
===================================================================
--- trunk/packages/parsinsert/trunk/debian/changelog	2016-05-14 08:21:01 UTC (rev 21953)
+++ trunk/packages/parsinsert/trunk/debian/changelog	2016-05-14 15:31:48 UTC (rev 21954)
@@ -1,3 +1,14 @@
+parsinsert (1.04-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix building with GCC 6.
+    Closes: #811909
+  * Enable full hardening.
+  * Use secure Vcs-*.
+  * Bump Standards-Version.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Sat, 14 May 2016 15:26:05 +0000
+
 parsinsert (1.04-1) unstable; urgency=medium
 
   * Initial upload to Debian (Closes: #740274)

Modified: trunk/packages/parsinsert/trunk/debian/control
===================================================================
--- trunk/packages/parsinsert/trunk/debian/control	2016-05-14 08:21:01 UTC (rev 21953)
+++ trunk/packages/parsinsert/trunk/debian/control	2016-05-14 15:31:48 UTC (rev 21954)
@@ -5,8 +5,8 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/parsinsert/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/parsinsert/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/parsinsert/trunk/
 Homepage: http://sourceforge.net/projects/parsinsert/
 

Added: trunk/packages/parsinsert/trunk/debian/patches/fix-gcc6.patch
===================================================================
--- trunk/packages/parsinsert/trunk/debian/patches/fix-gcc6.patch	                        (rev 0)
+++ trunk/packages/parsinsert/trunk/debian/patches/fix-gcc6.patch	2016-05-14 15:31:48 UTC (rev 21954)
@@ -0,0 +1,14 @@
+Description: fix building on GCC 6
+ Use correct initialization for char* array.
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+--- a/ParsInsert.cpp
++++ b/ParsInsert.cpp
+@@ -95,7 +95,7 @@
+ char                *seqFilename    = "PI_Tree.fasta";
+ char                *fullTreeName   = NULL;
+ 
+-char                *files[64]      = {64*0};
++char                *files[64]      = {NULL};
+ int                 nfiles          = 0;
+ 
+ BOOL                precision       = FALSE;

Modified: trunk/packages/parsinsert/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/parsinsert/trunk/debian/patches/hardening.patch	2016-05-14 08:21:01 UTC (rev 21953)
+++ trunk/packages/parsinsert/trunk/debian/patches/hardening.patch	2016-05-14 15:31:48 UTC (rev 21954)
@@ -4,12 +4,37 @@
 
 --- a/makefile
 +++ b/makefile
-@@ -31,7 +31,7 @@ test:  $(TEST_OBJECTS)
+@@ -9,15 +9,15 @@
+ PROGRAM = ParsInsert
+ OBJECTS = AttrList.o Knox_Stddef.o PNode.o SeqList.o Taxonomy.o ParsInsert.o
+ 
+-CFLAGS   = -g -O3
+-CC       = g++
++CFLAGS  += -g -O3
++CXX     ?= g++
+ INCLUDES =
+ LIBS     = -lm -lc
+ 
+ .SUFFIXES:	.o .cpp
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+ 
+ all:    $(PROGRAM) 
+ 
+@@ -26,12 +26,12 @@
+ 
+ TEST_OBJECTS = PNode.o AttrList.o Knox_Stddef.o Test.o
+ test:  $(TEST_OBJECTS)
+-	$(CC) $(CFLAG) -o Test $(TEST_OBJECTS) $(LIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o Test $(TEST_OBJECTS) $(LIBS) $(LDFLAGS)
+ 
  Knox_Stddef.o: Knox_Stddef.cpp Knox_Stddef.h
  
  $(PROGRAM):	$(OBJECTS)
 -	$(CC) $(CFLAG) -o $(PROGRAM) $(OBJECTS) $(LIBS)
-+	$(CC) $(CFLAG) -o $(PROGRAM) $(OBJECTS) $(LIBS) $(LDFLAGS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS) $(LDFLAGS)
  
  TEST_DIR = ./TestData
  test_short = short1000_NAST

Modified: trunk/packages/parsinsert/trunk/debian/patches/series
===================================================================
--- trunk/packages/parsinsert/trunk/debian/patches/series	2016-05-14 08:21:01 UTC (rev 21953)
+++ trunk/packages/parsinsert/trunk/debian/patches/series	2016-05-14 15:31:48 UTC (rev 21954)
@@ -1 +1,2 @@
 hardening.patch
+fix-gcc6.patch

Modified: trunk/packages/parsinsert/trunk/debian/rules
===================================================================
--- trunk/packages/parsinsert/trunk/debian/rules	2016-05-14 08:21:01 UTC (rev 21953)
+++ trunk/packages/parsinsert/trunk/debian/rules	2016-05-14 15:31:48 UTC (rev 21954)
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
@@ -10,7 +11,6 @@
 	dh_auto_build
 	mv ParsInsert parsinsert
 
-
 override_dh_auto_clean:
 	mv parsinsert ParsInsert || true
 	dh_auto_clean