summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Korzun <drtr0jan@yandex.ru>2025-10-19 00:56:17 +0300
committerVladimir Druzenko <vvd@FreeBSD.org>2025-10-19 00:59:50 +0300
commit814b89b8b073baec2ab66ef3fd0579924ff72cd4 (patch)
tree92bf821c88fc01265ec3337841a2efc8084319f0
parentmisc/freebsd-release-manifests: Add 15.0-BETA2 MANIFEST files (diff)
www/grafana: Update 12.1.0 => 12.2.0
Release notes: https://grafana.com/blog/2025/09/25/grafana-12-2-release-all-the-latest-features/ What's new: https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v12-2/ Changelogs: https://github.com/grafana/grafana/releases/tag/v12.1.1 https://github.com/grafana/grafana/releases/tag/v12.1.2 https://github.com/grafana/grafana/releases/tag/v12.2.0 Fix build with non-default user/group. PR: 289851
-rw-r--r--www/grafana/Makefile22
-rw-r--r--www/grafana/distinfo96
2 files changed, 68 insertions, 50 deletions
diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index ae6639e16770..a2ab205f5fd3 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,7 +1,6 @@
PORTNAME= grafana
DISTVERSIONPREFIX= v
-DISTVERSION= 12.1.0
-PORTREVISION= 4
+DISTVERSION= 12.2.0
CATEGORIES= www
MASTER_SITES= https://dl.grafana.com/oss/release/ \
https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
@@ -9,15 +8,20 @@ DISTFILES= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX} \
go.mod:gomod \
go.work:gomod \
apps/advisor/go.mod:gomod \
+ apps/alerting/alertenrichment/go.mod:gomod \
apps/alerting/notifications/go.mod:gomod \
apps/dashboard/go.mod:gomod \
apps/folder/go.mod:gomod \
apps/iam/go.mod:gomod \
apps/investigations/go.mod:gomod \
apps/playlist/go.mod:gomod \
+ apps/plugins/go.mod:gomod \
+ apps/preferences/go.mod:gomod \
+ apps/provisioning/go.mod:gomod \
+ apps/secret/go.mod:gomod \
+ apps/shorturl/go.mod:gomod \
pkg/aggregator/go.mod:gomod \
pkg/apimachinery/go.mod:gomod \
- pkg/apis/secret/go.mod:gomod \
pkg/apiserver/go.mod:gomod \
pkg/build/go.mod:gomod \
pkg/build/wire/go.mod:gomod \
@@ -44,7 +48,7 @@ USES= cpe go:modules
USE_GITHUB= yes
USE_RC_SUBR= grafana
-TAG= ccd7b6c
+TAG= 92f1fba
GO_MOD_DIST= github
GO_MODULE= github.com/grafana/grafana
@@ -66,11 +70,15 @@ SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \
# Disable some master port targets
TARGET_ORDER_OVERRIDE= -1:go-post-extract
-GRAFANA_USER?= grafana
-GRAFANA_GROUP?= grafana
+GRAFANA_USER?= ${PORTNAME}
+GRAFANA_GROUP?= ${PORTNAME}
+.if ${GRAFANA_USER} == ${PORTNAME}
USERS= ${GRAFANA_USER}
+.endif
+.if ${GRAFANA_GROUP} == ${PORTNAME}
GROUPS= ${GRAFANA_GROUP}
+.endif
PLIST_SUB= ${SUB_LIST}
@@ -109,7 +117,7 @@ post-install:
${STAGEDIR}${GRAFANA_PLUGINDIR} \
${STAGEDIR}${GRAFANA_LOGDIR} \
${GRAFANA_PROVISIONING:M*:C|^|${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/|}
- (cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} \
+ (cd ${WRKDIR}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX} \
&& ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR})
${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
diff --git a/www/grafana/distinfo b/www/grafana/distinfo
index d9b4687f92a6..268651d62cc7 100644
--- a/www/grafana/distinfo
+++ b/www/grafana/distinfo
@@ -1,43 +1,53 @@
-TIMESTAMP = 1753446520
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-12.1.0.linux-amd64.tar.gz) = 69923cf95824008a6a7529f242295ecc2bc6b1dc4e5142c889971e88407d8712
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-12.1.0.linux-amd64.tar.gz) = 198804186
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.mod) = ced873c2fef95afbf4a7087569246808c5fded9c490325338316062da5b21fa8
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.mod) = 40445
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.work) = cac55fcc92eaf457ba95d1ab73fad10103f3247450835d71c41356ee4f220a36
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.work) = 888
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/advisor/go.mod) = 962cca491bf59ec48c8bffd6d50d99f5151cc8a43ba43b541f97989ef2f43446
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/advisor/go.mod) = 4277
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/alerting/notifications/go.mod) = 66bb6a2c23a5b0491a9ed3798657d6331a806edfe5ba97182a23be840aff2bab
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/alerting/notifications/go.mod) = 5520
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/dashboard/go.mod) = bfa1c41646cee61989440bf413e8af4e25e8750df469ecaee7c86c465642fb30
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/dashboard/go.mod) = 6738
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/folder/go.mod) = 9626818858fdd607721f8133adb3956abf0df7460f1f2cf261b377d97838cc01
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/folder/go.mod) = 2871
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/iam/go.mod) = d0eac20a1aab91af633ea284c2d182ee73c310a88bd642b65b21a4467e14474f
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/iam/go.mod) = 2868
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/investigations/go.mod) = 0ca584f26b13c916060d7167240eabd2df8cf3667bb2b66bf6d5c094f80d996d
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/investigations/go.mod) = 4539
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/playlist/go.mod) = e0c86c12e890d2302b8fe6c912983723ff7d15e55ee84ea0e09b723ce59deb78
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/playlist/go.mod) = 4292
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/aggregator/go.mod) = f6ed3ded9d6eb77f62485cc27d1148a56df426ca76686adb2f953a2da356f1bc
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/aggregator/go.mod) = 8348
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apimachinery/go.mod) = 14ae9f9972a261a10ba12029c184545797dd568b40e7dc10fa94c6c4677abf28
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apimachinery/go.mod) = 2655
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apis/secret/go.mod) = e95b1247e19ccf728dcd0542024f1d89ee3895e6a443c405287c293e6bfa96e7
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apis/secret/go.mod) = 1938
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apiserver/go.mod) = 3bae51bda65f76845d0a9b8766e996ec6e9e98a954988cf2087cf433333d02d6
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apiserver/go.mod) = 5228
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/go.mod) = aa8c00afd01143df056fab379b5c2c3b22a11a16bee5db70369ee296b569a5f4
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/go.mod) = 7999
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/wire/go.mod) = b5cc16940df8ad672c07e44fd3824feed3f14b026dd4a591511d182f474f15b1
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/wire/go.mod) = 330
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/codegen/go.mod) = a7e2c2c92b4f923a401186c0cb570a2747d92676bc8753c9c93b97972e715355
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/codegen/go.mod) = 2522
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/plugins/codegen/go.mod) = a78bd06a4239c3482fe5a27fbb8ba347f9d469ae9329ea3a9c266ed2182d31ea
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/plugins/codegen/go.mod) = 2233
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/promlib/go.mod) = c6ef66cb6668fd2c144dbe70366a329a0c40126bfe2d1709042f8b32644a79e2
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/promlib/go.mod) = 7072
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/semconv/go.mod) = d20f9332c43873474014fac5af7c2b91088897760ccd57602aa9aee2460da1d1
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/semconv/go.mod) = 269
-SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-grafana-v12.1.0_GH0.tar.gz) = 9e2f3f11eff01f8b86c2c232c6a3c3a32fa303589ea9829538ffc867684a4436
-SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-grafana-v12.1.0_GH0.tar.gz) = 40109942
+TIMESTAMP = 1758718446
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-12.2.0.linux-amd64.tar.gz) = c4f53551ed4887c792caeb9d02fa0c1a36e3db9ee8bdda32b1ced810cb135a93
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-12.2.0.linux-amd64.tar.gz) = 189052083
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.mod) = 0b255e05f5c11677ee83dbf168f1d33ad92e651d1ba1410d7a66bc5c884dab4c
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.mod) = 42281
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.work) = b9bae14d2f21ac8bd5995834e8fa127ea7a19e4d8c7dfd8e35ae0c9708fe79a7
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/go.work) = 945
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/advisor/go.mod) = 68a02a8bfb8102b38a4f74bb5ec2b71bd3371980e42910ad8e142f68431f1c7c
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/advisor/go.mod) = 16000
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/alertenrichment/go.mod) = c5796d991b9405dfedaf194f8bfcb7abb1ff023edef6a67d7aa185ce2c332065
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/alertenrichment/go.mod) = 1569
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/notifications/go.mod) = d83fbc16cbe708bd5760f6ecc22c6d2cb7e12b8f082694da301aa93c8d2d9aa8
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/alerting/notifications/go.mod) = 5599
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/dashboard/go.mod) = e84521de947c0fc02d1c7264b377c51f1fda1beebbefd7d8e8ce8bb5e5f68705
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/dashboard/go.mod) = 7446
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/folder/go.mod) = b1ab486fcdd24cf8ee666d75c2851082f6e0b964fd113d724e6749da7859154e
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/folder/go.mod) = 3014
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/iam/go.mod) = aea61dc4fac1e3849b1d8f1c6132cf8c2ab7888b0191262b17b59a3c6c63fb99
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/iam/go.mod) = 24604
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/investigations/go.mod) = bce30b9f0d197451f2f7756decaed1ad56fe4e406facaad3eb70bf315afd1faa
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/investigations/go.mod) = 4389
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/playlist/go.mod) = 2c07aeedc16ec973af816bd18ba9a81043a64392940202d7792fffca09e2425b
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/playlist/go.mod) = 4383
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/plugins/go.mod) = 97883819be50de2109060dbbb0b8b73d908c33ece668ce792c16281e12b81b60
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/plugins/go.mod) = 4908
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/preferences/go.mod) = 3c8de820ca6ef8bd305c2ead4eb83d3e67082b1e89802d489af8470fb8da0700
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/preferences/go.mod) = 3019
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/provisioning/go.mod) = 6f2533d249566925718e012afa795823a8b1fcfb2e03df72281069ab62a751de
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/provisioning/go.mod) = 4018
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/secret/go.mod) = 56a17eda75df435eb4e0ff46232586ccb6875e3ee40c19f2f3ed8ac11fd8270b
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/secret/go.mod) = 3145
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/shorturl/go.mod) = 6647a40217b11c9eb4f4b0939fc623d388609c2919c233526a6cc7bebb3e7130
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/apps/shorturl/go.mod) = 4415
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/aggregator/go.mod) = fd18148d210618ea58c6c59de67f3a0339bd93f2477c27d692c6bcff9af98598
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/aggregator/go.mod) = 8387
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apimachinery/go.mod) = 67b5df6d7fa2447b760a24a1abcf02284ea98f03f4919cf046ee6dc54fed037c
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apimachinery/go.mod) = 2727
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apiserver/go.mod) = 18ac2e8e5bc49321e979adc73ec9aef1b932559e042e102df93876726f9b9db2
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/apiserver/go.mod) = 5267
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/go.mod) = 180df1e2cb9908d298b67e7d755b7414b23383e5d5e5a078e91588f633c67d65
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/go.mod) = 3874
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/wire/go.mod) = d0c57407186b93a8535836ead25f09af959dd5ba85aaa2cf15f25df1ff9a0716
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/build/wire/go.mod) = 330
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/codegen/go.mod) = 7422a59273900d092e04c375939b45f1804f251a34a1f00b94a75975af0d6673
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/codegen/go.mod) = 2522
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/plugins/codegen/go.mod) = 633f43b1e790c818c60791a067ab0a824a9d64674cda06cf5040fc53a5228ff3
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/plugins/codegen/go.mod) = 2233
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/promlib/go.mod) = ac80c72cc79c01b94a9115657d1acea9db872c413d357e8bddee840d52c99cf4
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/promlib/go.mod) = 7301
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/semconv/go.mod) = 3adbc3e65b069ef48400ca53d368166f9455be319212b94839837bfea256a24c
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/pkg/semconv/go.mod) = 269
+SHA256 (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-grafana-v12.2.0_GH0.tar.gz) = 0d55795b21cf5494e5e3ff33627f7bbb940de9298d0a0aa86831c2f2f15fef1e
+SIZE (go/www_grafana/grafana-grafana-v12.2.0_GH0/grafana-grafana-v12.2.0_GH0.tar.gz) = 42237954