4 files changed, 56 insertions, 75 deletions

diff --git a/mail/rspamd/files/patch-CMakeLists.txt b/mail/rspamd/files/patch-CMakeLists.txt
deleted file mode 100644
index c5638b122340..000000000000
--- a/mail/rspamd/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- CMakeLists.txt.orig	2018-09-24 13:53:53 UTC
-+++ CMakeLists.txt
-@@ -1320,6 +1320,28 @@ ENDFOREACH(CONF_FILE)
- SET(MAIN_CONF "conf/rspamd.conf")
- IF(BUILD_PORT)
- 	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/actions.conf" ${CONFDIR} "actions.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/cgp.inc" ${CONFDIR} "cgp.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/groups.conf" ${CONFDIR} "groups.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/worker-proxy.inc" ${CONFDIR} "worker-proxy.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/maillist.inc" ${CONFDIR} "maillist.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/settings.conf" ${CONFDIR} "settings.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample")
-+	INSTALL_IF_NOT_EXISTS("conf/spf_dkim_whitelist.inc" ${CONFDIR} "spf_dkim_whitelist.inc" ".sample")
- ELSE(BUILD_PORT)
- 	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
- ENDIF(BUILD_PORT)
diff --git a/mail/rspamd/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt b/mail/rspamd/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt
deleted file mode 100644
index 5578521b2e57..000000000000
--- a/mail/rspamd/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
---- contrib/lua-torch/torch7/lib/TH/CMakeLists.txt.orig	2018-06-16 00:02:13 UTC
-+++ contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
-@@ -230,22 +230,26 @@ ELSE()
-   ENDIF()
- ENDIF()
- 
--FIND_PACKAGE(BLAS)
--IF(BLAS_FOUND)
--  SET(USE_BLAS 1)
--  TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
--  IF(BLAS_INFO STREQUAL "mkl")
--    ADD_DEFINITIONS(-DTH_BLAS_MKL)
--  ELSEIF(BLAS_INFO STREQUAL "open")
--    ADD_DEFINITIONS(-DTH_BLAS_OPEN)
--  ENDIF()
--ENDIF(BLAS_FOUND)
-+IF(WITH_BLAS)
-+  FIND_PACKAGE(BLAS)
-+  IF(BLAS_FOUND)
-+    SET(USE_BLAS 1)
-+    TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
-+    IF(BLAS_INFO STREQUAL "mkl")
-+      ADD_DEFINITIONS(-DTH_BLAS_MKL)
-+    ELSEIF(BLAS_INFO STREQUAL "open")
-+      ADD_DEFINITIONS(-DTH_BLAS_OPEN)
-+    ENDIF()
-+  ENDIF(BLAS_FOUND)
-+ENDIF(WITH_BLAS)
- 
--FIND_PACKAGE(LAPACK)
--IF(LAPACK_FOUND)
--  SET(USE_LAPACK 1)
--  TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
--ENDIF(LAPACK_FOUND)
-+IF(WITH_LAPACK)
-+  FIND_PACKAGE(LAPACK)
-+  IF(LAPACK_FOUND)
-+    SET(USE_LAPACK 1)
-+    TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
-+  ENDIF(LAPACK_FOUND)
-+ENDIF(WITH_LAPACK)
- 
- IF (UNIX AND NOT APPLE)
-    INCLUDE(CheckLibraryExists)
diff --git a/mail/rspamd/files/patch-src_libutil_mem__pool.c b/mail/rspamd/files/patch-src_libutil_mem__pool.c
new file mode 100644
index 000000000000..a694aa6f96d0
--- /dev/null
+++ b/mail/rspamd/files/patch-src_libutil_mem__pool.c
@@ -0,0 +1,28 @@
+--- src/libutil/mem_pool.c.orig	2019-10-11 16:56:09 UTC
++++ src/libutil/mem_pool.c
+@@ -111,7 +111,7 @@ pool_chain_free (struct _pool_chain *chain)
+ 			chain->slice_size - occupied : 0);
+ }
+ 
+-/* By default allocate 8Kb chunks of memory */
++/* By default allocate 4Kb chunks of memory */
+ #define FIXED_POOL_SIZE 4096
+ 
+ static inline struct rspamd_mempool_entry_point *
+@@ -156,6 +156,7 @@ RSPAMD_DESTRUCTOR (rspamd_mempool_entries_dtor)
+ 	});
+ 
+ 	kh_destroy (mempool_entry, mempool_entries);
++	mempool_entries = NULL;
+ }
+ 
+ static inline struct rspamd_mempool_entry_point *
+@@ -676,7 +677,7 @@ rspamd_mempool_delete (rspamd_mempool_t * pool)
+ 		cur = pool->pools[RSPAMD_MEMPOOL_NORMAL];
+ 	}
+ 
+-	if (cur) {
++	if (cur && mempool_entries) {
+ 		pool->entry->elts[pool->entry->cur_elts].leftover =
+ 				pool_chain_free (cur);
+ 
diff --git a/mail/rspamd/files/patch-src_lua_lua__regexp.c b/mail/rspamd/files/patch-src_lua_lua__regexp.c
new file mode 100644
index 000000000000..b8ff7a4ab3f0
--- /dev/null
+++ b/mail/rspamd/files/patch-src_lua_lua__regexp.c
@@ -0,0 +1,28 @@
+--- src/lua/lua_regexp.c.orig	2019-10-11 16:56:09 UTC
++++ src/lua/lua_regexp.c
+@@ -889,16 +889,18 @@ lua_load_regexp (lua_State * L)
+ void
+ luaopen_regexp (lua_State * L)
+ {
++	if (!regexp_static_pool) {
++		regexp_static_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (),
++				"regexp_lua_pool");
++	}
++
+ 	rspamd_lua_new_class (L, "rspamd{regexp}", regexplib_m);
+ 	lua_pop (L, 1);
+ 	rspamd_lua_add_preload (L, "rspamd_regexp", lua_load_regexp);
+ }
+ 
+-RSPAMD_CONSTRUCTOR (lua_re_static_pool_ctor) {
+-	regexp_static_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (),
+-			"regexp_lua_pool");
+-}
+-
+ RSPAMD_DESTRUCTOR (lua_re_static_pool_dtor) {
+-	rspamd_mempool_delete (regexp_static_pool);
++	if (regexp_static_pool) {
++		rspamd_mempool_delete (regexp_static_pool);
++	}
+ }
+\ No newline at end of file