spamassassin: add upstream fix for perl warning.

This commit is contained in:
Leah Neukirchen 2018-06-10 19:04:35 +02:00
parent 43fc6323cb
commit 5d5ace8738
2 changed files with 26 additions and 1 deletions

View file

@ -0,0 +1,25 @@
https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7369
--- lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 05:54:45 1790926
+++ lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 18:56:16 1791013
@@ -916,16 +916,16 @@
$str .= shift @{$ary};
}
undef $ary;
- chomp ($str); $str .= " [...]\n";
# in case the last line was huge, trim it back to around 200 chars
local $1;
- $str =~ s/^(.{,200}).*$/$1/gs;
+ $str =~ s/^(.{200}).+$/$1 [...]/gm;
+ chomp ($str); $str .= "\n";
# now, some tidy-ups that make things look a bit prettier
- $str =~ s/-----Original Message-----.*$//gs;
+ $str =~ s/-----Original Message-----.*$//gm;
$str =~ s/This is a multi-part message in MIME format\.//gs;
- $str =~ s/[-_\*\.]{10,}//gs;
+ $str =~ s/[-_*.]{10,}//gs;
$str =~ s/\s+/ /gs;
# add "Content preview:" ourselves, so that the text aligns

View file

@ -1,7 +1,7 @@
# Template file for 'spamassassin'
pkgname=spamassassin
version=3.4.1
revision=2
revision=3
build_style=perl-module
# Missing optional dependencies:
# Mail::SPF, Geo::IP, Razor2, Encode::Detect, Net::Patricia