From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DE35138359 for ; Sun, 30 Aug 2020 21:46:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 752D4E0C86; Sun, 30 Aug 2020 21:46:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A48DE0C86 for ; Sun, 30 Aug 2020 21:46:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C48A433BF1F for ; Sun, 30 Aug 2020 21:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F757336 for ; Sun, 30 Aug 2020 21:46:40 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1598823992.4649f4932726cbdc92703a570cb19213170a16da.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logstash-bin/Manifest app-admin/logstash-bin/logstash-bin-6.8.12.ebuild app-admin/logstash-bin/logstash-bin-7.9.0.ebuild X-VCS-Directories: app-admin/logstash-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 4649f4932726cbdc92703a570cb19213170a16da X-VCS-Branch: master Date: Sun, 30 Aug 2020 21:46:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dfbcdceb-090f-4cb5-af36-254e57b5fae7 X-Archives-Hash: c99b74ed58e4098851f2709d6eb64624 commit: 4649f4932726cbdc92703a570cb19213170a16da Author: Tomáš Mózes gmail com> AuthorDate: Fri Aug 28 04:33:19 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 30 21:46:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4649f493 app-admin/logstash-bin: bump to 6.8.12/7.9.0 Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Thomas Deutschmann gentoo.org> app-admin/logstash-bin/Manifest | 4 + app-admin/logstash-bin/logstash-bin-6.8.12.ebuild | 73 +++++++++++++++++++ app-admin/logstash-bin/logstash-bin-7.9.0.ebuild | 89 +++++++++++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index 3cfaa0c0541..bdee93682b9 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,8 +1,12 @@ DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6 +DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276 +DIST logstash-7.9.0.tar.gz 158351233 BLAKE2B 67b8163312f832626227cb0e509b231254c331be4a7e8e9dbca4bc948f5ac05137ec0ff98c45a91f487aa53fc758d21ea4b5eff23b7f19dc3692bbab88087fa5 SHA512 61409b0a3d50f4fef3d42fefb6b39d4ff725478a9092f2e291eaca6aad6be2639a8675507f0be01ae74e88f4820aca242a94b9b79875b614ee3c2413ebe4a5db DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9 +DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4 +DIST logstash-oss-7.9.0.tar.gz 158167981 BLAKE2B 84f16d57ad2ce9ccda31a8621b1d71c47267b72c441e86d9afd6b5b713b94bd0662486dc7e8bd8aa967c8c2479f8054285227f8e3a2ad46c5e38e313a8cff793 SHA512 7304ddfd87c418f5ff52ea7f7db1bcc9f202cd83675373ef53dd0e8007d3b22eb16c77fc09eac8e1318257813fefe3108570bc5d84d088ec3c26d789ab7cacfd diff --git a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild new file mode 100644 index 00000000000..08167fb0287 --- /dev/null +++ b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 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.9.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild new file mode 100644 index 00000000000..f4705732966 --- /dev/null +++ b/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 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" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \ + vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \ + vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \ + vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \ + vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \ + vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || 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" +}