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

2 files changed, 17 insertions, 16 deletions

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