From 6990d0600970cefe6aa2c17668f9028b08d23441 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Apr 2023 23:37:47 +0100 Subject: gentoo auto-resync : 10:04:2023 - 23:37:47 --- app-metrics/Manifest.gz | Bin 6634 -> 6628 bytes app-metrics/carbonapi-booking/Manifest | 6 ++- .../carbonapi-booking-0.3.0-r1.ebuild | 58 +++++++++++++++++++++ .../carbonapi-booking-0.3.0.ebuild | 41 --------------- .../files/carbonapi-booking-0.3.0-colours.patch | 55 +++++++++++++++++++ .../files/carbonapi-booking-0.3.0-logfile.patch | 14 +++++ .../files/carbonapi-booking.initd | 3 +- 7 files changed, 133 insertions(+), 44 deletions(-) create mode 100644 app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild delete mode 100644 app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild create mode 100644 app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch create mode 100644 app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch (limited to 'app-metrics') diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz index 12d2c82d3528..6c5e3b0d309e 100644 Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ diff --git a/app-metrics/carbonapi-booking/Manifest b/app-metrics/carbonapi-booking/Manifest index 7765dd088a68..08b711d29b8f 100644 --- a/app-metrics/carbonapi-booking/Manifest +++ b/app-metrics/carbonapi-booking/Manifest @@ -1,5 +1,7 @@ +AUX carbonapi-booking-0.3.0-colours.patch 1273 BLAKE2B ef8e882c78668d54ca7cbbca051bafd5c291cb9cd9e6a2a7293b8069f1a886af44deea9cfb7abe4257894a42fc69794125fb58b31a33c831877bfb9f8c3b1e79 SHA512 0fedbee15d83de86b2edf4b5d1eb84f7cc4ad7d22a209fec3f50f45772a1ea6184f50b8ef635d5a9793bb2b0dd4921d62fa2348c46ce3ccca9a9824353f64bb5 +AUX carbonapi-booking-0.3.0-logfile.patch 395 BLAKE2B 2b4d87cc68d8ac798ec91d8de6d07b35adc583903fc4961f9cbdab8f3c1590a2a449fe83fb935e202c50139d629e835c2c096dbf0d5b084432b95581de3b2581 SHA512 675a04e32c8e449459d4410a6c472d8e7fa3892b9086b9314ac740c3fafd7b9b4df64455304eb917fc335f92305eec1e84cd0b87aa674e894880413e66d2d9ff AUX carbonapi-booking.confd 213 BLAKE2B 2a23f23f102c0f20a988d9a8d3da8f06494c1292de1fa26f500e5614b196b012129aae492f6e377ea4e0e092a01fed8888563e2958c2cdfcca3ecd7023ab7cbd SHA512 a014879eaa49accf7004d696dc5a46c157fdf07dce9dd0427e103ddbf524611036f48cadcf5875af00a22c2b2c14627435af3d835aa4bcdfcb5504bfcd89b1a9 -AUX carbonapi-booking.initd 884 BLAKE2B 52a3c46c3c3820091eccbf71a3ca2b4349840a318b0d04ea4e441377cc401a2d86e5b31f00670a034a447dafe67441b19ce2b0b78a8db9715cbdda43b5c87fc2 SHA512 f9ade9168520b1a128d156693d9093d7808bdf6976dd12cf2fc919218f2616743d64920bf56b70b1a00a023d55ada3bd981ddce23f44006a5a6510efd5918a60 +AUX carbonapi-booking.initd 932 BLAKE2B 52f37edae9b7f70ce53df62fe4c548bdaf977087efa776ba2d73214553912129b300b349ceadada51aa72b04d72908327b1cb73977bf80bae2bb3a96ee9214f0 SHA512 eca90cc38fa8a9af5459de7758b794503108fa64cbe2bb20cb18360cd5a2312091ca4236f018c5e51b325af474c1d4cf40286b4a18ca7096a3dee9b4ecfaea55 DIST carbonapi-booking-0.3.0.tar.gz 1395080 BLAKE2B e5ebe20a4833f17919f0a14e091b06b5270d7dd8880fa87600454ac33b7df7600d1428f0b2e06c65a1a36796e2eb026e8c47b98444dce168cec0e965ebee9d69 SHA512 327af89fd86661ccca9d7250e70b66f03089841b20e3c51128bcbb835a91d553d952928d991424f9bbe1fea235cd9e6242784d8cbd828725ba5b2cfb64328487 -EBUILD carbonapi-booking-0.3.0.ebuild 895 BLAKE2B 788486a46d004a69dbe50df9e77cebd57ec19490dcb36d765784623206474abee0c5d6b5a244a479702ff8d3bebd25f10a8349f6031738c8aa50693e07f32b76 SHA512 dc269fc9ad59c8e62ea7b0e13811662c28e62af6d70e903932164e5bdb116a61cf0ca51fdbdc6c19fb6b19c5c7bdf398c510b033fbdd6c6dfa97a74b468ff976 +EBUILD carbonapi-booking-0.3.0-r1.ebuild 1216 BLAKE2B 3848b750a058b49a62e038ebc45cf9664f22e751aa01c1e70ece86c6f21130c3341bec87a658df8cabb4d1b3eb047f9b61a48ab0073a8d8914e3c113bb3f7bbf SHA512 8066dc7874a8fa63019b0592f5b34297b5c8e96a77f1087182aa5ed7e1816c5e73a2fc73597ef905bfec11d4654d4310377914ec517f0637ecb3356a983c5ad5 MISC metadata.xml 334 BLAKE2B 81ff9b6976e8c05afd1a70cb03b1e3d14adf26df09883f21b13ad7368d527aea5aacaa1222e427a34c5b39922d0b4ab568d06846fb80381ed3c1e83e9c301e6d SHA512 a73a32986d738bef2d5ea5e479cd626c14c4bf7222e1b6b1918fd9232574975e1d002d479080a55ea02c40c129650093133da3b2eb1b8d658bff3f26d476cb27 diff --git a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild new file mode 100644 index 000000000000..166f4baa33fa --- /dev/null +++ b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +MY_PN=${PN%-booking} +DESCRIPTION="High-performance Graphite front-end, Booking.com fork" +HOMEPAGE="https://github.com/bookingcom/carbonapi" +SRC_URI="https://github.com/bookingcom/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + app-arch/bzip2 + dev-libs/expat + media-libs/fontconfig + media-libs/freetype + media-libs/libpng + x11-libs/cairo + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXrender + x11-libs/pixman +" +RDEPEND="${DEPEND} + acct-group/carbon + acct-user/carbon" +BDEPEND="" + +src_prepare() { + export VERSION="gentoo-${PVR}" + + # bug 904051: disable data-race detection, conflicts with + # go-module's -buildmode=pie + sed -i -e 's/ -race / /' Makefile || die + + eapply "${FILESDIR}"/${P}-logfile.patch + eapply "${FILESDIR}"/${P}-colours.patch + + eapply_user +} + +src_install() { + insinto /etc/carbonapi + doins -r "${S}"/config/* + dobin carbonapi carbonzipper + + newinitd "${FILESDIR}"/${PN}.initd carbonapi + newconfd "${FILESDIR}"/${PN}.confd carbonapi +} diff --git a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild b/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild deleted file mode 100644 index e8633fd600e7..000000000000 --- a/app-metrics/carbonapi-booking/carbonapi-booking-0.3.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -MY_PN=${PN%-booking} -DESCRIPTION="High-performance Graphite front-end, Booking.com fork" -HOMEPAGE="https://github.com/bookingcom/carbonapi" -SRC_URI="https://github.com/bookingcom/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="" -RDEPEND="${DEPEND} - acct-group/carbon - acct-user/carbon" -BDEPEND="" - -src_prepare() { - export VERSION="gentoo-${PVR}" - - # bug 904051: disable data-race detection, conflicts with - # go-module's -buildmode=pie - sed -i -e 's/ -race / /' Makefile || die - - eapply_user -} - -src_install() { - insinto /etc/carbonapi - doins -r "${S}"/config/* - dobin carbonapi carbonzipper - - newinitd "${FILESDIR}"/${PN}.initd carbonapi - newconfd "${FILESDIR}"/${PN}.confd carbonapi -} diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch new file mode 100644 index 000000000000..6fbbeeb181cb --- /dev/null +++ b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-colours.patch @@ -0,0 +1,55 @@ +use colouring defaults from graphite-web-1.10 + +--- carbonapi-0.3.0/expr/functions/cairo/png/picture_params.go ++++ carbonapi-0.3.0/expr/functions/cairo/png/picture_params.go +@@ -351,10 +351,10 @@ + Height: 250, + Margin: 10, + LogBase: 0, +- FgColor: "white", +- BgColor: "black", +- MajorLine: "rose", +- MinorLine: "grey", ++ FgColor: "black", ++ BgColor: "white", ++ MajorLine: "grey", ++ MinorLine: "rose", + FontName: "Sans", + FontSize: 10, + FontBold: FontWeightNormal, +@@ -414,8 +414,8 @@ + LeftDashed: false, + LeftColor: "", + +- MajorGridLineColor: "white", +- MinorGridLineColor: "grey", ++ MajorGridLineColor: "grey", ++ MinorGridLineColor: "rose", + } + + var templates = map[string]PictureParams{ +@@ -424,10 +424,10 @@ + Height: 250, + Margin: 10, + LogBase: 0, +- FgColor: "white", +- BgColor: "black", +- MajorLine: "rose", +- MinorLine: "grey", ++ FgColor: "black", ++ BgColor: "white", ++ MajorLine: "grey", ++ MinorLine: "rose", + FontName: "Sans", + FontSize: 10, + FontBold: FontWeightNormal, +@@ -487,7 +487,7 @@ + LeftDashed: false, + LeftColor: "", + +- MajorGridLineColor: "white", +- MinorGridLineColor: "grey", ++ MajorGridLineColor: "grey", ++ MinorGridLineColor: "rose", + }, + } diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch new file mode 100644 index 000000000000..5e1015cf67dd --- /dev/null +++ b/app-metrics/carbonapi-booking/files/carbonapi-booking-0.3.0-logfile.patch @@ -0,0 +1,14 @@ +- don't log to stdout +- change log to be under subdir so ebuild can manage its permissions + +--- carbonapi-0.3.0/config/carbonapi.yaml ++++ carbonapi-0.3.0/config/carbonapi.yaml +@@ -130,7 +130,7 @@ + - X-Real-Ip + - X-Webauth-User + loggerConfig: +- outputPaths: ["stdout", "/var/log/carbonapi.log"] ++ outputPaths: ["/var/log/carbonapi/carbonapi.log"] + level: "info" + encoding: "json" + diff --git a/app-metrics/carbonapi-booking/files/carbonapi-booking.initd b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd index c52069a77666..c4fbee5331a0 100644 --- a/app-metrics/carbonapi-booking/files/carbonapi-booking.initd +++ b/app-metrics/carbonapi-booking/files/carbonapi-booking.initd @@ -19,7 +19,8 @@ depend() { start_pre() { mkdir -p "${pidfile%/*}" - chown ${user}:${group} "${pidfile%/*}" + mkdir -p /var/log/carbonapi + chown ${user}:${group} "${pidfile%/*}" /var/log/carbonapi } stop_post() { -- cgit v1.2.3