[med-svn] r20752 - in trunk/packages/acedb/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-12 21:58:48 +0000 (Sat, 12 Dec 2015)
New Revision: 20752

Added:
   trunk/packages/acedb/trunk/debian/patches/fix_hardening_errors.patch
Modified:
   trunk/packages/acedb/trunk/debian/copyright
   trunk/packages/acedb/trunk/debian/patches/series
   trunk/packages/acedb/trunk/debian/rules
Log:
Fix build when using format-security, fix lintian issues


Modified: trunk/packages/acedb/trunk/debian/copyright
===================================================================
--- trunk/packages/acedb/trunk/debian/copyright	2015-12-12 20:15:21 UTC (rev 20751)
+++ trunk/packages/acedb/trunk/debian/copyright	2015-12-12 21:58:48 UTC (rev 20752)
@@ -22,7 +22,7 @@
     With no current employments
  MRC LMB, UK, Richard Durbin (now Sanger Center)
 License: GPL-2+
- All code is offered at either the GNU Lesser Public License (LGPL)
+ All code is offered at either the GNU Lesser General Public License (LGPL)
  or the GNU General Public License (GPL) version 2 or later.  Libraries are
  offered under the terms of the LGPL, while applications are put under
  the GPL. Deviations from that rule are indicated in the respective

Added: trunk/packages/acedb/trunk/debian/patches/fix_hardening_errors.patch
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/fix_hardening_errors.patch	                        (rev 0)
+++ trunk/packages/acedb/trunk/debian/patches/fix_hardening_errors.patch	2015-12-12 21:58:48 UTC (rev 20752)
@@ -0,0 +1,60 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 10 Dec 2015 15:24:16 +0100
+Description: Fix code errors preventing compilation with
+ hardening switched on
+
+--- a/wace/homonym.c
++++ b/wace/homonym.c
+@@ -75,8 +75,7 @@ static void scanInput(void)
+           && strcmp("Representative",cp)
+ 	  )  /* Just copy the whole line to the output */
+ 	{ freeback() ;
+-	  printf(freewordcut("\n",&cutter)) ;
+-	  printf("\n") ;
++	  printf("%s\n", freewordcut("\n",&cutter)) ;
+ 	  continue ;
+ 	}
+           /* Found author, do check */
+@@ -97,7 +96,7 @@ static void scanInput(void)
+ 	  nnew++ ;
+ 	  fprintf(new,"%s\n",cp) ;
+ 	found: 
+-	  printf(cp) ;
++	  printf("%s", cp) ;
+ 	}
+       printf("\"\n") ;
+     }
+--- a/w2/graphascii.c
++++ b/w2/graphascii.c
+@@ -117,7 +117,7 @@ static void asciiDump(void)
+ 	
+ 	for (;oldy<y; oldy++)
+ 	  fputc('\n', fil) ;
+-	fprintf(fil, space + 300 - i) ;
++	fprintf(fil, "%s",space + 300 - i) ;
+ 	fprintf(fil, "%s",cp) ; /* avoid bug if cp contains a % , mhmp 02.04.98 */
+ 	oldx = x + strlen(cp) ;
+       }      
+--- a/wgnbk/gnbk.c
++++ b/wgnbk/gnbk.c
+@@ -362,8 +362,7 @@ static void interactiveQuestions (void)
+ 	    {
+ 	      idxp =  arrayp (idx, key, IDX) ;  
+ 	      hp = genBankExport ( idxp->master, idxp->n1, idxp->n2) ;
+-	      printf(stackText (hp,0)) ; 
+-	      printf("\n") ; 
++	      printf("%s\n",stackText (hp,0)) ; 
+ 	      stackDestroy (hp) ;
+ 	    } 
+ 	  else
+--- a/wgnbk/gnbkclient.c
++++ b/wgnbk/gnbkclient.c
+@@ -76,7 +76,7 @@ void doQuery(char* query)
+   if (retval > 0) 
+     printf ("Server error code %d",retval);
+   else
+-    printf (answer) ;
++    printf ("%s",answer) ;
+   messfree(answer);
+ }
+ 

Modified: trunk/packages/acedb/trunk/debian/patches/series
===================================================================
--- trunk/packages/acedb/trunk/debian/patches/series	2015-12-12 20:15:21 UTC (rev 20751)
+++ trunk/packages/acedb/trunk/debian/patches/series	2015-12-12 21:58:48 UTC (rev 20752)
@@ -4,5 +4,5 @@
 dotter_help.patch
 binutils-gold.patch
 no-curses.patch
-## debug-clean.patch
 hardening.patch
+fix_hardening_errors.patch

Modified: trunk/packages/acedb/trunk/debian/rules
===================================================================
--- trunk/packages/acedb/trunk/debian/rules	2015-12-12 20:15:21 UTC (rev 20751)
+++ trunk/packages/acedb/trunk/debian/rules	2015-12-12 21:58:48 UTC (rev 20752)
@@ -41,6 +41,10 @@
 	cp -d `find bin/ -type f -a -executable` debian/tmp/usr/bin
 	# dh_install --autodest -s
 
+override_dh_fixperms:
+	dh_fixperms
+	rm -rf `find debian -name sbin -type d -empty`
+
 # Build architecture dependant packages using the common target.
 #binary-arch: build-arch install-arch
 #	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common