mail/rspamd: Update to 1.7.4.

* [Conf] Major stock config updates:
    - Workers are now specified in a new format worker "type" { ... }
    - Enable fuzzy worker to simplify local fuzzy storages configuration
    - Bind all workers to localhost by default to avoid security flaws
* [Conf] Make more sane fuzzy_check default settings
* [CritFix] Fix ucl escape for bad symbols
* [Feature] Add failure symbol for AV module
* [Feature] Add lazy expiration mode for new classifier schema
* [Feature] Add preliminary version of maps stats plugin
* [Feature] Allow to block fuzzy requests from specific networks
* [Feature] Allow to change `expire` of live statistics
* [Feature] Distinguish AV failure from clean result
* [Feature] Further improvements of language detector by using khash
* [Feature] Further optimization of the lang_detection
* [Feature] Implement cluster-aware bayes expiry
* [Feature] Implement exclude patterns in rspamc
* [Feature] Implement glob maps in addition to regexp maps
* [Feature] Implement map statistics function for lua API
* [Feature] Implement stop symbols for Clickhouse collection
* [Feature] Support recipients separated by commas
* [Feature] Try harder to upload scripts to the Redis server
* [Feature] Upgrade t1ha distribution
* [Feature] use_domain_sign_inbound
* [Feature] Use scores from maps if `symbols_set` is not defined
* [Fix] Add resolving version of radix map helper
* [Fix] Check URL before adding implicit prefix
* [Fix] Do not check pid/state when using PRNG
* [Fix] Fix CentOS logrotate script for systemd
* [Fix] Fix slash + dot in urls
* [Fix] Fix systemd version of the logrotate script
* [Fix] Propagate key when import implicit array from Lua
* [Fix] Strip spaces from map keys and values
* [Fix] Try to fix a specific case when processing milter protocol
* [Fix] Try to fix crash when a tcp connection cannot be set
* [Fix] Typo use_domain_local --> use_domain_sign_local
* [Fix] Various fixes to once_received module
* [Project] Store hits counters for map elements

5 files changed, 27 insertions, 26 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index ee6b3fbd3c9..e3951e05754 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2018/04/14 07:34:31 adam Exp $
+# $NetBSD: Makefile,v 1.42 2018/05/16 16:49:44 fhajny Exp $
 
-DISTNAME=	rspamd-1.7.3
-PKGREVISION=	1
+DISTNAME=	rspamd-1.7.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
 
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index fcce09d848c..52b2954a0ec 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/04/11 15:32:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/05/16 16:49:44 fhajny Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -193,6 +193,7 @@ share/rspamd/lua/hfilter.lua
 share/rspamd/lua/history_redis.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
+share/rspamd/lua/maps_stats.lua
 share/rspamd/lua/metadata_exporter.lua
 share/rspamd/lua/metric_exporter.lua
 share/rspamd/lua/mid.lua
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 8da735b9b67..30f2465e105 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2018/04/11 15:32:39 fhajny Exp $
+$NetBSD: distinfo,v 1.24 2018/05/16 16:49:44 fhajny Exp $
 
-SHA1 (rspamd-1.7.3.tar.gz) = 062863246e1646319d2fb686dcbe324fb340fd89
-RMD160 (rspamd-1.7.3.tar.gz) = 4572a8619eb14a0656e23c1bd4ce7ac9c8604169
-SHA512 (rspamd-1.7.3.tar.gz) = 9e94a0001ac5360ef61177ebd82002329777cec5fbf5b9969f1317509e39e0c239773b82ebee21e1262ebec35f6bbf098dd23f51e2cd46996a8c8a1a1fb25a68
-Size (rspamd-1.7.3.tar.gz) = 4470637 bytes
+SHA1 (rspamd-1.7.4.tar.gz) = 6087573227f7a737e69ae854d879b251631720fa
+RMD160 (rspamd-1.7.4.tar.gz) = 931514920f052b251713a5539e87abc19caa7fbe
+SHA512 (rspamd-1.7.4.tar.gz) = 625f7bffe75e81866f5eefabab4fb41bddb823397f6a930ab4c452e2219b4a33a5c4e1628a72551f55452a05c82c7c20d7be2097db9d59a68e66f6d348279191
+Size (rspamd-1.7.4.tar.gz) = 4485331 bytes
 SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad
+SHA1 (patch-contrib_t1ha_t1ha__bits.h) = 79255739468384adb099b1e7a0ae41549151e660
 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
-SHA1 (patch-src_libutil_util.c) = 64d0325c63c124d4dc1487afb24eb54b17748e8f
diff --git a/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h b/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h
new file mode 100644
index 00000000000..72bf9124818
--- /dev/null
+++ b/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-contrib_t1ha_t1ha__bits.h,v 1.1 2018/05/16 16:49:44 fhajny Exp $
+
+Backport SunOS fix.
+
+https://github.com/vstakhov/rspamd/commit/7f596814c14a5844d49c50cad68df568e6417793
+
+--- contrib/t1ha/t1ha_bits.h.orig	2018-05-01 15:52:02.000000000 +0000
++++ contrib/t1ha/t1ha_bits.h
+@@ -390,7 +390,7 @@ static __always_inline uint16_t fetch16_
+ #endif /* fetch16_le */
+ 
+ #if T1HA_USE_FAST_ONESHOT_READ && UNALIGNED_OK && defined(PAGESIZE) &&         \
+-    PAGESIZE > 0 && !defined(__SANITIZE_ADDRESS__)
++    !defined(__SANITIZE_ADDRESS__) && !defined(__sun)
+ #define can_read_underside(ptr, size)                                          \
+   ((size) <= sizeof(uintptr_t) && ((PAGESIZE - (size)) & (uintptr_t)(ptr)) != 0)
+ #endif /* can_fast_read */
diff --git a/mail/rspamd/patches/patch-src_libutil_util.c b/mail/rspamd/patches/patch-src_libutil_util.c
deleted file mode 100644
index dc35ae4df2e..00000000000
--- a/mail/rspamd/patches/patch-src_libutil_util.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libutil_util.c,v 1.3 2018/04/11 15:32:39 fhajny Exp $
-
-Fix SunOS workaround.
-
---- src/libutil/util.c.orig	2018-04-10 16:12:46.000000000 +0000
-+++ src/libutil/util.c
-@@ -2766,8 +2766,8 @@ rspamd_gmtime (gint64 ts, struct tm *des
- 	dest->tm_sec = remsecs % 60;
- #if !defined(__sun)
- 	dest->tm_gmtoff = 0;
--#endif
- 	dest->tm_zone = "GMT";
-+#endif
- }
- 
- void