- Update to 1.5.0

3 files changed, 45 insertions, 22 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 03893e96e028..829e8d1c3e17 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -12,10 +11,10 @@ COMMENT=	Fast spam filtering system
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libgmime-2.6.so:mail/gmime26 \
 		libevent.so:devel/libevent \
 		libluajit-5.1.so:lang/luajit \
-		libfann.so:math/fann
+		libfann.so:math/fann \
+		libicui18n.so:devel/icu
 BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd-devel
@@ -37,12 +36,12 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DMANDIR=${MANPREFIX}/man \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
-		-DFORCE_GMIME24=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DENABLE_FANN=ON \
+		-DENABLE_GD=OFF \
 		-DNO_SHARED=ON
 
-USES=		cmake:outsource gettext iconv pkgconfig tar:xz perl5 \
+USES=		cmake:outsource gettext pkgconfig tar:xz perl5 \
 		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 97ec9b3adc1c..1edbc13200a5 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487243417
-SHA256 (rspamd-1.4.4.tar.xz) = 51342639dd1e50b235ae7fb2e877dee1d5b90c8102ce7ff817545fa0fb6ebc6d
-SIZE (rspamd-1.4.4.tar.xz) = 1780816
+TIMESTAMP = 1488452158
+SHA256 (rspamd-1.5.0.tar.xz) = 9e7c36e58d9a5607e36f4002cc1abcc2f511c48e9d8b0ef24f765e82c06a9706
+SIZE (rspamd-1.5.0.tar.xz) = 1846696
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 4ff9a42e661a..9a79edb4e478 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -16,16 +16,23 @@ bin/rspamc
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
+%%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/dmarc.conf
 %%ETCDIR%%/modules.d/emails.conf
 %%ETCDIR%%/modules.d/fann_redis.conf
+%%ETCDIR%%/modules.d/force_actions.conf
 %%ETCDIR%%/modules.d/forged_recipients.conf
 %%ETCDIR%%/modules.d/fuzzy_check.conf
+%%ETCDIR%%/modules.d/greylist.conf
 %%ETCDIR%%/modules.d/hfilter.conf
 %%ETCDIR%%/modules.d/ip_score.conf
 %%ETCDIR%%/modules.d/maillist.conf
+%%ETCDIR%%/modules.d/metadata_exporter.conf
+%%ETCDIR%%/modules.d/metric_exporter.conf
 %%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
@@ -35,9 +42,13 @@ bin/rspamc
 %%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
+%%ETCDIR%%/modules.d/rmilter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
+%%ETCDIR%%/modules.d/url_redirector.conf
+%%ETCDIR%%/modules.d/url_reputation.conf
+%%ETCDIR%%/modules.d/url_tags.conf
 %%ETCDIR%%/modules.d/whitelist.conf
 @sample %%ETCDIR%%/options.inc.sample
 %%ETCDIR%%/redirectors.inc
@@ -56,14 +67,17 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/asn.lua
 %%DATADIR%%/lua/clickhouse.lua
 %%DATADIR%%/lua/dcc.lua
+%%DATADIR%%/lua/dkim_signing.lua
 %%DATADIR%%/lua/dmarc.lua
 %%DATADIR%%/lua/dynamic_conf.lua
 %%DATADIR%%/lua/emails.lua
 %%DATADIR%%/lua/fann_classifier.lua
 %%DATADIR%%/lua/fann_redis.lua
 %%DATADIR%%/lua/fann_scores.lua
+%%DATADIR%%/lua/force_actions.lua
 %%DATADIR%%/lua/forged_recipients.lua
 %%DATADIR%%/lua/fun.lua
+%%DATADIR%%/lua/fuzzy_collect.lua
 %%DATADIR%%/lua/greylist.lua
 %%DATADIR%%/lua/hfilter.lua
 %%DATADIR%%/lua/ip_score.lua
@@ -77,13 +91,18 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/once_received.lua
 %%DATADIR%%/lua/phishing.lua
 %%DATADIR%%/lua/ratelimit.lua
+%%DATADIR%%/lua/url_redirector.lua
+%%DATADIR%%/lua/url_tags.lua
 %%DATADIR%%/lua/replies.lua
 %%DATADIR%%/lua/rbl.lua
+%%DATADIR%%/lua/rmilter_headers.lua
 %%DATADIR%%/lua/rspamd_update.lua
 %%DATADIR%%/lua/settings.lua
 %%DATADIR%%/lua/spamassassin.lua
 %%DATADIR%%/lua/trie.lua
+%%DATADIR%%/lua/url_reputation.lua
 %%DATADIR%%/lua/whitelist.lua
+%%DATADIR%%/rules/global_functions.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/html.lua
 %%DATADIR%%/rules/http_headers.lua
@@ -102,8 +121,6 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/www/css/bootstrap.min.css
 %%DATADIR%%/www/css/d3evolution.css
 %%DATADIR%%/www/css/datatables.min.css
-%%DATADIR%%/www/css/glyphicons-halflings-regular.woff
-%%DATADIR%%/www/css/glyphicons-halflings-regular.woff2
 %%DATADIR%%/www/css/rspamd.css
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
@@ -112,18 +129,25 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/www/img/asc.png
 %%DATADIR%%/www/img/desc.png
 %%DATADIR%%/www/img/rspamd_logo_navbar.png
-%%DATADIR%%/www/img/spinner.gif
-%%DATADIR%%/www/img/spinner.png
 %%DATADIR%%/www/index.html
-%%DATADIR%%/www/js/d3evolution.min.js
-%%DATADIR%%/www/js/d3pie.min.js
-%%DATADIR%%/www/js/datatables.min.js
-%%DATADIR%%/www/js/humanize.min.js
-%%DATADIR%%/www/js/bootstrap.min.js
-%%DATADIR%%/www/js/d3.min.js
-%%DATADIR%%/www/js/jquery-3.1.1.min.js
-%%DATADIR%%/www/js/jquery.cookie.min.js
-%%DATADIR%%/www/js/rspamd.js
+%%DATADIR%%/www/js/app/config.js
+%%DATADIR%%/www/js/app/graph.js
+%%DATADIR%%/www/js/app/history.js
+%%DATADIR%%/www/js/app/rspamd.js
+%%DATADIR%%/www/js/app/stats.js
+%%DATADIR%%/www/js/app/symbols.js
+%%DATADIR%%/www/js/app/upload.js
+%%DATADIR%%/www/js/lib/bootstrap.min.js
+%%DATADIR%%/www/js/lib/d3.min.js
+%%DATADIR%%/www/js/lib/d3evolution.min.js
+%%DATADIR%%/www/js/lib/d3pie.min.js
+%%DATADIR%%/www/js/lib/datatables.min.js
+%%DATADIR%%/www/js/lib/domReady.js
+%%DATADIR%%/www/js/lib/humanize.min.js
+%%DATADIR%%/www/js/lib/jquery-3.1.1.min.js
+%%DATADIR%%/www/js/lib/visibility.min.js
+%%DATADIR%%/www/js/main.js
+%%DATADIR%%/www/js/require.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
 man/man1/rspamadm.1.gz