- Update to 1.4.1

4 files changed, 19 insertions, 14 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index cac0162b90b5..31ddb46efe4a 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index a4a9b8034173..3f956fbe849b 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479731945
-SHA256 (rspamd-1.4.0.tar.xz) = 30c9acf93bdcc6c009524c8b2770931475929c6c9e948faa90d7412306055a1c
-SIZE (rspamd-1.4.0.tar.xz) = 1769860
+TIMESTAMP = 1480517320
+SHA256 (rspamd-1.4.1.tar.xz) = 11e39e4b44a85feaf546696d28a72ffc32e35c01a028a251d5175ba58343eb28
+SIZE (rspamd-1.4.1.tar.xz) = 1779492
diff --git a/mail/rspamd/files/patch-CMakeLists.txt b/mail/rspamd/files/patch-CMakeLists.txt
index 43852babe384..065ba11b3a10 100644
--- a/mail/rspamd/files/patch-CMakeLists.txt
+++ b/mail/rspamd/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-07-03 20:55:47 UTC
+--- CMakeLists.txt.orig	2016-10-19 16:09:11 UTC
 +++ CMakeLists.txt
-@@ -1223,6 +1223,21 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
+@@ -1261,6 +1261,23 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
@@ -13,7 +13,9 @@
 +	INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/maillist.inc" ${CONFDIR} "maillist.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 054cb5d9d6f6..4ff9a42e661a 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -12,9 +12,9 @@ bin/rspamc
 @sample %%ETCDIR%%/composites.conf.sample
 @sample %%ETCDIR%%/dmarc_whitelist.inc.sample
 @sample %%ETCDIR%%/logging.inc.sample
-%%ETCDIR%%/maillist.inc
+@sample %%ETCDIR%%/maillist.inc.sample
 @sample %%ETCDIR%%/metrics.conf.sample
-%%ETCDIR%%/mid.inc
+@sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/dkim.conf
@@ -26,8 +26,8 @@ bin/rspamc
 %%ETCDIR%%/modules.d/hfilter.conf
 %%ETCDIR%%/modules.d/ip_score.conf
 %%ETCDIR%%/modules.d/maillist.conf
-%%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/mime_types.conf
+%%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
@@ -49,9 +49,12 @@ bin/rspamc
 @sample %%ETCDIR%%/worker-fuzzy.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+etc/newsyslog.conf.d/rspamd.newsyslog.conf
+lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/antivirus.lua
 %%DATADIR%%/lua/asn.lua
+%%DATADIR%%/lua/clickhouse.lua
 %%DATADIR%%/lua/dcc.lua
 %%DATADIR%%/lua/dmarc.lua
 %%DATADIR%%/lua/dynamic_conf.lua
@@ -74,8 +77,8 @@ bin/rspamc
 %%DATADIR%%/lua/once_received.lua
 %%DATADIR%%/lua/phishing.lua
 %%DATADIR%%/lua/ratelimit.lua
-%%DATADIR%%/lua/rbl.lua
 %%DATADIR%%/lua/replies.lua
+%%DATADIR%%/lua/rbl.lua
 %%DATADIR%%/lua/rspamd_update.lua
 %%DATADIR%%/lua/settings.lua
 %%DATADIR%%/lua/spamassassin.lua
@@ -84,12 +87,14 @@ bin/rspamc
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/html.lua
 %%DATADIR%%/rules/http_headers.lua
+%%DATADIR%%/rules/mid.lua
 %%DATADIR%%/rules/misc.lua
 %%DATADIR%%/rules/regexp/compromised_hosts.lua
 %%DATADIR%%/rules/regexp/drugs.lua
 %%DATADIR%%/rules/regexp/fraud.lua
 %%DATADIR%%/rules/regexp/headers.lua
 %%DATADIR%%/rules/regexp/lotto.lua
+%%DATADIR%%/rules/regexp/misc.lua
 %%DATADIR%%/rules/regexp/upstream_spam_filters.lua
 %%DATADIR%%/rules/rspamd.classifiers.lua
 %%DATADIR%%/rules/rspamd.lua
@@ -110,19 +115,17 @@ bin/rspamc
 %%DATADIR%%/www/img/spinner.gif
 %%DATADIR%%/www/img/spinner.png
 %%DATADIR%%/www/index.html
-%%DATADIR%%/www/js/bootstrap.min.js
-%%DATADIR%%/www/js/d3.min.js
 %%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/plugins.txt
 %%DATADIR%%/www/react-index.html
-etc/newsyslog.conf.d/rspamd.newsyslog.conf
-lib/rspamd/librspamd-actrie.so
 man/man1/rspamadm.1.gz
 man/man1/rspamc.1.gz
 man/man8/rspamd.8.gz