commit: f92e23d09a5e790756ff7c64489ab25a93d8da6c Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Fri Aug 3 09:11:39 2018 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Tue Aug 7 22:26:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92e23d0
app-admin/logstash-bin: version bump to 6.3.2. Closes: https://github.com/gentoo/gentoo/pull/9432 app-admin/logstash-bin/Manifest | 2 + app-admin/logstash-bin/logstash-bin-6.3.2.ebuild | 77 ++++++++++++++++++++++++ app-admin/logstash-bin/metadata.xml | 33 +++++----- 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 65f4e4e815a..49a2f3c04b1 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,3 +1,5 @@ DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745 DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189 +DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c +DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d diff --git a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild new file mode 100644 index 00000000000..acbb17a3c74 --- /dev/null +++ b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 user + +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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz ) + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )" + +# source: LICENSE.txt and NOTICE.txt +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )" +SLOT="0" +KEYWORDS="~amd64" +IUSE="x-pack" + +RESTRICT="strip" +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so" + +RDEPEND="virtual/jre:1.8" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup ${MY_PN} + enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} +} + +src_install() { + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} + keepdir "/var/lib/${MY_PN}" + keepdir "/var/log/${MY_PN}" + + insinto "/usr/share/${MY_PN}" + newins "${FILESDIR}/agent.conf.sample" agent.conf + + rm -v config/{pipelines.yml,startup.options} || die + insinto /etc/${MY_PN} + doins -r config/. + doins "${FILESDIR}/pipelines.yml" + rm -rv config data || die + + insinto "/opt/${MY_PN}" + doins -r . + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin" + + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}" + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}" + + insinto /usr/share/eselect/modules + doins "${FILESDIR}"/logstash-plugin.eselect +} + +pkg_postinst() { + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)" + ewarn "Install the plugins via eselect module that will automatically re-install" + ewarn "all self installed plugins after Logstash upgrades." + elog + elog "Installing plugins:" + elog "eselect logstash-plugin install logstash-output-gelf" + elog + + elog "Reinstalling self installed plugins (installed via eselect module):" + eselect logstash-plugin reinstall + + elog + elog "Sample configuration:" + elog "${EROOT%/}/usr/share/${MY_PN}" + elog + elog "The default pipeline configuration expects the configuration(s) to be found in:" + elog "${EROOT%/}/etc/logstash/conf.d/*.conf" +} diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml index d4758fc5062..6381ef41d5e 100644 --- a/app-admin/logstash-bin/metadata.xml +++ b/app-admin/logstash-bin/metadata.xml @@ -1,19 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="person"> - <email>hydrapo...@gmail.com</email> - <name>Tomáš Mózes</name> - </maintainer> - <maintainer type="person"> - <email>erkifer...@gmail.com</email> - <name>Ferenc Erki</name> - </maintainer> - <maintainer type="project"> - <email>proxy-ma...@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">elastic/logstash</remote-id> - </upstream> + <maintainer type="person"> + <email>hydrapo...@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="person"> + <email>erkifer...@gmail.com</email> + <name>Ferenc Erki</name> + </maintainer> + <maintainer type="project"> + <email>proxy-ma...@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">elastic/logstash</remote-id> + </upstream> + <use> + <flag name="x-pack">Enable additional features (may need a license)</flag> + </use> </pkgmetadata>
