[med-svn] [Git][med-team/mrs][master] 4 commits: Fix format string error

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / mrs


Commits:
4bb80d6c by Andreas Tille at 2018-04-25T21:36:41+02:00
Fix format string error

- - - - -
2e5f12e8 by Andreas Tille at 2018-04-25T21:41:47+02:00
Standards-Version: 4.1.4

- - - - -
20eae595 by Andreas Tille at 2018-04-25T21:41:50+02:00
Point Vcs-fields to Salsa

- - - - -
af3fca3b by Andreas Tille at 2018-04-25T21:48:01+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix_format_string.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mrs (6.0.5+dfsg-5) unstable; urgency=medium
+
+  * Fix format string error
+    Closes: #893526
+  * Standards-Version: 4.1.4
+  * Point Vcs-fields to Salsa
+
+ -- Andreas Tille <tille at debian.org>  Wed, 25 Apr 2018 21:42:38 +0200
+
 mrs (6.0.5+dfsg-4) unstable; urgency=medium
 
   [ Steve Langasek ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -23,9 +23,9 @@ Build-Depends: debhelper (>= 11~),
                libbz2-dev,
                libjs-jquery,
                libjs-jquery-ui
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mrs.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/mrs.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/mrs
+Vcs-Git: https://salsa.debian.org/med-team/mrs.git
 Homepage: http://mrs.cmbi.ru.nl/
 
 Package: mrs


=====================================
debian/patches/fix_format_string.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix_format_string.patch
@@ -0,0 +1,79 @@
+Description: Fix format string error
+Bug-Debian: https://bugs.debian.org/893526
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 25 Apr 2018 21:31:46 +0200
+
+--- a/src/M6Parser.cpp
++++ b/src/M6Parser.cpp
+@@ -691,7 +691,7 @@ XS(_M6_Script_set_attribute)
+ 	}
+ 	catch (exception& e)
+ 	{
+-		croak(e.what());
++		croak("%s", e.what());
+ 	}
+ 	
+ 	XSRETURN(0);
+@@ -721,7 +721,7 @@ XS(_M6_Script_set_document)
+ 	}
+ 	catch (exception& e)
+ 	{
+-		croak(e.what());
++		croak("%s", e.what());
+ 	}
+ 	
+ 	XSRETURN(0);
+@@ -759,7 +759,7 @@ XS(_M6_Script_index_text)
+ 		}
+ 		catch (exception& e)
+ 		{
+-			croak(e.what());
++			croak("%s", e.what());
+ 		}
+ 	}
+ //	else if (VERBOSE)
+@@ -799,7 +799,7 @@ XS(_M6_Script_index_string)
+ 		}
+ 		catch (exception& e)
+ 		{
+-			croak(e.what());
++			croak("%s", e.what());
+ 		}
+ 	}
+ 	
+@@ -837,7 +837,7 @@ XS(_M6_Script_index_unique_string)
+ 		}
+ 		catch (exception& e)
+ 		{
+-			croak(e.what());
++			croak("%s", e.what());
+ 		}
+ 	}
+ 	
+@@ -877,7 +877,7 @@ XS(_M6_Script_index_number)
+ 	}
+ 	catch (exception& e)
+ 	{
+-		croak(e.what());
++		croak("%s", e.what());
+ 	}
+ 	
+ 	XSRETURN(0);
+@@ -915,7 +915,7 @@ XS(_M6_Script_index_date)
+ 	}
+ 	catch (exception& e)
+ 	{
+-		croak(e.what());
++		croak("%s", e.what());
+ 	}
+ 	
+ 	XSRETURN(0);
+@@ -955,7 +955,7 @@ XS(_M6_Script_add_link)
+ 	}
+ 	catch (exception& e)
+ 	{
+-		croak(e.what());
++		croak("%s", e.what());
+ 	}
+ 	
+ 	XSRETURN(0);


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ makefile.diff
 init_d.diff
 gcc-6.patch
 boost-1.65-compat.patch
+fix_format_string.patch



View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/d3f27ddd04b550e961ca95600a3061b5b6cd947e...af3fca3b27a49393dac9a3c59237965a2213f9ba

---
View it on GitLab: https://salsa.debian.org/med-team/mrs/compare/d3f27ddd04b550e961ca95600a3061b5b6cd947e...af3fca3b27a49393dac9a3c59237965a2213f9ba
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180425/bc434b7b/attachment-0001.html>