update to rspamd-2.4

mail/rspamd/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.80 2020/02/11 15:16:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.81 2020/03/02 20:53:48 sthen Exp $
 
 COMMENT=	event-driven spam filtering system in C/Lua
 
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rspamd
-GH_TAGNAME=	2.3
-REVISION=	0
+GH_TAGNAME=	2.4
 
 CATEGORIES=	mail
 

mail/rspamd/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rspamd-2.3.tar.gz) = mU9zeHW2FZIlOEYGB2eYaHpSkzbWZJZ4GoPekWS21Bs=
-SIZE (rspamd-2.3.tar.gz) = 4409924
+SHA256 (rspamd-2.4.tar.gz) = O05xcdHUXo/ku6WbP0f+1VwfY++fOhkf6eIsxsEgTZ0=
+SIZE (rspamd-2.4.tar.gz) = 4462119

mail/rspamd/patches/patch-CMakeLists_txt

@@ -0,0 +1,14 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.24 2020/03/02 20:53:48 sthen Exp $
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -337,7 +337,7 @@ IF(LIBCRYPT_LIBRARY_PATH)
+ 	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-L${LIBCRYPT_LIBRARY_PATH};${LIBCRYPT_LIBRARY}")
+ 	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-L${LIBSSL_LIBRARY_PATH};${LIBSSL_LIBRARY}")
+ ELSE()
+-	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-lcrypt;-lssl")
++	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};-lcrypto;-lssl")
+ ENDIF()
+ 
+ CHECK_SYMBOL_EXISTS(SSL_set_tlsext_host_name "openssl/ssl.h" HAVE_SSL_TLSEXT_HOSTNAME)

mail/rspamd/patches/patch-src_libutil_util_c

@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_libutil_util_c,v 1.4 2020/02/11 15:16:22 sthen Exp $
-
-- libressl doesn't have FIPS mode, so FIPS_mode and friends don't exist
-
-- openblas_set_bum_threads is only on OpenBLAS not plain BLAS
-
-Index: src/libutil/util.c
---- src/libutil/util.c.orig
-+++ src/libutil/util.c
-@@ -2484,6 +2484,9 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *c
- 		}
- 
- 		if (cfg->fips_mode) {
-+#ifdef LIBRESSL_VERSION_NUMBER
-+			msg_info_config ("LibreSSL does not support FIPS mode");
-+#else
- 			int mode = FIPS_mode ();
- 			unsigned long err = (unsigned long)-1;
- 
-@@ -2505,6 +2508,7 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *c
- 			else {
- 				msg_info_config ("OpenSSL FIPS mode is enabled");
- 			}
-+#endif
- 		}
- 
- 		if (cfg->ssl_ca_path) {
-@@ -2553,7 +2557,7 @@ rspamd_config_libs (struct rspamd_external_libs_ctx *c
- 			ZSTD_freeCStream (ctx->out_zstream);
- 			ctx->out_zstream = NULL;
- 		}
--#ifdef HAVE_CBLAS
-+#if 0
- 		openblas_set_num_threads (cfg->max_blas_threads);
- #endif
- 	}

mail/rspamd/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.36 2020/02/06 16:18:54 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.37 2020/03/02 20:53:48 sthen Exp $
 @newgroup _rspamd:756
 @newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin
 @rcscript ${RCDIR}/rspamd
@@ -302,6 +302,7 @@ share/rspamd/lualib/lua_settings.lua
 share/rspamd/lualib/lua_smtp.lua
 share/rspamd/lualib/lua_stat.lua
 share/rspamd/lualib/lua_tcp_sync.lua
+share/rspamd/lualib/lua_urls_compose.lua
 share/rspamd/lualib/lua_util.lua
 share/rspamd/lualib/lua_verdict.lua
 share/rspamd/lualib/lupa.lua