From owner-svn-ports-all@freebsd.org Tue Nov 6 20:46:34 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 A2D541130F41; Tue, 6 Nov 2018 20:46:34 +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 0883A6D904; Tue, 6 Nov 2018 20:46:34 +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 C521040F1; Tue, 6 Nov 2018 20:46:33 +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 wA6KkXgA069231; Tue, 6 Nov 2018 20:46:33 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6KkXKI069229; Tue, 6 Nov 2018 20:46:33 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201811062046.wA6KkXKI069229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 6 Nov 2018 20:46:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484326 - head/mail/spamassassin X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/mail/spamassassin X-SVN-Commit-Revision: 484326 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0883A6D904 X-Spamd-Result: default: False [-103.09 / 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(-0.99)[-0.992,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(-0.99)[-0.988,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] 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, 06 Nov 2018 20:46:34 -0000 Author: zeising Date: Tue Nov 6 20:46:33 2018 New Revision: 484326 URL: https://svnweb.freebsd.org/changeset/ports/484326 Log: mail/spamassassin: switch gpg version, silence gpg Switch to use gpg2 instead of the old and mostly deprecated gpg as the default gpg version. Add a gpg.conf file to silence the warning about using insecure memory with gpg2 [1]. Bump portrevision Submitted by: Larry Rosenman (ler) [1] Modified: head/mail/spamassassin/Makefile head/mail/spamassassin/pkg-plist Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Tue Nov 6 20:45:27 2018 (r484325) +++ head/mail/spamassassin/Makefile Tue Nov 6 20:46:33 2018 (r484326) @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.2 -PORTREVISION?= 0 # also bump japanese/spamassassin +PORTREVISION?= 1 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -24,6 +24,8 @@ 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 @@ -32,7 +34,6 @@ CONFLICTS?= ja-spamassassin-[0-9]* CPE_VENDOR= apache -USES= cpe perl5 USE_PERL5= configure USE_LDCONFIG= yes @@ -55,7 +56,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 GNUPG SSL SPF_QUERY +OPTIONS_DEFAULT= AS_ROOT DKIM GNUPG2 SSL SPF_QUERY AS_ROOT_DESC= Run spamd as root (recommended) @@ -168,11 +169,15 @@ pre-su-install: .endif ${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${STAGEDIR}${PREFIX}/include -post-install:: +post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spamc @${MKDIR} ${STAGEDIR}/var/lib/spamassassin ${STAGEDIR}${DBDIR}/spamassassin ${STAGEDIR}/var/run/spamd @${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 6 20:45:27 2018 (r484325) +++ head/mail/spamassassin/pkg-plist Tue Nov 6 20:46:33 2018 (r484326) @@ -16,6 +16,7 @@ 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