svn commit: r447641 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files

[Niclas Zeising]

Author: zeising
Date: Wed Aug  9 19:30:58 2017
New Revision: 447641
URL: https://svnweb.freebsd.org/changeset/ports/447641

Log:
  Fix runtime on recent perl versions and change default options
  
  Add a patch from upstream to fix runtime when using perl 5.26 or later. [0]
  Change default options to include DKIM and SPF checking.
  Bump portrevision.
  
  PR:		220474 (based on) [0]
  Reported by:	Trond.Endrestol at ximalas.info [0]

Added:
  head/mail/spamassassin/files/patch-bug7404   (contents, props changed)
Modified:
  head/japanese/spamassassin/Makefile
  head/mail/spamassassin/Makefile

Modified: head/japanese/spamassassin/Makefile
==============================================================================
--- head/japanese/spamassassin/Makefile	Wed Aug  9 18:58:59 2017	(r447640)
+++ head/japanese/spamassassin/Makefile	Wed Aug  9 19:30:58 2017	(r447641)
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 

Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile	Wed Aug  9 18:58:59 2017	(r447640)
+++ head/mail/spamassassin/Makefile	Wed Aug  9 19:30:58 2017	(r447641)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamassassin
 PORTVERSION=	3.4.1
-PORTREVISION?=	10	# also bump japanese/spamassassin
+PORTREVISION?=	11	# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	APACHE/spamassassin/source CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
@@ -55,7 +55,7 @@ OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
 OPTIONS_GROUP_PLUGINS=	DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY
 OPTIONS_SINGLE=		GPG
 OPTIONS_SINGLE_GPG=	GNUPG_NONE GNUPG GNUPG2
-OPTIONS_DEFAULT=	AS_ROOT GNUPG SSL UPDATE_AND_COMPILE
+OPTIONS_DEFAULT=	AS_ROOT DKIM GNUPG SSL UPDATE_AND_COMPILE SPF_QUERY
 
 AS_ROOT_DESC=		Run spamd as root (recommended)
 

Added: head/mail/spamassassin/files/patch-bug7404
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/spamassassin/files/patch-bug7404	Wed Aug  9 19:30:58 2017	(r447641)
@@ -0,0 +1,23 @@
+--- lib/Mail/SpamAssassin/PerMsgStatus.pm
++++ lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -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