- Update rspamd to 1.1.0

- Update rmilter to 1.7.0
- Fix dependencies
- Add UPDATING entry

6 files changed, 23 insertions, 27 deletions

diff --git a/UPDATING b/UPDATING
index 9ef972a8ae90..35abf1940b25 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160118:
+  AFFECTS: users of mail/rspamd and mail/rmilter
+  AUTHOR: vsevolod@FreeBSD.org
+
+  Rspamd has been updated to the version 1.1.0. If you have used per user
+  statistics, then please consult changelog for details: your configuration
+  should be changed.
+
+  Rmilter has been updated to the version 1.7.0. Support of SPF and Spamassassin
+  has been dropped from this project completely. You might also consider
+  migration from memcahched to redis in this version.
+
 20160113:
   AFFECTS: users of sysutils/ansible
   AUTHOR: lifanov@mail.lifanov.com
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index aafa10387bb3..9c41cd4658b3 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -1,16 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	rmilter
-PORTVERSION=	1.6.7
+PORTVERSION=	1.7.0
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
-COMMENT=	Milter that performs spamd, clamav, and spf checks
+COMMENT=	Milter that performs rspamd, clamav, and other checks
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libspf2.so:${PORTSDIR}/mail/libspf2 \
 		libopendkim.so:${PORTSDIR}/mail/opendkim
 
 USE_GITHUB=	yes
@@ -23,8 +22,7 @@ USE_OPENSSL=	yes
 USERS=		_rmilter
 GROUPS=		_rmilter
 
-CMAKE_ARGS+=	-DENABLE_SPF=ON \
-		-DENABLE_DKIM=ON
+CMAKE_ARGS+=	-DENABLE_DKIM=ON
 
 WITH_SENDMAIL_BASE=	yes
 
diff --git a/mail/rmilter/distinfo b/mail/rmilter/distinfo
index ce431f4b696e..351cc53c86d3 100644
--- a/mail/rmilter/distinfo
+++ b/mail/rmilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vstakhov-rmilter-1.6.7_GH0.tar.gz) = d8312be6ab79cf42fd28a85c4eda3868e20a4d182f06c1491ce8cdc8c2bed8df
-SIZE (vstakhov-rmilter-1.6.7_GH0.tar.gz) = 117993
+SHA256 (vstakhov-rmilter-1.7.0_GH0.tar.gz) = 0337c1e643f1c9115ae9a53cb79d883ef857ca8457a94b37ef135ee89166ea3d
+SIZE (vstakhov-rmilter-1.7.0_GH0.tar.gz) = 159459
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 9b4d80a02546..1a7dfd7aab1c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.0.11
+PORTVERSION=	1.1.0
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 
@@ -17,11 +17,9 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 
 CONFLICTS_INSTALL=	rspamd
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR HIREDIS
+OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
-HIREDIS_DESC=		Redis support through hiredis
-OPTIONS_DEFAULT=	HIREDIS
 
 USE_RC_SUBR=	rspamd
 
@@ -75,12 +73,6 @@ USE_OPENSSL=	yes
  PLIST_SUB+=		REDIRECTOR="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MHIREDIS}
- LIB_DEPENDS+=	libhiredis.so:${PORTSDIR}/databases/hiredis
-.else
- CMAKE_ARGS+=	-DENABLE_HIREDIS=OFF
-.endif
-
 post-stage:
 	${INSTALL} -d \
 		${STAGEDIR}/var/log/rspamd \
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 04f5ae131dd0..ec446ffd99b4 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.0.11.tar.xz) = b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928
-SIZE (rspamd-1.0.11.tar.xz) = 1176160
+SHA256 (rspamd-1.1.0.tar.xz) = 69db05150b4ba8304d24dd0f96c79b5d3792478373f0d6be6c92b51b1cf60ead
+SIZE (rspamd-1.1.0.tar.xz) = 1291004
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 9301562c7340..04db986ce1e6 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -25,6 +25,7 @@ bin/rspamc
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
 %%ETCDIR%%/modules.d/ratelimit.conf
+%%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/regexp.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
@@ -42,6 +43,7 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/dmarc.lua
 %%DATADIR%%/lua/emails.lua
+%%DATADIR%%/lua/fann_scores.lua
 %%DATADIR%%/lua/forged_recipients.lua
 %%DATADIR%%/lua/fun.lua
 %%DATADIR%%/lua/hfilter.lua
@@ -81,14 +83,6 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/www/js/rspamd.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
-%%DATADIR%%/www/src/Gruntfile.js
-%%DATADIR%%/www/src/common.js
-%%DATADIR%%/www/src/components/app.jsx
-%%DATADIR%%/www/src/components/dashboard.jsx
-%%DATADIR%%/www/src/components/login.jsx
-%%DATADIR%%/www/src/components/piechart.jsx
-%%DATADIR%%/www/src/components/rrdgraph.jsx
-%%DATADIR%%/www/src/package.json
 man/man1/rspamadm.1.gz
 man/man1/rspamc.1.gz
 man/man8/rspamd.8.gz