Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/
Date: Mon, 31 May 2021 08:20:11
Message-Id: 1622448935.1b48d2aebf253e7b6f2adbfa09d54baeefa88c53.sam@gentoo
1 commit: 1b48d2aebf253e7b6f2adbfa09d54baeefa88c53
2 Author: Ferenc Erki <erkiferenc <AT> gmail <DOT> com>
3 AuthorDate: Sat May 29 19:14:00 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 08:15:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b48d2ae
7
8 app-admin/logstash-bin: drop vulnerable
9
10 Bug: https://bugs.gentoo.org/790287
11 Signed-off-by: Ferenc Erki <erkiferenc <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/21043
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 app-admin/logstash-bin/Manifest | 2 -
16 app-admin/logstash-bin/logstash-bin-7.10.2.ebuild | 88 -----------------------
17 2 files changed, 90 deletions(-)
18
19 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
20 index dc178438def..7eb1f33754d 100644
21 --- a/app-admin/logstash-bin/Manifest
22 +++ b/app-admin/logstash-bin/Manifest
23 @@ -1,8 +1,6 @@
24 DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01
25 -DIST logstash-7.10.2-linux-x86_64.tar.gz 351170815 BLAKE2B 536a33de4be4bd1b6dfccf7d4cedc064b0f0b9c0569545d195244cf14f38d9c83159439d7710a76fdc4e4394b5f7d5a1919460c1c03186b4fc7f054744a46016 SHA512 34099b34a05c6b85b1b355310bd190b606aa0bcce1cad07bf5fd98959e54f61860bdd697cca8f3cdab2d2b815bbc2a788d2e14dcac4b3d85a0d5bafd72d2b170
26 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195
27 DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834
28 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2
29 -DIST logstash-oss-7.10.2-linux-x86_64.tar.gz 350992238 BLAKE2B f31207af62b6ff36af4be6fae9c6ede18a481317d28ba2ee6469cd095acba9b41ad4d7598756a51a078bf3d4269ae2f11750e4117842e496811a79825f284aef SHA512 5425483a7d3ec5ba186574940031a529efa683f452f5e3e38ffd9bd07771beabdd5c54a8147ed42fe761b700ea5c294018f1efb22fa6fdcf23189f2aea314b5b
30 DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60
31 DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4
32
33 diff --git a/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild
34 deleted file mode 100644
35 index 2003a547d37..00000000000
36 --- a/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild
37 +++ /dev/null
38 @@ -1,88 +0,0 @@
39 -# Copyright 1999-2020 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -
44 -inherit java-pkg-2
45 -
46 -MY_PN="${PN%-bin}"
47 -MY_P="${MY_PN}-${PV}"
48 -
49 -DESCRIPTION="Tool for managing events and logs"
50 -HOMEPAGE="https://www.elastic.co/products/logstash"
51 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
52 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
53 -
54 -# source: LICENSE.txt and NOTICE.txt
55 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
56 -SLOT="0"
57 -KEYWORDS="~amd64"
58 -IUSE="x-pack"
59 -
60 -RESTRICT="strip"
61 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
62 -
63 -RDEPEND="acct-group/logstash
64 - acct-user/logstash
65 - virtual/jre"
66 -
67 -S="${WORKDIR}/${MY_P}"
68 -
69 -src_prepare() {
70 - default
71 -
72 - local d
73 - for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
74 - i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
75 - ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
76 - x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
77 - rm -r vendor/jruby/lib/jni/$d || die
78 - done
79 -
80 - # remove bundled java
81 - rm -r jdk || die
82 -}
83 -
84 -src_install() {
85 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
86 - keepdir "/var/log/${MY_PN}"
87 -
88 - insinto "/usr/share/${MY_PN}"
89 - newins "${FILESDIR}/agent.conf.sample" agent.conf
90 -
91 - rm -v config/{pipelines.yml,startup.options} || die
92 - insinto /etc/${MY_PN}
93 - doins -r config/.
94 - doins "${FILESDIR}/pipelines.yml"
95 - rm -rv config data || die
96 -
97 - insinto "/opt/${MY_PN}"
98 - doins -r .
99 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
100 -
101 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
102 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
103 -
104 - insinto /usr/share/eselect/modules
105 - doins "${FILESDIR}"/logstash-plugin.eselect
106 -}
107 -
108 -pkg_postinst() {
109 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
110 - ewarn "Install the plugins via eselect module that will automatically re-install"
111 - ewarn "all self installed plugins after Logstash upgrades."
112 - elog
113 - elog "Installing plugins:"
114 - elog "eselect logstash-plugin install logstash-output-gelf"
115 - elog
116 -
117 - elog "Reinstalling self installed plugins (installed via eselect module):"
118 - eselect logstash-plugin reinstall
119 -
120 - elog
121 - elog "Sample configuration:"
122 - elog "${EROOT}/usr/share/${MY_PN}"
123 - elog
124 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
125 - elog "${EROOT}/etc/logstash/conf.d/*.conf"
126 -}