mail/rspamd:

- Update to 2.0
- Add upstream patches to fix crash due to constructors init order
- Remove sample configuration files as default configuration files are NOT intended for modification by users and SHOULD be overwritten on port upgrade.
- Remove NO_SHARED CMake flag as it is on by default
- Add notes to UPDATING

mail/rspamd-devel:
- Update to 2.1.a1.20191014
- Remove sample configuration files as default configuration files are NOT intended for modification by users and SHOULD be overwritten on port upgrade.
- Add notes to UPDATING

PR:		241204
Submitted by:	Alexander Moisseev <moiseev at mezonplus.ru>
Reported by:	Yasuhiro KIMURA <yasu at utahime.org>

4 files changed, 23 insertions, 48 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index b8fb4e195ba4..9ee261ac49e6 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	2.0.a1.20191010
+PORTVERSION=	2.1.a1.20191014
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -51,7 +51,7 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME}
 USE_GITHUB=	yes
-GH_TAGNAME=	1bf202d
+GH_TAGNAME=	fe09a19
 
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
@@ -70,16 +70,14 @@ CGP_RUN_DEPENDS+=	\
 	p5-EV>=0:devel/p5-EV \
 	p5-JSON-XS>=0:converters/p5-JSON-XS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
+	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
-	# No need, since rspamd.conf.sample is a same
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	# No examples installed by the port
 	${RMDIR} ${STAGEDIR}/${EXAMPLESDIR}
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 439dc5ac18ec..2569a7ed0c31 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570685523
-SHA256 (rspamd-rspamd-2.0.a1.20191010-1bf202d_GH0.tar.gz) = 7f08dedd1253e909da749e2c85bfeb4a6deb74786badc44a64e280c837135beb
-SIZE (rspamd-rspamd-2.0.a1.20191010-1bf202d_GH0.tar.gz) = 4222899
+TIMESTAMP = 1571067018
+SHA256 (rspamd-rspamd-2.1.a1.20191014-fe09a19_GH0.tar.gz) = ceee5af2a8a40b7e2fabd9fd57e3be737cc6cbd3d375d93b9252feefc69263de
+SIZE (rspamd-rspamd-2.1.a1.20191014-fe09a19_GH0.tar.gz) = 4230877
diff --git a/mail/rspamd-devel/files/patch-CMakeLists.txt b/mail/rspamd-devel/files/patch-CMakeLists.txt
deleted file mode 100644
index 16f3b66bf9ea..000000000000
--- a/mail/rspamd-devel/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- CMakeLists.txt.orig	2019-08-16 17:34:47 UTC
-+++ CMakeLists.txt
-@@ -1235,6 +1235,21 @@ ENDFOREACH(CONF_FILE)
- SET(MAIN_CONF "conf/rspamd.conf")
- IF(BUILD_PORT)
- 	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/actions.conf" ${CONFDIR} "actions.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/cgp.inc" ${CONFDIR} "cgp.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/groups.conf" ${CONFDIR} "groups.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-proxy.inc" ${CONFDIR} "worker-proxy.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/settings.conf" ${CONFDIR} "settings.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
- ELSE(BUILD_PORT)
- 	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
- ENDIF(BUILD_PORT)
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index d62038eeeeec..fd0d6428ed6c 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -7,12 +7,12 @@ bin/rspamd-%%RSPAMDVERSION%%
 bin/rspamd_stats
 %%CGP%%bin/rspamd-cgp-helper
 etc/newsyslog.conf.d/rspamd.newsyslog.conf
-@sample %%ETCDIR%%/actions.conf.sample
-@sample %%ETCDIR%%/cgp.inc.sample
-@sample %%ETCDIR%%/common.conf.sample
-@sample %%ETCDIR%%/composites.conf.sample
-@sample %%ETCDIR%%/groups.conf.sample
-@sample %%ETCDIR%%/logging.inc.sample
+%%ETCDIR%%/actions.conf
+%%ETCDIR%%/cgp.inc
+%%ETCDIR%%/common.conf
+%%ETCDIR%%/composites.conf
+%%ETCDIR%%/groups.conf
+%%ETCDIR%%/logging.inc
 %%ETCDIR%%/maps.d/dmarc_whitelist.inc
 %%ETCDIR%%/maps.d/maillist.inc
 %%ETCDIR%%/maps.d/mid.inc
@@ -20,8 +20,8 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/maps.d/redirectors.inc
 %%ETCDIR%%/maps.d/spf_dkim_whitelist.inc
 %%ETCDIR%%/maps.d/surbl-whitelist.inc
-@sample %%ETCDIR%%/metrics.conf.sample
-@sample %%ETCDIR%%/modules.conf.sample
+%%ETCDIR%%/metrics.conf
+%%ETCDIR%%/modules.conf
 %%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/arc.conf
 %%ETCDIR%%/modules.d/asn.conf
@@ -66,8 +66,8 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/modules.d/trie.conf
 %%ETCDIR%%/modules.d/url_redirector.conf
 %%ETCDIR%%/modules.d/whitelist.conf
-@sample %%ETCDIR%%/options.inc.sample
-@sample %%ETCDIR%%/rspamd.conf.sample
+%%ETCDIR%%/options.inc
+%%ETCDIR%%/rspamd.conf
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
 %%ETCDIR%%/scores.d/fuzzy_group.conf
 %%ETCDIR%%/scores.d/headers_group.conf
@@ -81,12 +81,12 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/scores.d/subject_group.conf
 %%ETCDIR%%/scores.d/surbl_group.conf
 %%ETCDIR%%/scores.d/whitelist_group.conf
-@sample %%ETCDIR%%/settings.conf.sample
-@sample %%ETCDIR%%/statistic.conf.sample
-@sample %%ETCDIR%%/worker-controller.inc.sample
-@sample %%ETCDIR%%/worker-fuzzy.inc.sample
-@sample %%ETCDIR%%/worker-normal.inc.sample
-@sample %%ETCDIR%%/worker-proxy.inc.sample
+%%ETCDIR%%/settings.conf
+%%ETCDIR%%/statistic.conf
+%%ETCDIR%%/worker-controller.inc
+%%ETCDIR%%/worker-fuzzy.inc
+%%ETCDIR%%/worker-normal.inc
+%%ETCDIR%%/worker-proxy.inc
 lib/rspamd/librspamd-actrie.so
 lib/rspamd/librspamd-ev.so
 lib/rspamd/librspamd-kann.so
@@ -181,6 +181,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_scanners/kaspersky_se.lua
 %%DATADIR%%/lualib/lua_scanners/oletools.lua
 %%DATADIR%%/lualib/lua_scanners/p0f.lua
+%%DATADIR%%/lualib/lua_scanners/razor.lua
 %%DATADIR%%/lualib/lua_scanners/savapi.lua
 %%DATADIR%%/lualib/lua_scanners/sophos.lua
 %%DATADIR%%/lualib/lua_scanners/spamassassin.lua