Skip to content

Commit

Permalink
rspamd: Adjust patch for current release
Browse files Browse the repository at this point in the history
There's a minor change in the current rspamd release 3.5 making our
integration patch fail. Adjust to suit.
  • Loading branch information
michaelweiser committed Jun 6, 2023
1 parent c0126fd commit 0a8e574
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions rspamd/peekaboo.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git /usr/share/rspamd/lualib/lua_scanners/common.lua /usr/share/rspamd/lualib/lua_scanners/common.lua
index cefec8780..d314b050d 100644
index c2e314d39..7599b4631 100644
--- /usr/share/rspamd/lualib/lua_scanners/common.lua
+++ /usr/share/rspamd/lualib/lua_scanners/common.lua
@@ -62,7 +62,7 @@ local function match_patterns(default_sym, found, patterns, dyn_weight)
Expand Down Expand Up @@ -57,7 +57,7 @@ index cefec8780..d314b050d 100644
exports.check_metric_results = check_metric_results

diff --git /usr/share/rspamd/lualib/lua_scanners/init.lua /usr/share/rspamd/lualib/lua_scanners/init.lua
index 8c0f18caa..9ceab7663 100644
index 20bea7a47..d4d4a87fd 100644
--- /usr/share/rspamd/lualib/lua_scanners/init.lua
+++ /usr/share/rspamd/lualib/lua_scanners/init.lua
@@ -50,6 +50,7 @@
Expand All @@ -69,7 +69,7 @@ index 8c0f18caa..9ceab7663 100644
exports.add_scanner = function(name, t, conf_func, check_func)
assert(type(conf_func) == 'function' and type(check_func) == 'function',
diff --git /usr/share/rspamd/plugins/external_services.lua /usr/share/rspamd/plugins/external_services.lua
index 02068685b..728137ec2 100644
index d6fedeece..852c991ff 100644
--- /usr/share/rspamd/plugins/external_services.lua
+++ /usr/share/rspamd/plugins/external_services.lua
@@ -16,6 +16,7 @@ limitations under the License.
Expand Down Expand Up @@ -203,16 +203,17 @@ index 02068685b..728137ec2 100644
score = 0.0,
group = N
}
@@ -223,12 +270,38 @@ if opts and type(opts) == 'table' then
@@ -223,6 +270,9 @@ if opts and type(opts) == 'table' then
if m.symbol_type == 'postfilter' then
t.type = 'postfilter'
t.priority = 3
t.priority = lua_util.symbols_priorities.medium
+ elseif m.symbol_type == 'prefilter' then
+ t.type = 'prefilter'
+ t.priority = 3
+ t.priority = lua_util.symbols_priorities.medium
else
t.type = 'normal'
end
@@ -237,6 +287,29 @@ if opts and type(opts) == 'table' then

local id = rspamd_config:register_symbol(t)

Expand Down

0 comments on commit 0a8e574

Please sign in to comment.