From owner-svn-ports-head@freebsd.org Wed Sep 26 19:30:37 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D107C10B4B6C; Wed, 26 Sep 2018 19:30:37 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 84D648B795; Wed, 26 Sep 2018 19:30:37 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7FB971B72B; Wed, 26 Sep 2018 19:30:37 +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 w8QJUbrc063411; Wed, 26 Sep 2018 19:30:37 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8QJUagQ063408; Wed, 26 Sep 2018 19:30:36 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201809261930.w8QJUagQ063408@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 26 Sep 2018 19:30:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480763 - in head/mail/spamassassin: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/mail/spamassassin: . files X-SVN-Commit-Revision: 480763 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2018 19:30:38 -0000 Author: zeising Date: Wed Sep 26 19:30:36 2018 New Revision: 480763 URL: https://svnweb.freebsd.org/changeset/ports/480763 Log: mail/spamassassin: Update to 3.4.2 Update mail/spamassassin to 3.4.2. This update includes security fixes. For complete changelog and upgrade notes, see: https://mail-archives.apache.org/mod_mbox/spamassassin-announce/201809.mbox/%3cc44ca0f1-cba9-b129-20b2-ba59816cfd13@apache.org%3e Big thanks to Larry Rosenman (ler) for help with testing! PR: 231412 Reported by: dewayne@heuristicsystems.com.au Tested by: ler MFH: 2018Q3 Security: 613193a0-c1b4-11e8-ae2d-54e1ad3d6335 Deleted: head/mail/spamassassin/files/patch-DnsResolver.pm head/mail/spamassassin/files/patch-bug7199 head/mail/spamassassin/files/patch-bug7208 head/mail/spamassassin/files/patch-bug7231 head/mail/spamassassin/files/patch-bug7265 head/mail/spamassassin/files/patch-bug7404 Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/distinfo head/mail/spamassassin/files/sa-spamd.in head/mail/spamassassin/pkg-plist Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Wed Sep 26 19:19:03 2018 (r480762) +++ head/mail/spamassassin/Makefile Wed Sep 26 19:30:36 2018 (r480763) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= spamassassin -PORTVERSION= 3.4.1 -PORTREVISION?= 12 # also bump japanese/spamassassin +PORTVERSION= 3.4.2 +PORTREVISION?= 0 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -24,7 +24,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ p5-URI>=0:net/p5-URI \ re2c>=.12.0:devel/re2c -.for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY SPF_QUERY SSL +.for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL TEST_DEPENDS+= ${${dep}_RUN_DEPENDS} .endfor @@ -52,7 +52,7 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ OPTIONS_DEFINE= AS_ROOT DOCS SSL OPTIONS_GROUP= DATABASE GPG PLUGINS OPTIONS_GROUP_DATABASE= MYSQL PGSQL -OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY +OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY OPTIONS_SINGLE= GPG OPTIONS_SINGLE_GPG= GNUPG_NONE GNUPG GNUPG2 OPTIONS_DEFAULT= AS_ROOT DKIM GNUPG SSL SPF_QUERY @@ -71,7 +71,8 @@ DCC_DESC= DCC digest list support (mail/dcc-dccd) DKIM_DESC= Verify DKIM records (mail/p5-Mail-DKIM) PYZOR_DESC= Pyzor digest list support (mail/pyzor) RAZOR_DESC= Vipul's Razor digest list support (mail/razor-agents) -RELAY_COUNTRY_DESC= Location-based scoring (net/p5-Geo-IP) +RELAY_COUNTRY_DESC= Location-based scoring (net/p5-GeoIP2) +RLIMIT_DESC= Resource limits (devel/p5-BSD-Resource) SPF_QUERY_DESC= Verify SPF records (mail/p5-Mail-SPF) SUB_FILES= pkg-message @@ -90,8 +91,10 @@ GNUPG2_RUN_DEPENDS= gpg2:security/gnupg MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg PYZOR_RUN_DEPENDS= pyzor:mail/pyzor -RAZOR_RUN_DEPENDS= razor-agents>=2.84:mail/razor-agents -RELAY_COUNTRY_RUN_DEPENDS= p5-Geo-IP>=0:net/p5-Geo-IP \ +RAZOR_RUN_DEPENDS= razor-agents>=2.84:mail/razor-agents \ + p5-Digest-SHA1>=2.13:security/p5-Digest-SHA1 +RLIMIT_RUN_DEPENDS= p5-BSD-Resource>=1.2911:devel/p5-BSD-Resource +RELAY_COUNTRY_RUN_DEPENDS= p5-GeoIP2>=0:net/p5-GeoIP2 \ p5-IP-Country>=0:net/p5-IP-Country SPF_QUERY_RUN_DEPENDS= p5-Mail-SPF>=0:mail/p5-Mail-SPF @@ -106,6 +109,7 @@ DKIM_INITVAR= DKIM PYZOR_INITVAR= Pyzor RAZOR_INITVAR= Razor2 RELAY_COUNTRY_INITVAR= RelayCountry +RLIMIT_INITVAR= ResourceLimit SPF_QUERY_INITVAR= SPF DOCS= CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example @@ -140,6 +144,7 @@ post-patch:: -e 's,B_CONFDIR)/v330.pre,B_CONFDIR)/v330.pre.sample,g' \ -e 's,B_CONFDIR)/v340.pre,B_CONFDIR)/v340.pre.sample,g' \ -e 's,B_CONFDIR)/v341.pre,B_CONFDIR)/v341.pre.sample,g' \ + -e 's,B_CONFDIR)/v342.pre,B_CONFDIR)/v342.pre.sample,g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL ${REINPLACE_CMD} -e '/^CC =/d; \ Modified: head/mail/spamassassin/distinfo ============================================================================== --- head/mail/spamassassin/distinfo Wed Sep 26 19:19:03 2018 (r480762) +++ head/mail/spamassassin/distinfo Wed Sep 26 19:30:36 2018 (r480763) @@ -1,2 +1,3 @@ -SHA256 (Mail-SpamAssassin-3.4.1.tar.gz) = 9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726 -SIZE (Mail-SpamAssassin-3.4.1.tar.gz) = 3174888 +TIMESTAMP = 1537273902 +SHA256 (Mail-SpamAssassin-3.4.2.tar.gz) = 8a1c139ee08f140d3d3fdf13e03d98cf68a5cae27a082c4a614d154565a3c34f +SIZE (Mail-SpamAssassin-3.4.2.tar.gz) = 3185452 Modified: head/mail/spamassassin/files/sa-spamd.in ============================================================================== --- head/mail/spamassassin/files/sa-spamd.in Wed Sep 26 19:19:03 2018 (r480762) +++ head/mail/spamassassin/files/sa-spamd.in Wed Sep 26 19:30:36 2018 (r480763) @@ -43,7 +43,7 @@ restart_precmd="precmd" pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} command_args="-d -r ${pidfile}" -#command_interpreter="%%PREFIX%%/bin/perl" +command_interpreter="%%PREFIX%%/bin/perl" required_dirs="%%PREFIX%%/share/spamassassin" precmd() Modified: head/mail/spamassassin/pkg-plist ============================================================================== --- head/mail/spamassassin/pkg-plist Wed Sep 26 19:19:03 2018 (r480762) +++ head/mail/spamassassin/pkg-plist Wed Sep 26 19:30:36 2018 (r480763) @@ -7,14 +7,15 @@ bin/spamassassin bin/spamc bin/spamd @preunexec rm -rf %D/%%ETCDIR%%/sa-update-keys 2>&1 >/dev/null || true -@sample %%ETCDIR%%/local.cf.sample @sample %%ETCDIR%%/init.pre.sample +@sample %%ETCDIR%%/local.cf.sample @sample %%ETCDIR%%/v310.pre.sample @sample %%ETCDIR%%/v312.pre.sample @sample %%ETCDIR%%/v320.pre.sample @sample %%ETCDIR%%/v330.pre.sample @sample %%ETCDIR%%/v340.pre.sample @sample %%ETCDIR%%/v341.pre.sample +@sample %%ETCDIR%%/v342.pre.sample include/libspamc.h lib/libspamc.so lib/libspamc.so.0 @@ -79,8 +80,10 @@ lib/libspamc.so.0 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DNSEval.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/FreeMail.pm +%%SITE_PERL%%/Mail/SpamAssassin/Plugin/FromNameSpoof.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTMLEval.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm +%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HashBL.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/HeaderEval.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ImageInfo.pm @@ -89,11 +92,13 @@ lib/libspamc.so.0 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/PDFInfo.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/PhishTag.pm +%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Phishing.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ReplaceTags.pm +%%SITE_PERL%%/Mail/SpamAssassin/Plugin/ResourceLimits.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Reuse.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Rule2XSBody.pm %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm @@ -119,11 +124,18 @@ lib/libspamc.so.0 %%SITE_PERL%%/Mail/SpamAssassin/Util.pm %%SITE_PERL%%/Mail/SpamAssassin/Util/DependencyInfo.pm %%SITE_PERL%%/Mail/SpamAssassin/Util/Progress.pm -%%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm %%SITE_PERL%%/Mail/SpamAssassin/Util/ScopedTimer.pm %%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm %%SITE_PERL%%/Mail/SpamAssassin/Util/TinyRedis.pm %%SITE_PERL%%/spamassassin-run.pod +%%PERL5_MAN1%%/sa-awl.1.gz +%%PERL5_MAN1%%/sa-compile.1.gz +%%PERL5_MAN1%%/sa-learn.1.gz +%%PERL5_MAN1%%/sa-update.1.gz +%%PERL5_MAN1%%/spamassassin-run.1.gz +%%PERL5_MAN1%%/spamassassin.1.gz +%%PERL5_MAN1%%/spamc.1.gz +%%PERL5_MAN1%%/spamd.1.gz %%PERL5_MAN3%%/Mail::SpamAssassin.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::AICache.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::ArchiveIterator.3.gz @@ -165,16 +177,20 @@ lib/libspamc.so.0 %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DCC.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DKIM.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DNSEval.3.gz +%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::FromNameSpoof.3.gz +%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::HashBL.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Hashcash.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEEval.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEHeader.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PDFInfo.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PhishTag.3.gz +%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Phishing.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Pyzor.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Razor2.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::RelayCountry.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ReplaceTags.3.gz +%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ResourceLimits.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Reuse.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Rule2XSBody.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SPF.3.gz @@ -196,24 +212,15 @@ lib/libspamc.so.0 %%PERL5_MAN3%%/Mail::SpamAssassin::Util.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Util::DependencyInfo.3.gz %%PERL5_MAN3%%/Mail::SpamAssassin::Util::Progress.3.gz -%%PERL5_MAN3%%/Mail::SpamAssassin::Util::RegistrarBoundaries.3.gz %%PERL5_MAN3%%/spamassassin-run.3.gz -%%PERL5_MAN1%%/sa-awl.1.gz -%%PERL5_MAN1%%/sa-compile.1.gz -%%PERL5_MAN1%%/sa-learn.1.gz -%%PERL5_MAN1%%/sa-update.1.gz -%%PERL5_MAN1%%/spamassassin-run.1.gz -%%PERL5_MAN1%%/spamassassin.1.gz -%%PERL5_MAN1%%/spamc.1.gz -%%PERL5_MAN1%%/spamd.1.gz %%DATADIR%%/languages %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template @comment ################################################################## @postunexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true -@dir /var/lib/spamassassin -@dir /var/lib @dir /var/db/spamassassin +@dir /var/lib +@dir /var/lib/spamassassin @dir(%%USER%%,%%GROUP%%,) /var/run/spamd @comment ################################################################## @postunexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin"