www-apps/kibana-bin: bump to 6.8.3

Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Closes: https://bugs.gentoo.org/693374
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

3 files changed, 91 insertions, 1 deletions

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 5300d33e6a78..8a24131f7ba4 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,10 +2,12 @@ DIST kibana-5.6.16-linux-x86_64.tar.gz 53468981 BLAKE2B dda2aacad7043e4ed259c194
 DIST kibana-6.6.1-linux-x86_64.tar.gz 180675854 BLAKE2B 7c911f6715f1bb526e09a47de55b10b197dd78bcd5c9a6e710890cd333d23c8556d8efb12d34b0c0cdf1e989bb456da8f79e54b1798c02ea57658d90fbb80f83 SHA512 df4547a0056b46d6351948e7f67439b5a7fe46c27f20c9cb7783046abea04d28aa85ba74751f54c7a1524dbca55ee9c9bfaec50be903f964dedc1ceeb5d823b0
 DIST kibana-6.7.1-linux-x86_64.tar.gz 186430753 BLAKE2B 10d3b4d7996ee88ea3fc7062585dd0b00618650779e779c2fc18dcb9e0c62d964abb2806997f0712c495fb54ad2399a8b55745c67b6ff77ec1fa8e6041e7a075 SHA512 5ad5af43c18f12312d8bf5b50e8550ed8a008fb36efddb1756498c6a44cbb40cfa3ae7d307f5cb88daee0690dfd3aacfbb7bd526f098c140886a821af4b28e9d
 DIST kibana-6.8.1-linux-x86_64.tar.gz 186486884 BLAKE2B 6fc640637a2bca675726f485aef7931f475c91f92682101b987972ec9f39b57f5a7e3029dd9de102971356d17a6ce9fef197d8cd7a720e9a2511a4bb73a256b5 SHA512 31f3224bc4b571b24275dab21d3eb09fc592e7989887073985e17ccb718867d71e686f0299d28d0fb9f64388f1dfb98c82dbfaa6e7adc2d07685deffac2fed53
+DIST kibana-6.8.3-linux-x86_64.tar.gz 186404046 BLAKE2B aa4220fe060dce823c22a1b366dbe941e5f0930cde290b7272fade5e330a8f4f4dbe8fb4215d55b88edef3c8e65418e8f3659b7658355197f38b20316e0c3dff SHA512 54c3b9ad197bb8f100905c8b933b94a2dccd38ae3c4482d9b798fc3bd86e53a1e8d60d30554223da537012da47f9aefdbd0d41b9fc01bf01f7bcb45ffe60ebbc
 DIST kibana-7.0.0-linux-x86_64.tar.gz 167679944 BLAKE2B 55e1e36134861a063e6a2e844e717fc1e90130403d1f08be87c27582b822e866d8703b7a16a9cf1371ec65e0ff1a314bf6e838ce4b1b5905911325a1a4850b5a SHA512 647dd3900d70dfcf7c8f97d8a020f204b4e2f11c2fc23b4733618ad931f7876b37bfd885809632bbd05fdac75fbc0e233d48367ddb34801e1450b452af8e3f4a
 DIST kibana-7.2.0-linux-x86_64.tar.gz 213198521 BLAKE2B 64ce95baa14107c3789d4aff748310cacd41cdabe227cb3fedab4bdd5d65d86d4bc8883dd7f8fbced3fda2ed25ed294ce49a8f28311fcbcfcae3c7bdc960c4ac SHA512 78368be3c55ef09cfed6903cc6556edb1a77f9e548614535b261d13c3190052ee9571cbb686470662f5563c564f1256e3a31ca233a26e8b734f3df44ab5a97f0
 DIST kibana-oss-6.6.1-linux-x86_64.tar.gz 59466869 BLAKE2B 593563976b4d1c89b6042dbd1a945c6fc7ae2a8c3ea18d142d9e7e5f8307d72e7b358059316130880c64c6879e5df41d80005a1dad82d8a5ae223bf292bdf392 SHA512 1131ce7cab882166478be89426a8885fb53e2b1154100b6fa5dd0a431b1d9aa20df73c687159c18e1b9703e42f953fb10b3ab7fbfe634ed253331238249bf574
 DIST kibana-oss-6.7.1-linux-x86_64.tar.gz 62807564 BLAKE2B 8fec550769f4a2a88a4fab72b0ecb49d81d25d2f13d365cfefce2f70ed5c088a72f750a0b5807d729621a78c7fe393a5f9875012b6559aa82bb049083eaff5bf SHA512 309c25a16d535b1c5f0853ea89b7b69b61e3472afdabdd6f60a86fabba4c76c034b620cbe3d7f988cc78d21e5ed058b4f97e4995d868876a55fcc30769822882
 DIST kibana-oss-6.8.1-linux-x86_64.tar.gz 62862417 BLAKE2B ac421af54dff10dec2cd414f3a2101df6fa7691092865d53a35a80cd015679d3d749ef8b37bd67bf6a709741f310fc1ebfeb54ee705f2e81c044ae714e90c932 SHA512 853d920253e1c55ad284d713065174696d228634a90bfef20d7ada1f76a8db94b1d61b62c5e715356381780dcb28f87ae71c2d509282e97c524a8cb313a79e66
+DIST kibana-oss-6.8.3-linux-x86_64.tar.gz 62872100 BLAKE2B e47755708b7fa1a7a2b8d74b4fde352b554b350f31541eb98467f66e599ba1075c5833e1926e1f2cf6ec7accfc302bfd271dbba2ef6a9526683950d67442be0f SHA512 baa8ad7bb9388d6f969509ff1c8fe6273d8ec0b377aa15942a41a8f3934a670bf84fd84b96b76dbfb8fc4c053084b38dc26a6d2ce02efcb2ddf7b4530dfdeae4
 DIST kibana-oss-7.0.0-linux-x86_64.tar.gz 70548795 BLAKE2B b41f6073548f1cf09fd1e49504775f4802a1e86ed561870b60507054583f73bc0c531fadb831c7145d5234832eabf94a1b7e23ba78c88481be154d4b24ee07c4 SHA512 091ab4fbf0aec782307b7313dec82e6437be4cb76efac49eed6434c393e9adda3f925d6a75be4b78c9768c943168881dc38aa7b1b23462af80d5d158b3806136
 DIST kibana-oss-7.2.0-linux-x86_64.tar.gz 82672623 BLAKE2B 770e35f8025fb65513e51cb6a582dfe456e348efc7493c3710f2fa8ee49207392494aa437d7fe2d7115e5f607926e185264b6f92dacdc202331aab3d8ab10254 SHA512 ea735ecd18fc4441f29adcd7fd5a08a61e8bf1e82170219f598edf4a7726a11166e16b36f125edbfecafb6ed2c7cf003880d428960765861868e22cf55542e6b
diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd
index 84f38e9aeefa..80623fe54b37 100644
--- a/www-apps/kibana-bin/files/kibana.initd
+++ b/www-apps/kibana-bin/files/kibana.initd
@@ -12,7 +12,7 @@ KIBANA_LOG_DIR="${KIBANA_LOG_DIR:-/var/log/kibana}"
 command="/opt/kibana/bin/kibana"
 command_args="--elasticsearch ${ES_INSTANCE} --config ${KIBANA_CONFIG} --path.data=${KIBANA_DATA_DIR}"
 
-pidfile="/run/kibana.pid"
+pidfile="/run/${RC_SVCNAME}.pid"
 command_background="true"
 start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout ${KIBANA_LOG_DIR}/kibana.log --stderr ${KIBANA_LOG_DIR}/kibana.err --env BABEL_CACHE_PATH=${KIBANA_BABEL_CACHE_PATH}"
 
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild
new file mode 100644
index 000000000000..2cc05a870273
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-6.8.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 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
+	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."
+}