Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/
Date: Mon, 04 Mar 2019 15:58:13
Message-Id: 1551714878.63c5fd041716434d8dd6a1d632be0e8696251ca3.whissi@gentoo
1 commit: 63c5fd041716434d8dd6a1d632be0e8696251ca3
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 4 10:54:40 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 4 15:54:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c5fd04
7
8 app-admin/logstash-bin: drop vulnerable
9
10 Bug: https://bugs.gentoo.org/678954
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
13 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
14
15 app-admin/logstash-bin/Manifest | 7 ---
16 app-admin/logstash-bin/logstash-bin-5.6.13.ebuild | 77 -----------------------
17 app-admin/logstash-bin/logstash-bin-6.3.2.ebuild | 77 -----------------------
18 app-admin/logstash-bin/logstash-bin-6.4.3.ebuild | 77 -----------------------
19 app-admin/logstash-bin/logstash-bin-6.5.4.ebuild | 77 -----------------------
20 5 files changed, 315 deletions(-)
21
22 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
23 index 65a612cea44..781355621ac 100644
24 --- a/app-admin/logstash-bin/Manifest
25 +++ b/app-admin/logstash-bin/Manifest
26 @@ -1,10 +1,3 @@
27 -DIST logstash-5.6.13.tar.gz 104517136 BLAKE2B c4f0ba5f8e1624ef0493e553166a3c18aab9c4d73a661a5f91988627ec8470dc8a1b52461673e27169c8c10b33dfdeffeef96e70e1a8a04b7ee4a1e71a9afb68 SHA512 df12877b8d28ce9392f9d9ec9414205dd1f628a8e927c8b31f0ad3c3c7b11108509fe6b44119faa3f1bab393ea7be74a3a7c5b5b6b49d6ff5b54ce31fd024a04
28 DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
29 -DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
30 -DIST logstash-6.4.3.tar.gz 153936585 BLAKE2B efdcc4664587a3ab18e2e78136c92bc643e99989fa5ac1cd1daaeb48ca1f6fa57f122a5686ddcaab59d920a0ef0e59dc70f59c05a520b731347f37d8faa78c38 SHA512 39bab1b9b0c9f0006c2ad7aa152b3863179030352202ec0c4c4a887bdeb98d4c34127699655cfc7c5b9f44119b45de9629bfacc670d520dcf266b3298fdf2484
31 -DIST logstash-6.5.4.tar.gz 160286824 BLAKE2B 6f76edee968566539670b0ffc5462a0a417d39dc8f7d3fab35704ace23c27503f7051a064fca2820d52b100a19818621841356f8e1df20a80c95902f4c1c7f95 SHA512 8dff51b3944219b462002d0ced4ae7050d8ab8f9335de1132be11ab8e7277731f319c5794601881ee94350152725c599093316c5ef55ddc95279697ec794cc57
32 DIST logstash-6.6.1.tar.gz 169642354 BLAKE2B 335fa036e9f120de5d6588ed18e927ddfb3a94dfcfbc9605fbda3e3eb4da3ba88561d466eb171c85a2deebb3328312ba903616704844e253a7599f75597efbae SHA512 a66f196f160af29492b64efb61b7e3253a4ef45764c5e6226f73c2a216151ff43f6d344c2e3340a1a9ddb8b00e61f14c65d5dd0c14d69421f4efa3542445fe4f
33 -DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
34 -DIST logstash-oss-6.4.3.tar.gz 153809786 BLAKE2B 774e67b7f3b89747299fda520456164186e843dedbea4b6727fa325dc8148ea1b25fcb2105e76b84330729a55390e597fac93cf2e2f258e83f2b6cc1c1091372 SHA512 c84e4fcdbf8e96e5d3005186bdf45f20939bb065f02370128b4e15273c4c0fe5609bab606fc7a6a2b71fcee90beb3f435ff42c9126efaed436bf5af1d784c56a
35 -DIST logstash-oss-6.5.4.tar.gz 160157672 BLAKE2B 47a6de33697ccc04ba08cb15086cb17ead20a38c9348619ddcd383e61c20265864451939f5be10ec9ebd0ba9b0667264af389130f87181734b942efa49c7e705 SHA512 0b8384e48bc584236fa7369339843c9aa1d08fb09a80e209beabf8e029f2fb5a4a5a1a5ef8b91f069cb35472d3b8147752749a4f6a84c6fc5a2cc801ac8d3c91
36 DIST logstash-oss-6.6.1.tar.gz 169512439 BLAKE2B 54a18deda80079c9bf2de39936737689d696a4ddc6f8a7ae375d48817ea127f1eb83f1ef50a18b573709446fc3deb858f53a5aff6411329b52ef0316859a7f03 SHA512 7fbe960e615c3c6b6715bd63debd3db869abe29bfdc94d4947290b822fe1d858e289548dbda266c8ad6d25745e63a788de0c83566121faa0d3027642b0f3d108
37
38 diff --git a/app-admin/logstash-bin/logstash-bin-5.6.13.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.13.ebuild
39 deleted file mode 100644
40 index 9692d38eba5..00000000000
41 --- a/app-admin/logstash-bin/logstash-bin-5.6.13.ebuild
42 +++ /dev/null
43 @@ -1,77 +0,0 @@
44 -# Copyright 1999-2018 Gentoo Authors
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=6
48 -
49 -inherit java-pkg-2 user
50 -
51 -MY_PN="${PN%-bin}"
52 -MY_P="${MY_PN}-${PV}"
53 -
54 -DESCRIPTION="Tool for managing events and logs"
55 -HOMEPAGE="https://www.elastic.co/products/logstash"
56 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
57 -
58 -# source: LICENSE.txt and NOTICE.txt
59 -LICENSE="Apache-2.0 MIT"
60 -SLOT="0"
61 -KEYWORDS="~amd64"
62 -
63 -RESTRICT="strip"
64 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
65 -
66 -RDEPEND="virtual/jre:1.8"
67 -
68 -S="${WORKDIR}/${MY_P}"
69 -
70 -pkg_setup() {
71 - enewgroup ${MY_PN}
72 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
73 -}
74 -
75 -src_install() {
76 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
77 - keepdir "/var/lib/${MY_PN}"
78 - keepdir "/var/log/${MY_PN}"
79 -
80 - insinto "/usr/share/${MY_PN}"
81 - newins "${FILESDIR}/agent.conf.sample" agent.conf
82 -
83 - rm -v config/startup.options || die
84 - insinto /etc/${MY_PN}
85 - doins -r config/.
86 - rm -rv config data || die
87 -
88 - insinto "/opt/${MY_PN}"
89 - doins -r .
90 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
91 -
92 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
93 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
94 -
95 - insinto /usr/share/eselect/modules
96 - doins "${FILESDIR}"/logstash-plugin.eselect
97 -}
98 -
99 -pkg_postinst() {
100 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
101 - ewarn "Please ensure any running logstash processes are shut down cleanly."
102 - ewarn
103 - ewarn "The default data directory has been moved from /opt/logstash/data to"
104 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
105 - ewarn
106 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
107 - ewarn "Install the plugins via eselect module that will automatically re-install"
108 - ewarn "all self installed plugins after Logstash upgrades."
109 - elog
110 - elog "Installing plugins:"
111 - elog "eselect logstash-plugin install logstash-output-gelf"
112 - elog
113 -
114 - elog "Reinstalling self installed plugins (installed via eselect module):"
115 - eselect logstash-plugin reinstall
116 -
117 - elog
118 - elog "Sample configuration:"
119 - elog "${EROOT%/}/usr/share/${MY_PN}"
120 -}
121
122 diff --git a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
123 deleted file mode 100644
124 index acbb17a3c74..00000000000
125 --- a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
126 +++ /dev/null
127 @@ -1,77 +0,0 @@
128 -# Copyright 1999-2018 Gentoo Foundation
129 -# Distributed under the terms of the GNU General Public License v2
130 -
131 -EAPI=6
132 -
133 -inherit java-pkg-2 user
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}.tar.gz )
141 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.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="virtual/jre:1.8"
153 -
154 -S="${WORKDIR}/${MY_P}"
155 -
156 -pkg_setup() {
157 - enewgroup ${MY_PN}
158 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
159 -}
160 -
161 -src_install() {
162 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
163 - keepdir "/var/lib/${MY_PN}"
164 - keepdir "/var/log/${MY_PN}"
165 -
166 - insinto "/usr/share/${MY_PN}"
167 - newins "${FILESDIR}/agent.conf.sample" agent.conf
168 -
169 - rm -v config/{pipelines.yml,startup.options} || die
170 - insinto /etc/${MY_PN}
171 - doins -r config/.
172 - doins "${FILESDIR}/pipelines.yml"
173 - rm -rv config data || die
174 -
175 - insinto "/opt/${MY_PN}"
176 - doins -r .
177 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
178 -
179 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
180 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
181 -
182 - insinto /usr/share/eselect/modules
183 - doins "${FILESDIR}"/logstash-plugin.eselect
184 -}
185 -
186 -pkg_postinst() {
187 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
188 - ewarn "Install the plugins via eselect module that will automatically re-install"
189 - ewarn "all self installed plugins after Logstash upgrades."
190 - elog
191 - elog "Installing plugins:"
192 - elog "eselect logstash-plugin install logstash-output-gelf"
193 - elog
194 -
195 - elog "Reinstalling self installed plugins (installed via eselect module):"
196 - eselect logstash-plugin reinstall
197 -
198 - elog
199 - elog "Sample configuration:"
200 - elog "${EROOT%/}/usr/share/${MY_PN}"
201 - elog
202 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
203 - elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
204 -}
205
206 diff --git a/app-admin/logstash-bin/logstash-bin-6.4.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.4.3.ebuild
207 deleted file mode 100644
208 index 7cc0ca6f38b..00000000000
209 --- a/app-admin/logstash-bin/logstash-bin-6.4.3.ebuild
210 +++ /dev/null
211 @@ -1,77 +0,0 @@
212 -# Copyright 1999-2018 Gentoo Authors
213 -# Distributed under the terms of the GNU General Public License v2
214 -
215 -EAPI=6
216 -
217 -inherit java-pkg-2 user
218 -
219 -MY_PN="${PN%-bin}"
220 -MY_P="${MY_PN}-${PV}"
221 -
222 -DESCRIPTION="Tool for managing events and logs"
223 -HOMEPAGE="https://www.elastic.co/products/logstash"
224 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
225 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
226 -
227 -# source: LICENSE.txt and NOTICE.txt
228 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
229 -SLOT="0"
230 -KEYWORDS="~amd64"
231 -IUSE="x-pack"
232 -
233 -RESTRICT="strip"
234 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
235 -
236 -RDEPEND="virtual/jre:1.8"
237 -
238 -S="${WORKDIR}/${MY_P}"
239 -
240 -pkg_setup() {
241 - enewgroup ${MY_PN}
242 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
243 -}
244 -
245 -src_install() {
246 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
247 - keepdir "/var/lib/${MY_PN}"
248 - keepdir "/var/log/${MY_PN}"
249 -
250 - insinto "/usr/share/${MY_PN}"
251 - newins "${FILESDIR}/agent.conf.sample" agent.conf
252 -
253 - rm -v config/{pipelines.yml,startup.options} || die
254 - insinto /etc/${MY_PN}
255 - doins -r config/.
256 - doins "${FILESDIR}/pipelines.yml"
257 - rm -rv config data || die
258 -
259 - insinto "/opt/${MY_PN}"
260 - doins -r .
261 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
262 -
263 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
264 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
265 -
266 - insinto /usr/share/eselect/modules
267 - doins "${FILESDIR}"/logstash-plugin.eselect
268 -}
269 -
270 -pkg_postinst() {
271 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
272 - ewarn "Install the plugins via eselect module that will automatically re-install"
273 - ewarn "all self installed plugins after Logstash upgrades."
274 - elog
275 - elog "Installing plugins:"
276 - elog "eselect logstash-plugin install logstash-output-gelf"
277 - elog
278 -
279 - elog "Reinstalling self installed plugins (installed via eselect module):"
280 - eselect logstash-plugin reinstall
281 -
282 - elog
283 - elog "Sample configuration:"
284 - elog "${EROOT%/}/usr/share/${MY_PN}"
285 - elog
286 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
287 - elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
288 -}
289
290 diff --git a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
291 deleted file mode 100644
292 index 7cc0ca6f38b..00000000000
293 --- a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
294 +++ /dev/null
295 @@ -1,77 +0,0 @@
296 -# Copyright 1999-2018 Gentoo Authors
297 -# Distributed under the terms of the GNU General Public License v2
298 -
299 -EAPI=6
300 -
301 -inherit java-pkg-2 user
302 -
303 -MY_PN="${PN%-bin}"
304 -MY_P="${MY_PN}-${PV}"
305 -
306 -DESCRIPTION="Tool for managing events and logs"
307 -HOMEPAGE="https://www.elastic.co/products/logstash"
308 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
309 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
310 -
311 -# source: LICENSE.txt and NOTICE.txt
312 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
313 -SLOT="0"
314 -KEYWORDS="~amd64"
315 -IUSE="x-pack"
316 -
317 -RESTRICT="strip"
318 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
319 -
320 -RDEPEND="virtual/jre:1.8"
321 -
322 -S="${WORKDIR}/${MY_P}"
323 -
324 -pkg_setup() {
325 - enewgroup ${MY_PN}
326 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
327 -}
328 -
329 -src_install() {
330 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
331 - keepdir "/var/lib/${MY_PN}"
332 - keepdir "/var/log/${MY_PN}"
333 -
334 - insinto "/usr/share/${MY_PN}"
335 - newins "${FILESDIR}/agent.conf.sample" agent.conf
336 -
337 - rm -v config/{pipelines.yml,startup.options} || die
338 - insinto /etc/${MY_PN}
339 - doins -r config/.
340 - doins "${FILESDIR}/pipelines.yml"
341 - rm -rv config data || die
342 -
343 - insinto "/opt/${MY_PN}"
344 - doins -r .
345 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
346 -
347 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
348 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
349 -
350 - insinto /usr/share/eselect/modules
351 - doins "${FILESDIR}"/logstash-plugin.eselect
352 -}
353 -
354 -pkg_postinst() {
355 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
356 - ewarn "Install the plugins via eselect module that will automatically re-install"
357 - ewarn "all self installed plugins after Logstash upgrades."
358 - elog
359 - elog "Installing plugins:"
360 - elog "eselect logstash-plugin install logstash-output-gelf"
361 - elog
362 -
363 - elog "Reinstalling self installed plugins (installed via eselect module):"
364 - eselect logstash-plugin reinstall
365 -
366 - elog
367 - elog "Sample configuration:"
368 - elog "${EROOT%/}/usr/share/${MY_PN}"
369 - elog
370 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
371 - elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
372 -}