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 98DDC13835B for ; Mon, 31 May 2021 08:20:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E39E8E084A; Mon, 31 May 2021 08:20:10 +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 B11FFE084A for ; Mon, 31 May 2021 08:20:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 96B90340CFE for ; Mon, 31 May 2021 08:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EA7A793 for ; Mon, 31 May 2021 08:20:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1622448935.1b48d2aebf253e7b6f2adbfa09d54baeefa88c53.sam@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-7.10.2.ebuild X-VCS-Directories: app-admin/logstash-bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1b48d2aebf253e7b6f2adbfa09d54baeefa88c53 X-VCS-Branch: master Date: Mon, 31 May 2021 08:20:06 +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: 763913c9-c6b6-41f0-8041-263b97ebdbfd X-Archives-Hash: d5212ab88ce85a9f1e9ae25c101fe9f9 commit: 1b48d2aebf253e7b6f2adbfa09d54baeefa88c53 Author: Ferenc Erki gmail com> AuthorDate: Sat May 29 19:14:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 31 08:15:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b48d2ae app-admin/logstash-bin: drop vulnerable Bug: https://bugs.gentoo.org/790287 Signed-off-by: Ferenc Erki gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21043 Signed-off-by: Sam James gentoo.org> app-admin/logstash-bin/Manifest | 2 - app-admin/logstash-bin/logstash-bin-7.10.2.ebuild | 88 ----------------------- 2 files changed, 90 deletions(-) diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest index dc178438def..7eb1f33754d 100644 --- a/app-admin/logstash-bin/Manifest +++ b/app-admin/logstash-bin/Manifest @@ -1,8 +1,6 @@ DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01 -DIST logstash-7.10.2-linux-x86_64.tar.gz 351170815 BLAKE2B 536a33de4be4bd1b6dfccf7d4cedc064b0f0b9c0569545d195244cf14f38d9c83159439d7710a76fdc4e4394b5f7d5a1919460c1c03186b4fc7f054744a46016 SHA512 34099b34a05c6b85b1b355310bd190b606aa0bcce1cad07bf5fd98959e54f61860bdd697cca8f3cdab2d2b815bbc2a788d2e14dcac4b3d85a0d5bafd72d2b170 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195 DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2 -DIST logstash-oss-7.10.2-linux-x86_64.tar.gz 350992238 BLAKE2B f31207af62b6ff36af4be6fae9c6ede18a481317d28ba2ee6469cd095acba9b41ad4d7598756a51a078bf3d4269ae2f11750e4117842e496811a79825f284aef SHA512 5425483a7d3ec5ba186574940031a529efa683f452f5e3e38ffd9bd07771beabdd5c54a8147ed42fe761b700ea5c294018f1efb22fa6fdcf23189f2aea314b5b DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60 DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4 diff --git a/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild deleted file mode 100644 index 2003a547d37..00000000000 --- a/app-admin/logstash-bin/logstash-bin-7.10.2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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}-linux-x86_64.tar.gz ) - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.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 - - local d - for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \ - i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \ - ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \ - x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do - rm -r vendor/jruby/lib/jni/$d || die - done - - # remove bundled java - rm -r jdk || 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" -}