[med-svn] r15051 - trunk/packages/staden/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2013-10-29 21:34:15 +0000 (Tue, 29 Oct 2013)
New Revision: 15051

Added:
   trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch
Modified:
   trunk/packages/staden/trunk/debian/patches/series
Log:
Patch to build using -Werror=format-security


Added: trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch
===================================================================
--- trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch	                        (rev 0)
+++ trunk/packages/staden/trunk/debian/patches/hardening_format-security.patch	2013-10-29 21:34:15 UTC (rev 15051)
@@ -0,0 +1,61 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Tue, 29 Oct 2013 22:26:41 +0100
+Description: Build using Debian hardening options
+ When using -Werror=format-security the following patches are needed
+
+--- a/gap4/gap-error.c
++++ b/gap4/gap-error.c
+@@ -89,7 +89,7 @@ void error_sig(int sig) {
+ }
+ 
+ static void xperror_out_func(char *name, char *str) {
+-    verror(ERR_FATAL, name, str);
++    verror(ERR_FATAL, name, "%s", str);
+ }
+ 
+ /* NOT FATAL */
+--- a/gap4/show_relationships.c
++++ b/gap4/show_relationships.c
+@@ -34,7 +34,7 @@ int show_relationships(GapIO *io,
+ 		cright = io_crnbr(io, contigs[i].contig);
+ 		
+ 		/* print contig information */
+-		vmessage(contig_line);
++		vmessage("%s", contig_line);
+ 		vmessage("%25d %8d %15d %8d\n", contigs[i].contig,
+ 			 clen, cleft, cright);
+ 	    
+@@ -66,7 +66,7 @@ int show_relationships(GapIO *io,
+ 	} else if (ordered == 0) {
+ 	
+ 	    /* print contig information */
+-	    vmessage(contig_line);
++	    vmessage("%s", contig_line);
+ 	
+ 	    for (i = 0; i < num_contigs; i++){ 
+ 		clen   = io_clength(io, contigs[i].contig);
+@@ -106,7 +106,7 @@ int show_relationships(GapIO *io,
+ 	    cright = io_crnbr(io, contigs[i].contig);
+ 	    
+ 	    /* print contig information */
+-	    vmessage(contig_line);
++	    vmessage("%s", contig_line);
+ 	    vmessage("%25d %8d %15d %8d\n",contigs[i].contig,
+ 		     clen, cleft, cright);
+ 	    
+--- a/gap5/tg_gio.c
++++ b/gap5/tg_gio.c
+@@ -20,11 +20,11 @@
+ /* Open/close/commit */
+ 
+ void xperror_fatal(char *name, char *str) {
+-    verror(ERR_FATAL, name, str);
++    verror(ERR_FATAL, name, "%s", str);
+ }
+ 
+ void xperror_warn(char *name, char *str) {
+-    verror(ERR_WARN, name, str);
++    verror(ERR_WARN, name, "%s", str);
+ }
+ 
+ static int db_version = DB_VERSION;

Modified: trunk/packages/staden/trunk/debian/patches/series
===================================================================
--- trunk/packages/staden/trunk/debian/patches/series	2013-10-29 20:25:54 UTC (rev 15050)
+++ trunk/packages/staden/trunk/debian/patches/series	2013-10-29 21:34:15 UTC (rev 15051)
@@ -1,2 +1,3 @@
 remove_svnversion_dep
 make_help_menus_work
+hardening_format-security.patch