Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at 2018-02-22 14:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spamassassin (Old) and /work/SRC/openSUSE:Factory/.spamassassin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spamassassin" Thu Feb 22 14:57:31 2018 rev:74 rq:578829 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/spamassassin/spamassassin.changes 2018-01-25 12:35:36.444481713 +0100 +++ /work/SRC/openSUSE:Factory/.spamassassin.new/spamassassin.changes 2018-02-22 14:57:32.924575419 +0100 @@ -1,0 +2,6 @@ +Mon Feb 19 17:19:18 UTC 2018 - vark...@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning about deprecated regex + o add deprecated-regex.patch + +------------------------------------------------------------------- New: ---- deprecated-regex.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.2v3Xe0/_old 2018-02-22 14:57:34.536517419 +0100 +++ /var/tmp/diff_new_pack.2v3Xe0/_new 2018-02-22 14:57:34.540517275 +0100 @@ -62,6 +62,8 @@ Patch13: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/attachment.cgi?id=5314 Patch14: DNS-resolver-recursion-desired-not-set.patch +# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 +Patch15: deprecated-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -181,6 +183,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p2 %build if [ -e t/data/whitelists/winxpnews.com ]; then ++++++ deprecated-regex.patch ++++++ --- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 18:34:11 1791009 +++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 18:37:20 1791010 @@ -896,16 +896,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
