commit: 63e977160f74721f87592d1a62692a365e7dd797 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Thu May 5 20:46:01 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri May 6 05:14:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e97716
www-apps/kibana-bin: drop old Depends on vulnerable nodejs. https://github.com/gentoo/gentoo/commit/06150adeff078a4cefa44939362f24059dbabfc2#commitcomment-72885279 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25339 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-apps/kibana-bin/Manifest | 2 - www-apps/kibana-bin/kibana-bin-6.8.23.ebuild | 89 ---------------------------- www-apps/kibana-bin/metadata.xml | 3 - 3 files changed, 94 deletions(-) diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest index ecc67a0a4a66..22daa2eb5e21 100644 --- a/www-apps/kibana-bin/Manifest +++ b/www-apps/kibana-bin/Manifest @@ -1,3 +1 @@ -DIST kibana-6.8.23-linux-x86_64.tar.gz 186911401 BLAKE2B 4d0894b88c855bc64ed648489d8c7293965a6edee0ebb841f22c5779592a282dc6af800f39bcd4fd710242aa63365165616bd7a2cf17e8ca0a6560c7bc604256 SHA512 15226207e3606637fe5004bf7b994fa8d09a0b2860881f7539a70872e5480c6614a6181fbb1ec0effa24380bd7721a8bdd87dea152e628c6577684c1b13ee0a2 DIST kibana-7.17.3-linux-x86_64.tar.gz 263671680 BLAKE2B fe044050ffbc7f83428cb75f27bcab0afbabbe6ee69603067ceeffb13c673973f7413b8ea13ee6534bc1e96898b2955da0f16c41f254e7e8a56ea58d74032903 SHA512 ad675a4f7ae05dba56517435057d7698c967f71c5b4bca722583bc0075dde15b54757fb99cfa7ed64c488a1cc62b00a617cbd645b052829062be1cb30fc023cc -DIST kibana-oss-6.8.23-linux-x86_64.tar.gz 67419004 BLAKE2B e7d7be6947cdb3d19efae9ca4113d22a70d3354632c57df266f0dff0b367caa01e3e0ee797ed6330f59cf4d4de63c7985c3504b0914445fb18ab696cbbaf98c1 SHA512 f6ffd8e8f957e08a6783b3decbab0f85654eb1386d7135e76c25799c76524957aa250f8bae43b220c0f14616071a63f5132ca73145d5a44ac8a52d106403a530 diff --git a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild deleted file mode 100644 index 0c16c09d3126..000000000000 --- a/www-apps/kibana-bin/kibana-bin-6.8.23.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -MY_PN="${PN%-bin}" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Analytics and search dashboard for Elasticsearch" -HOMEPAGE="https://www.elastic.co/products/kibana"; -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz ) - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )" - -# source: LICENSE.txt and NOTICE.txt -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 )" -SLOT="0" -KEYWORDS="~amd64" -IUSE="x-pack" - -RDEPEND=" - acct-group/kibana - acct-user/kibana - >=net-libs/nodejs-10.15.2 - <net-libs/nodejs-14 - x-pack? ( - dev-libs/expat - dev-libs/nss - )" - -S="${WORKDIR}/${MY_P}-linux-x86_64" - -src_prepare() { - default - - # remove empty unused directory - rmdir data || die - - # remove bundled nodejs - rm -r node || die - - # move optimize/plugins to /var/lib/kibana - rm -r optimize plugins || die - - # handle node.js version with RDEPEND - sed -i /node_version_validator/d src/setup_node_env/index.js || die -} - -src_install() { - insinto /etc/${MY_PN} - doins -r config/. - rm -r config || die - - insinto /etc/logrotate.d - newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN} - - newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN} - newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN} - systemd_dounit "${FILESDIR}"/${MY_PN}.service - - insinto /opt/${MY_PN} - doins -r . - - fperms -R +x /opt/${MY_PN}/bin - - diropts -m 0750 -o ${MY_PN} -g ${MY_PN} - keepdir /var/lib/${MY_PN}/optimize - keepdir /var/lib/${MY_PN}/plugins - keepdir /var/log/${MY_PN} - - dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214 - dosym ../../var/lib/kibana/plugins /opt/kibana/plugins -} - -pkg_postinst() { - ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana." - ewarn "In case of startup failures (FATAL Error: Cannot find module...)," - ewarn "please remove the optimize directory content:" - ewarn "rm -r /var/lib/kibana/optimize/*" - elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and" - elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)." - elog - elog "To set a customized Elasticsearch instance:" - elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}" - elog " systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml" - elog - elog "Elasticsearch can run local or remote." -} diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml index 239f72d67760..c1786678a5e5 100644 --- a/www-apps/kibana-bin/metadata.xml +++ b/www-apps/kibana-bin/metadata.xml @@ -12,7 +12,4 @@ <upstream> <remote-id type="github">elastic/kibana</remote-id> </upstream> - <use> - <flag name="x-pack">Enable additional features (may need a license)</flag> - </use> </pkgmetadata>
