rspamd: Commit patch changes missed in previous update.

4 files changed, 20 insertions, 76 deletions

diff --git a/mail/rspamd/patches/patch-contrib_fpconv_fpconv.c b/mail/rspamd/patches/patch-contrib_fpconv_fpconv.c
new file mode 100644
index 00000000000..8d91aafb2b1
--- /dev/null
+++ b/mail/rspamd/patches/patch-contrib_fpconv_fpconv.c
@@ -0,0 +1,20 @@
+$NetBSD: patch-contrib_fpconv_fpconv.c,v 1.1 2019/06/21 15:02:54 jperkin Exp $
+
+Provide compat MIN/MAX macros.
+
+--- contrib/fpconv/fpconv.c.orig	2019-05-23 14:41:27.000000000 +0000
++++ contrib/fpconv/fpconv.c
+@@ -14,6 +14,13 @@
+ #define absv(n) ((n) < 0 ? -(n) : (n))
+ #define minv(a, b) ((a) < (b) ? (a) : (b))
+ 
++#ifndef MIN
++#define MIN(a, b)	((a) < (b) ? (a) : (b))
++#endif
++#ifndef MAX
++#define MAX(a, b)	((a) < (b) ? (b) : (a))
++#endif
++
+ static uint64_t tens[] = {
+ 		10000000000000000000U, 1000000000000000000U, 100000000000000000U,
+ 		10000000000000000U, 1000000000000000U, 100000000000000U,
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 556da203b42..00000000000
--- a/mail/rspamd/patches/patch-src_libcryptobox_cryptobox.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libcryptobox_cryptobox.c,v 1.1 2018/10/12 12:49:28 roy Exp $
-
-OpenSSL-1.1 automatically loads error strings.
-Calling these without an OpenSSL init function can result in an error.
-
---- src/libcryptobox/cryptobox.c.orig	2018-09-24 13:53:53.000000000 +0000
-+++ src/libcryptobox/cryptobox.c
-@@ -374,7 +374,7 @@ rspamd_cryptobox_init (void)
- 	ctx->blake2_impl = blake2b_load ();
- 	ctx->ed25519_impl = ed25519_load ();
- 	ctx->base64_impl = base64_load ();
--#ifdef HAVE_USABLE_OPENSSL
-+#if defined(HAVE_USABLE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
- 	ERR_load_EC_strings ();
- 	ERR_load_RAND_strings ();
- 	ERR_load_EVP_strings ();
diff --git a/mail/rspamd/patches/patch-test_CMakeLists.txt b/mail/rspamd/patches/patch-test_CMakeLists.txt
deleted file mode 100644
index 41105d41a20..00000000000
--- a/mail/rspamd/patches/patch-test_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-test_CMakeLists.txt,v 1.1 2018/09/07 11:19:07 fhajny Exp $
-
-Avoid linker args that do not work on SunOS.
-
---- test/CMakeLists.txt.orig	2018-08-01 14:21:24.000000000 +0000
-+++ test/CMakeLists.txt
-@@ -19,7 +19,11 @@ SET_TARGET_PROPERTIES(rspamd-test PROPER
- SET_TARGET_PROPERTIES(rspamd-test PROPERTIES COMPILE_FLAGS "-DRSPAMD_TEST")
- ADD_DEPENDENCIES(rspamd-test rspamd-server)
- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-+	TARGET_LINK_LIBRARIES(rspamd-test "${CMAKE_BINARY_DIR}/src/librspamd-server.a")
-+ELSE(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- 	TARGET_LINK_LIBRARIES(rspamd-test "-Wl,-whole-archive ${CMAKE_BINARY_DIR}/src/librspamd-server.a -Wl,-no-whole-archive")
-+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- ELSE(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- 	TARGET_LINK_LIBRARIES(rspamd-test "-Wl,-force_load ${CMAKE_BINARY_DIR}/src/librspamd-server.a")
- ENDIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
diff --git a/mail/rspamd/patches/patch-test_rspamd__lua__pcall__vs__resume__test.c b/mail/rspamd/patches/patch-test_rspamd__lua__pcall__vs__resume__test.c
deleted file mode 100644
index c1050be3712..00000000000
--- a/mail/rspamd/patches/patch-test_rspamd__lua__pcall__vs__resume__test.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-test_rspamd__lua__pcall__vs__resume__test.c,v 1.1 2018/10/07 20:10:57 fhajny Exp $
-
-Add Lua 5.3 support.
-
---- test/rspamd_lua_pcall_vs_resume_test.c.orig	2018-09-24 13:53:53.000000000 +0000
-+++ test/rspamd_lua_pcall_vs_resume_test.c
-@@ -53,7 +53,11 @@ test_resume(lua_State *L, gint function_
- 
- 	for (i = 0; i < N; i ++) {
- 		lua_rawgeti (L, LUA_REGISTRYINDEX, function_call);
-+#if LUA_VERSION_NUM < 503
- 		lua_resume (L, 0);
-+#else
-+		lua_resume (L, NULL, 0);
-+#endif
- 		lua_pop (L, 1);
- 	}
- 
-@@ -75,7 +79,11 @@ test_resume_get_thread(gint function_cal
- 		ent = lua_thread_pool_get_for_config (rspamd_main->cfg);
- 
- 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
-+#if LUA_VERSION_NUM < 503
- 		lua_resume (ent->lua_state, 0);
-+#else
-+		lua_resume (ent->lua_state, NULL, 0);
-+#endif
- 		lua_pop (ent->lua_state, 1);
- 
- 		lua_thread_pool_return (rspamd_main->cfg->lua_thread_pool, ent);
-@@ -99,7 +107,11 @@ test_resume_get_new_thread(gint function
- 		ent = lua_thread_pool_get_for_task (rspamd_main->cfg->lua_thread_pool);
- 
- 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
-+#if LUA_VERSION_NUM < 503
- 		lua_resume (ent->lua_state, 0);
-+#else
-+		lua_resume (ent->lua_state, NULL, 0);
-+#endif
- 		lua_pop (ent->lua_state, 1);
- 
- 		/* lua_thread_pool_return (rspamd_main->cfg->lua_thread_pool, ent); */