rspamd: Update to 3.2.

3.2: 26 Mar 2022
  * [Conf] Score MIME_OBFUSCATED_ARCHIVE to 8 points
  * [Conf] Set one_shot for URIBL rules by default
  * [CritFix] Fix upstreams name resolution when there is also a port
  * [Feature] Add ROC feature to neural network plugin
  * [Feature] Add public suffic compilation utility
  * [Feature] Add support of Cloudmark
  * [Feature] Allow hyperscan for ppc64, as vectorscan now suports it.
  * [Feature] Allow to skip DNS resolution for keep-alive connections
  * [Feature] Aws_s3: Allow to store large parts separately
  * [Feature] BIMI: Add preliminary version of the BIMI plugin
  * [Feature] JSON endpoint for querying maps
  * [Feature] Lua_magic: Add a sane CSV heuristic
  * [Feature] Lua_mime: Add schema for message transfer
  * [Feature] Output average scan time in /stat endpoint
  * [Feature] Show average scan time in `rspamc stat` output
  * [Fix] Add guards to avoid race condition on TCP connection
  * [Fix] Allow spaces in DKIM key records
  * [Fix] Apply the similar fix to the url_reputation
  * [Fix] Avoid overwriting whitelisted_signers_map
  * [Fix] Backport PR from libucl
  * [Fix] Clear SSL errors
  * [Fix] ClickHouse cleanup of old partitions
  * [Fix] Do not double call error handler on ssl errors in the timeout path
  * [Fix] Do not forget to clear pointers on IOC reset
  * [Fix] External_relay: Remove useless check of the map value
  * [Fix] Find suspicious url encodings that could break url extraction
  * [Fix] Fix HTTP(s) client timeout
  * [Fix] Fix exclude flags setting
  * [Fix] Fix expanding of the variables
  * [Fix] Fix host header usage in lua_http
  * [Fix] Fix http maps shared memory cache cleanup
  * [Fix] Fix logic in HTML processing FSM
  * [Fix] Fix parsing of the compound mailto urls
  * [Fix] Fix processing captures from pcre2
  * [Fix] Fix removing from khash
  * [Fix] Fix stuctured headers pushing
  * [Fix] Further fix for i386 compilation
  * [Fix] Improve duplicate settings error reporting
  * [Fix] Lua: task:remove_result didn't work in some cases
  * [Fix] Output service parts as well
  * [Fix] Phishing: Deal with phishing + redirected URL
  * [Fix] Phishing: Fix finding domains in the phishing map
  * [Fix] Plug memory leak by using mempool for a copied address
  * [Fix] Properly find the request and the number of requested entries
  * [Fix] Rbl: Fix inversed logic of the url_full_hostname
  * [Fix] Read file maps if they were not pre-read during preload
  * [Fix] Restrict x86_64 assembly to x86_64
  * [Fix] Return a real number of recipients when dealing with aliases
  * [Fix] Rework unshedule DNS request function
  * [Fix] Support definition of ungrouped symbol in conf file, use group info from lua or other conf file
  * [Fix] Unschedule DNS request when clearing IO channel
  * [Fix] When checking for phishing, we need to convert punicode -> UTF8, not vice versa
  * [Fix] lua_cfg_transform - actions without score (discard)
  * [Fix] lua_cfg_transform - silly break break actions
  * [Fix] ratelimit - symbol per bucket
  * [Project] BIMI: Fix helper integration issues
  * [Project] Further DNS over TCP architecturing
  * [Project] Rdns: Add more functions for TCP based requests
  * [Project] Rdns: Add preliminary reading logic for TCP channels
  * [Project] Rdns: Add reaper for inactive TCP connections
  * [Project] Rdns: Add timeout logic for TCP requests
  * [Project] Rdns: Do not treat TCP channels failure as fatal
  * [Project] Rdns: Fix TCP connection mess
  * [Project] Rdns: Fix TCP stuff cleanup
  * [Project] Rdns: Fix various ownership issues
  * [Project] Rdns: Implement TCP writing logic
  * [Project] Rdns: Initial support of TCP IO channels
  * [Project] Rdns: More fixes in TCP handling
  * [Project] Rdns: Restore the previous EDNS0 size
  * [Project] Rdns: Send truncated replies via TCP
  * [Project] Rdns: Unregister TCP requests
  * [Rework] Allow to restore SSL handlers after keepalive pooling
  * [Rework] Allow to set a different behaviour for actions from settings
  * [Rework] Include SSL flag into keepalive hash
  * [Rework] Make `rspamadm dmarc_report` default behaviour more sane
  * [Rework] Mempool: Use explicit alignment
  * [Rework] Rdns: Use faster and more compact hash table for DNS requests
  * [Rework] Rework SSL flag operations
  * [Rework] Take disabled flag into account
  * [Rework] Timeouts are now global per event and not reseted by IO activity
  * [Rework] Use xxh3 as a default hash and fix memory/alignment issues
  * [Rules] Fix old rules to stop global functions usage
  * [Rules] Fix symbol for DKIM temporary failure
  * [Rules] Remove ancient and inefficient rules
  * [Rules] Slightly reduce MULTIPLE_FROM score

5 files changed, 7 insertions, 107 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 6350e6b1ac0..b49258351a5 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2022/06/28 11:34:34 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2022/07/20 15:55:04 jperkin Exp $
 
-DISTNAME=	rspamd-3.1
-PKGREVISION=	2
+DISTNAME=	rspamd-3.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rspamd/}
 
@@ -110,6 +109,7 @@ post-extract:
 .include "../../devel/fann/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index ba978c4c2f2..ca8ce1f433f 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.42 2022/05/29 19:21:46 gavan Exp $
+$NetBSD: distinfo,v 1.43 2022/07/20 15:55:04 jperkin Exp $
 
-BLAKE2s (rspamd-3.1.tar.gz) = d23e3aba1974e31236295171e7d74df624497c9ab11c8d8ebfe95830b70d9d7a
-SHA512 (rspamd-3.1.tar.gz) = 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-Size (rspamd-3.1.tar.gz) = 5566920 bytes
+BLAKE2s (rspamd-3.2.tar.gz) = 21a01cba3973e41836a0d7ff9bf451adc6b5bc305dd918dbe9d9949d6efbd9fa
+SHA512 (rspamd-3.2.tar.gz) = fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
+Size (rspamd-3.2.tar.gz) = 5637835 bytes
 SHA1 (patch-CMakeLists.txt) = e50137fb3c2d467a8c880491e5d34d475e1a8d05
 SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
 SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
-SHA1 (patch-src_libcryptobox_CMakeLists.txt) = c003a1992221090f8d7f259a2387319b3fa999f0
-SHA1 (patch-src_libcryptobox_chacha20_chacha.c) = 22072c2ba35914ded17a8707e04cedf0de8cfc1d
-SHA1 (patch-src_libcryptobox_cryptobox.c) = c284aac8a65ae3a5fb9eccd8fb9dcee238518846
diff --git a/mail/rspamd/patches/patch-src_libcryptobox_CMakeLists.txt b/mail/rspamd/patches/patch-src_libcryptobox_CMakeLists.txt
deleted file mode 100644
index ba9182b6cb8..00000000000
--- a/mail/rspamd/patches/patch-src_libcryptobox_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_libcryptobox_CMakeLists.txt,v 1.1 2022/05/29 19:21:46 gavan Exp $
-
---- src/libcryptobox/CMakeLists.txt.orig	2021-11-01 14:33:30.000000000 +0000
-+++ src/libcryptobox/CMakeLists.txt
-@@ -5,17 +5,24 @@ SET(BASE64SRC ${CMAKE_CURRENT_SOURCE_DIR
- 		${CMAKE_CURRENT_SOURCE_DIR}/base64/base64.c)
- 
- IF(HAVE_AVX2)
--	SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
-+	IF ("${ARCH}" STREQUAL "x86_64")
-+		SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
-+		MESSAGE(STATUS "Cryptobox: AVX2 support is added (chacha20, avx2)")
-+	ENDIF()
- 	SET(BASE64SRC ${BASE64SRC} ${CMAKE_CURRENT_SOURCE_DIR}/base64/avx2.c)
--	MESSAGE(STATUS "Cryptobox: AVX2 support is added (chacha20, avx2)")
-+	MESSAGE(STATUS "Cryptobox: AVX2 support is added (base64, avx2)")
- ENDIF(HAVE_AVX2)
- IF(HAVE_AVX)
--	SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx.S)
--	MESSAGE(STATUS "Cryptobox: AVX support is added (chacha20)")
-+	IF ("${ARCH}" STREQUAL "x86_64")
-+		SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx.S)
-+		MESSAGE(STATUS "Cryptobox: AVX support is added (chacha20)")
-+	ENDIF()
- ENDIF(HAVE_AVX)
- IF(HAVE_SSE2)
--	SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/sse2.S)
--	MESSAGE(STATUS "Cryptobox: SSE2 support is added (chacha20)")
-+	IF ("${ARCH}" STREQUAL "x86_64")
-+		SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/sse2.S)
-+		MESSAGE(STATUS "Cryptobox: SSE2 support is added (chacha20)")
-+	ENDIF()
- ENDIF(HAVE_SSE2)
- IF(HAVE_SSE42)
- 	SET(BASE64SRC ${BASE64SRC} ${CMAKE_CURRENT_SOURCE_DIR}/base64/sse42.c)
diff --git a/mail/rspamd/patches/patch-src_libcryptobox_chacha20_chacha.c b/mail/rspamd/patches/patch-src_libcryptobox_chacha20_chacha.c
deleted file mode 100644
index ecd8091f9ac..00000000000
--- a/mail/rspamd/patches/patch-src_libcryptobox_chacha20_chacha.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_libcryptobox_chacha20_chacha.c,v 1.1 2022/05/29 19:21:46 gavan Exp $
-
---- src/libcryptobox/chacha20/chacha.c.orig	2021-11-01 14:33:30.000000000 +0000
-+++ src/libcryptobox/chacha20/chacha.c
-@@ -52,15 +52,15 @@ typedef struct chacha_impl_t {
- #define CHACHA_IMPL(cpuflags, desc, ext) \
- 		{(cpuflags), desc, chacha_##ext, xchacha_##ext, chacha_blocks_##ext, hchacha_##ext}
- 
--#if defined(HAVE_AVX2)
-+#if defined(HAVE_AVX2) && defined(__x86_64__)
- 	CHACHA_DECLARE(avx2)
- 	#define CHACHA_AVX2 CHACHA_IMPL(CPUID_AVX2, "avx2", avx2)
- #endif
--#if defined(HAVE_AVX)
-+#if defined(HAVE_AVX) && defined(__x86_64__)
- 	CHACHA_DECLARE(avx)
- 	#define CHACHA_AVX CHACHA_IMPL(CPUID_AVX, "avx", avx)
- #endif
--#if defined(HAVE_SSE2)
-+#if defined(HAVE_SSE2) && defined(__x86_64__)
- 	CHACHA_DECLARE(sse2)
- 	#define CHACHA_SSE2 CHACHA_IMPL(CPUID_SSE2, "sse2", sse2)
- #endif
-@@ -70,13 +70,13 @@ CHACHA_DECLARE(ref)
- 
- static const chacha_impl_t chacha_list[] = {
- 	CHACHA_GENERIC,
--#if defined(CHACHA_AVX2)
-+#if defined(CHACHA_AVX2) && defined(__x86_64__)
- 	CHACHA_AVX2,
- #endif
--#if defined(CHACHA_AVX)
-+#if defined(CHACHA_AVX) && defined(__x86_64__)
- 	CHACHA_AVX,
- #endif
--#if defined(CHACHA_SSE2)
-+#if defined(CHACHA_SSE2) && defined(__x86_64__)
- 	CHACHA_SSE2
- #endif
- };
diff --git a/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c b/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c
deleted file mode 100644
index 3df0778f361..00000000000
--- a/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_libcryptobox_cryptobox.c,v 1.3 2022/05/29 19:21:46 gavan Exp $
-
---- src/libcryptobox/cryptobox.c.orig	2021-11-01 14:33:30.000000000 +0000
-+++ src/libcryptobox/cryptobox.c
-@@ -118,7 +118,7 @@ rspamd_cryptobox_test_instr (gint instr)
- 	}
- 
- 	switch (instr) {
--#ifdef HAVE_SSE2
-+#if defined HAVE_SSE2 && defined(__x86_64__)
- 	case CPUID_SSE2:
- 		__asm__ volatile ("psubb %xmm0, %xmm0");
- 		break;
-@@ -146,7 +146,7 @@ rspamd_cryptobox_test_instr (gint instr)
- 		__asm__ volatile ("pcmpeqq %xmm0, %xmm0");
- 		break;
- #endif
--#ifdef HAVE_SSE42
-+#if defined HAVE_SSE42 && defined(__x86_64__)
- 	case CPUID_SSE42:
- 		__asm__ volatile ("pushq %rax\n"
- 				"xorq %rax, %rax\n"