repo/gentoo:master commit in: www-apps/grafana-bin/, www-apps/grafana-bin/files/

commit:     203631d2478bb6b745b5675fa75b160be8c5bc5b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 06:01:29 2026 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 06:01:44 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203631d2

www-apps/grafana-bin: bump for CVE-2026-13438

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 www-apps/grafana-bin/Manifest                  |  4 ++
 www-apps/grafana-bin/files/grafana.service     |  2 +-
 www-apps/grafana-bin/grafana-bin-12.4.7.ebuild | 81 +++++++++++++++++++++++++
 www-apps/grafana-bin/grafana-bin-13.1.2.ebuild | 83 ++++++++++++++++++++++++++
 4 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 90ebe06b6e8e..a55aeb701da3 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -8,3 +8,7 @@ DIST grafana-bin-12.4.0.amd64.tar.gz 198219983 BLAKE2B aaa608b477a307d41a28bba5e
 DIST grafana-bin-12.4.0.arm64.tar.gz 188539753 BLAKE2B adcc241566a2b1b75823a18247b3c5b44d1f33de5744f60e86a407d5205e786f6c2c9f84635f7555e283d80f76df7c6eb7f9233777d449cc7f19e4f5029411a4 SHA512 3888c531bbce11ddd5293219f72a880d7bcf9b0eedc0e1ea8502782fc3971723e83ed2317be4bc9771a9aa807e22255e0778dc97993bdc9a75840bb0219ab263
 DIST grafana_12.4.3+security-02_25720634919_linux_amd64.tar.gz 271616696 BLAKE2B 58a7cb2a7c480f538a172b5b562dd43cba4dac52043749264c3adee7852b9d848a1ba309dc5a16ce513e8e3c073e308f7c43b0432715e3784e1a2494397c9549 SHA512 e185a116d902b4ea54474614078ece0d002a1ff3b8629359b8c12929c2ed285b32a9143d60dea5a243bef54c34b74a757c9630f9700e3107a3d7bd3bd9053d7d
 DIST grafana_12.4.3+security-02_25720634919_linux_arm64.tar.gz 256899119 BLAKE2B b2b367a1e83376bd2470b691a25572858ceba2ad95ea741aabbfeeb8bcf9ab0b20570179c4399cf9bd7e3c815bd2134f0a5fd28a61bf8349be3a4ebfdddee341 SHA512 91a457d187010866bb332705a9505fef580a83c3be1745093ceadc155d7c9b93c9024e4d048df5a815281f8d86debc643b9a50069cd7c992d5e334121d0ba816
+DIST grafana_12.4.7_30647961040_linux_amd64.tar.gz 276364750 BLAKE2B 2776d21cf2f95d4e966f9c7d945c7489c9880b2cc51b36970ad316d365b871c32ac7142e54a7d560c98cd35b8913a60044c76eb2437786d1d70cf08b5a474f25 SHA512 c0385d5f17a0e4db9379e6138b6946282e2fd4508ae1e607152b964f7dbc8a1a56bf7f5a1e8a5f802c00efed6b42741b44deff1a9ca556402784a2211497e37e
+DIST grafana_12.4.7_30647961040_linux_arm64.tar.gz 261028431 BLAKE2B 793ad9e4e05ffeb66a46ee382dbc8bf3d4bcaf53de75028f1da6363cf6ee2d91b3bc165414e8d08c730ec5a7f169de61f0cd5070b806dcc5cd984100c998d34c SHA512 a4dfd232d743e9004db0b5a43cdc80238cdee4c816f7ce4aa198a711e45de322a666dde6e3407c1eb37324a133b512fc10f700ecb4ad98503f25b9b121beec62
+DIST grafana_13.1.2_30900078095_linux_amd64.tar.gz 363415655 BLAKE2B e8daf2f2624d7ae66a24ebecd6d6bcce1dc1bed5e7a8ac73c76443dfeaaa0f3c28e7ba254fe203dc9100db79e0359134c02c55aaec18a6676f4e619fd58ca45a SHA512 14660284886da303db4fc694911f2ea5594c7f4330a9a467b87094c9ca75f194153b0a6508fedf60d7c012115e74b208b5daa4f6d900d046ee82ac1b3e54ba12
+DIST grafana_13.1.2_30900078095_linux_arm64.tar.gz 345280204 BLAKE2B 73e032cbd2c6d0b19d82877cb50a49ae033f8957bc94b294841b92b758222b66c9495aa0139c3e53184a24fdf4be4887ac744a319c4ef1ac8c49b3f2ca9b1917 SHA512 736eb2ba285afbec74d10ba003e0b7cd7a02d9620783347d0133b1eda9a7e4ad5c72d2d3f66011cbd5bfa6e20dd9162b0f31e5c4673fe4896e7a09d696713894

diff --git a/www-apps/grafana-bin/files/grafana.service b/www-apps/grafana-bin/files/grafana.service
index dcf1de295eed..3b009c96df3d 100644
--- a/www-apps/grafana-bin/files/grafana.service
+++ b/www-apps/grafana-bin/files/grafana.service
@@ -11,7 +11,7 @@ Type=simple
 Restart=on-failure
 RuntimeDirectory=grafana
 WorkingDirectory=/usr/share/grafana
-ExecStart=/usr/bin/grafana-server                      \
+ExecStart=/usr/bin/grafana server                      \
     --config=/etc/grafana/grafana.ini                  \
     --pidfile=/run/grafana/grafana.pid                 \
     cfg:default.paths.logs=/var/log/grafana            \

diff --git a/www-apps/grafana-bin/grafana-bin-12.4.7.ebuild b/www-apps/grafana-bin/grafana-bin-12.4.7.ebuild
new file mode 100644
index 000000000000..75c21c3952a4
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-12.4.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+
+REAL_PV="12.4.7"
+REAL_PVR="12.4.7_30647961040"
+
+BASE_A_ARM64="grafana_${REAL_PVR}_linux_arm64.tar.gz"
+BASE_A_AMD64="grafana_${REAL_PVR}_linux_amd64.tar.gz"
+BASE_URL="https://dl.grafana.com/grafana/release/${REAL_PV}"
+MY_PATCH="" # leading zero means we cannot use plain $PV
+SRC_URI="
+amd64? (
+	${BASE_URL}/${BASE_A_AMD64}
+)
+arm64? (
+	${BASE_URL}/${BASE_A_ARM64}
+)
+"
+S=${WORKDIR}/${MY_PN}-${REAL_PV}
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}

diff --git a/www-apps/grafana-bin/grafana-bin-13.1.2.ebuild b/www-apps/grafana-bin/grafana-bin-13.1.2.ebuild
new file mode 100644
index 000000000000..0ea0357f3699
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-13.1.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+
+REAL_PV="13.1.2"
+REAL_PVR="13.1.2_30900078095"
+BASE_A_ARM64="grafana_${REAL_PVR}_linux_arm64.tar.gz"
+BASE_A_AMD64="grafana_${REAL_PVR}_linux_amd64.tar.gz"
+BASE_URL="https://dl.grafana.com/grafana/release/${REAL_PV}"
+MY_PATCH="" # leading zero means we cannot use plain $PV
+SRC_URI="
+amd64? (
+	${BASE_URL}/${BASE_A_AMD64}
+)
+arm64? (
+	${BASE_URL}/${BASE_A_ARM64}
+)
+"
+S=${WORKDIR}/${MY_PN}-${REAL_PV}
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+RESTRICT="mirror"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	# Upstream packaging changes in v13; "cli" and "server" are commands ideally
+	exeinto /usr/share/grafana/bin
+	doexe bin/grafana
+	dobin packaging/wrappers/grafana-cli
+	dobin packaging/wrappers/grafana
+	dobin packaging/wrappers/grafana-server
+
+	newconfd "${FILESDIR}"/grafana-r1.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd2 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}