Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Nov 2018 20:46:33 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r484326 - head/mail/spamassassin
Message-ID:  <201811062046.wA6KkXKI069229@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811062046.wA6KkXKI069229>