* [gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/
@ 2017-04-29 10:41 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2017-04-29 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 9342556588081817302a677e071a271b505ba7c8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 10:40:45 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 10:40:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93425565
app-misc/carbon-c-relay: version bump to 3.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-misc/carbon-c-relay/Manifest | 2 +-
...-relay-2.6.ebuild => carbon-c-relay-3.1.ebuild} | 17 +++---
.../carbon-c-relay/files/carbon-c-relay.confd-r1 | 18 ++++++
.../carbon-c-relay/files/carbon-c-relay.initd-r1 | 70 ++++++++++++++++++++++
4 files changed, 96 insertions(+), 11 deletions(-)
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index e6ee5a0930e..f99336178c8 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
DIST carbon-c-relay-2.5.tar.gz 102119 SHA256 6d3c538aacd08e9798e294d56b98854fdafe1b3a1d0d8118a406a2d8fe6aad5b SHA512 0b3b04003cda761816ea4bbe9d441366438c8507702f157504b21b66c9ef9b1e135239e6627d3dd3d371c023d71f2cd97ba45bc2ff6296a4998e06bdda219ea3 WHIRLPOOL dc73f9e001217ebbc84bc603fe94bdbf34a8039c65f3d1612c31a2e5de0fe8cb6a5c9db5bb7e79681daf567033b5ee2534a844f9e6d3315ca50f2ab0f1d5befa
-DIST carbon-c-relay-2.6.tar.gz 103576 SHA256 580ec4629ab63288ba73259a8b98300d649e253ac940c0343e009ed5c454053f SHA512 652cde8b70118af43d90f053cfc54d458abcacbe63a8f1fffe97df76d3ce956c6903132bc39a6d0bda10406e929bcaed49f8c6285e4de7b4c047b5420b7ec446 WHIRLPOOL faf2d936acfb7a7eddb9fcf50d62ad32560bbca7e998dd327c5473a38faaba5c55713d2c3c243f121a790a5dd001169e38bffc9be8c25a1c292082c3bf176b8b
DIST carbon-c-relay-3.0.tar.gz 153479 SHA256 5ae673ed0091a814bc8d6081ff14cfbbda7582fa0c8ccf1a5cf438ba84c2b585 SHA512 046dd19be1791eaf2b50bd7029f0bbe8ad0805113faf9a80b37571c42d76c0f7661a9273876de8cd5bf1d13fdc8133a8eaf9def28dd8077bf667225726797fdc WHIRLPOOL f349475179f762a226c87c87fe12e5b43be4fbff36ed12292c5461e65cbf1a814108daa4e0bd6946b077c230656372e6190fc657136cf6e4fa541e4636dc9b8d
+DIST carbon-c-relay-3.1.tar.gz 271011 SHA256 d21203a63fefa7c226f8170da204832d8e519001004f0f6fb44546c5eb147389 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e WHIRLPOOL bdc4d238398ac6b981e432bef3c1f4c9d181d1540a0af1e573bb6e8bb0a42deb0e4b504b6b727019e4667aa8188d476e261e0bdbe5b469345f7b17a39b966b6c
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-2.6.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1.ebuild
similarity index 64%
rename from app-misc/carbon-c-relay/carbon-c-relay-2.6.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.1.ebuild
index 963456421ce..c017ee525eb 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-2.6.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.1.ebuild
@@ -3,11 +3,11 @@
EAPI=6
-inherit toolchain-funcs user
+inherit user
DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -22,15 +22,12 @@ pkg_preinst() {
enewuser carbon -1 -1 -1 carbon
}
-src_configure() {
- tc-export CC
-}
-
src_install() {
- newbin relay ${PN}
+ default
+ # rename too generic name
+ mv "${ED}"/usr/bin/{relay,${PN}} || die
dodoc ChangeLog.md
- doman ${PN}.1
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
new file mode 100644
index 00000000000..64e4ab5c832
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# routing file to read
+#ROUTES_FILE=/etc/carbon-c-relay.conf
+
+# where to store the PID-file
+#PIDFILE=/run/carbon-c-relay.pid
+
+# where to store the logfile
+#LOGFILE=/var/log/carbon-c-relay.log
+
+# user and group to run carbon-c-relay as
+#USER=carbon
+#GROUP=carbon
+
+# any options to use when starting the relay
+#EXTRA_OPTS=
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
new file mode 100644
index 00000000000..104a7e0878e
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Lightweight graphite metrics router and aggregator."
+description_configtest="Run carbon-c-relay's internal config check."
+description_reload="Reload the carbon-c-relay configuration without losing connections."
+
+routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
+
+command="/usr/bin/carbon-c-relay"
+command_args="-f ${routes_config} ${EXTRA_OPTS}"
+pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
+logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+ touch "${logfile}"
+ chown ${user}:${group} "${logfile}"
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ rm -f "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile "${pidfile}" \
+ --user ${user} --group ${group} \
+ --exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
+ ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+ eend $?
+}
+
+reload() {
+ configtest || return 1
+ ebegin "Refreshing ${SVCNAME}'s configuration"
+ kill -HUP $(< "${pidfile}") &>/dev/null
+ eend $? "Failed to reload ${SVCNAME}"
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME}'s configuration"
+ ${command} -f "${routes_config}" -t < /dev/null > /dev/null
+ eend $? "failed, please correct errors above"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/
@ 2017-04-30 8:08 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2017-04-30 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 7df95ab46cf9636cdc9890430ed6709696fa4237
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 30 08:06:55 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 30 08:08:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df95ab4
app-misc/carbon-c-relay: revbump 3.1 to fix pidfile creation permission issues on some systems
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...{carbon-c-relay-3.1.ebuild => carbon-c-relay-3.1-r1.ebuild} | 0
app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1 | 3 ---
app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 | 10 +++++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
similarity index 100%
rename from app-misc/carbon-c-relay/carbon-c-relay-3.1.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
index 64e4ab5c832..5233eec2d2a 100644
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.confd-r1
@@ -4,9 +4,6 @@
# routing file to read
#ROUTES_FILE=/etc/carbon-c-relay.conf
-# where to store the PID-file
-#PIDFILE=/run/carbon-c-relay.pid
-
# where to store the logfile
#LOGFILE=/var/log/carbon-c-relay.log
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
index 104a7e0878e..1e2734941cc 100644
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
@@ -13,7 +13,7 @@ routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
command="/usr/bin/carbon-c-relay"
command_args="-f ${routes_config} ${EXTRA_OPTS}"
-pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
+pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
user=${USER:-carbon}
group=${GROUP:-carbon}
@@ -28,7 +28,8 @@ start_pre() {
configtest || return 1
fi
touch "${logfile}"
- chown ${user}:${group} "${logfile}"
+ mkdir -p "${pidfile%/*}"
+ chown ${user}:${group} "${logfile}" "${pidfile%/*}"
}
stop_pre() {
@@ -52,7 +53,10 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec ${command} --pidfile "${pidfile}"
+ # migration path
+ local pfile=${pidfile}
+ [[ -e /run/carbon-c-relay.pid ]] && pfile="/run/carbon-c-relay.pid"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
eend $?
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/
@ 2022-09-18 18:30 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2022-09-18 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 626dd530e5d30fe297d086ab838e2a35ec2a99bf
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 18:26:55 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 18:29:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626dd530
app-misc/carbon-c-relay-3.7.4-r1: revbump for POSIX script fixes
Closes: https://bugs.gentoo.org/841794
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild | 58 +++++++++++++++++
.../carbon-c-relay/files/carbon-c-relay.initd-r2 | 74 ++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
new file mode 100644
index 000000000000..d34fed5a74de
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+ pcre2? ( !oniguruma )
+ oniguruma? ( !pcre2 )
+"
+RDEPEND="lz4? ( app-arch/lz4 )
+ snappy? ( app-arch/snappy )
+ zlib? ( app-arch/gzip )
+ ssl? ( dev-libs/openssl:0= )
+ !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+ pcre2? ( dev-libs/libpcre2 )
+ oniguruma? ( dev-libs/oniguruma )
+ acct-group/carbon
+ acct-user/carbon"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local pcrecfg
+ if use !pcre2 && use !oniguruma ; then
+ pcrecfg=$(use_with pcre)
+ else
+ pcrecfg="--without-pcre"
+ fi
+
+ econf $(use_with lz4) $(use_with snappy) \
+ $(use_with ssl) $(use_with zlib gzip) \
+ "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+}
+
+src_install() {
+ default
+
+ # rename too generic name
+ mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+ # remove libfaketime, necessary for testing only
+ rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
+ dodoc ChangeLog.md
+
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
new file mode 100644
index 000000000000..fa0781dcddc8
--- /dev/null
+++ b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r2
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Lightweight graphite metrics router and aggregator."
+description_configtest="Run carbon-c-relay's internal config check."
+description_reload="Reload the carbon-c-relay configuration without losing connections."
+
+routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
+
+command="/usr/bin/carbon-c-relay"
+command_args="-f ${routes_config} ${EXTRA_OPTS}"
+pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
+logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
+user=${USER:-carbon}
+group=${GROUP:-carbon}
+
+depend() {
+ need net
+ use dns
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+ touch "${logfile}"
+ mkdir -p "${pidfile%/*}"
+ chown ${user}:${group} "${logfile}" "${pidfile%/*}"
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ rm -f "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile "${pidfile}" \
+ --user ${user} --group ${group} \
+ --exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
+ ${command_args}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ # migration path
+ local pfile=${pidfile}
+ [ -e /run/carbon-c-relay.pid ] && pfile="/run/carbon-c-relay.pid"
+ start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
+ eend $?
+}
+
+reload() {
+ configtest || return 1
+ ebegin "Refreshing ${SVCNAME}'s configuration"
+ kill -HUP $(cat "${pidfile}") >/dev/null 2>&1
+ eend $? "Failed to reload ${SVCNAME}"
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME}'s configuration"
+ ${command} -f "${routes_config}" -t < /dev/null > /dev/null
+ eend $? "failed, please correct errors above"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/
@ 2024-04-28 11:26 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2024-04-28 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 3910e4bcf80ac61b65e5ec309af43b5a8bd2170c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 11:26:03 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 11:26:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3910e4bc
app-misc/carbon-c-relay-3.8.1: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-misc/carbon-c-relay/Manifest | 2 +-
.../carbon-c-relay/carbon-c-relay-3.7.3.ebuild | 58 -----------------
...3.7.4-r1.ebuild => carbon-c-relay-3.8.1.ebuild} | 49 ++++++++------
.../carbon-c-relay/files/carbon-c-relay.initd-r1 | 74 ----------------------
app-misc/carbon-c-relay/metadata.xml | 1 +
5 files changed, 30 insertions(+), 154 deletions(-)
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index c39232681687..6e9549419b53 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,2 +1,2 @@
-DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e SHA512 ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3
DIST carbon-c-relay-3.7.4.tar.gz 584098 BLAKE2B 27fe6d7b785129aa6edd81e0a92880eee3530249900662e63f1ad7a9c1b4c8f9ff98635989311de964e4c42d4bb98f3ce1956ed170b8eceeea558ec3c191f45e SHA512 a9bcaa699e071e57e0a9092b97d1ead6781af4e00ef19f289a986c5baf56dec2c747961dfc2622285de034c17ce7ed2f5a7c856d617b26488dbdea58c4d72754
+DIST carbon-c-relay-3.8.1.tar.gz 465489 BLAKE2B 984bc330e0188cd403461c44388e8166840eeafc6f76cefd3f13da617ef9026ee7638367522d046b7f7df268aecaa088603be98a7f5650cce7759b00193d52d0 SHA512 fd59bf8af91a606e03e80c7ab7c8819d6040e2f8057bd66c6fcdacc526e5ba41479b19393919d89712af78a5050dd61db378b9620a880e7cec6b5c9b19e10ff5
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
deleted file mode 100644
index 4e3fbd702416..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
-
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
-REQUIRED_USE="
- pcre2? ( !oniguruma )
- oniguruma? ( !pcre2 )
-"
-RDEPEND="lz4? ( app-arch/lz4 )
- snappy? ( app-arch/snappy )
- zlib? ( app-arch/gzip )
- ssl? ( dev-libs/openssl:0= )
- !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
- pcre2? ( dev-libs/libpcre2 )
- oniguruma? ( dev-libs/oniguruma )
- acct-group/carbon
- acct-user/carbon"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local pcrecfg
- if use !pcre2 && use !oniguruma ; then
- pcrecfg=$(use_with pcre)
- else
- pcrecfg="--without-pcre"
- fi
-
- econf $(use_with lz4) $(use_with snappy) \
- $(use_with ssl) $(use_with zlib gzip) \
- "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
-}
-
-src_install() {
- default
-
- # rename too generic name
- mv "${ED}"/usr/bin/{relay,${PN}} || die
-
- # remove libfaketime, necessary for testing only
- rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
-
- dodoc ChangeLog.md
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
similarity index 54%
rename from app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
index 3282c5737a7d..17b4a10ca21f 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
HOMEPAGE="https://github.com/grobian/carbon-c-relay"
@@ -10,36 +10,44 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos ~x64-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+IUSE="client lz4 snappy zlib ssl pcre2 +oniguruma"
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
+# ensure only one of pcre2 and oniguruma is set, or none (libc)
REQUIRED_USE="
pcre2? ( !oniguruma )
oniguruma? ( !pcre2 )
"
-RDEPEND="lz4? ( app-arch/lz4 )
+DEPEND="
+ lz4? ( app-arch/lz4 )
snappy? ( app-arch/snappy )
zlib? ( app-arch/gzip )
ssl? ( dev-libs/openssl:0= )
- !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
pcre2? ( dev-libs/libpcre2 )
oniguruma? ( dev-libs/oniguruma )
+"
+RDEPEND="
+ ${DEPEND}
acct-group/carbon
- acct-user/carbon"
-DEPEND="${RDEPEND}"
+ acct-user/carbon
+"
src_configure() {
- local pcrecfg
- if use !pcre2 && use !oniguruma ; then
- pcrecfg=$(use_with pcre)
- else
- pcrecfg="--without-pcre"
- fi
+ econf \
+ $(use_with lz4) \
+ $(use_with snappy) \
+ $(use_with ssl) \
+ $(use_with zlib gzip) \
+ --without-pcre \
+ $(use_with pcre2) \
+ $(use_with oniguruma)
+}
- econf $(use_with lz4) $(use_with snappy) \
- $(use_with ssl) $(use_with zlib gzip) \
- "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
+src_compile() {
+ default
+ # build useful utility irregardless of FEATURES=test
+ if use client ; then
+ emake sendmetric || die
+ fi
}
src_install() {
@@ -47,9 +55,8 @@ src_install() {
# rename too generic name
mv "${ED}"/usr/bin/{relay,${PN}} || die
-
- # remove libfaketime, necessary for testing only
- rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+ # install useful utility
+ use client && dobin sendmetric
dodoc ChangeLog.md
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1 b/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
deleted file mode 100644
index 1e2734941cc1..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.initd-r1
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description="Lightweight graphite metrics router and aggregator."
-description_configtest="Run carbon-c-relay's internal config check."
-description_reload="Reload the carbon-c-relay configuration without losing connections."
-
-routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
-
-command="/usr/bin/carbon-c-relay"
-command_args="-f ${routes_config} ${EXTRA_OPTS}"
-pidfile="/run/carbon-c-relay/${SVCNAME}.pid"
-logfile=${LOGFILE:-/var/log/${SVCNAME}.log}
-user=${USER:-carbon}
-group=${GROUP:-carbon}
-
-depend() {
- need net
- use dns
-}
-
-start_pre() {
- if [ "${RC_CMD}" != "restart" ]; then
- configtest || return 1
- fi
- touch "${logfile}"
- mkdir -p "${pidfile%/*}"
- chown ${user}:${group} "${logfile}" "${pidfile%/*}"
-}
-
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- configtest || return 1
- fi
-}
-
-stop_post() {
- rm -f "${pidfile}"
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --pidfile "${pidfile}" \
- --user ${user} --group ${group} \
- --exec ${command} -- -D -P "${pidfile}" -l "${logfile}" \
- ${command_args}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- # migration path
- local pfile=${pidfile}
- [[ -e /run/carbon-c-relay.pid ]] && pfile="/run/carbon-c-relay.pid"
- start-stop-daemon --stop --exec ${command} --pidfile "${pfile}"
- eend $?
-}
-
-reload() {
- configtest || return 1
- ebegin "Refreshing ${SVCNAME}'s configuration"
- kill -HUP $(< "${pidfile}") &>/dev/null
- eend $? "Failed to reload ${SVCNAME}"
-}
-
-configtest() {
- ebegin "Checking ${SVCNAME}'s configuration"
- ${command} -f "${routes_config}" -t < /dev/null > /dev/null
- eend $? "failed, please correct errors above"
-}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index 6555a55f462c..2cc5368cb4d1 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -5,6 +5,7 @@
<email>grobian@gentoo.org</email>
</maintainer>
<use>
+ <flag name="client">build and install sendmetric client utility</flag>
<flag name="lz4">add support for LZ4 compressed transport</flag>
<flag name="snappy">add support for Snappy compressed transport</flag>
<flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-28 11:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-18 18:30 [gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2024-04-28 11:26 Fabian Groffen
2017-04-30 8:08 Fabian Groffen
2017-04-29 10:41 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox