From 02a6ec00a4e1750051488a68204b5e4f9c2922ef Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Tue, 10 Oct 2023 11:10:56 +0200 Subject: [PATCH] MT#58471 Fix mod_carbons_adhoc call to adhoc module The commit fix the startup error: modulemanager: Error initializing module 'carbons_adhoc' on '...': /usr/lib/prosody/modules/adhoc/adhoc.lib.lua:25: adhoc.new() expects a permission argument, none given The 'adhoc.new()' function now requires a new paramenter called 'permission' and this is not updated in the carbon plugin. For the moment the premission has been statically set to 'any' value. Change-Id: I897e421b994aae6ad95c29ab405a24c796d33e2b --- .../fix_mod_carbons_adhoc_call_to_adhoc.patch | 21 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 22 insertions(+) create mode 100644 debian/patches/fix_mod_carbons_adhoc_call_to_adhoc.patch diff --git a/debian/patches/fix_mod_carbons_adhoc_call_to_adhoc.patch b/debian/patches/fix_mod_carbons_adhoc_call_to_adhoc.patch new file mode 100644 index 0000000..a229855 --- /dev/null +++ b/debian/patches/fix_mod_carbons_adhoc_call_to_adhoc.patch @@ -0,0 +1,21 @@ +From: Sipwise Development Team +Date: Wed, 11 Oct 2023 09:52:08 +0200 +Subject: fix_mod_carbons_adhoc_call_to_adhoc + +Change-Id: If2ce4cf8dff63c3a8491845d76f0b33b472dc8b6 +--- + plugins/mod_carbons_adhoc/mod_carbons_adhoc.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/mod_carbons_adhoc/mod_carbons_adhoc.lua b/plugins/mod_carbons_adhoc/mod_carbons_adhoc.lua +index 406a0b0..e8af962 100644 +--- a/plugins/mod_carbons_adhoc/mod_carbons_adhoc.lua ++++ b/plugins/mod_carbons_adhoc/mod_carbons_adhoc.lua +@@ -35,6 +35,6 @@ local function adhoc_status(self, data, state) + end + + local status_desc = adhoc_new("Carbons: Get Status", +- "mod_carbons_adhoc#status", adhoc_status); ++ "mod_carbons_adhoc#status", adhoc_status, 'any'); + + module:add_item("adhoc", status_desc); diff --git a/debian/patches/series b/debian/patches/series index e89826a..6e245b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ mod_auth_sql.path +fix_mod_carbons_adhoc_call_to_adhoc.patch