[gentoo-commits] repo/gentoo:master commit in: app-admin/fluentd/files/, app-admin/fluentd/

[William Hubbs]

commit:     36bbd3f3c31377163901a3139e90e75c0cb723eb
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Tue Sep 14 08:56:11 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 15:39:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36bbd3f3

app-admin/fluentd: 1.14.4 bump.

Closes: https://bugs.gentoo.org/781197
Closes: https://github.com/gentoo/gentoo/pull/22292
Bug: https://bugs.gentoo.org/820779
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-admin/fluentd/Manifest              |  1 +
 app-admin/fluentd/files/fluentd.initd   |  2 +-
 app-admin/fluentd/fluentd-1.14.4.ebuild | 62 +++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index adc11320eac4..6ac1d5302f00 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,2 +1,3 @@
+DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
 DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
 DIST fluentd-1.9.0.gem 500224 BLAKE2B c09fc4d40e931ef2dc669cac1358c3b15baf434b7920f9481644953986dd1c3d140c4f4f8b53dd46d5972207ca7b1cb355f7fc51830b1adbb275c82ea9a7b979 SHA512 145b14b77900b2c7e4b83923d0d06465c7c5fdbfcdf39d1ab0be31a91e9003da7086b02b5fe9b4367956d892aadd65ac3ee34cafdf4f746c630a306af245b69d

diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
index 03fb7fbff7e7..76c7c6374f86 100644
--- a/app-admin/fluentd/files/fluentd.initd
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -5,7 +5,7 @@
 command=/usr/bin/fluentd
 logfile=/var/log/fluentd/fluent.log
 pidfile=/var/run/fluentd.pid
-command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
+command_args="--no-supervisor -o ${logfile} ${fluentd_opts}"
 command_background=yes
 command_user=fluentd:fluentd
 retry="${retry:-TERM/10/KILL/30}"

diff --git a/app-admin/fluentd/fluentd-1.14.4.ebuild b/app-admin/fluentd/fluentd-1.14.4.ebuild
new file mode 100644
index 000000000000..61c666cd7a7b
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.14.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27"
+# ruby30 should be fine according to fluent docs but http_parser_rb and serverengine below doesn't.
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/fluentd
+	acct-user/fluentd"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/msgpack-1.3.1
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/strptime-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/yajl-ruby-1.0"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+
+	# Avoid test dependency on unpackaged oj
+	rm -f test/test_event_time.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}/etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}