[arch-commits] Commit in spamassassin/trunk (2 files)

[Florian Pritz]

    Date: Thursday, June 15, 2017 @ 08:07:56
  Author: bluewind
Revision: 298851

Fix FS#54378 - [spamassassin] sa-update Perl deprecation warnings

upgpkg: spamassassin 3.4.1-9

Added:
  spamassassin/trunk/edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch
Modified:
  spamassassin/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   10 ++++--
 edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch |   36 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-15 06:05:36 UTC (rev 298850)
+++ PKGBUILD	2017-06-15 08:07:56 UTC (rev 298851)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -23,7 +23,7 @@
         'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
 source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-        'spamassassin.service' net-dns-1.01-compat.patch net-dns-1.01-compat-uribl.patch disable-sslv3.patch 'bug_828552-openssl-1.1.0.patch')
+        'spamassassin.service' net-dns-1.01-compat.patch net-dns-1.01-compat-uribl.patch disable-sslv3.patch 'bug_828552-openssl-1.1.0.patch' edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch)
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('76eca1f38c11635d319e62c26d5b034b'
          'SKIP'
@@ -31,7 +31,8 @@
          '63458976671c35f423bd4e8033cfff3a'
          '14f2e3dc93c560d6b5a7fd7d54e44e11'
          'e6aeeae9828f305db72abb8707312ee7'
-         '8de3e540060b5a0dce23d12420cb7902')
+         '8de3e540060b5a0dce23d12420cb7902'
+         'faec41f86be348c1d6f131612a8ee1fa')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -45,6 +46,9 @@
   # From Debian
   patch -i "$srcdir/disable-sslv3.patch" -p1
   patch -i "$srcdir/bug_828552-openssl-1.1.0.patch" -p1
+
+  # FS#54378 - [spamassassin] sa-update Perl deprecation warnings
+  patch -i "$srcdir/edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch" -p1
 }
 
 build() {

Added: edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch
===================================================================
--- edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch	                        (rev 0)
+++ edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch	2017-06-15 08:07:56 UTC (rev 298851)
@@ -0,0 +1,36 @@
+From edb00a8d76a625bf03227ee2f6e915c9a0d90bad Mon Sep 17 00:00:00 2001
+From: Mark Martinec <mmartinec at apache.org>
+Date: Tue, 11 Apr 2017 18:37:20 +0000
+Subject: [PATCH] Bug 7404: Bad regexp (and logic) in
+ MS::PerMsgStatus::get_content_preview
+
+git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1791010 13f79535-47bb-0310-9956-ffa450edef68
+---
+ lib/Mail/SpamAssassin/PerMsgStatus.pm | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm
+index f8c55061b..126157bf5 100644
+--- a/lib/Mail/SpamAssassin/PerMsgStatus.pm
++++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -896,16 +896,16 @@ sub get_content_preview {
+     $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