From 5d5ace8738eef6660baeb8ac1028bef389114b13 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 10 Jun 2018 19:04:35 +0200 Subject: [PATCH] spamassassin: add upstream fix for perl warning. --- srcpkgs/spamassassin/patches/r1791013.patch | 25 +++++++++++++++++++++ srcpkgs/spamassassin/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/spamassassin/patches/r1791013.patch diff --git a/srcpkgs/spamassassin/patches/r1791013.patch b/srcpkgs/spamassassin/patches/r1791013.patch new file mode 100644 index 00000000000..4d5fcee2f93 --- /dev/null +++ b/srcpkgs/spamassassin/patches/r1791013.patch @@ -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 diff --git a/srcpkgs/spamassassin/template b/srcpkgs/spamassassin/template index 9f745d35f21..8d1adb5aacf 100644 --- a/srcpkgs/spamassassin/template +++ b/srcpkgs/spamassassin/template @@ -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