Index: head/mail/rspamd/Makefile
===================================================================
--- head/mail/rspamd/Makefile	(revision 554310)
+++ head/mail/rspamd/Makefile	(revision 554311)
@@ -1,107 +1,107 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
 PORTVERSION=	2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libicui18n.so:devel/icu \
 		libsodium.so:security/libsodium
 BUILD_DEPENDS=	ragel:devel/ragel
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
 USES=		cmake gnome perl5 pkgconfig \
 		sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_GNOME=	glib20
 
 CONFLICTS_INSTALL=	rspamd-devel
 
 USERS=		rspamd
 GROUPS=		rspamd
 
 OPTIONS_DEFINE=			BLAS CGP GPERF LUAJIT
 OPTIONS_DEFINE_amd64=		HYPERSCAN
 OPTIONS_DEFAULT_amd64=		LUAJIT
 OPTIONS_DEFAULT_armv7=		LUAJIT
 OPTIONS_DEFAULT_i386=		LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 OPTIONS_SUB=	yes
 
 BLAS_DESC=	Use OpenBLAS to accelerate KANN
 CGP_DESC=	Install Communigate Pro(tm) helper
 GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DRUNDIR=/var/run/rspamd \
 		-DMANDIR=${MANPREFIX}/man \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd
 
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	rspamd
 
 BLAS_CMAKE_ON=	-DENABLE_BLAS=ON
 BLAS_LIB_DEPENDS=	libblis.so:math/blis liblapack.so:math/lapack
 BLAS_USES=	blaslapack:openblas
 
 GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 
 HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 
 LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=	lua:51+
 
 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
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*}
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c11
 .endif
 
 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
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${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
 post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 
 .include <bsd.port.mk>
Index: head/mail/rspamd/files/pkg-message.in
===================================================================
--- head/mail/rspamd/files/pkg-message.in	(revision 554310)
+++ head/mail/rspamd/files/pkg-message.in	(revision 554311)
@@ -1,14 +1,17 @@
 [
 { type: install
   message: <<EOM
  - Add the following line to /etc/rc.conf to enable rspamd:
 
      rspamd_enable="YES"
 
+ - Optionally you can adjust the user which runs Rspamd workers with the
+   variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd).
+
  - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
    has been created in the /usr/local/etc/newsyslog.conf.d directory.
    You can edit %%ETCDIR%%/rspamd.newsyslog.conf
    to change log file rotation configuration.
 EOM
 }
 ]
Index: head/mail/rspamd/files/rspamd.in
===================================================================
--- head/mail/rspamd/files/rspamd.in	(revision 554310)
+++ head/mail/rspamd/files/rspamd.in	(revision 554311)
@@ -1,59 +1,59 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: rspamd
 # REQUIRE: LOGIN redis
 # BEFORE:  mail
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable rspamd:
 #
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "rspamd".
+# rspamd_worker_user (str):	Default to "rspamd".
 #
-# rspamd_group (str):		Default to "rspamd".
+# rspamd_worker_group (str):	Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
 . /etc/rc.subr
 
 name=rspamd
 rcvar=rspamd_enable
 
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="rspamd"}
-: ${rspamd_group="rspamd"}
+: ${rspamd_worker_user="rspamd"}
+: ${rspamd_worker_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
 
 command=%%PREFIX%%/bin/rspamd
 command_adm=%%PREFIX%%/bin/rspamadm
 restart_precmd="rspamd_checkconfig"
 reload_precmd="rspamd_checkconfig"
 configtest_cmd="rspamd_checkconfig"
 reopenlog_cmd="reopenlog_cmd"
 
 required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
-command_args="-u ${rspamd_user} -g ${rspamd_group}"
+command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}"
 extra_commands="reload configtest reopenlog"
 stop_postcmd="rm -f $pidfile"
 sig_reload="HUP"
 
 rspamd_checkconfig()
 {
 	echo "Performing sanity check on rspamd configuration:"
 	eval ${command_adm} configtest ${rspamd_flags}
 }
 
 reopenlog_cmd()
 {
 	pkill -USR1 -F $pidfile
 }
 
 run_rc_command "$1"
Index: head/mail/rspamd-devel/Makefile
===================================================================
--- head/mail/rspamd-devel/Makefile	(revision 554310)
+++ head/mail/rspamd-devel/Makefile	(revision 554311)
@@ -1,111 +1,111 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
 PORTVERSION=	2.6.a1.20200929
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system dev version
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libicui18n.so:devel/icu \
 		libsodium.so:security/libsodium
 BUILD_DEPENDS=	ragel:devel/ragel
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
 USES=		cmake gnome perl5 pkgconfig sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_GNOME=	glib20
 
 CONFLICTS_INSTALL=	rspamd
 
 USERS=		rspamd
 GROUPS=		rspamd
 
 OPTIONS_DEFINE=			BLAS CGP GPERF LUAJIT
 OPTIONS_DEFINE_amd64=		HYPERSCAN
 OPTIONS_DEFAULT_amd64=		LUAJIT
 OPTIONS_DEFAULT_armv7=		LUAJIT
 OPTIONS_DEFAULT_i386=		LUAJIT
 OPTIONS_DEFAULT_powerpc=	LUAJIT
 OPTIONS_DEFAULT_powerpc64=	LUAJIT
 OPTIONS_DEFAULT_powerpc64le=	LUAJIT
 OPTIONS_SUB=	yes
 
 BLAS_DESC=	Use OpenBLAS to accelerate KANN
 CGP_DESC=	Install Communigate Pro(tm) helper
 GPERF_DESC=	Google perf-tools profiling
 HYPERSCAN_DESC=	Use hyperscan optimizations (amd64 only)
 LUAJIT_DESC=	Use LuaJIT instead of standard Lua
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
 		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
 		-DRUNDIR=/var/run/rspamd \
 		-DMANDIR=${MANPREFIX}/man \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME}
 USE_GITHUB=	yes
 GH_TAGNAME=	80b8f0e
 
 DEBUG_FLAGS=	-g -O0
 
 USE_RC_SUBR=	rspamd
 
 BLAS_CMAKE_ON=	-DENABLE_BLAS=ON
 BLAS_LIB_DEPENDS=	libblis.so:math/blis liblapack.so:math/lapack
 BLAS_USES=	blaslapack:openblas
 
 GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 
 HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
 HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
 
 LUAJIT_CMAKE_OFF=	-DENABLE_LUAJIT=OFF
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_USES_OFF=	lua:51+
 
 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
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*}
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c11
 .endif
 
 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
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
 	${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
 post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 
 .include <bsd.port.mk>
Index: head/mail/rspamd-devel/files/pkg-message.in
===================================================================
--- head/mail/rspamd-devel/files/pkg-message.in	(revision 554310)
+++ head/mail/rspamd-devel/files/pkg-message.in	(revision 554311)
@@ -1,14 +1,17 @@
 [
 { type: install
   message: <<EOM
  - Add the following line to /etc/rc.conf to enable rspamd:
 
      rspamd_enable="YES"
 
+ - Optionally you can adjust the user which runs Rspamd workers with the
+   variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd).
+
  - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf
    has been created in the /usr/local/etc/newsyslog.conf.d directory.
    You can edit %%ETCDIR%%/rspamd.newsyslog.conf
    to change log file rotation configuration.
 EOM
 }
 ]
Index: head/mail/rspamd-devel/files/rspamd.in
===================================================================
--- head/mail/rspamd-devel/files/rspamd.in	(revision 554310)
+++ head/mail/rspamd-devel/files/rspamd.in	(revision 554311)
@@ -1,59 +1,59 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: rspamd
 # REQUIRE: LOGIN redis
 # BEFORE:  mail
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable rspamd:
 #
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "rspamd".
+# rspamd_worker_user (str):	Default to "rspamd".
 #
-# rspamd_group (str):		Default to "rspamd".
+# rspamd_worker_group (str):	Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
 . /etc/rc.subr
 
 name=rspamd
 rcvar=rspamd_enable
 
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="rspamd"}
-: ${rspamd_group="rspamd"}
+: ${rspamd_worker_user="rspamd"}
+: ${rspamd_worker_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
 
 command=%%PREFIX%%/bin/rspamd
 command_adm=%%PREFIX%%/bin/rspamadm
 restart_precmd="rspamd_checkconfig"
 reload_precmd="rspamd_checkconfig"
 configtest_cmd="rspamd_checkconfig"
 reopenlog_cmd="reopenlog_cmd"
 
 required_files=%%PREFIX%%/etc/rspamd/rspamd.conf
-command_args="-u ${rspamd_user} -g ${rspamd_group}"
+command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}"
 extra_commands="reload configtest reopenlog"
 stop_postcmd="rm -f $pidfile"
 sig_reload="HUP"
 
 rspamd_checkconfig()
 {
 	echo "Performing sanity check on rspamd configuration:"
 	eval ${command_adm} configtest ${rspamd_flags}
 }
 
 reopenlog_cmd()
 {
 	pkill -USR1 -F $pidfile
 }
 
 run_rc_command "$1"