[med-svn] r8483 - in trunk/packages/seaview/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-11-09 07:35:13 +0000 (Wed, 09 Nov 2011)
New Revision: 8483

Added:
   trunk/packages/seaview/trunk/debian/patches/
   trunk/packages/seaview/trunk/debian/patches/format-security.patch
   trunk/packages/seaview/trunk/debian/patches/series
Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/control
Log:
Fix format security patch


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2011-11-08 20:09:30 UTC (rev 8482)
+++ trunk/packages/seaview/trunk/debian/changelog	2011-11-09 07:35:13 UTC (rev 8483)
@@ -1,3 +1,11 @@
+seaview (1:4.3.0-2) unstable; urgency=low
+
+  * debian/patches/format-security.patch: Handle format strings properly
+    Closes: #648121
+  * debian/control: Fix Vcs fields
+
+ -- Andreas Tille <tille at debian.org>  Wed, 09 Nov 2011 08:26:27 +0100
+
 seaview (1:4.3.0-1) unstable; urgency=low
 
   * New upstream version with SVG output.

Modified: trunk/packages/seaview/trunk/debian/control
===================================================================
--- trunk/packages/seaview/trunk/debian/control	2011-11-08 20:09:30 UTC (rev 8482)
+++ trunk/packages/seaview/trunk/debian/control	2011-11-09 07:35:13 UTC (rev 8483)
@@ -5,11 +5,11 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper ( >= 8  ), libfltk1.3-dev, libjpeg-dev, libpng12-dev,
+Build-Depends: cdbs, debhelper ( >= 8 ), libfltk1.3-dev, libjpeg-dev, libpng12-dev,
  libxft-dev, libxext-dev, libxinerama-dev, zlib1g-dev
 Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seaview/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/seaview/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/seaview/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/seaview/trunk/
 Homepage: http://pbil.univ-lyon1.fr/software/seaview.html
 XS-Autobuild: yes
 

Added: trunk/packages/seaview/trunk/debian/patches/format-security.patch
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/format-security.patch	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/format-security.patch	2011-11-09 07:35:13 UTC (rev 8483)
@@ -0,0 +1,42 @@
+--- seaview-4.3.0.orig/xfmatpt.cxx
++++ seaview-4.3.0/xfmatpt.cxx
+@@ -408,7 +408,7 @@
+ 
+ static void err_message(const char *text)
+ {
+-fl_alert(text);
++fl_alert("%s", text);
+ exit(1);
+ }
+ 
+@@ -643,7 +643,7 @@
+ 	compute_region_text(matpt);
+ 	fl_reset_cursor(this->window());
+ 	if(erreur) {
+-		fl_message(errmess);
++		fl_message("%s", errmess);
+ 		erreur = FALSE;
+ 		}
+ }
+--- seaview-4.3.0.orig/treedraw.cxx
++++ seaview-4.3.0/treedraw.cxx
+@@ -380,7 +380,7 @@
+ 	if(name != NULL) {
+ 		const char *mess;
+ 		if( (mess = preptree(fd_nj_plot)) != NULL ) {
+-			fl_alert(mess);
++			fl_alert("%s", mess);
+ 			fd_nj_plot->notu = 0;
+ 			w->do_callback();
+ 			return NULL;
+--- seaview-4.3.0.orig/unrooted.cxx
++++ seaview-4.3.0/unrooted.cxx
+@@ -690,7 +690,7 @@
+ if( (pname=preptree_unrooted(tree, fd_unrooted)) != NULL ) {
+         char mess[150];
+         strcpy(mess, pname);
+-        fl_alert(mess);
++        fl_alert("%s", mess);
+         fd_unrooted->notu = 0;
+         return 1;
+         }

Added: trunk/packages/seaview/trunk/debian/patches/series
===================================================================
--- trunk/packages/seaview/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/seaview/trunk/debian/patches/series	2011-11-09 07:35:13 UTC (rev 8483)
@@ -0,0 +1 @@
+format-security.patch