- Update to 1.5.8

- Backport IPv6 bugfix from the upstream
- Remove obsoleted redirector support

4 files changed, 34 insertions, 27 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index d77dead2e63e..cfc3972c7dce 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.8
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -18,10 +18,9 @@ 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
@@ -72,26 +71,6 @@ GH_ACCOUNT=	vstakhov
  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=""
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 539130a38409..8da5173f84a3 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -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
diff --git a/mail/rspamd/files/patch-ipv6-support b/mail/rspamd/files/patch-ipv6-support
new file mode 100644
index 000000000000..1d7f36735f6b
--- /dev/null
+++ b/mail/rspamd/files/patch-ipv6-support
@@ -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 {
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index cf88e73784ac..18ac095b4b5b 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -5,7 +5,6 @@ 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