- Update mail/rspamd to 1.9

- Remove obsoleted redirector start script
- Change user and group from nobody to Rspamd
- Add notes to UPDATING

PR:		236505
Submitted by:	Yasuhiro KIMURA <yasu at utahime.org>

6 files changed, 17 insertions, 45 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index c582296fbe29..c56138ffda7f 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.8.0.a1.20180920
-PORTREVISION=	3
+PORTVERSION=	1.9.0.a1.20180920
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -10,7 +10,7 @@ MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system dev version
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
@@ -27,6 +27,9 @@ USE_GNOME=	glib20
 
 CONFLICTS_INSTALL=	rspamd
 
+USERS=		rspamd
+GROUPS=		rspamd
+
 OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT_amd64=	TORCH
@@ -60,7 +63,7 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DGIT_ID=${GH_TAGNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	571ce4f
+GH_TAGNAME=	76fafe01d
 
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 6f6885027c85..331749e3ab22 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537422438
-SHA256 (vstakhov-rspamd-1.8.0.a1.20180920-571ce4f_GH0.tar.gz) = c80bc4acefbd15cfe18e3c1655216e89c7c480667a596b4924342621e8cccc7c
-SIZE (vstakhov-rspamd-1.8.0.a1.20180920-571ce4f_GH0.tar.gz) = 4260326
+TIMESTAMP = 1550141837
+SHA256 (vstakhov-rspamd-1.9.0.a1.20180920-76fafe01d_GH0.tar.gz) = 45cfde76a55a97ebcbc9f270bbe1bed1cf56cde780c6bff58501c7283cb92461
+SIZE (vstakhov-rspamd-1.9.0.a1.20180920-76fafe01d_GH0.tar.gz) = 4381878
diff --git a/mail/rspamd-devel/files/rspamd.in b/mail/rspamd-devel/files/rspamd.in
index a594f0bda034..b605115cb77e 100644
--- a/mail/rspamd-devel/files/rspamd.in
+++ b/mail/rspamd-devel/files/rspamd.in
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "nobody".
+# rspamd_user (str):		Default to "rspamd".
 #
-# rspamd_group (str):		Default to "nobody".
+# rspamd_group (str):		Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@ rcvar=rspamd_enable
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="nobody"}
-: ${rspamd_group="nobody"}
+: ${rspamd_user="rspamd"}
+: ${rspamd_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
diff --git a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
index de693aabf0d1..3b5933cebbf3 100644
--- a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
+++ b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
@@ -8,4 +8,4 @@
 # See newsyslog.conf(5) for details.
 #
 # logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
-/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
+/var/log/rspamd/rspamd.log	rspamd:rspamd	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
diff --git a/mail/rspamd-devel/files/rspamd_redirector.in b/mail/rspamd-devel/files/rspamd_redirector.in
deleted file mode 100644
index d719ee240af0..000000000000
--- a/mail/rspamd-devel/files/rspamd_redirector.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: rspamd_redirector
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable rspamd_redirector:
-#
-# rspamd_redirector_enable (bool):	Set to "NO" by default.
-# 					Set it to "YES" to enable redirector.
-
-. /etc/rc.subr
-
-name="rspamd_redirector"
-rcvar=rspamd_redirector_enable
-
-load_rc_config $name
-
-: ${rspamd_redirector_enable:="NO"}
-
-pidfile=${rspamd_redirector_pidfile:-"/var/run/rspamd/redirector.pid"}
-
-command="%%PREFIX%%/bin/rspamd-redirector"
-command_interpreter="%%PREFIX%%/bin/perl"
-extra_commands="reload"
-sig_reload="USR1"
-stop_postcmd="rm -f $pidfile"
-
-run_rc_command "$1"
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 7f8624e54e78..56eb3dc386b6 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -520,8 +520,8 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/www/js/main.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
-@owner nobody
-@group nobody
+@owner rspamd
+@group rspamd
 @dir /var/db/rspamd
 @dir /var/log/rspamd
 @dir /var/run/rspamd