msg_iter: workaround broken Email::MIME versions

Email::MIME >= 1.923 and < 1.935 would drop too many newlines
in attachments.  This would lead to ugly text files without
a proper trailing newline if using quoted-printable, 7bit, or
8bit.  Attachments encoded with base64 were not affected.

These versions of Email::MIME are widely available in Debian 8
(Jessie) and even Ubuntu LTS distros so we will need to support
this workaround for a while.

1 files changed, 9 insertions, 5 deletions

diff --git a/t/msg_iter.t b/t/msg_iter.t
index cc58b93f..7ade6e41 100644
--- a/t/msg_iter.t
+++ b/t/msg_iter.t
@@ -7,14 +7,16 @@ use Email::MIME;
 use_ok('PublicInbox::MsgIter');
 
 {
-        my $parts = [ Email::MIME->create(body => 'a'),
-                        Email::MIME->create(body => 'b') ];
+        my $parts = [ Email::MIME->create(body => "a\n"),
+                        Email::MIME->create(body => "b\n") ];
         my $mime = Email::MIME->create(parts => $parts,
                                 header_str => [ From => 'root@localhost' ]);
         my @parts;
         msg_iter($mime, sub {
                 my ($part, $level, @ex) = @{$_[0]};
-                push @parts, [ $part->body_str, $level, @ex ];
+                my $s = $part->body_str;
+                $s =~ s/\s+//s;
+                push @parts, [ $s, $level, @ex ];
         });
         is_deeply(\@parts, [ [ qw(a 1 1) ], [ qw(b 1 2) ] ], 'order is fine');
 }
@@ -30,9 +32,11 @@ use_ok('PublicInbox::MsgIter');
         my @parts;
         msg_iter($mime, sub {
                 my ($part, $level, @ex) = @{$_[0]};
-                push @parts, [ $part->body_str, $level, @ex ];
+                my $s = $part->body_str;
+                $s =~ s/\s+//s;
+                push @parts, [ $s, $level, @ex ];
         });
-        is_deeply(\@parts, [ [ qw(a 2 1 1)], [qw(b 2 1 2)], [qw(sig 1 2)] ],
+        is_deeply(\@parts, [ [qw(a 2 1 1)], [qw(b 2 1 2)], [qw(sig 1 2)] ],
                 'nested part shows up properly');
 }