www-apps/prewikka: Bump version 4.1

Closes: https://bugs.gentoo.org/645852

2 files changed, 44 insertions, 0 deletions

diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
new file mode 100644
index 000000000000..64fd92f14ef8
--- /dev/null
+++ b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
@@ -0,0 +1,32 @@
+# Based on https://www.prelude-siem.org/projects/prewikka/repository/revisions/9814f708b6e157795b89f9edda32ab38d0a2ced7/diff/prewikka/view.py
+# Already commited
+
+--- a/prewikka/view.py
++++ b/prewikka/view.py
+@@ -523,7 +523,7 @@
+ 
+         try:
+             rule, view_kwargs = env.request.url_adapter.match(request.path, method=request.method, return_rule=True)
+-            view = self._views_rules[rule]
++            view = self._views_rules[rule.rule+rule.endpoint]
+ 
+         except werkzeug.exceptions.MethodNotAllowed:
+             raise InvalidMethodError(N_("Method '%(method)s' is not allowed for view '%(view)s'",
+@@ -580,7 +580,7 @@
+ 
+         rule = Rule(path, endpoint=v.view_endpoint, methods=methods, defaults=defaults)
+ 
+-        self._views_rules[rule] = v
++        self._views_rules[rule.rule+rule.endpoint] = v
+         self._rule_map.add(rule)
+ 
+     def addView(self, view):
+@@ -601,7 +601,7 @@
+ 
+             rule = Rule((view.view_path or "/" + view.view_id), endpoint=view.view_endpoint)
+ 
+-            self._views_rules[rule] = view
++            self._views_rules[rule.rule+rule.endpoint] = view
+             self._rule_map.add(rule)
+             self._views[view.view_id] = view
+ 
diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
new file mode 100644
index 000000000000..773b2e984698
--- /dev/null
+++ b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -84,7 +84,8 @@
+ 
+     def init_siteconfig(self):
+         config = open("prewikka/siteconfig.py", "w")
+-        config.write("tmp_dir = '%s'\n" % (os.path.join(tempfile.gettempdir(), "prewikka")))
++        config.write("import os, tempfile\n")
++        config.write("tmp_dir = os.path.join(tempfile.gettempdir(), 'prewikka')\n")
+         config.write("conf_dir = '%s'\n" % (os.path.abspath(self.conf_prefix)))
+         config.write("data_dir = '%s'\n" % (os.path.abspath(self.data_prefix)))
+         config.write("libprelude_required_version = '%s'\n" % (LIBPRELUDE_REQUIRED_VERSION))