From owner-svn-ports-all@freebsd.org Tue Nov 13 21:11:56 2018 Return-Path: Delivered-To: svn-ports-all@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 03DE2113232E; Tue, 13 Nov 2018 21:11:56 +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 6E6CA7838F; Tue, 13 Nov 2018 21:11:55 +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 3619515A07; Tue, 13 Nov 2018 21:11:55 +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 wADLBs3J009041; Tue, 13 Nov 2018 21:11:54 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wADLBs9d009039; Tue, 13 Nov 2018 21:11:54 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201811132111.wADLBs9d009039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 13 Nov 2018 21:11:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484899 - head/mail/spamassassin X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/mail/spamassassin X-SVN-Commit-Revision: 484899 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6E6CA7838F X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 13 Nov 2018 21:11:56 -0000 Author: zeising Date: Tue Nov 13 21:11:54 2018 New Revision: 484899 URL: https://svnweb.freebsd.org/changeset/ports/484899 Log: mail/spamassassin: Revert r484326 Revert r484326, switch to gpg2, silence gpg2 memory warnings. I have gotten multiple reports of this causing issues when upgrading or installing. Revert this until I can look at this in more detail. Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/pkg-plist Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Tue Nov 13 21:06:37 2018 (r484898) +++ head/mail/spamassassin/Makefile Tue Nov 13 21:11:54 2018 (r484899) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.2 -PORTREVISION?= 1 # also bump japanese/spamassassin +PORTREVISION?= 2 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -24,8 +24,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ p5-URI>=0:net/p5-URI \ re2c>=.12.0:devel/re2c -USES= cpe perl5 - .for dep in DCC DKIM MYSQL PGSQL PYZOR RAZOR RELAY_COUNTRY RLIMIT SPF_QUERY SSL TEST_DEPENDS+= ${${dep}_RUN_DEPENDS} .endfor @@ -34,6 +32,7 @@ CONFLICTS?= ja-spamassassin-[0-9]* CPE_VENDOR= apache +USES= cpe perl5 USE_PERL5= configure USE_LDCONFIG= yes @@ -56,7 +55,7 @@ OPTIONS_GROUP_DATABASE= MYSQL PGSQL 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 GNUPG2 SSL SPF_QUERY +OPTIONS_DEFAULT= AS_ROOT DKIM GNUPG SSL SPF_QUERY AS_ROOT_DESC= Run spamd as root (recommended) @@ -175,9 +174,5 @@ post-install:: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "sql ldap" ${STAGEDIR}${DOCSDIR}) - -post-install-GNUPG2-on: - ${MKDIR} ${STAGEDIR}/${ETCDIR}/sa-update-keys - ${ECHO} "no-secmem-warning" >${STAGEDIR}/${ETCDIR}/sa-update-keys/gpg.conf .include Modified: head/mail/spamassassin/pkg-plist ============================================================================== --- head/mail/spamassassin/pkg-plist Tue Nov 13 21:06:37 2018 (r484898) +++ head/mail/spamassassin/pkg-plist Tue Nov 13 21:11:54 2018 (r484899) @@ -16,7 +16,6 @@ bin/spamd @sample %%ETCDIR%%/v340.pre.sample @sample %%ETCDIR%%/v341.pre.sample @sample %%ETCDIR%%/v342.pre.sample -%%GNUPG2%%%%ETCDIR%%/sa-update-keys/gpg.conf include/libspamc.h lib/libspamc.so lib/libspamc.so.0