kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mail/spamassassin: Revert r484326

Browse source 
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.
This commit is contained in:
Niclas Zeising 2018-11-13 21:11:54 +00:00
parent 78e4511730
commit 018ed36728
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=484899
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mail/spamassassin/Makefile
View file

@ -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)
@ -176,8 +175,4 @@ post-install::
${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>

1
mail/spamassassin/pkg-plist
View file

@ -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