From owner-svn-ports-all@freebsd.org Wed Aug 9 19:31:00 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E748DD423B; Wed, 9 Aug 2017 19:31:00 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 212A8825B9; Wed, 9 Aug 2017 19:31:00 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v79JUx53061742; Wed, 9 Aug 2017 19:30:59 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v79JUxxv061739; Wed, 9 Aug 2017 19:30:59 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201708091930.v79JUxxv061739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 9 Aug 2017 19:30:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447641 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files X-SVN-Commit-Revision: 447641 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2017 19:31:00 -0000 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@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