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>[email protected]</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>
