[med-svn] r20822 - in trunk/packages/ampliconnoise/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-18 15:12:35 +0000 (Fri, 18 Dec 2015)
New Revision: 20822

Modified:
   trunk/packages/ampliconnoise/trunk/debian/changelog
   trunk/packages/ampliconnoise/trunk/debian/patches/mayhem.patch
Log:
Upload to unstable


Modified: trunk/packages/ampliconnoise/trunk/debian/changelog
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/changelog	2015-12-18 15:04:55 UTC (rev 20821)
+++ trunk/packages/ampliconnoise/trunk/debian/changelog	2015-12-18 15:12:35 UTC (rev 20822)
@@ -1,10 +1,10 @@
-ampliconnoise (1.29-5) UNRELEASED; urgency=medium
+ampliconnoise (1.29-5) unstable; urgency=medium
 
-  * Fix Mayhem issues
+  * Fix Mayhem issues by making reading fasta files more robust
     Closes: #715593, #715594
   * Fix remaining hardening issue
 
- -- Andreas Tille <tille at debian.org>  Fri, 18 Dec 2015 12:14:54 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 18 Dec 2015 16:05:09 +0100
 
 ampliconnoise (1.29-4) unstable; urgency=medium
 

Modified: trunk/packages/ampliconnoise/trunk/debian/patches/mayhem.patch
===================================================================
--- trunk/packages/ampliconnoise/trunk/debian/patches/mayhem.patch	2015-12-18 15:04:55 UTC (rev 20821)
+++ trunk/packages/ampliconnoise/trunk/debian/patches/mayhem.patch	2015-12-18 15:12:35 UTC (rev 20822)
@@ -41,7 +41,7 @@
  	szBrk = strpbrk(szLine, " \n");
 +        if(! szBrk)
 +        {
-+            fprintf(stderr, "File %s does not appear to be in FASTA format.\n", szInputFile);
++            fprintf(stderr, "File %s does not appear to be in FASTA format.\n", ptParams->szDataFile);
 +            exit(EXIT_FAILURE);
 +        }
  	(*szBrk) = '\0';
@@ -53,7 +53,7 @@
  
 +    if(! szBrk)
 +    {
-+        fprintf(stderr, "File %s does not appear to be in FASTA format.\n", szInputFile);
++        fprintf(stderr, "File %s does not appear to be in FASTA format.\n", szDistFile);
 +        exit(EXIT_FAILURE);
 +    }
      (*szBrk) = '\0';
@@ -65,7 +65,7 @@
  	szBrk = strpbrk(szLine, "\n");
 +        if(! szBrk)
 +        {
-+            fprintf(stderr, "File %s does not appear to be in FASTA format.\n", szInputFile);
++            fprintf(stderr, "File %s does not appear to be in FASTA format.\n", szDistFile);
 +            exit(EXIT_FAILURE);
 +        }
  	(*szBrk) = '\0';