[med-svn] [parsinsert] 09/15: bug fix and housekeeping

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository parsinsert.

commit d9fff7249fb7264cc99d54ff0d0448ee48619ae1
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sat May 14 15:31:48 2016 +0000

    bug fix and housekeeping
---
 debian/changelog               | 11 +++++++++++
 debian/control                 |  4 ++--
 debian/patches/fix-gcc6.patch  | 14 ++++++++++++++
 debian/patches/hardening.patch | 29 +++++++++++++++++++++++++++--
 debian/patches/series          |  1 +
 debian/rules                   |  2 +-
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0881501..bfac337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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)
diff --git a/debian/control b/debian/control
index f77d1ec..270ea3f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Uploaders: Tim Booth <tbooth at ceh.ac.uk>,
 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/
 
diff --git a/debian/patches/fix-gcc6.patch b/debian/patches/fix-gcc6.patch
new file mode 100644
index 0000000..e531000
--- /dev/null
+++ b/debian/patches/fix-gcc6.patch
@@ -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;
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 0cde032..48c16a1 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -4,12 +4,37 @@ Description: Propagate hardening options
 
 --- 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
diff --git a/debian/patches/series b/debian/patches/series
index 814900f..714ba0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hardening.patch
+fix-gcc6.patch
diff --git a/debian/rules b/debian/rules
index 6a7f7fe..cef92eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ override_dh_auto_build:
 	dh_auto_build
 	mv ParsInsert parsinsert
 
-
 override_dh_auto_clean:
 	mv parsinsert ParsInsert || true
 	dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/parsinsert.git