commit: 2cd6c667f4f73dff7f184ea2fb026af780ce5e22
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jan 28 08:02:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 08:36:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd6c667
app-admin/logstash-bin: bump to 6.8.23/7.16.3
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/logstash-bin/Manifest | 4 ++
app-admin/logstash-bin/logstash-bin-6.8.23.ebuild | 73 +++++++++++++++++++
app-admin/logstash-bin/logstash-bin-7.16.3.ebuild | 88 +++++++++++++++++++++++
3 files changed, 165 insertions(+)
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 9709eff0d87b..3af0e7b7546b 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,8 @@
DIST logstash-6.8.22.tar.gz 178580688 BLAKE2B
f75b00b93532ee680623abdd63e05bf6453e09850863a71d8c7ea71505f172b3151a258d2f08846cc3866fe38aa8da27dfdac2fa2ebb218862711f08efa46365
SHA512
f9f32f5a769c1d9fb46e453d758539f4bb3256cf3891f626dd8613d4673e244bfe90299208f3086b02d388825c73331764f9e95914563fb0b8bf7b7963d5ecfd
+DIST logstash-6.8.23.tar.gz 178007697 BLAKE2B
d7ba85a141586b8ee6cf524b9ab39b6b9a0777df5357fb22f15770126023599d7b62eeafc55dc87e0ff401b5df8dab9084a9ea4ba98c850e2ee98d4988bf4ad2
SHA512
3ee0de55cca50c1ea5b8afbc618783c7e301ebdc570c34d590160468b0b7708afe83589669c08106ac006e64436903ccbb3b3322e2801332b921ea802a788d86
DIST logstash-7.16.2-linux-x86_64.tar.gz 365618045 BLAKE2B
ccbdc8c61dd6d2a95971a8a11eb4c92b2388214a34a7b6024fdad03676308b0bab030287f5db3132c47caff53f82259ba2422cd72ef77c358020d1866278bd32
SHA512
1ff7077735167e328766bb710e4a22e139a713ef940946e454cd21ebe61b5e50af042c0da1baac6eafba973e96f596b80a0342e9dc26beecd3740e6e37e6c981
+DIST logstash-7.16.3-linux-x86_64.tar.gz 364791274 BLAKE2B
12e9944dce3e270358ef02d292655171911774a2351bf7c0a4f9aaf6206db31c4b1b114fee24c39fa72d9e10f31e5a6ad56f42dd8a25278c28cec6c2ab52a1b7
SHA512
fd9bc03c4dd58853075cd4d179a613cc24fde22a5decc943197002dc5cda9d03ece716e766084fd3d293293f4de88866264f5bd7e96ffd3d541c555b4264782d
DIST logstash-oss-6.8.22.tar.gz 178446837 BLAKE2B
c17bb3c2e2e0e8fd131edbc96516c1739aac9230f75b4473fb1f57020792b4def1caed901391b7762766fa0273a0b3f66153070213ba92e96713d0444f17da73
SHA512
12f51a49fa6d5f3b4f997759beaaf836cb5b792626ab96493f039f2a9018441f246af8ea2d4c344190714b66eb1955b629b403c5cc7aafec4f9abbd6f1ac89fa
+DIST logstash-oss-6.8.23.tar.gz 177876480 BLAKE2B
d961c9073c1108b3a0e74ba763e0ce45b35a5767cd732e7ec756697c5f1526e01b23c0919acefa173b5410e9a4908920a24c1ce351dd7c09d998cb025ba05aef
SHA512
87488767c6239878c1383c1f28ca17e8f330c10298542627c0c44a0620976737a1acbca55b8db6b6917d8b8bcb988ec4d84b2a840a4ef6362909b7e230a0e0b6
DIST logstash-oss-7.16.2-linux-x86_64.tar.gz 365422510 BLAKE2B
89a9ea82d6eb028e4dea18f19453671a138d26507c0dd3409f8113d48de4bcf2bb93f11cc7f1d4e85596cc5ba5e3219d2abe1a9ef55c753e0cc13f6cefa3d2f5
SHA512
b87925bd62387bfcf9e06efedb6e18daf15d221a81f60ed16a837e3c2673948b1c835703675ece7101f9da03ae202f55d2e1859a9fd67d420d824ef69bd1bb1a
+DIST logstash-oss-7.16.3-linux-x86_64.tar.gz 364597354 BLAKE2B
9ddda512913491cc178fccc513d9a26298dda62169db8e8e1c61d6c37ad4af08b1cc152d978f8b353030d9366a07e53acc4596162ab5f7f5e57060d953d99c97
SHA512
b49ed0923ac202e406919758fbeadf1169492ff3d60adad6dba5e2eb3de08344b1e060d6efa2161c1653636bf51f7f8f877992f0d2cd06c5d35d7323f84dadbc
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
b/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
new file mode 100644
index 000000000000..8388a11e7f88
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+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="acct-group/logstash
+ acct-user/logstash
+ virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ 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/logstash-bin-7.16.3.ebuild
b/app-admin/logstash-bin/logstash-bin-7.16.3.ebuild
new file mode 100644
index 000000000000..ddceca40f83c
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.16.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+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}-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 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+ acct-user/logstash
+ virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ local d
+ for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux
i386-SunOS \
+ i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux
\
+ ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS
x86_64-DragonFlyBSD \
+ x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
+ rm -r vendor/jruby/lib/jni/$d || die
+ done
+
+ # remove bundled java
+ rm -r jdk || die
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ 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"
+}
