app-admin/logstash-bin: bump to version 1.5.5

init scripts updated with confd-r1 && initd-r1
patches and scripts porvided by proxy maintianer in gentoo bug

Gentoo bug: #564608

Package-Manager: portage-2.2.24

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 5b69ca8d16770fc6a056789dba37e7f2e374edb9..6e4440eb2f9d43d64ae50ce2823924d4ec61666d 100644 (file)
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,2 +1,3 @@
 DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
 DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
+DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0

diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
new file mode 100644 (file)
index 0000000..b101e86
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r1
@@ -0,0 +1,7 @@
+#LS_USER="root"
+#LS_GROUP="root"
+#LS_CONFDIR="/etc/logstash/conf.d"
+#LS_LOGFILE="/var/log/logstash/logstash.log"
+#LS_PIDFILE="/run/logstash/logstash.pid"
+#LS_HEAP_SIZE="500m"
+#LS_OPTS=""

diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
new file mode 100644 (file)
index 0000000..c65f098
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r1
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER="${LS_USER:-root}"
+LS_GROUP="${LS_GROUP:-root}"
+LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
+LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
+LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
+LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--user=${LS_USER}:${LS_GROUP} \
+       --env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
+pidfile="${LS_PIDFILE}"
+
+depend() {
+       use net
+       after elasticsearch
+}
+
+checkconfig() {
+       ebegin "Checking your configuration"
+       ${command} ${command_args} --configtest
+       eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+       checkconfig || return 1
+
+       checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
+       checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
+       checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+}
+
+stop() {
+       ebegin "Stopping logstash"
+       start-stop-daemon --stop \
+               --pidfile="${LS_PIDFILE}" \
+               --retry=TERM/5/KILL/5
+}

diff --git a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
new file mode 100644 (file)
index 0000000..a7e0cac
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+       keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+       keepdir "/var/log/${MY_PN}"
+
+       insinto "/etc/${MY_PN}/conf.d"
+       doins "${FILESDIR}/agent.conf.sample"
+
+       insinto "/opt/${MY_PN}"
+       doins -r .
+       fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+       newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+       newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+}
+
+pkg_postinst() {
+       einfo "Getting started with logstash:"
+       einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+       einfo ""
+       einfo "Packages that might be interesting:"
+       einfo "  app-misc/elasticsearch"
+       einfo "  dev-python/elasticsearch-curator"
+       einfo "  www-apps/kibana-bin"
+}