[med-svn] r20849 - in trunk/packages/epcr/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-21 14:09:16 +0000 (Mon, 21 Dec 2015)
New Revision: 20849

Added:
   trunk/packages/epcr/trunk/debian/patches/mayhem.patch
Modified:
   trunk/packages/epcr/trunk/debian/changelog
   trunk/packages/epcr/trunk/debian/patches/ensure_build_options.patch
   trunk/packages/epcr/trunk/debian/patches/series
Log:
Fix Mayhem issue


Modified: trunk/packages/epcr/trunk/debian/changelog
===================================================================
--- trunk/packages/epcr/trunk/debian/changelog	2015-12-21 10:02:19 UTC (rev 20848)
+++ trunk/packages/epcr/trunk/debian/changelog	2015-12-21 14:09:16 UTC (rev 20849)
@@ -1,9 +1,11 @@
-epcr (2.3.12-1-3) UNRELEASED; urgency=medium
+epcr (2.3.12-1-3) unstable; urgency=medium
 
   * new homepage
   * cme fix dpkg-control
+  * Fix Mayhem issue
+    Closes: #715850
 
- -- Andreas Tille <tille at debian.org>  Mon, 21 Dec 2015 11:00:34 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 21 Dec 2015 14:56:24 +0100
 
 epcr (2.3.12-1-2) unstable; urgency=low
 

Modified: trunk/packages/epcr/trunk/debian/patches/ensure_build_options.patch
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/ensure_build_options.patch	2015-12-21 10:02:19 UTC (rev 20848)
+++ trunk/packages/epcr/trunk/debian/patches/ensure_build_options.patch	2015-12-21 14:09:16 UTC (rev 20849)
@@ -1,3 +1,8 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 22 Feb 2011 09:09:21 +0100
+Bug-Debian: https://bugs.debian.org/614482
+Ensure Build options will be propagated properly
+
 --- e-PCR-2.3.12.orig/Makefile
 +++ e-PCR-2.3.12/Makefile
 @@ -29,7 +29,7 @@

Added: trunk/packages/epcr/trunk/debian/patches/mayhem.patch
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/mayhem.patch	                        (rev 0)
+++ trunk/packages/epcr/trunk/debian/patches/mayhem.patch	2015-12-21 14:09:16 UTC (rev 20849)
@@ -0,0 +1,27 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 21 Dec 2015 11:00:34 +0100
+Bug-Debian: http://bugs.debian.org/715850
+Description: Fix Mayhem issue
+
+--- a/stsmatch_m.cpp
++++ b/stsmatch_m.cpp
+@@ -38,7 +38,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <stdexcept>
+-
++#include <iostream>
+ 
+ USING_NCBI_SCOPE;
+ USING_SCOPE(EPCR_SCOPE);
+@@ -167,6 +167,10 @@ void CStsFileHash::ReadStsFile(const str
+ 
+ 		for(int to_parse=m_MemorySize; to_parse>1; to_parse=end-pos) {
+ 			const char * nl=strpbrk(pos,"\n\r");
++			if (!nl) {
++				std::cerr << "Unable to find line end in string '" << pos << "'.\n";
++				std::exit(EXIT_FAILURE);
++			}
+ 
+ 			if(!ParseLine(cbk,pos,nl-pos)) break;
+ 

Modified: trunk/packages/epcr/trunk/debian/patches/series
===================================================================
--- trunk/packages/epcr/trunk/debian/patches/series	2015-12-21 10:02:19 UTC (rev 20848)
+++ trunk/packages/epcr/trunk/debian/patches/series	2015-12-21 14:09:16 UTC (rev 20849)
@@ -2,3 +2,4 @@
 fix_header_location.patch
 ensure_build_options.patch
 use-dpkg-buildflags.patch
+mayhem.patch