diff options
| author | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2019-10-29 11:41:18 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@FreeBSD.org> | 2019-10-29 11:41:18 +0000 |
| commit | 46704fc7e39f9b6e3da811da12cc9246601a382e (patch) | |
| tree | 3a6852d4fb1d36d8dbf612307ad8ec2ef8133971 /mail/rspamd | |
| parent | 2b8283ea90eb8966eec78b3968a225dd1ccb0b82 (diff) | |
| download | ports-46704fc7e39f9b6e3da811da12cc9246601a382e.tar.gz ports-46704fc7e39f9b6e3da811da12cc9246601a382e.zip | |
- Update to 2.1
PR: 241557
Submitted by: Yasuhiro KIMURA <yasu at utahime.org>
Notes
Notes:
svn path=/head/; revision=515972
Diffstat (limited to 'mail/rspamd')
| -rw-r--r-- | mail/rspamd/Makefile | 2 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 6 | ||||
| -rw-r--r-- | mail/rspamd/files/patch-src_libutil_mem__pool.c | 28 | ||||
| -rw-r--r-- | mail/rspamd/files/patch-src_lua_lua__regexp.c | 28 |
4 files changed, 4 insertions, 60 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 08e4c4a11f4c..7b2c8ec412f4 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 2.0 +PORTVERSION= 2.1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 7e461176923e..9a57ef03e4d3 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570866704 -SHA256 (rspamd-rspamd-2.0_GH0.tar.gz) = 88d90c874f4256de64621b3697630c530cadc9a5194652d7ab67a9f075defe7b -SIZE (rspamd-rspamd-2.0_GH0.tar.gz) = 4230761 +TIMESTAMP = 1572306585 +SHA256 (rspamd-rspamd-2.1_GH0.tar.gz) = 9b3180b5d44dd808df09dc118b73c467991f6f71e422850bc591382835f3efcc +SIZE (rspamd-rspamd-2.1_GH0.tar.gz) = 4232297 diff --git a/mail/rspamd/files/patch-src_libutil_mem__pool.c b/mail/rspamd/files/patch-src_libutil_mem__pool.c deleted file mode 100644 index a694aa6f96d0..000000000000 --- a/mail/rspamd/files/patch-src_libutil_mem__pool.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 deleted file mode 100644 index b8ff7a4ab3f0..000000000000 --- a/mail/rspamd/files/patch-src_lua_lua__regexp.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 |