Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/
Date: Mon, 04 Oct 2021 12:51:54
Message-Id: 1633351733.b442c5e6de7f963b6f7c5c0b5639769d48aa10f9.juippis@gentoo
1 commit: b442c5e6de7f963b6f7c5c0b5639769d48aa10f9
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 24 21:25:16 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 12:48:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b442c5e6
7
8 app-admin/logstash-bin: bump to 6.8.19/7.15.0
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 app-admin/logstash-bin/Manifest | 4 ++
14 app-admin/logstash-bin/logstash-bin-6.8.19.ebuild | 73 +++++++++++++++++++
15 app-admin/logstash-bin/logstash-bin-7.15.0.ebuild | 88 +++++++++++++++++++++++
16 3 files changed, 165 insertions(+)
17
18 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
19 index b7e2db23968..6e05e409cd0 100644
20 --- a/app-admin/logstash-bin/Manifest
21 +++ b/app-admin/logstash-bin/Manifest
22 @@ -1,14 +1,18 @@
23 DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01
24 DIST logstash-6.8.16.tar.gz 176912473 BLAKE2B ec7d5fb92a2ef55499b395a855bc5cfd3c953180d5bd443bd70ff792f12c51a6635d1cc60cf115cab6b934c6201f889f8fbb3b3e35a4841b177d42d0d6864c3f SHA512 c272fb8b0e03c37a057f7789989645077279492abca58a690fbc50e8e5e428a8f3c765e7d68d37ddaf927650b563d1ab0f637eb8a5213f4f0475bbfed1264caf
25 DIST logstash-6.8.17.tar.gz 179116623 BLAKE2B fa25a3149fded215586d97b3bd2a2b2b168292d45e32f1b69987c9e6e9e6f35100643df09d03f51da042b27acfd57bfcfdb1f4f18fddf7b9d21e01ef84668cc7 SHA512 00cf51cbce906d2594b0a17548d362fe678f458a2e7f9c167d4387953a848a588dbba070d370002a5e4d7ca2df2e3910805a27e3c0263ab29d99042229af0c3a
26 +DIST logstash-6.8.19.tar.gz 179116787 BLAKE2B 156c915e4932acd1668b811f0c39c51870faa1ad462b6059a89e4f085af7e8aeaebcb458d65dec5fbc925ba49293db662af1fcb62f3a3b02eabe7756f6f193ab SHA512 19648c9f5f4ae2d222157d45a639f8e6740cd96610fa44a3374c036944b2dba8582f69909ece3e6b0cefe2f340cdc3094bb4b6daace2e564935cad4f8a4f4b19
27 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195
28 DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834
29 DIST logstash-7.13.2-linux-x86_64.tar.gz 360899712 BLAKE2B 327c5a2820cc42ec0d63bd5d8e1983f37e217e7fe28eebe326a7437b938a3602b387e0138c0055b3b23f8d657013e79a8d7b9b0ad698075667a0c944c07e7dd8 SHA512 706a107fefc587262c27d754ddddce482affc6b12e240895d56ec61e97887f1edf7b0a0888e089827c622917d772f3b9231b6aadf352f5e78c7eee98cfdbfb2b
30 DIST logstash-7.13.4-linux-x86_64.tar.gz 361126551 BLAKE2B e972b2c6b992573f0320de0487141c17fa6cd1889d7d266f79958fbc261a4e8564b9f9fc88b654de7e476c6c2747f47e169d0fd3601888035193a2cb844fd710 SHA512 2dba64af5f6b0724a75a8f4f3dc9fb067e27785fd5d0b9ef0571c77df6ebaa89418a165b7489ad47676847c4a9f928cbfc8d3ddc885db21053d0bda9dd524f49
31 +DIST logstash-7.15.0-linux-x86_64.tar.gz 368280150 BLAKE2B 6e98096782ba4b36428b72e6f48007ccb6db05ac5032475267ebd1564dac1c136a059b42330f85efc8a758372fe0851b6c0d676f4062e01fe2c0d8f6c010de70 SHA512 50503eeea1ebed2540fac23429962f945e66fd8e1c260b6f4d3a80b220d83f2799d703b5d7778c6c80aed90c9e36cd777a580d63c80ab78dd440e26ff2e8b7ac
32 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2
33 DIST logstash-oss-6.8.16.tar.gz 176782454 BLAKE2B afdea56bbaa2623548948722f5dcd85172e0d3580c302fde91e1f6d0af66e82538465da9aeb428bbb9e66c7a8bdd29ce69279098d5c3ee9a7c2ac1efdbedb628 SHA512 d994472606cbb474471441a238c6bfacf9c1cdf1adf20129a8bc256daab9ea49adaa8c425c9a41520846465393a2c112ec6c83478579620ebbf446e528accf20
34 DIST logstash-oss-6.8.17.tar.gz 178986613 BLAKE2B 5e318903fb134f6096fb983d3651d5d81c2bc9d62421aa7468ee7cb82a5e7895a517911a759d82f1f2c939c3ce67df4e26c1296c0871cb1cfb8078627e68e5f3 SHA512 0f43f9f0dc4a253c6d5a6f07234a22bc67b8866dd6f25837372c1d3c9cca2ddb1b94b632c4528324eeb23019d5d1ae7374661dec8011e55210555e01bec77c2c
35 +DIST logstash-oss-6.8.19.tar.gz 178986302 BLAKE2B 54ff9be5f26f5e1aaf69403a05ec15358951f5ff4676ba1dc22d995c59071554ef542100400712238c01924a07de5777cda13b0cb84f8d19f1b953405eaab82e SHA512 2f7a2b187c418ba85fff5c86ff12379bc0a8ae0fe098f713c6d5c5339b6aec19589382e0817f6bf495c253f13f489eecb9161daa9102b366ef32073def4e75cf
36 DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60
37 DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4
38 DIST logstash-oss-7.13.2-linux-x86_64.tar.gz 360703237 BLAKE2B 130b68f77fb5b52db71d478801afe498ab157f2b38c56e67455b28bc7358faaae9663c79b515031544136e6dc126d8d96b6fab8f7802bf84d5125850540feaae SHA512 0d4cc38740b9a9b44a528a148ea8f2032a27af275bf4508700ec62ae3d74987c4fbbda72b4b6fb4a4059e9be3a7949813ad401187d43335e99b9a280350fba93
39 DIST logstash-oss-7.13.4-linux-x86_64.tar.gz 360925283 BLAKE2B 68482538d4b2589044215495ab7d41b4820650908d979438b197c5ee4ff82dfc53580fba7c834c62964e9b12ff23e6d9ecfc6e333a2cb6f077d6d4c953527173 SHA512 d57c30c763ba3323380c7276a49895ce3adbe90700061bdf1ce8c6abe98c4ac0c5789ac2a725f15d8d4f89c80dec691479027887b8976dcd618aa91f7af13d8e
40 +DIST logstash-oss-7.15.0-linux-x86_64.tar.gz 368079309 BLAKE2B 8f21ad0572b93ea7711fc4e721afcb067a629798b72325bff5642b3406e432da5ad6c0b4515ea6e4fa1e2412fdaae464f97bebc1531c61b30abfa8f8ddbb27b8 SHA512 648d83444cdf4997175eb48833cb4ddad09876fd65f6a01bc6ad2d983eb109707885a08250191b066f9d3775247774e09ecdbb7bcac2f7c22c6f1901f0648ba8
41
42 diff --git a/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild
43 new file mode 100644
44 index 00000000000..beabb835c09
45 --- /dev/null
46 +++ b/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild
47 @@ -0,0 +1,73 @@
48 +# Copyright 1999-2021 Gentoo Authors
49 +# Distributed under the terms of the GNU General Public License v2
50 +
51 +EAPI=7
52 +
53 +inherit java-pkg-2
54 +
55 +MY_PN="${PN%-bin}"
56 +MY_P="${MY_PN}-${PV}"
57 +
58 +DESCRIPTION="Tool for managing events and logs"
59 +HOMEPAGE="https://www.elastic.co/products/logstash"
60 +SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
61 + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
62 +
63 +# source: LICENSE.txt and NOTICE.txt
64 +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
65 +SLOT="0"
66 +KEYWORDS="~amd64"
67 +IUSE="x-pack"
68 +
69 +RESTRICT="strip"
70 +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
71 +
72 +RDEPEND="acct-group/logstash
73 + acct-user/logstash
74 + virtual/jre:1.8"
75 +
76 +S="${WORKDIR}/${MY_P}"
77 +
78 +src_install() {
79 + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
80 + keepdir "/var/log/${MY_PN}"
81 +
82 + insinto "/usr/share/${MY_PN}"
83 + newins "${FILESDIR}/agent.conf.sample" agent.conf
84 +
85 + rm -v config/{pipelines.yml,startup.options} || die
86 + insinto /etc/${MY_PN}
87 + doins -r config/.
88 + doins "${FILESDIR}/pipelines.yml"
89 + rm -rv config data || die
90 +
91 + insinto "/opt/${MY_PN}"
92 + doins -r .
93 + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
94 +
95 + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
96 + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
97 +
98 + insinto /usr/share/eselect/modules
99 + doins "${FILESDIR}"/logstash-plugin.eselect
100 +}
101 +
102 +pkg_postinst() {
103 + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
104 + ewarn "Install the plugins via eselect module that will automatically re-install"
105 + ewarn "all self installed plugins after Logstash upgrades."
106 + elog
107 + elog "Installing plugins:"
108 + elog "eselect logstash-plugin install logstash-output-gelf"
109 + elog
110 +
111 + elog "Reinstalling self installed plugins (installed via eselect module):"
112 + eselect logstash-plugin reinstall
113 +
114 + elog
115 + elog "Sample configuration:"
116 + elog "${EROOT}/usr/share/${MY_PN}"
117 + elog
118 + elog "The default pipeline configuration expects the configuration(s) to be found in:"
119 + elog "${EROOT}/etc/logstash/conf.d/*.conf"
120 +}
121
122 diff --git a/app-admin/logstash-bin/logstash-bin-7.15.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.15.0.ebuild
123 new file mode 100644
124 index 00000000000..aea75866ef6
125 --- /dev/null
126 +++ b/app-admin/logstash-bin/logstash-bin-7.15.0.ebuild
127 @@ -0,0 +1,88 @@
128 +# Copyright 1999-2021 Gentoo Authors
129 +# Distributed under the terms of the GNU General Public License v2
130 +
131 +EAPI=7
132 +
133 +inherit java-pkg-2
134 +
135 +MY_PN="${PN%-bin}"
136 +MY_P="${MY_PN}-${PV}"
137 +
138 +DESCRIPTION="Tool for managing events and logs"
139 +HOMEPAGE="https://www.elastic.co/products/logstash"
140 +SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
141 + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
142 +
143 +# source: LICENSE.txt and NOTICE.txt
144 +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
145 +SLOT="0"
146 +KEYWORDS="~amd64"
147 +IUSE="x-pack"
148 +
149 +RESTRICT="strip"
150 +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
151 +
152 +RDEPEND="acct-group/logstash
153 + acct-user/logstash
154 + virtual/jre"
155 +
156 +S="${WORKDIR}/${MY_P}"
157 +
158 +src_prepare() {
159 + default
160 +
161 + local d
162 + for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
163 + i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
164 + ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
165 + x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
166 + rm -r vendor/jruby/lib/jni/$d || die
167 + done
168 +
169 + # remove bundled java
170 + rm -r jdk || die
171 +}
172 +
173 +src_install() {
174 + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
175 + keepdir "/var/log/${MY_PN}"
176 +
177 + insinto "/usr/share/${MY_PN}"
178 + newins "${FILESDIR}/agent.conf.sample" agent.conf
179 +
180 + rm -v config/{pipelines.yml,startup.options} || die
181 + insinto /etc/${MY_PN}
182 + doins -r config/.
183 + doins "${FILESDIR}/pipelines.yml"
184 + rm -rv config data || die
185 +
186 + insinto "/opt/${MY_PN}"
187 + doins -r .
188 + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
189 +
190 + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
191 + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
192 +
193 + insinto /usr/share/eselect/modules
194 + doins "${FILESDIR}"/logstash-plugin.eselect
195 +}
196 +
197 +pkg_postinst() {
198 + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
199 + ewarn "Install the plugins via eselect module that will automatically re-install"
200 + ewarn "all self installed plugins after Logstash upgrades."
201 + elog
202 + elog "Installing plugins:"
203 + elog "eselect logstash-plugin install logstash-output-gelf"
204 + elog
205 +
206 + elog "Reinstalling self installed plugins (installed via eselect module):"
207 + eselect logstash-plugin reinstall
208 +
209 + elog
210 + elog "Sample configuration:"
211 + elog "${EROOT}/usr/share/${MY_PN}"
212 + elog
213 + elog "The default pipeline configuration expects the configuration(s) to be found in:"
214 + elog "${EROOT}/etc/logstash/conf.d/*.conf"
215 +}