* [gentoo-commits] repo/gentoo:master commit in: www-apps/prewikka/files/, www-apps/prewikka/
@ 2018-07-18 7:32 Tony Vroon
0 siblings, 0 replies; 2+ messages in thread
From: Tony Vroon @ 2018-07-18 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 8a214509fee49cb4af6e7030b94d5dadf31b9739
Author: Thomas Andrejak <thomas.andrejak <AT> gmail <DOT> com>
AuthorDate: Sat May 19 16:35:08 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 07:31:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a214509
www-apps/prewikka: Bump version 4.1
Closes: https://bugs.gentoo.org/645852
www-apps/prewikka/Manifest | 1 +
.../files/prewikka-4.1.5-fix_rule_error.patch | 32 ++++++++++++++++++
.../files/prewikka-4.1.5-fix_siteconfig.patch | 12 +++++++
www-apps/prewikka/prewikka-4.1.5.ebuild | 38 ++++++++++++++++++++++
4 files changed, 83 insertions(+)
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index ec269634681..1024ef2e42d 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,2 +1,3 @@
DIST prewikka-3.1.0.tar.gz 1349193 BLAKE2B b87021ecec490b44f080dfd7a29b301ec55c1e6316fbaa385edfd9a9c586c8eb964bd8aa637041eda3fff3b7d3463845de207bc9e6cb6a209d3c15c8c661daaa SHA512 7321e7383d6205f18dffd00a23d07e9154dd79e35eb58d04a6af77bc9f70e476b67a953eb5d09685b4a7c386ecdb9111d40c77bf3b570ffc27a1c90b612a4803
DIST prewikka-4.0.0.tar.gz 1365985 BLAKE2B 2248c80bebccf4a5f4b99f46d3af6f2aff433c19105e02dfa6c8570a6e41436a9f74971774f3963cbec9abcf70a2bf52b04cd99d930f3e193033aeb1246d1a18 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6
+DIST prewikka-4.1.5.tar.gz 1432885 BLAKE2B aa899eae92b7eee10c4e80544fc02c80fce403dd808464ef3ca21a6d8ddb052730314bd4b83970c684401c53f8398df0f9ca5180c946999e08a2faf9eb7b94f4 SHA512 f68fb6c893727e1bfc2611ef8e3327e6c44d24ea36239fb998675d0e8102dd9849990dbd344c9f584a045f9ed6b4208c3a9928c952ed6248e691687827677dd3
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 00000000000..64fd92f14ef
--- /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 00000000000..773b2e98469
--- /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))
diff --git a/www-apps/prewikka/prewikka-4.1.5.ebuild b/www-apps/prewikka/prewikka-4.1.5.ebuild
new file mode 100644
index 00000000000..712e2dcd057
--- /dev/null
+++ b/www-apps/prewikka/prewikka-4.1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="adns"
+
+DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ sys-devel/gettext"
+
+RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
+ ~dev-libs/libpreludedb-4.1.0[python,${PYTHON_USEDEP}]
+ dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/croniter[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ media-fonts/font-xfree86-type1
+ adns? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.1.5-fix_siteconfig.patch"
+ "${FILESDIR}/${PN}-4.1.5-fix_rule_error.patch"
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/prewikka/files/, www-apps/prewikka/
@ 2020-10-12 12:39 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-10-12 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 68c85586ce7d9b479fa4ed239d0c60ca437e294b
Author: Thomas Andrejak <thomas.andrejak <AT> gmail <DOT> com>
AuthorDate: Mon Sep 28 23:19:43 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:39:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c85586
www-apps/prewikka: Bump version 5.2.0
Signed-off-by: Thomas Andrejak <thomas.andrejak <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17704
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
www-apps/prewikka/Manifest | 1 +
.../files/prewikka-5.2.0-fix_siteconfig.patch | 10 +++++
www-apps/prewikka/prewikka-5.2.0.ebuild | 52 ++++++++++++++++++++++
3 files changed, 63 insertions(+)
diff --git a/www-apps/prewikka/Manifest b/www-apps/prewikka/Manifest
index 871f7538d92..9404de59cca 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1 +1,2 @@
DIST prewikka-5.1.1.tar.gz 1662093 BLAKE2B a4057ee35bb2dbc55ee86c4f41c32074d20712e79fe62b4a409fb0c842ee6aac06418aeace8d11d3c74c99b6787a2e507d0e424180849b4acb3296ebc6c785f0 SHA512 97ac557964fc7a3a633d879830dbda1a263061acc7d943798638686a67db46f08371af081b07eded60dc9856dd47641fae5df50603e190f36acb71a45ee6089a
+DIST prewikka-5.2.0.tar.gz 1808717 BLAKE2B 5713b0ce47a3ef137795035ca074410abf9e934c3e9c90b48d127396f0c92e48969e755b48a8519f52cc63bf56e7200c285fb7ad7069f4489cd552eddaa1be5a SHA512 034040e22c2b122289f6af5a2221024585c671327f158e61845feef720c7f70b06a6aa4caaaeba7b48394aa95cd67c45061d97cdaecc3902e26175df9b86c411
diff --git a/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch
new file mode 100644
index 00000000000..03a20ab36ef
--- /dev/null
+++ b/www-apps/prewikka/files/prewikka-5.2.0-fix_siteconfig.patch
@@ -0,0 +1,10 @@
+--- a/setup.py 2020-09-09 16:44:23.000000000 +0200
++++ b/setup.py 2020-09-29 01:07:56.522604785 +0200
+@@ -108,6 +108,7 @@
+ ofile, copied = self.copy_file('scripts/prewikka.wsgi', share_dir)
+
+ def run(self):
++ self.skip_build = 0
+ os.umask(0o22)
+ self.install_conf()
+ self.install_wsgi()
diff --git a/www-apps/prewikka/prewikka-5.2.0.ebuild b/www-apps/prewikka/prewikka-5.2.0.ebuild
new file mode 100644
index 00000000000..334841afd51
--- /dev/null
+++ b/www-apps/prewikka/prewikka-5.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}]
+ <dev-libs/libprelude-6[python,${PYTHON_USEDEP}]
+ >=dev-libs/libpreludedb-5.2.0[python,${PYTHON_USEDEP}]
+ <dev-libs/libpreludedb-6[python,${PYTHON_USEDEP}]
+ dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/croniter[${PYTHON_USEDEP}]
+ dev-python/gevent[${PYTHON_USEDEP}]
+ dev-python/lark-parser[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/voluptuous[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ media-fonts/font-xfree86-type1"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
+ sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch"
+)
+
+src_install() {
+ distutils-r1_src_install
+
+ keepdir /var/lib/prewikka
+}
+
+pkg_postinst() {
+ optfeature "Asynchronous DNS" dev-python/twisted[${PYTHON_USEDEP}]
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-12 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-18 7:32 [gentoo-commits] repo/gentoo:master commit in: www-apps/prewikka/files/, www-apps/prewikka/ Tony Vroon
-- strict thread matches above, loose matches on Subject: below --
2020-10-12 12:39 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox