View | Details | Raw Unified | Return to bug 281851 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/grafana/Makefile (-8 / +24 lines)
Lines 1-13 Link Here
1
PORTNAME=	grafana
1
PORTNAME=	grafana
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	10.4.5
3
DISTVERSION=	11.3.0
4
PORTREVISION=	1
5
CATEGORIES=	www
4
CATEGORIES=	www
6
MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
5
MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
7
		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
6
		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
8
DISTFILES=	grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}:public \
7
DISTFILES=	grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}:public \
9
		go.mod:gomod \
8
		go.mod:gomod \
9
		go.work:gomod \
10
		apps/playlist/go.mod:gomod \
11
		pkg/aggregator/go.mod:gomod \
12
		pkg/apimachinery/go.mod:gomod \
13
		pkg/apiserver/go.mod:gomod \
14
		pkg/build/go.mod:gomod \
15
		pkg/build/wire/go.mod:gomod \
16
		pkg/promlib/go.mod:gomod \
17
		pkg/semconv/go.mod:gomod \
18
		pkg/storage/unified/apistore/go.mod:gomod \
19
		pkg/storage/unified/resource/go.mod:gomod \
10
		pkg/util/xorm/go.mod:gomod
20
		pkg/util/xorm/go.mod:gomod
21
EXTRACT_ONLY=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Ngo.work}
11
22
12
MAINTAINER=	drtr0jan@yandex.ru
23
MAINTAINER=	drtr0jan@yandex.ru
13
COMMENT=	Dashboard and graph editor for multiple data stores
24
COMMENT=	Dashboard and graph editor for multiple data stores
Lines 22-33 ONLY_FOR_ARCHS= aarch64 amd64 i386 riscv64 Link Here
22
BUILD_DEPENDS=	wire:devel/go-wire
33
BUILD_DEPENDS=	wire:devel/go-wire
23
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
34
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
24
35
25
USES=		cpe go:1.21,modules
36
USES=		cpe go:1.23,modules
26
37
27
USE_GITHUB=	yes
38
USE_GITHUB=	yes
28
39
29
USE_RC_SUBR=	grafana
40
USE_RC_SUBR=	grafana
30
TAG=		17cbd42
41
TAG=		d9455ff
31
42
32
GO_MODULE=	github.com/grafana/grafana
43
GO_MODULE=	github.com/grafana/grafana
33
GO_TARGET=	./pkg/cmd/grafana \
44
GO_TARGET=	./pkg/cmd/grafana \
Lines 59-64 GRAFANA_LOGDIR?= /var/log/${PORTNAME} Link Here
59
GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
70
GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
60
GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
71
GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
61
72
73
# Disable some master port targets
74
TARGET_ORDER_OVERRIDE=	-1:go-post-extract
75
76
post-extract:
77
	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
78
	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
79
	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
80
	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} work vendor -e)
81
62
post-patch:
82
post-patch:
63
	@${REINPLACE_CMD} \
83
	@${REINPLACE_CMD} \
64
		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
84
		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
Lines 82-91 post-install: Link Here
82
.endfor
102
.endfor
83
	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
103
	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
84
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
104
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
85
.for dir in input-datasource
86
	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir}
87
	( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}/plugins-bundled/internal/${dir}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} )
88
.endfor
89
	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
105
	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
90
	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
106
	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
91
	${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml ${STAGEDIR}${ETCDIR}/ldap.toml.sample
107
	${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml ${STAGEDIR}${ETCDIR}/ldap.toml.sample
(-)b/www/grafana/distinfo (-9 / +31 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1720812688
1
TIMESTAMP = 1729685722
2
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 20089e2fb313df92249c6892d00577318e00defd43a31e5ddcefda9f02b4914e
2
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/grafana-11.3.0.linux-amd64.tar.gz) = 5058c67fc0ff6e209992fb3bd5884f08ac379276eecd8fc810ffb5de2e7ae8c3
3
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 119510444
3
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/grafana-11.3.0.linux-amd64.tar.gz) = 132672499
4
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 4f295efaef23d3e1d3e72fce4f826bf1f7cafca84d82778d05f99c179ae9714c
4
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/go.mod) = 1e3af2adb03612b98d67b3ba45c64ab53603e73b1a62abab9124a8d00560cc42
5
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 30926
5
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/go.mod) = 31518
6
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 3d10f62daeec5bdd173ecade9841919787ff706fb8f286c90a423cd82a44ac5f
6
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/go.work) = 2e3d410e51ed1eaa0d96f01ecc297b01ef88b2fcfde32bc7aac06bf657ea3366
7
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 184
7
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/go.work) = 986
8
SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 864ca27ccf7c2fcd19a9cc5f6eafa32a44df9cf54b50046c4a1306884d4b9196
8
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/apps/playlist/go.mod) = 6740589796c3cac1a765d7013aa9734357c2446900b77dfa4cca5e6b5da1bd36
9
SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 29162880
9
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/apps/playlist/go.mod) = 1485
10
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/aggregator/go.mod) = 39574ebd7fbd1cbe05a98006a2d47598ec530c7a771ef451d77d27ce3b74bfc7
11
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/aggregator/go.mod) = 8188
12
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/apimachinery/go.mod) = 0d42d7150cd806d4e5d8af093deb932aa40048d23e042c77809850336cf4ea87
13
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/apimachinery/go.mod) = 2324
14
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/apiserver/go.mod) = 0303d70af8d9bc60ab2cd3b971676d8e14abd7430b4a148b4a360e7c82fce345
15
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/apiserver/go.mod) = 4692
16
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/build/go.mod) = b4401b254ddc2ad0e619c333c5aab58feb0e3b52ead12ea952ac9ab32226d914
17
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/build/go.mod) = 7697
18
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/build/wire/go.mod) = 1fcb6b958df4f7522519deaeb38e94706b126ee9f2b68a4cf7c84ef34f56c8a2
19
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/build/wire/go.mod) = 329
20
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/promlib/go.mod) = 67006ed88d6fb7ff339b5d96b521773cba02925e713d0e79aae346cc997d88ad
21
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/promlib/go.mod) = 6919
22
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/semconv/go.mod) = 0b51a8e6324569216cf7b45e937f9bb8b6a27ebddf32fcf5ddf082ba682d6248
23
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/semconv/go.mod) = 269
24
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/storage/unified/apistore/go.mod) = 645a6bdafac17f30d4d84b2e9bec8dbf5ef6174e7b1b32cd789a4315b822d51b
25
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/storage/unified/apistore/go.mod) = 5393
26
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/storage/unified/resource/go.mod) = f95741501ff65a2d53f4e579e5410961d4db6589a882cdc4f2f80dafe64be937
27
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/storage/unified/resource/go.mod) = 4231
28
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/util/xorm/go.mod) = 4f68d456ac4893fd6111b282fbc59a677b22574df085a797dedb37b475f7aa92
29
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/pkg/util/xorm/go.mod) = 610
30
SHA256 (go/www_grafana/grafana-grafana-v11.3.0_GH0/grafana-grafana-v11.3.0_GH0.tar.gz) = 488e403d9dbe694c24e7b34d16568a3d750e7d4fd080001b0adb279209e9f6fd
31
SIZE (go/www_grafana/grafana-grafana-v11.3.0_GH0/grafana-grafana-v11.3.0_GH0.tar.gz) = 34290539
(-)b/www/grafana/files/patch-go.mod (+10 lines)
Added Link Here
1
--- go.mod.orig	2024-09-27 16:40:42 UTC
2
+++ go.mod
3
@@ -1,6 +1,6 @@ module github.com/grafana/grafana
4
 module github.com/grafana/grafana
5
 
6
-go 1.23.1
7
+go 1.23
8
 
9
 // contains openapi encoder fixes. remove ASAP
10
 replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code
(-)b/www/grafana/pkg-plist (-6 lines)
Lines 4-14 bin/grafana-server Link Here
4
@sample %%ETCDIR%%/grafana.ini.sample
4
@sample %%ETCDIR%%/grafana.ini.sample
5
@sample %%ETCDIR%%/ldap.toml.sample
5
@sample %%ETCDIR%%/ldap.toml.sample
6
%%DATADIR%%/conf/defaults.ini
6
%%DATADIR%%/conf/defaults.ini
7
%%DATADIR%%/plugins-bundled/internal/input-datasource/README.md
8
%%DATADIR%%/plugins-bundled/internal/input-datasource/img/input.svg
9
%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js
10
%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js.map
11
%%DATADIR%%/plugins-bundled/internal/input-datasource/plugin.json
12
@owner %%GRAFANA_USER%%
7
@owner %%GRAFANA_USER%%
13
@group %%GRAFANA_GROUP%%
8
@group %%GRAFANA_GROUP%%
14
@mode 750
9
@mode 750
15
- 

Return to bug 281851