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: Sun, 30 Aug 2020 21:46:44
Message-Id: 1598823992.4649f4932726cbdc92703a570cb19213170a16da.whissi@gentoo
1 commit: 4649f4932726cbdc92703a570cb19213170a16da
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 28 04:33:19 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 21:46:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4649f493
7
8 app-admin/logstash-bin: bump to 6.8.12/7.9.0
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 app-admin/logstash-bin/Manifest | 4 +
14 app-admin/logstash-bin/logstash-bin-6.8.12.ebuild | 73 +++++++++++++++++++
15 app-admin/logstash-bin/logstash-bin-7.9.0.ebuild | 89 +++++++++++++++++++++++
16 3 files changed, 166 insertions(+)
17
18 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
19 index 3cfaa0c0541..bdee93682b9 100644
20 --- a/app-admin/logstash-bin/Manifest
21 +++ b/app-admin/logstash-bin/Manifest
22 @@ -1,8 +1,12 @@
23 DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
24 +DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47
25 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
26 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
27 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
28 +DIST logstash-7.9.0.tar.gz 158351233 BLAKE2B 67b8163312f832626227cb0e509b231254c331be4a7e8e9dbca4bc948f5ac05137ec0ff98c45a91f487aa53fc758d21ea4b5eff23b7f19dc3692bbab88087fa5 SHA512 61409b0a3d50f4fef3d42fefb6b39d4ff725478a9092f2e291eaca6aad6be2639a8675507f0be01ae74e88f4820aca242a94b9b79875b614ee3c2413ebe4a5db
29 DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
30 +DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
31 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
32 DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
33 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
34 +DIST logstash-oss-7.9.0.tar.gz 158167981 BLAKE2B 84f16d57ad2ce9ccda31a8621b1d71c47267b72c441e86d9afd6b5b713b94bd0662486dc7e8bd8aa967c8c2479f8054285227f8e3a2ad46c5e38e313a8cff793 SHA512 7304ddfd87c418f5ff52ea7f7db1bcc9f202cd83675373ef53dd0e8007d3b22eb16c77fc09eac8e1318257813fefe3108570bc5d84d088ec3c26d789ab7cacfd
35
36 diff --git a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
37 new file mode 100644
38 index 00000000000..08167fb0287
39 --- /dev/null
40 +++ b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
41 @@ -0,0 +1,73 @@
42 +# Copyright 1999-2020 Gentoo Authors
43 +# Distributed under the terms of the GNU General Public License v2
44 +
45 +EAPI=7
46 +
47 +inherit java-pkg-2
48 +
49 +MY_PN="${PN%-bin}"
50 +MY_P="${MY_PN}-${PV}"
51 +
52 +DESCRIPTION="Tool for managing events and logs"
53 +HOMEPAGE="https://www.elastic.co/products/logstash"
54 +SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
55 + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
56 +
57 +# source: LICENSE.txt and NOTICE.txt
58 +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
59 +SLOT="0"
60 +KEYWORDS="~amd64"
61 +IUSE="x-pack"
62 +
63 +RESTRICT="strip"
64 +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
65 +
66 +RDEPEND="acct-group/logstash
67 + acct-user/logstash
68 + virtual/jre:1.8"
69 +
70 +S="${WORKDIR}/${MY_P}"
71 +
72 +src_install() {
73 + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
74 + keepdir "/var/log/${MY_PN}"
75 +
76 + insinto "/usr/share/${MY_PN}"
77 + newins "${FILESDIR}/agent.conf.sample" agent.conf
78 +
79 + rm -v config/{pipelines.yml,startup.options} || die
80 + insinto /etc/${MY_PN}
81 + doins -r config/.
82 + doins "${FILESDIR}/pipelines.yml"
83 + rm -rv config data || die
84 +
85 + insinto "/opt/${MY_PN}"
86 + doins -r .
87 + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
88 +
89 + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
90 + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
91 +
92 + insinto /usr/share/eselect/modules
93 + doins "${FILESDIR}"/logstash-plugin.eselect
94 +}
95 +
96 +pkg_postinst() {
97 + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
98 + ewarn "Install the plugins via eselect module that will automatically re-install"
99 + ewarn "all self installed plugins after Logstash upgrades."
100 + elog
101 + elog "Installing plugins:"
102 + elog "eselect logstash-plugin install logstash-output-gelf"
103 + elog
104 +
105 + elog "Reinstalling self installed plugins (installed via eselect module):"
106 + eselect logstash-plugin reinstall
107 +
108 + elog
109 + elog "Sample configuration:"
110 + elog "${EROOT}/usr/share/${MY_PN}"
111 + elog
112 + elog "The default pipeline configuration expects the configuration(s) to be found in:"
113 + elog "${EROOT}/etc/logstash/conf.d/*.conf"
114 +}
115
116 diff --git a/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild
117 new file mode 100644
118 index 00000000000..f4705732966
119 --- /dev/null
120 +++ b/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild
121 @@ -0,0 +1,89 @@
122 +# Copyright 1999-2020 Gentoo Authors
123 +# Distributed under the terms of the GNU General Public License v2
124 +
125 +EAPI=7
126 +
127 +inherit java-pkg-2
128 +
129 +MY_PN="${PN%-bin}"
130 +MY_P="${MY_PN}-${PV}"
131 +
132 +DESCRIPTION="Tool for managing events and logs"
133 +HOMEPAGE="https://www.elastic.co/products/logstash"
134 +SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
135 + !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
136 +
137 +# source: LICENSE.txt and NOTICE.txt
138 +LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
139 +SLOT="0"
140 +KEYWORDS="~amd64"
141 +IUSE="x-pack"
142 +
143 +RESTRICT="strip"
144 +QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
145 +
146 +RDEPEND="acct-group/logstash
147 + acct-user/logstash
148 + virtual/jre"
149 +
150 +S="${WORKDIR}/${MY_P}"
151 +
152 +src_prepare() {
153 + default
154 +
155 + rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
156 + vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
157 + vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
158 + vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
159 + vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
160 + vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
161 + vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
162 + vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
163 + vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
164 + vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
165 + vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
166 +}
167 +
168 +src_install() {
169 + keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
170 + keepdir "/var/log/${MY_PN}"
171 +
172 + insinto "/usr/share/${MY_PN}"
173 + newins "${FILESDIR}/agent.conf.sample" agent.conf
174 +
175 + rm -v config/{pipelines.yml,startup.options} || die
176 + insinto /etc/${MY_PN}
177 + doins -r config/.
178 + doins "${FILESDIR}/pipelines.yml"
179 + rm -rv config data || die
180 +
181 + insinto "/opt/${MY_PN}"
182 + doins -r .
183 + fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
184 +
185 + newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
186 + newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
187 +
188 + insinto /usr/share/eselect/modules
189 + doins "${FILESDIR}"/logstash-plugin.eselect
190 +}
191 +
192 +pkg_postinst() {
193 + ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
194 + ewarn "Install the plugins via eselect module that will automatically re-install"
195 + ewarn "all self installed plugins after Logstash upgrades."
196 + elog
197 + elog "Installing plugins:"
198 + elog "eselect logstash-plugin install logstash-output-gelf"
199 + elog
200 +
201 + elog "Reinstalling self installed plugins (installed via eselect module):"
202 + eselect logstash-plugin reinstall
203 +
204 + elog
205 + elog "Sample configuration:"
206 + elog "${EROOT}/usr/share/${MY_PN}"
207 + elog
208 + elog "The default pipeline configuration expects the configuration(s) to be found in:"
209 + elog "${EROOT}/etc/logstash/conf.d/*.conf"
210 +}