- Update to 2.3

PR:		243877
Submitted by:	Yasuhiro KIMURA <yasu at utahime.org>
Reviewed by:	Alexander Moisseev

3 files changed, 17 insertions, 11 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index fe1dcc90ee4b..54e266061668 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.3
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -86,7 +85,6 @@ post-install:
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	# No examples installed by the port
-	${RMDIR} ${STAGEDIR}/${EXAMPLESDIR}
 	${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
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 190543321a68..79cf300d3cfe 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574230570
-SHA256 (rspamd-rspamd-2.2_GH0.tar.gz) = ea45239db0abba66f1b1a07710c2306da85bfdd921f31158486d3f6522f88be5
-SIZE (rspamd-rspamd-2.2_GH0.tar.gz) = 4257574
+TIMESTAMP = 1580833267
+SHA256 (rspamd-rspamd-2.3_GH0.tar.gz) = 994f737875b6159225384606076798687a529336d66496781a83de9164b6d41b
+SIZE (rspamd-rspamd-2.3_GH0.tar.gz) = 4409924
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index d30304e4e3ab..2aa94b9c30ff 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -69,6 +69,7 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/options.inc
 %%ETCDIR%%/rspamd.conf
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+%%ETCDIR%%/scores.d/content_group.conf
 %%ETCDIR%%/scores.d/fuzzy_group.conf
 %%ETCDIR%%/scores.d/headers_group.conf
 %%ETCDIR%%/scores.d/hfilter_group.conf
@@ -154,23 +155,26 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_bayes_learn.lua
 %%DATADIR%%/lualib/lua_cfg_transform.lua
 %%DATADIR%%/lualib/lua_clickhouse.lua
+%%DATADIR%%/lualib/lua_content/ical.lua
+%%DATADIR%%/lualib/lua_content/init.lua
+%%DATADIR%%/lualib/lua_content/pdf.lua
 %%DATADIR%%/lualib/lua_dkim_tools.lua
 %%DATADIR%%/lualib/lua_ffi/common.lua
 %%DATADIR%%/lualib/lua_ffi/dkim.lua
 %%DATADIR%%/lualib/lua_ffi/init.lua
 %%DATADIR%%/lualib/lua_ffi/spf.lua
 %%DATADIR%%/lualib/lua_fuzzy.lua
-%%DATADIR%%/lualib/lua_ical.lua
 %%DATADIR%%/lualib/lua_lexer.lua
 %%DATADIR%%/lualib/lua_magic/heuristics.lua
 %%DATADIR%%/lualib/lua_magic/init.lua
 %%DATADIR%%/lualib/lua_magic/patterns.lua
 %%DATADIR%%/lualib/lua_magic/types.lua
-%%DATADIR%%/lualib/lua_maps_expressions.lua
 %%DATADIR%%/lualib/lua_maps.lua
+%%DATADIR%%/lualib/lua_maps_expressions.lua
 %%DATADIR%%/lualib/lua_meta.lua
 %%DATADIR%%/lualib/lua_mime.lua
 %%DATADIR%%/lualib/lua_redis.lua
+%%DATADIR%%/lualib/lua_scanners/avast.lua
 %%DATADIR%%/lualib/lua_scanners/clamav.lua
 %%DATADIR%%/lualib/lua_scanners/common.lua
 %%DATADIR%%/lualib/lua_scanners/dcc.lua
@@ -257,10 +261,12 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/plugins/settings.lua
 %%DATADIR%%/plugins/spamassassin.lua
 %%DATADIR%%/plugins/spamtrap.lua
+%%DATADIR%%/plugins/spf.lua
 %%DATADIR%%/plugins/trie.lua
 %%DATADIR%%/plugins/url_redirector.lua
 %%DATADIR%%/plugins/whitelist.lua
 %%DATADIR%%/rules/bitcoin.lua
+%%DATADIR%%/rules/content.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua
@@ -274,11 +280,14 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/rules/rspamd.lua
 %%DATADIR%%/rules/subject_checks.lua
 %%DATADIR%%/www/README.md
+%%DATADIR%%/www/browserconfig.xml
 %%DATADIR%%/www/css/bootstrap.min.css
 %%DATADIR%%/www/css/d3evolution.css
 %%DATADIR%%/www/css/footable.bootstrap.min.css
 %%DATADIR%%/www/css/nprogress.css
 %%DATADIR%%/www/css/rspamd.css
+%%DATADIR%%/www/favicon-16x16.png
+%%DATADIR%%/www/favicon-32x32.png
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff
@@ -299,15 +308,14 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/www/js/lib/d3evolution.min.js
 %%DATADIR%%/www/js/lib/d3pie.min.js
 %%DATADIR%%/www/js/lib/footable.min.js
-%%DATADIR%%/www/js/lib/humanize.min.js
 %%DATADIR%%/www/js/lib/jquery-3.4.1.min.js
 %%DATADIR%%/www/js/lib/jquery.stickytabs.min.js
 %%DATADIR%%/www/js/lib/nprogress.min.js
 %%DATADIR%%/www/js/lib/require.min.js
 %%DATADIR%%/www/js/lib/visibility.min.js
 %%DATADIR%%/www/js/main.js
-%%DATADIR%%/www/plugins.txt
-%%DATADIR%%/www/react-index.html
+%%DATADIR%%/www/mstile-150x150.png
+%%DATADIR%%/www/safari-pinned-tab.svg
 @owner rspamd
 @group rspamd
 @dir /var/db/rspamd