diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-12-16 16:48:14 +0000 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-12-18 06:37:56 +0000 |
| commit | 56c99895b0eb91f4198e503bd07e9cfdd363f049 (patch) | |
| tree | cd3bdd8c8ac7d7f9ea5d4ec1e612b888f0f5bdef /mail | |
| parent | 0a6eb1ee3e207148accbcfa004fab0de7e512907 (diff) | |
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/rspamd/Makefile | 2 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 6 | ||||
| -rw-r--r-- | mail/rspamd/files/patch-src_rspamd.c | 29 | ||||
| -rw-r--r-- | mail/rspamd/pkg-plist | 7 |
4 files changed, 38 insertions, 6 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 02d794156a03..4190c2a768e3 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,5 +1,5 @@ PORTNAME= rspamd -PORTVERSION= 3.10.2 +PORTVERSION= 3.11.0 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index d37671bfa903..f2bdcc1666d2 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1729467927 -SHA256 (rspamd-rspamd-3.10.2_GH0.tar.gz) = 3f77a2230c88b5026b5c3cef022f0432b324ef492fdc297f30c6916f17103bdf -SIZE (rspamd-rspamd-3.10.2_GH0.tar.gz) = 6048061 +TIMESTAMP = 1734363357 +SHA256 (rspamd-rspamd-3.11.0_GH0.tar.gz) = 6dbe6fc7df4079a64f59cd6e8e996400d02d946d808140a1f30060cea76088a6 +SIZE (rspamd-rspamd-3.11.0_GH0.tar.gz) = 6440612 diff --git a/mail/rspamd/files/patch-src_rspamd.c b/mail/rspamd/files/patch-src_rspamd.c new file mode 100644 index 000000000000..9b40b9da918e --- /dev/null +++ b/mail/rspamd/files/patch-src_rspamd.c @@ -0,0 +1,29 @@ +From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov <vsevolod@rspamd.com> +Date: Tue, 17 Dec 2024 13:37:54 +0000 +Subject: [PATCH] [Fix] Fix crash on FreeBSD when Rspamd is built without + hyperscan + +--- + src/rspamd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git src/rspamd.c src/rspamd.c +index 088bfba49..dafd9aebe 100644 +--- src/rspamd.c ++++ src/rspamd.c +@@ -56,9 +56,10 @@ + + #ifdef WITH_HYPERSCAN + #include "libserver/hyperscan_tools.h" +-#include "rspamd_simdutf.h" + #endif + ++#include "rspamd_simdutf.h" ++ + /* 2 seconds to fork new process in place of dead one */ + #define SOFT_FORK_TIME 2 + +-- +2.47.1 + diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist index 8bf4bb6163d2..f97e58fd1abd 100644 --- a/mail/rspamd/pkg-plist +++ b/mail/rspamd/pkg-plist @@ -13,7 +13,9 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf %%ETCDIR%%/composites.conf %%ETCDIR%%/groups.conf %%ETCDIR%%/lang_detection.inc +%%ETCDIR%%/local.d/module.conf.example %%ETCDIR%%/logging.inc +%%ETCDIR%%/lua.local.d/module.lua.example %%ETCDIR%%/maps.d/dmarc_whitelist.inc %%ETCDIR%%/maps.d/exe_clickbait.inc %%ETCDIR%%/maps.d/maillist.inc @@ -75,7 +77,9 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf %%ETCDIR%%/modules.d/trie.conf %%ETCDIR%%/modules.d/url_redirector.conf %%ETCDIR%%/modules.d/whitelist.conf +%%ETCDIR%%/modules.local.d/module.conf.example %%ETCDIR%%/options.inc +%%ETCDIR%%/override.d/module.conf.example %%ETCDIR%%/rspamd.conf @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample %%ETCDIR%%/scores.d/content_group.conf @@ -106,8 +110,6 @@ share/man/man1/rspamadm.1.gz share/man/man1/rspamc.1.gz share/man/man8/rspamd.8.gz %%DATADIR%%/effective_tld_names.dat -%%DATADIR%%/elastic/kibana.json -%%DATADIR%%/elastic/rspamd_template.json %%DATADIR%%/languages/af.json %%DATADIR%%/languages/an.json %%DATADIR%%/languages/ar.json @@ -256,6 +258,7 @@ share/man/man8/rspamd.8.gz %%DATADIR%%/lualib/rspamadm/mime.lua %%DATADIR%%/lualib/rspamadm/neural_test.lua %%DATADIR%%/lualib/rspamadm/publicsuffix.lua +%%DATADIR%%/lualib/rspamadm/ratelimit.lua %%DATADIR%%/lualib/rspamadm/secretbox.lua %%DATADIR%%/lualib/rspamadm/stat_convert.lua %%DATADIR%%/lualib/rspamadm/statistics_dump.lua |