1 |
commit: 63e977160f74721f87592d1a62692a365e7dd797 |
2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu May 5 20:46:01 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 6 05:14:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e97716 |
7 |
|
8 |
www-apps/kibana-bin: drop old |
9 |
|
10 |
Depends on vulnerable nodejs. |
11 |
|
12 |
https://github.com/gentoo/gentoo/commit/06150adeff078a4cefa44939362f24059dbabfc2#commitcomment-72885279 |
13 |
|
14 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
15 |
Closes: https://github.com/gentoo/gentoo/pull/25339 |
16 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
17 |
|
18 |
www-apps/kibana-bin/Manifest | 2 - |
19 |
www-apps/kibana-bin/kibana-bin-6.8.23.ebuild | 89 ---------------------------- |
20 |
www-apps/kibana-bin/metadata.xml | 3 - |
21 |
3 files changed, 94 deletions(-) |
22 |
|
23 |
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest |
24 |
index ecc67a0a4a66..22daa2eb5e21 100644 |
25 |
--- a/www-apps/kibana-bin/Manifest |
26 |
+++ b/www-apps/kibana-bin/Manifest |
27 |
@@ -1,3 +1 @@ |
28 |
-DIST kibana-6.8.23-linux-x86_64.tar.gz 186911401 BLAKE2B 4d0894b88c855bc64ed648489d8c7293965a6edee0ebb841f22c5779592a282dc6af800f39bcd4fd710242aa63365165616bd7a2cf17e8ca0a6560c7bc604256 SHA512 15226207e3606637fe5004bf7b994fa8d09a0b2860881f7539a70872e5480c6614a6181fbb1ec0effa24380bd7721a8bdd87dea152e628c6577684c1b13ee0a2 |
29 |
DIST kibana-7.17.3-linux-x86_64.tar.gz 263671680 BLAKE2B fe044050ffbc7f83428cb75f27bcab0afbabbe6ee69603067ceeffb13c673973f7413b8ea13ee6534bc1e96898b2955da0f16c41f254e7e8a56ea58d74032903 SHA512 ad675a4f7ae05dba56517435057d7698c967f71c5b4bca722583bc0075dde15b54757fb99cfa7ed64c488a1cc62b00a617cbd645b052829062be1cb30fc023cc |
30 |
-DIST kibana-oss-6.8.23-linux-x86_64.tar.gz 67419004 BLAKE2B e7d7be6947cdb3d19efae9ca4113d22a70d3354632c57df266f0dff0b367caa01e3e0ee797ed6330f59cf4d4de63c7985c3504b0914445fb18ab696cbbaf98c1 SHA512 f6ffd8e8f957e08a6783b3decbab0f85654eb1386d7135e76c25799c76524957aa250f8bae43b220c0f14616071a63f5132ca73145d5a44ac8a52d106403a530 |
31 |
|
32 |
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild |
33 |
deleted file mode 100644 |
34 |
index 0c16c09d3126..000000000000 |
35 |
--- a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,89 +0,0 @@ |
38 |
-# Copyright 1999-2022 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=7 |
42 |
- |
43 |
-inherit systemd |
44 |
- |
45 |
-MY_PN="${PN%-bin}" |
46 |
-MY_P=${MY_PN}-${PV} |
47 |
- |
48 |
-DESCRIPTION="Analytics and search dashboard for Elasticsearch" |
49 |
-HOMEPAGE="https://www.elastic.co/products/kibana" |
50 |
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz ) |
51 |
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )" |
52 |
- |
53 |
-# source: LICENSE.txt and NOTICE.txt |
54 |
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64" |
57 |
-IUSE="x-pack" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- acct-group/kibana |
61 |
- acct-user/kibana |
62 |
- >=net-libs/nodejs-10.15.2 |
63 |
- <net-libs/nodejs-14 |
64 |
- x-pack? ( |
65 |
- dev-libs/expat |
66 |
- dev-libs/nss |
67 |
- )" |
68 |
- |
69 |
-S="${WORKDIR}/${MY_P}-linux-x86_64" |
70 |
- |
71 |
-src_prepare() { |
72 |
- default |
73 |
- |
74 |
- # remove empty unused directory |
75 |
- rmdir data || die |
76 |
- |
77 |
- # remove bundled nodejs |
78 |
- rm -r node || die |
79 |
- |
80 |
- # move optimize/plugins to /var/lib/kibana |
81 |
- rm -r optimize plugins || die |
82 |
- |
83 |
- # handle node.js version with RDEPEND |
84 |
- sed -i /node_version_validator/d src/setup_node_env/index.js || die |
85 |
-} |
86 |
- |
87 |
-src_install() { |
88 |
- insinto /etc/${MY_PN} |
89 |
- doins -r config/. |
90 |
- rm -r config || die |
91 |
- |
92 |
- insinto /etc/logrotate.d |
93 |
- newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} |
94 |
- |
95 |
- newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN} |
96 |
- newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN} |
97 |
- systemd_dounit "${FILESDIR}"/${MY_PN}.service |
98 |
- |
99 |
- insinto /opt/${MY_PN} |
100 |
- doins -r . |
101 |
- |
102 |
- fperms -R +x /opt/${MY_PN}/bin |
103 |
- |
104 |
- diropts -m 0750 -o ${MY_PN} -g ${MY_PN} |
105 |
- keepdir /var/lib/${MY_PN}/optimize |
106 |
- keepdir /var/lib/${MY_PN}/plugins |
107 |
- keepdir /var/log/${MY_PN} |
108 |
- |
109 |
- dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214 |
110 |
- dosym ../../var/lib/kibana/plugins /opt/kibana/plugins |
111 |
-} |
112 |
- |
113 |
-pkg_postinst() { |
114 |
- ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana." |
115 |
- ewarn "In case of startup failures (FATAL Error: Cannot find module...)," |
116 |
- ewarn "please remove the optimize directory content:" |
117 |
- ewarn "rm -r /var/lib/kibana/optimize/*" |
118 |
- elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and" |
119 |
- elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)." |
120 |
- elog |
121 |
- elog "To set a customized Elasticsearch instance:" |
122 |
- elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}" |
123 |
- elog " systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml" |
124 |
- elog |
125 |
- elog "Elasticsearch can run local or remote." |
126 |
-} |
127 |
|
128 |
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml |
129 |
index 239f72d67760..c1786678a5e5 100644 |
130 |
--- a/www-apps/kibana-bin/metadata.xml |
131 |
+++ b/www-apps/kibana-bin/metadata.xml |
132 |
@@ -12,7 +12,4 @@ |
133 |
<upstream> |
134 |
<remote-id type="github">elastic/kibana</remote-id> |
135 |
</upstream> |
136 |
- <use> |
137 |
- <flag name="x-pack">Enable additional features (may need a license)</flag> |
138 |
- </use> |
139 |
</pkgmetadata> |