Index: head/mail/rspamd/Makefile
===================================================================
--- head/mail/rspamd/Makefile	(revision 441674)
+++ head/mail/rspamd/Makefile	(revision 441675)
@@ -1,123 +1,102 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.8
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Fast spam filtering system
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
 		libluajit-5.1.so:lang/luajit \
 		libfann.so:math/fann \
 		libicui18n.so:devel/icu
 BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd-devel
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD CGP
+OPTIONS_DEFINE=	GPERF HYPERSCAN GD CGP
 OPTIONS_DEFAULT=	GD
 GPERF_DESC=		Google perf-tools profiling
-REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 GD_DESC=		Enable libgd support for images fuzzy hashes
 CGP_DESC=		Install Communigate Pro(tm) helper
 
 USE_RC_SUBR=	rspamd
 
 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 \
 		-DNO_SHARED=ON \
 		-DENABLE_FANN=ON
 
 USES=		cmake:outsource pkgconfig perl5 \
 		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 USE_GNOME=	glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGD}
  CMAKE_ARGS+=	-DENABLE_GD=ON
  LIB_DEPENDS+=	libgd.so:graphics/gd
 .else
  CMAKE_ARGS+=	-DENABLE_GD=OFF
 .endif
 
 .if ${PORT_OPTIONS:MGPERF}
  CMAKE_ARGS+=	-DENABLE_GPERF_TOOLS=ON
  LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
 .endif
 
 .if ${PORT_OPTIONS:MHYPERSCAN}
  CMAKE_ARGS+=		-DENABLE_HYPERSCAN=ON
  LIB_DEPENDS+=		libhs.so:devel/hyperscan
  ONLY_FOR_ARCHS=	amd64
-.endif
-
-.if ${PORT_OPTIONS:MREDIRECTOR}
- USE_PERL5+=	run
- CMAKE_ARGS+=	-DENABLE_REDIRECTOR=ON
- PLIST_SUB+=	REDIRECTOR=""
- USE_RC_SUBR+=	rspamd_redirector
- RUN_DEPENDS+=	\
-	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
-	p5-IO-String>=0:devel/p5-IO-String \
-	p5-XML-Parser>=0:textproc/p5-XML-Parser \
-	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-	p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
-	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
-	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
-	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
-	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
-.else
- PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCGP}
  USE_PERL5+=	run
  PLIST_SUB+=	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
 .else
  PLIST_SUB+=	CGP="@comment "
 .endif
 
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
 		${STAGEDIR}/var/db/rspamd \
 		${STAGEDIR}/var/run/rspamd
 	# Linux specific
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	# No need, since rspamd.conf.sample is a same
 	${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
 .if ${PORT_OPTIONS:MCGP}
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/rspamd/distinfo
===================================================================
--- head/mail/rspamd/distinfo	(revision 441674)
+++ head/mail/rspamd/distinfo	(revision 441675)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493732063
-SHA256 (vstakhov-rspamd-1.5.7_GH0.tar.gz) = 73d18b129a072e35c74c9a440abdd0985fa15696d308a5e23736ec007432fd70
-SIZE (vstakhov-rspamd-1.5.7_GH0.tar.gz) = 2384051
+TIMESTAMP = 1495707999
+SHA256 (vstakhov-rspamd-1.5.8_GH0.tar.gz) = 1c414396e02df52b3a31914cad51a4ca8f9947af619db7221b98c9aa04907668
+SIZE (vstakhov-rspamd-1.5.8_GH0.tar.gz) = 2385290
Index: head/mail/rspamd/files/patch-ipv6-support
===================================================================
--- head/mail/rspamd/files/patch-ipv6-support	(nonexistent)
+++ head/mail/rspamd/files/patch-ipv6-support	(revision 441675)
@@ -0,0 +1,29 @@
+diff --git a/src/libutil/addr.c b/src/libutil/addr.c
+index 1687c80bd..ee70a90f4 100644
+--- src/libutil/addr.c
++++ src/libutil/addr.c
+@@ -287,8 +287,6 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
+ 		addr->slen = len;
+ 
+ 		if (addr->af == AF_UNIX) {
+-			addr->u.un = g_slice_alloc0 (sizeof (*addr->u.un));
+-			/* Get name from the listening socket */
+ 			len = sizeof (su);
+ 
+ 			if (getsockname (sock, &su.sa, &len) != -1) {
+diff --git a/src/libutil/addr.c b/src/libutil/addr.c
+index ee70a90f4..9a278a432 100644
+--- src/libutil/addr.c
++++ src/libutil/addr.c
+@@ -280,6 +280,11 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
+ 						sizeof (struct in6_addr));
+ 			}
+ 		}
++		else {
++			addr = rspamd_inet_addr_create (AF_INET6);
++			memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr,
++					sizeof (struct in6_addr));
++		}
+ 
+ 	}
+ 	else {

Property changes on: head/mail/rspamd/files/patch-ipv6-support
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/rspamd/pkg-plist
===================================================================
--- head/mail/rspamd/pkg-plist	(revision 441674)
+++ head/mail/rspamd/pkg-plist	(revision 441675)
@@ -1,171 +1,170 @@
 bin/rspamd-%%RSPAMDVERSION%%
 bin/rspamd
 bin/rspamd_stats
 bin/rspamadm-%%RSPAMDVERSION%%
 bin/rspamadm
 bin/rspamc-%%RSPAMDVERSION%%
 bin/rspamc
-%%REDIRECTOR%%bin/rspamd-redirector
 %%CGP%%bin/rspamd-cgp-helper
 @sample %%ETCDIR%%/2tld.inc.sample
 @sample %%ETCDIR%%/mime_types.inc.sample
 @sample %%ETCDIR%%/common.conf.sample
 @sample %%ETCDIR%%/composites.conf.sample
 @sample %%ETCDIR%%/dmarc_whitelist.inc.sample
 @sample %%ETCDIR%%/logging.inc.sample
 @sample %%ETCDIR%%/maillist.inc.sample
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
 %%ETCDIR%%/modules.d/dkim.conf
 %%ETCDIR%%/modules.d/dkim_signing.conf
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/emails.conf
 %%ETCDIR%%/modules.d/fann_redis.conf
 %%ETCDIR%%/modules.d/force_actions.conf
 %%ETCDIR%%/modules.d/forged_recipients.conf
 %%ETCDIR%%/modules.d/fuzzy_check.conf
 %%ETCDIR%%/modules.d/greylist.conf
 %%ETCDIR%%/modules.d/hfilter.conf
 %%ETCDIR%%/modules.d/history_redis.conf
 %%ETCDIR%%/modules.d/ip_score.conf
 %%ETCDIR%%/modules.d/maillist.conf
 %%ETCDIR%%/modules.d/metadata_exporter.conf
 %%ETCDIR%%/modules.d/metric_exporter.conf
 %%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
 %%ETCDIR%%/modules.d/mx_check.conf
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
 %%ETCDIR%%/modules.d/ratelimit.conf
 %%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
 %%ETCDIR%%/modules.d/replies.conf
 %%ETCDIR%%/modules.d/rmilter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
 %%ETCDIR%%/modules.d/spamassassin.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
 %%ETCDIR%%/modules.d/trie.conf
 %%ETCDIR%%/modules.d/url_redirector.conf
 %%ETCDIR%%/modules.d/url_reputation.conf
 %%ETCDIR%%/modules.d/url_tags.conf
 %%ETCDIR%%/modules.d/whitelist.conf
 @sample %%ETCDIR%%/options.inc.sample
 %%ETCDIR%%/redirectors.inc
 @sample %%ETCDIR%%/rspamd.conf.sample
 @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
 @sample %%ETCDIR%%/statistic.conf.sample
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @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/dkim_signing.lua
 %%DATADIR%%/lua/dmarc.lua
 %%DATADIR%%/lua/dynamic_conf.lua
 %%DATADIR%%/lua/emails.lua
 %%DATADIR%%/lua/fann_classifier.lua
 %%DATADIR%%/lua/fann_redis.lua
 %%DATADIR%%/lua/fann_scores.lua
 %%DATADIR%%/lua/force_actions.lua
 %%DATADIR%%/lua/forged_recipients.lua
 %%DATADIR%%/lua/fun.lua
 %%DATADIR%%/lua/fuzzy_collect.lua
 %%DATADIR%%/lua/greylist.lua
 %%DATADIR%%/lua/hfilter.lua
 %%DATADIR%%/lua/history_redis.lua
 %%DATADIR%%/lua/ip_score.lua
 %%DATADIR%%/lua/maillist.lua
 %%DATADIR%%/lua/metadata_exporter.lua
 %%DATADIR%%/lua/metric_exporter.lua
 %%DATADIR%%/lua/mid.lua
 %%DATADIR%%/lua/mime_types.lua
 %%DATADIR%%/lua/multimap.lua
 %%DATADIR%%/lua/mx_check.lua
 %%DATADIR%%/lua/once_received.lua
 %%DATADIR%%/lua/phishing.lua
 %%DATADIR%%/lua/ratelimit.lua
 %%DATADIR%%/lua/url_redirector.lua
 %%DATADIR%%/lua/url_tags.lua
 %%DATADIR%%/lua/replies.lua
 %%DATADIR%%/lua/rbl.lua
 %%DATADIR%%/lua/rmilter_headers.lua
 %%DATADIR%%/lua/rspamd_update.lua
 %%DATADIR%%/lua/settings.lua
 %%DATADIR%%/lua/spamassassin.lua
 %%DATADIR%%/lua/trie.lua
 %%DATADIR%%/lua/url_reputation.lua
 %%DATADIR%%/lua/whitelist.lua
 %%DATADIR%%/rules/global_functions.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.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/headers.lua
 %%DATADIR%%/rules/regexp/misc.lua
 %%DATADIR%%/rules/regexp/upstream_spam_filters.lua
 %%DATADIR%%/rules/rspamd.classifiers.lua
 %%DATADIR%%/rules/rspamd.lua
 %%DATADIR%%/rules/subject_checks.lua
 %%DATADIR%%/www/README.md
 %%DATADIR%%/www/css/bootstrap.min.css
 %%DATADIR%%/www/css/d3evolution.css
 %%DATADIR%%/www/css/footable.bootstrap.min.css
 %%DATADIR%%/www/css/rspamd.css
 %%DATADIR%%/www/favicon.ico
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff
 %%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff2
 %%DATADIR%%/www/img/asc.png
 %%DATADIR%%/www/img/desc.png
 %%DATADIR%%/www/img/rspamd_logo_navbar.png
 %%DATADIR%%/www/index.html
 %%DATADIR%%/www/js/app/config.js
 %%DATADIR%%/www/js/app/graph.js
 %%DATADIR%%/www/js/app/history.js
 %%DATADIR%%/www/js/app/rspamd.js
 %%DATADIR%%/www/js/app/stats.js
 %%DATADIR%%/www/js/app/symbols.js
 %%DATADIR%%/www/js/app/upload.js
 %%DATADIR%%/www/js/lib/bootstrap.min.js
 %%DATADIR%%/www/js/lib/d3.min.js
 %%DATADIR%%/www/js/lib/d3evolution.min.js
 %%DATADIR%%/www/js/lib/d3pie.min.js
 %%DATADIR%%/www/js/lib/domReady.js
 %%DATADIR%%/www/js/lib/footable.min.js
 %%DATADIR%%/www/js/lib/humanize.min.js
 %%DATADIR%%/www/js/lib/jquery-3.1.1.min.js
 %%DATADIR%%/www/js/lib/visibility.min.js
 %%DATADIR%%/www/js/main.js
 %%DATADIR%%/www/js/require.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
 man/man1/rspamadm.1.gz
 man/man1/rspamc.1.gz
 man/man8/rspamd.8.gz
 @dir %%EXAMPLESDIR%%
 @owner nobody
 @group nobody
 @dir /var/db/rspamd
 @dir /var/log/rspamd
 @dir /var/run/rspamd
 @owner
 @group