[mb2md] 29/30: Add patch to more reliably detect seperator lines

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository mb2md.

commit a0044004404c19997c3263e393e99412350d6095
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Oct 16 23:43:23 2013 +0200

    Add patch to more reliably detect seperator lines
    
    Closes: #578084
---
 debian/changelog                                   |    1 +
 .../patches/better-seperator-line-detection.patch  |   27 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6dc45c7..7afab1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ mb2md (3.20-6) UNRELEASED; urgency=low
     like most users expect it. (Closes: #594049)
     + Update man page and USAGE accordingly
   * Add patch by Bastien Mourgues to fix the -r option (Closes: #333499)
+  * Add patch to more reliably detect seperator lines (Closes: #578084)
 
  -- Axel Beckert <abe at debian.org>  Wed, 16 Oct 2013 20:30:44 +0200
 
diff --git a/debian/patches/better-seperator-line-detection.patch b/debian/patches/better-seperator-line-detection.patch
new file mode 100644
index 0000000..8a44789
--- /dev/null
+++ b/debian/patches/better-seperator-line-detection.patch
@@ -0,0 +1,27 @@
+Description: Better, but still not too strict RFC4155 separator line detection
+Bug-Debian: http://bugs.debian.org/578084
+Author: Pete Ashdown <pashdown at xmission.com>
+Author: Axel Beckert <abe at debian.org>
+
+Index: mb2md/mb2md-3.20.pl
+===================================================================
+--- mb2md.orig/mb2md-3.20.pl	2013-10-16 22:53:45.000000000 +0200
++++ mb2md/mb2md-3.20.pl	2013-10-16 23:10:04.000000000 +0200
+@@ -601,7 +601,7 @@
+ 	return 1 if(-z $mbxfile);
+ 	sysopen(MBXFILE, "$mbxfile", O_RDONLY) or die "Could not open $mbxfile ! \n";
+ 	while(<MBXFILE>) {
+-		if (/^From/) {
++		if (/^From +\S+ .*\d\d:\d\d/) {
+ 			close(MBXFILE);
+ 			return 1;
+ 		}
+@@ -1005,7 +1005,7 @@
+                             # exchange possible Windows EOL (CRLF) with Unix EOL (LF)
+             $_ =~ s/\r\n$/\n/;
+ 
+-            if ( /^From /
++            if ( /^From +\S+ .*\d\d:\d\d/
+ 		&& $previous_line_was_empty
+ 		&& (!defined $contentlength) 
+ 	       )
diff --git a/debian/patches/series b/debian/patches/series
index 2903631..ac0c965 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-path-expansion.patch
 fix-dash-r-option.patch
+better-seperator-line-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/mb2md.git