pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/rspamd
Module Name: pkgsrc
Committed By: wiz
Date: Thu Oct 19 14:35:01 UTC 2023
Modified Files:
pkgsrc/mail/rspamd: Makefile PLIST cfgfiles.mk distinfo
Added Files:
pkgsrc/mail/rspamd/patches: patch-src_libserver_cfg__utils.cxx
Log Message:
rspamd: update to 3.7.1.
3.7.1: 07 Oct 2023
* [CritFix] Fix leak in `gzip` function
* [Feature] Add ICAP Content-Type and Filename
* [Feature] Add `logging`->`task_max_elts` option
* [Feature] Add utility to split string like stuff for C++ code
* [Feature] Allow to set HTTP auth parameters for the maps
* [Feature] Check for plugin configuration errors on `configtest`
* [Feature] `known_senders` plugin
* [Feature] Use backward-cpp instead of manual libunwind stuff
* [Feature] rbl: support checking numeric URLs in isolation
* [Fix] CMakeLists.txt remove whitespace added by linter as it makes tests fail
* [Fix] Change Date: header location to conform with RFC
* [Fix] Correct format pattern for RE tree tempfile name
* [Fix] Correct format string for unw_word_t
* [Fix] Do not accept invalid ucl object types
* [Fix] Do not pollute public headers with libev internals
* [Fix] Do not set output type if list application failed
* [Fix] Fix `url:set_redirected` method
* [Fix] Fix format string and some length issues
* [Fix] Fix grammar definition for content-disposition attributes
* [Fix] Fix lua schema enrichment logic for Redis params
* [Fix] Fix lua stack corruption when logging large tables
* [Fix] Fix merge table utility
* [Fix] Fix output of non-RSA DKIM keys
* [Fix] Fix some corner cases of single-host urls parsing
* [Fix] Fix various issues in the `url_redirector` plugin
* [Fix] MISSING_MIMEOLE: avoid matching messages from Android GMail app (#4561)
* [Fix] Prevent DNSWL sabotage
* [Fix] Try to fix unzip function
* [Fix] rbl: really fix dependency registration when symbols_prefixes is used
* [Fix] rspamadm mime: arguments beginning with letter `t`
* [Rework] Breaking: return back to semver
* [Rework] Move rcl logic to C++
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/rspamd/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/rspamd/cfgfiles.mk
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/mail/rspamd/patches/patch-src_libserver_cfg__utils.cxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.92 pkgsrc/mail/rspamd/Makefile:1.93
--- pkgsrc/mail/rspamd/Makefile:1.92 Wed Sep 6 03:22:52 2023
+++ pkgsrc/mail/rspamd/Makefile Thu Oct 19 14:35:00 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2023/09/06 03:22:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.93 2023/10/19 14:35:00 wiz Exp $
-DISTNAME= rspamd-3.6
+DISTNAME= rspamd-3.7.1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GITHUB:=rspamd/}
Index: pkgsrc/mail/rspamd/PLIST
diff -u pkgsrc/mail/rspamd/PLIST:1.27 pkgsrc/mail/rspamd/PLIST:1.28
--- pkgsrc/mail/rspamd/PLIST:1.27 Thu Aug 24 19:38:09 2023
+++ pkgsrc/mail/rspamd/PLIST Thu Oct 19 14:35:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2023/08/24 19:38:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2023/10/19 14:35:00 wiz Exp $
bin/rspamadm
bin/rspamadm-${PKGVERSION}
bin/rspamc
@@ -52,6 +52,7 @@ share/examples/rspamd/modules.d/greylist
share/examples/rspamd/modules.d/hfilter.conf
share/examples/rspamd/modules.d/history_redis.conf
share/examples/rspamd/modules.d/http_headers.conf
+share/examples/rspamd/modules.d/known_senders.conf
share/examples/rspamd/modules.d/maillist.conf
share/examples/rspamd/modules.d/metadata_exporter.conf
share/examples/rspamd/modules.d/metric_exporter.conf
@@ -158,6 +159,7 @@ share/rspamd/lualib/lua_auth_results.lua
share/rspamd/lualib/lua_aws.lua
share/rspamd/lualib/lua_bayes_learn.lua
share/rspamd/lualib/lua_cfg_transform.lua
+share/rspamd/lualib/lua_cfg_utils.lua
share/rspamd/lualib/lua_clickhouse.lua
share/rspamd/lualib/lua_content/ical.lua
share/rspamd/lualib/lua_content/init.lua
@@ -224,7 +226,6 @@ share/rspamd/lualib/redis_scripts/neural
share/rspamd/lualib/redis_scripts/ratelimit_check.lua
share/rspamd/lualib/redis_scripts/ratelimit_cleanup_pending.lua
share/rspamd/lualib/redis_scripts/ratelimit_update.lua
-share/rspamd/lualib/rescore_utility.lua
share/rspamd/lualib/rspamadm/clickhouse.lua
share/rspamd/lualib/rspamadm/configgraph.lua
share/rspamd/lualib/rspamadm/confighelp.lua
@@ -241,7 +242,6 @@ share/rspamd/lualib/rspamadm/keypair.lua
share/rspamd/lualib/rspamadm/mime.lua
share/rspamd/lualib/rspamadm/neural_test.lua
share/rspamd/lualib/rspamadm/publicsuffix.lua
-share/rspamd/lualib/rspamadm/rescore.lua
share/rspamd/lualib/rspamadm/stat_convert.lua
share/rspamd/lualib/rspamadm/statistics_dump.lua
share/rspamd/lualib/rspamadm/template.lua
@@ -271,6 +271,7 @@ share/rspamd/plugins/hfilter.lua
share/rspamd/plugins/history_redis.lua
share/rspamd/plugins/http_headers.lua
share/rspamd/plugins/ip_score.lua
+share/rspamd/plugins/known_senders.lua
share/rspamd/plugins/maillist.lua
share/rspamd/plugins/maps_stats.lua
share/rspamd/plugins/metadata_exporter.lua
@@ -353,7 +354,7 @@ share/rspamd/www/js/lib/d3evolution.min.
share/rspamd/www/js/lib/d3pie.min.js
share/rspamd/www/js/lib/fontawesome.min.js
share/rspamd/www/js/lib/footable.min.js
-share/rspamd/www/js/lib/jquery-3.6.3.min.js
+share/rspamd/www/js/lib/jquery-3.7.0.min.js
share/rspamd/www/js/lib/jquery.stickytabs.min.js
share/rspamd/www/js/lib/linenumbers.min.js
share/rspamd/www/js/lib/nprogress.min.js
Index: pkgsrc/mail/rspamd/cfgfiles.mk
diff -u pkgsrc/mail/rspamd/cfgfiles.mk:1.7 pkgsrc/mail/rspamd/cfgfiles.mk:1.8
--- pkgsrc/mail/rspamd/cfgfiles.mk:1.7 Thu Aug 24 19:38:09 2023
+++ pkgsrc/mail/rspamd/cfgfiles.mk Thu Oct 19 14:35:00 2023
@@ -1,3 +1,4 @@
-# $NetBSD: cfgfiles.mk,v 1.7 2023/08/24 19:38:09 wiz Exp $
+# $NetBSD: cfgfiles.mk,v 1.8 2023/10/19 14:35:00 wiz Exp $
# Do not edit, regenerate using 'make cfgfiles'
-CFGFILES= actions.conf cgp.inc common.conf composites.conf groups.conf lang_detection.inc logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc
maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/aws_s3.conf
modules.d/bimi.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf
modules.d/emails.conf modules.d/external_relay.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf
modules.d/hfilter.conf modules.d/history_redis.conf modules.d/http_headers.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf
modules.d/milter_headers.conf modules.d/mime_types.co
nf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf
modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf
modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/content_group.conf scores.d/fuzzy_group.conf
scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf
scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc
worker-normal.inc worker-proxy.inc
+CFGFILES= actions.conf cgp.inc common.conf composites.conf groups.conf lang_detection.inc logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc
maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/aws_s3.conf
modules.d/bimi.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf
modules.d/emails.conf modules.d/external_relay.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf
modules.d/hfilter.conf modules.d/history_redis.conf modules.d/http_headers.conf modules.d/known_senders.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf
modules.d/mid.conf modules.d/milter_headers
.conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf
modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf
modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/content_group.conf scores.d/fuzzy_group.conf
scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf
scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc
worker-normal.inc worker-proxy.inc
+
Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.49 pkgsrc/mail/rspamd/distinfo:1.50
--- pkgsrc/mail/rspamd/distinfo:1.49 Wed Sep 6 03:22:52 2023
+++ pkgsrc/mail/rspamd/distinfo Thu Oct 19 14:35:00 2023
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.49 2023/09/06 03:22:52 schmonz Exp $
+$NetBSD: distinfo,v 1.50 2023/10/19 14:35:00 wiz Exp $
-BLAKE2s (rspamd-3.6.tar.gz) = 1481638675a661812d45dddb806fada9dbc4f39e51653f7fa4485ccd759c0d68
-SHA512 (rspamd-3.6.tar.gz) = d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
-Size (rspamd-3.6.tar.gz) = 5843907 bytes
+BLAKE2s (rspamd-3.7.1.tar.gz) = 8dc9f7878b4916280a3922f16f189d734ce3d0d5aff0b78af060e0619e423149
+SHA512 (rspamd-3.7.1.tar.gz) = bfd9bb1d2c1e409b9836e2f160d2a6f056e25cf8cdbc9557b2fc7ac5cd8697acea9c0f060028a2b2c3d7d39a42a3c85e2170b084efbd048d23949d9f35791860
+Size (rspamd-3.7.1.tar.gz) = 5899444 bytes
SHA1 (patch-CMakeLists.txt) = 1c91cf53edeb12e1a469cd02421e1eaee5061ab7
SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab
SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
+SHA1 (patch-src_libserver_cfg__utils.cxx) = 7122f06adeaaa9a362606ef38147b7e39f66393c
SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53
SHA1 (patch-src_rspamd.c) = 1903994d5970af57de9c5d522df3dd12576c8418
Added files:
Index: pkgsrc/mail/rspamd/patches/patch-src_libserver_cfg__utils.cxx
diff -u /dev/null pkgsrc/mail/rspamd/patches/patch-src_libserver_cfg__utils.cxx:1.1
--- /dev/null Thu Oct 19 14:35:01 2023
+++ pkgsrc/mail/rspamd/patches/patch-src_libserver_cfg__utils.cxx Thu Oct 19 14:35:01 2023
@@ -0,0 +1,58 @@
+$NetBSD: patch-src_libserver_cfg__utils.cxx,v 1.1 2023/10/19 14:35:01 wiz Exp $
+
+--- src/libserver/cfg_utils.cxx.orig 2023-10-07 13:52:02.000000000 +0000
++++ src/libserver/cfg_utils.cxx
+@@ -135,14 +135,14 @@ struct rspamd_actions_list {
+ void sort()
+ {
+ std::sort(actions.begin(), actions.end(), [](const action_ptr &a1, const action_ptr &a2) -> bool {
+- if (!isnan(a1->threshold) && !isnan(a2->threshold)) {
++ if (!std::isnan(a1->threshold) && !std::isnan(a2->threshold)) {
+ return a1->threshold < a2->threshold;
+ }
+
+- if (isnan(a1->threshold) && isnan(a2->threshold)) {
++ if (std::isnan(a1->threshold) && std::isnan(a2->threshold)) {
+ return false;
+ }
+- else if (isnan(a1->threshold)) {
++ else if (std::isnan(a1->threshold)) {
+ return true;
+ }
+
+@@ -1524,7 +1524,7 @@ rspamd_config_new_symbol(struct rspamd_c
+ rspamd_mempool_alloc0_type(cfg->cfg_pool, struct rspamd_symbol);
+ score_ptr = rspamd_mempool_alloc_type(cfg->cfg_pool, double);
+
+- if (isnan(score)) {
++ if (std::isnan(score)) {
+ /* In fact, it could be defined later */
+ msg_debug_config("score is not defined for symbol %s, set it to zero",
+ symbol);
+@@ -1635,7 +1635,7 @@ rspamd_config_add_symbol(struct rspamd_c
+ }
+
+ if (sym_def->priority > priority &&
+- (isnan(score) || !(sym_def->flags & RSPAMD_SYMBOL_FLAG_UNSCORED))) {
++ (std::isnan(score) || !(sym_def->flags & RSPAMD_SYMBOL_FLAG_UNSCORED))) {
+ msg_debug_config("symbol %s has been already registered with "
+ "priority %ud, do not override (new priority: %ud)",
+ symbol,
+@@ -1656,7 +1656,7 @@ rspamd_config_add_symbol(struct rspamd_c
+ }
+ else {
+
+- if (!isnan(score)) {
++ if (!std::isnan(score)) {
+ msg_debug_config("symbol %s has been already registered with "
+ "priority %ud, override it with new priority: %ud, "
+ "old score: %.2f, new score: %.2f",
+@@ -1996,7 +1996,7 @@ rspamd_config_action_from_ucl(struct rsp
+
+ /* TODO: add lua references support */
+
+- if (isnan(threshold) && !(flags & RSPAMD_ACTION_NO_THRESHOLD)) {
++ if (std::isnan(threshold) && !(flags & RSPAMD_ACTION_NO_THRESHOLD)) {
+ msg_err_config("action %s has no threshold being set and it is not"
+ " a no threshold action",
+ act->name);
Home |
Main Index |
Thread Index |
Old Index