Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/fluentd/
Date: Sat, 22 Jan 2022 00:30:15
Message-Id: 1642811349.b0a43f560ea0dd7066add760b2d39d4e937fc0f6.williamh@gentoo
1 commit: b0a43f560ea0dd7066add760b2d39d4e937fc0f6
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 21 15:52:44 2022 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 22 00:29:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a43f56
7
8 app-admin/fluentd: remove vulnerable versions
9
10 Bug: https://bugs.gentoo.org/820779
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 app-admin/fluentd/Manifest | 2 --
15 app-admin/fluentd/fluentd-1.4.2.ebuild | 61 ----------------------------------
16 app-admin/fluentd/fluentd-1.9.0.ebuild | 61 ----------------------------------
17 3 files changed, 124 deletions(-)
18
19 diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
20 index 6ac1d5302f00..d372c73abf84 100644
21 --- a/app-admin/fluentd/Manifest
22 +++ b/app-admin/fluentd/Manifest
23 @@ -1,3 +1 @@
24 DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
25 -DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
26 -DIST fluentd-1.9.0.gem 500224 BLAKE2B c09fc4d40e931ef2dc669cac1358c3b15baf434b7920f9481644953986dd1c3d140c4f4f8b53dd46d5972207ca7b1cb355f7fc51830b1adbb275c82ea9a7b979 SHA512 145b14b77900b2c7e4b83923d0d06465c7c5fdbfcdf39d1ab0be31a91e9003da7086b02b5fe9b4367956d892aadd65ac3ee34cafdf4f746c630a306af245b69d
27
28 diff --git a/app-admin/fluentd/fluentd-1.4.2.ebuild b/app-admin/fluentd/fluentd-1.4.2.ebuild
29 deleted file mode 100644
30 index 137927eb85ae..000000000000
31 --- a/app-admin/fluentd/fluentd-1.4.2.ebuild
32 +++ /dev/null
33 @@ -1,61 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -USE_RUBY="ruby23 ruby24 ruby25 ruby26"
39 -
40 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
41 -
42 -inherit ruby-fakegem user
43 -
44 -DESCRIPTION="data collector and unified logging layer (project under CNCF)"
45 -HOMEPAGE="https://www.fluentd.org"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64"
50 -
51 -ruby_add_rdepend "
52 - >=dev-ruby/msgpack-0.7.0
53 - >=dev-ruby/yajl-ruby-1.0
54 - >=dev-ruby/coolio-1.4.5
55 - >=dev-ruby/serverengine-2.0.4
56 - >=dev-ruby/http_parser_rb-0.5.1
57 - >=dev-ruby/sigdump-0.2.2
58 - >=dev-ruby/tzinfo-1.0
59 - >=dev-ruby/strptime-0.2.2"
60 -
61 -pkg_setup() {
62 - enewgroup ${PN}
63 - enewuser ${PN} -1 -1 -1 ${PN}
64 -}
65 -
66 -all_ruby_prepare() {
67 - sed -i \
68 - -e '/tzinfo-data/d' \
69 - -e '/dig_rb/d' \
70 - "${PN}".gemspec || die "'sed failed"
71 -
72 - # Avoid test dependency on unpackaged oj
73 - rm -f test/test_event_time.rb || die
74 -}
75 -
76 -all_ruby_install() {
77 - all_fakegem_install
78 - keepdir /var/log/fluentd
79 - fowners fluentd:adm /var/log/fluentd
80 - insinto /etc/fluent
81 - doins fluent.conf
82 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
83 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
84 - insinto /etc/logrotate.d
85 - newins "${FILESDIR}"/${PN}.logrotate ${PN}
86 -}
87 -
88 -pkg_postinst() {
89 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
90 - elog "A default configuration file has been installed in"
91 - elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
92 - elog "this file to match your configuration."
93 - fi
94 -}
95
96 diff --git a/app-admin/fluentd/fluentd-1.9.0.ebuild b/app-admin/fluentd/fluentd-1.9.0.ebuild
97 deleted file mode 100644
98 index 501d09685987..000000000000
99 --- a/app-admin/fluentd/fluentd-1.9.0.ebuild
100 +++ /dev/null
101 @@ -1,61 +0,0 @@
102 -# Copyright 1999-2020 Gentoo Authors
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI=7
106 -USE_RUBY="ruby23 ruby24 ruby25 ruby26"
107 -
108 -RUBY_FAKEGEM_RECIPE_DOC="rdoc"
109 -
110 -inherit ruby-fakegem user
111 -
112 -DESCRIPTION="data collector and unified logging layer (project under CNCF)"
113 -HOMEPAGE="https://www.fluentd.org"
114 -
115 -LICENSE="Apache-2.0"
116 -SLOT="0"
117 -KEYWORDS="~amd64"
118 -
119 -ruby_add_rdepend "
120 - >=dev-ruby/coolio-1.4.5
121 - >=dev-ruby/http_parser_rb-0.5.1
122 - >=dev-ruby/msgpack-1.3.1
123 - >=dev-ruby/serverengine-2.0.4
124 - >=dev-ruby/sigdump-0.2.2
125 - >=dev-ruby/strptime-0.2.2
126 - >=dev-ruby/tzinfo-1.0
127 - >=dev-ruby/yajl-ruby-1.0"
128 -
129 -pkg_setup() {
130 - enewgroup ${PN}
131 - enewuser ${PN} -1 -1 -1 ${PN}
132 -}
133 -
134 -all_ruby_prepare() {
135 - sed -i \
136 - -e '/tzinfo-data/d' \
137 - -e '/dig_rb/d' \
138 - "${PN}".gemspec || die "'sed failed"
139 -
140 - # Avoid test dependency on unpackaged oj
141 - rm -f test/test_event_time.rb || die
142 -}
143 -
144 -all_ruby_install() {
145 - all_fakegem_install
146 - keepdir /var/log/fluentd
147 - fowners fluentd:adm /var/log/fluentd
148 - insinto /etc/fluent
149 - doins fluent.conf
150 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
151 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
152 - insinto /etc/logrotate.d
153 - newins "${FILESDIR}"/${PN}.logrotate ${PN}
154 -}
155 -
156 -pkg_postinst() {
157 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
158 - elog "A default configuration file has been installed in"
159 - elog "${EROOT}/etc/fluent/fluent.conf. You will need to edit"
160 - elog "this file to match your configuration."
161 - fi
162 -}