svn commit: r435540 - head/mail/rspamd-devel

[Vsevolod Stakhov]

Author: vsevolod
Date: Mon Mar  6 15:06:10 2017
New Revision: 435540
URL: https://svnweb.freebsd.org/changeset/ports/435540

Log:
  - Update to 1.5.2.b1
  - Add CGP helper option

Modified:
  head/mail/rspamd-devel/Makefile
  head/mail/rspamd-devel/distinfo
  head/mail/rspamd-devel/pkg-plist

Modified: head/mail/rspamd-devel/Makefile
==============================================================================
--- head/mail/rspamd-devel/Makefile	Mon Mar  6 14:46:04 2017	(r435539)
+++ head/mail/rspamd-devel/Makefile	Mon Mar  6 15:06:10 2017	(r435540)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.0.b1.20170301
+PORTVERSION=	1.5.2.b1.20170306
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -20,17 +20,18 @@ BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd
 
-RSPAMD_VERSION=	1.5.0
+RSPAMD_VERSION=	1.5.2
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	fa5bd55
+GH_TAGNAME=	30d96d3
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD
+OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD CGP
 OPTIONS_DEFAULT=	GD
 GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 GD_DESC=		Enable libgd support for images fuzzy hashes
+CGP_DESC=		Install Communigate Pro(tm) helper
 
 USE_RC_SUBR=	rspamd
 
@@ -94,12 +95,23 @@ WITH_DEBUG=	yes
 	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
 	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
 	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
-	p5-SWF-File>=0:graphics/p5-SWF-File
+	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
 .else
  PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MCGP}
+ USE_PERL5+=	run
+ PLIST_SUB+=	CGP=""
+ RUN_DEPENDS+=	\
+	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+	p5-AnyEvent>=0:devel/p5-AnyEvent \
+	p5-EV>=0:devel/p5-EV \
+	p5-JSON-XS>=0:converters/p5-JSON-XS
+.else
+ PLIST_SUB+=	CGP="@comment "
+.endif
+
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
@@ -112,5 +124,8 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
+.if ${PORT_OPTIONS:MCGP}
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
+.endif
 
 .include <bsd.port.mk>

Modified: head/mail/rspamd-devel/distinfo
==============================================================================
--- head/mail/rspamd-devel/distinfo	Mon Mar  6 14:46:04 2017	(r435539)
+++ head/mail/rspamd-devel/distinfo	Mon Mar  6 15:06:10 2017	(r435540)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488362335
-SHA256 (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 406b66588fb2f9f22f450612a2cfd1b445d7ae21aac2ed61c27ecc4c6abbee27
-SIZE (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 2362114
+TIMESTAMP = 1488811771
+SHA256 (vstakhov-rspamd-1.5.2.b1.20170306-30d96d3_GH0.tar.gz) = ef676543e73dba0522c5b6555f0bea8a567b8a332ee559d4f53a5a685c8ab417
+SIZE (vstakhov-rspamd-1.5.2.b1.20170306-30d96d3_GH0.tar.gz) = 2372085

Modified: head/mail/rspamd-devel/pkg-plist
==============================================================================
--- head/mail/rspamd-devel/pkg-plist	Mon Mar  6 14:46:04 2017	(r435539)
+++ head/mail/rspamd-devel/pkg-plist	Mon Mar  6 15:06:10 2017	(r435540)
@@ -6,6 +6,7 @@ bin/rspamadm
 bin/rspamc-%%RSPAMDVERSION%%
 bin/rspamc
 %%REDIRECTOR%%bin/rspamd-redirector
+%%CGP%%bin/rspamd-cgp-helper
 @sample %%ETCDIR%%/2tld.inc.sample
 @sample %%ETCDIR%%/mime_types.inc.sample
 @sample %%ETCDIR%%/common.conf.sample
@@ -16,11 +17,13 @@ bin/rspamc
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
+%%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
 %%ETCDIR%%/modules.d/dkim.conf
+%%ETCDIR%%/modules.d/dkim_signing.conf
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/emails.conf
 %%ETCDIR%%/modules.d/fann_redis.conf
@@ -36,16 +39,20 @@ bin/rspamc
 %%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
+%%ETCDIR%%/modules.d/mx_check.conf
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
 %%ETCDIR%%/modules.d/ratelimit.conf
 %%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
+%%ETCDIR%%/modules.d/replies.conf
 %%ETCDIR%%/modules.d/rmilter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
+%%ETCDIR%%/modules.d/spamassassin.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
+%%ETCDIR%%/modules.d/trie.conf
 %%ETCDIR%%/modules.d/url_redirector.conf
 %%ETCDIR%%/modules.d/url_reputation.conf
 %%ETCDIR%%/modules.d/url_tags.conf