commit:     3465c9e035cf4904334c586c4878d41c4d7caedb
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 00:36:25 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 00:37:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3465c9e0

www-apps/kibana-bin:  bump -> vn. 4.1.3, clean old vns. & defunct init scripts

Requests made, new ebuild submitted via proxy maintainer via the gentoo bug
which is under category of security bug.

Gentoo bug: #566044O

Package-Manager: portage-2.2.24

 www-apps/kibana-bin/Manifest                       |  4 +--
 www-apps/kibana-bin/files/kibana.initd             | 39 ----------------------
 www-apps/kibana-bin/files/kibana.initd-r1          | 18 ----------
 www-apps/kibana-bin/kibana-bin-4.0.3.ebuild        | 39 ----------------------
 www-apps/kibana-bin/kibana-bin-4.1.1.ebuild        | 39 ----------------------
 ...na-bin-4.1.2.ebuild => kibana-bin-4.1.3.ebuild} | 14 ++++----
 www-apps/kibana-bin/metadata.xml                   |  1 +
 7 files changed, 9 insertions(+), 145 deletions(-)

diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 79468cc..e495012 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,3 +1 @@
-DIST kibana-4.0.3-linux-x64.tar.gz 14331227 SHA256 
320a43ed11f8f3f95709ceaec11ef8192c9bc2e64ea73a5f973b43aa8a422922 SHA512 
745faffd9d8d67d6322f64223b829eb8eff4fba5d2f435a72b0c52c64e1578f0f5e741285c20904b6215d0c8da2cc5833fead86fc519bb4fdc51e8d51a18c465
 WHIRLPOOL 
2e67b9ba702ff78b9e775517333739cb96ad7dc88ab413768b897374f5ec25daa3b861f420b54451906231eca0ce5558306613a6597a7c85d340d897da0a0a08
-DIST kibana-4.1.1-linux-x64.tar.gz 11676499 SHA256 
6f42d25f337fd49f38e2af81b9ab6e0c987a199a8c0b2e1410d072f812cb4520 SHA512 
d72f235704e2a85b4d993f55550b5d8b6de049f05f4ff7781e122af65fca88d3966db188a8bbc877928751aacd69f8ecf4c412cd05bfa88d1a9e785fa952aeed
 WHIRLPOOL 
a60321cf7ae511dd03c2099b61ea0fe5abb479b264842150a84d6791e8b9ba6682dc1c95059800a8cf714898350ec533440eb43240fa78491836fa3b7d6ef23d
-DIST kibana-4.1.2-linux-x64.tar.gz 11787239 SHA256 
5f6213f7ac7ef71016a6750f09e7316ccc9bca139bc5389b417395b179bc370c SHA512 
08e8a8d5582019ee977a43e25afe874cd34fe0097ed17dc4738abaf6493c224061997a2558a297748f53bbee97bcd83b1dc54d0287594ba60d917d19c0baca9b
 WHIRLPOOL 
dd537add18d7a01622541850ff7385ec72174f473c6f89d56172a41cc3eac79d49e2df3079fef3160acb6f7c390eae5afb614b14402ebdf21cfba67289fb5142
+DIST kibana-4.1.3-linux-x64.tar.gz 11800636 SHA256 
f2cb5389ad0acfbc4006f739d75d5ede541483d1fa6be728bbf547a9d7ddeb4a SHA512 
81549c881ec222bcac73a0cf60766752591031ea8f3d28cce98ce06458376036f119353e7b820faef2cb42b23e5f6ef96cd98c1f256b3361513e71877082301c
 WHIRLPOOL 
0d2272361a1b07984cfa7539d4d36e2465b87cdc046ae7cd6d2b6e5da69861feca0e74d9e0ad467d7f4cef9865b72c0bcc1a769bbc6458227fe590e1f99a21b1

diff --git a/www-apps/kibana-bin/files/kibana.initd 
b/www-apps/kibana-bin/files/kibana.initd
deleted file mode 100644
index 9effc54..0000000
--- a/www-apps/kibana-bin/files/kibana.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-command="/opt/kibana/bin/kibana"
-pidfile="/run/kibana.pid"
-KIBANA_USER=${KIBANA_USER:="kibana"}
-
-depend() {
-       need elasticsearch
-}
-
-start() {
-       ebegin "Starting ${SVCNAME}"
-
-       checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
-
-       start-stop-daemon --start \
-               --user $KIBANA_USER \
-               --background \
-               --make-pidfile \
-               --pidfile $pidfile \
-               --stdout /var/log/kibana/kibana.log \
-               --stderr /var/log/kibana/kibana.err \
-               --exec $command
-       
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping ${SVCNAME}"
-       
-       start-stop-daemon --stop \
-               --pidfile $pidfile
-
-       
-       eend $?
-}

diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 
b/www-apps/kibana-bin/files/kibana.initd-r1
deleted file mode 100644
index 3fdcec6..0000000
--- a/www-apps/kibana-bin/files/kibana.initd-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-KIBANA_USER=${KIBANA_USER:-kibana}
-
-command="/opt/kibana/bin/kibana"
-pidfile="/run/kibana.pid"
-command_background="true"
-start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout 
/var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err"
-
-depend() {
-        need elasticsearch
-}
-
-start_pre() {
-        checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
-}

diff --git a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild 
b/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild
deleted file mode 100644
index ee1c13e..0000000
--- a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="kibana"
-MY_P=${MY_PN}-${PV/_rc/-rc}
-
-DESCRIPTION="visualize logs and time-stamped data"
-HOMEPAGE="http://www.elasticsearch.org/overview/kibana/";
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-misc/elasticsearch-1.4.4"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/kibana/node/bin/node"
-
-S="${WORKDIR}/${MY_P}-linux-x64"
-
-pkg_setup() {
-       enewgroup ${MY_PN}
-       enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-       keepdir /opt/${MY_PN}
-       keepdir /var/log/${MY_PN}
-
-       newinitd "${FILESDIR}"/kibana.initd "${MY_PN}"
-
-       mv * "${D}/opt/${MY_PN}"
-}

diff --git a/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild 
b/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild
deleted file mode 100644
index 4ee1ab1..0000000
--- a/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="kibana"
-MY_P=${MY_PN}-${PV/_rc/-rc}
-
-DESCRIPTION="visualize logs and time-stamped data"
-HOMEPAGE="https://www.elastic.co/products/kibana";
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-misc/elasticsearch-1.4.4"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/kibana/node/bin/node"
-
-S="${WORKDIR}/${MY_P}-linux-x64"
-
-pkg_setup() {
-       enewgroup ${MY_PN}
-       enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-       keepdir /opt/${MY_PN}
-       keepdir /var/log/${MY_PN}
-
-       newinitd "${FILESDIR}"/kibana.initd-r1 "${MY_PN}"
-
-       mv * "${D}/opt/${MY_PN}"
-}

diff --git a/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild 
b/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
similarity index 75%
rename from www-apps/kibana-bin/kibana-bin-4.1.2.ebuild
rename to www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
index fdace00..facd6af 100644
--- a/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit user
 MY_PN="kibana"
 MY_P=${MY_PN}-${PV/_rc/-rc}
 
-DESCRIPTION="visualize logs and time-stamped data"
+DESCRIPTION="Explore and visualize data"
 HOMEPAGE="https://www.elastic.co/products/kibana";
 
SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz";
 
@@ -34,13 +34,13 @@ src_install() {
        keepdir /opt/${MY_PN}
        keepdir /var/log/${MY_PN}
 
-       insinto "/etc/logrotate.d"
-       newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
 
-       newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-       newinitd "${FILESDIR}"/kibana.initd-r2 "${MY_PN}"
+       newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+       newinitd "${FILESDIR}"/${MY_PN}.initd-r2 ${MY_PN}
 
-       mv * "${D}/opt/${MY_PN}"
+       mv * "${D}"/opt/${MY_PN}
 }
 
 pkg_postinst() {

diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index cf1b428..4069bfc 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
         <maintainer>
                 <email>[email protected]</email>
+                <name>Ian Delaney</name>
         </maintainer>
         <maintainer>
                 <email>[email protected]</email>

Reply via email to