Attachment #227383 for bug #258006




PORTNAME=	grafana
DISTVERSION=	8.1.0
DISTVERSIONPREFIX=	v
DISTVERSION=	8.1.2
CATEGORIES=	www
MASTER_SITES+=	https://dl.grafana.com/oss/release/:public \
		https://gitea.com/xorm/builder/archive/:builder \

USE_GITHUB=	yes

USE_RC_SUBR=	grafana
TAG=		103f8fa

GO_TARGET=	./pkg/cmd/grafana-server \
		./pkg/cmd/grafana-cli

		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
		GRAFANA_BUILDHASH=8ea303538f79ee32b68a

GRAFANA_USER?=	grafana
GRAFANA_GROUP?=	grafana

Lines 114-120 GH_TUPLE= \ Link Here

(-)b/www/grafana8/Makefile.modules (-1 / +1 lines)
114	gosimple:slug:v1.9.0:gosimple_slug/vendor/github.com/gosimple/slug \	114	gosimple:slug:v1.9.0:gosimple_slug/vendor/github.com/gosimple/slug \
115	grafana:go-mssqldb:d0ce3c521036:grafana_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \	115	grafana:go-mssqldb:d0ce3c521036:grafana_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
116	grafana:grafana-aws-sdk:v0.7.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \	116	grafana:grafana-aws-sdk:v0.7.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
117	grafana:grafana-plugin-sdk-go:v0.111.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \	117	grafana:grafana-plugin-sdk-go:v0.112.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
118	grafana:loki:15d417efe103:grafana_loki/vendor/github.com/grafana/loki \	118	grafana:loki:15d417efe103:grafana_loki/vendor/github.com/grafana/loki \
119	grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \	119	grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
120	grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \	120	grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \




TIMESTAMP = 1629702792
SHA256 (grafana-8.1.2.linux-amd64.tar.gz) = d1fcc2c24547ac116248ac6fc932b45eef301e9ca8e7cbbe6bd73b75a69409cd
SIZE (grafana-8.1.2.linux-amd64.tar.gz) = 57186805
SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
SIZE (v0.3.6.tar.gz) = 22747
SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
SIZE (v0.7.3.tar.gz) = 21163
SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
SIZE (v0.8.2.tar.gz) = 413897
SHA256 (grafana-grafana-v8.1.2_GH0.tar.gz) = 068c4944089298cf30ebcf0da2a9f9e896ba690a78866c007ce7e54447d6b40a
SIZE (grafana-grafana-v8.1.2_GH0.tar.gz) = 11910424
SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c
SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192
SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079

SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960
SHA256 (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 8134e3424fe2f22707d4aefbe8bbbe00ecd9da00fa86ea75691e6d9061f0a026
SIZE (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 247569
SHA256 (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = a2e8138a99cf74cea3130b9fc0589f99f5f54e7851f9be2d0bbe1aa652934b67
SIZE (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = 170128
SHA256 (grafana-loki-15d417efe103_GH0.tar.gz) = 5bbd4caedfd9e57ffb64102abc992e9de3d672d387e4d6fede76f15ddc704889
SIZE (grafana-loki-15d417efe103_GH0.tar.gz) = 25278521
SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc

Lines 9-12 Link Here

(-)b/www/grafana8/pkg-message (-1 lines)
9	EOM	9	EOM
10	}	10	}
11	]	11	]
12




%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap
%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSection.test.tsx.snap
%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap
%%DATADIR%%/public/app/core/components/sidemenu/utils.test.ts
%%DATADIR%%/public/app/core/components/sidemenu/utils.ts
%%DATADIR%%/public/app/core/components/sql_part/sql_part.ts

%%DATADIR%%/public/app/features/variables/state/setOptionFromUrl.test.ts
%%DATADIR%%/public/app/features/variables/state/sharedReducer.test.ts
%%DATADIR%%/public/app/features/variables/state/sharedReducer.ts
%%DATADIR%%/public/app/features/variables/state/templateVarsChangedInUrl.test.ts
%%DATADIR%%/public/app/features/variables/state/transactionReducer.test.ts
%%DATADIR%%/public/app/features/variables/state/transactionReducer.ts
%%DATADIR%%/public/app/features/variables/state/types.ts

%%DATADIR%%/public/app/polyfills/old-mediaquerylist.ts
%%DATADIR%%/public/app/routes/GrafanaCtrl.ts
%%DATADIR%%/public/app/routes/routes.tsx
%%DATADIR%%/public/app/routes/utils.test.ts
%%DATADIR%%/public/app/routes/utils.ts
%%DATADIR%%/public/app/store/configureStore.ts
%%DATADIR%%/public/app/store/store.ts
%%DATADIR%%/public/app/types/accessControl.ts

Return to bug 258006

Lines 1-7 Link Here

(-)b/www/grafana8/Makefile (-4 / +3 lines)
1	PORTNAME= grafana	1	PORTNAME= grafana
2	DISTVERSION= 8.1.0
3	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
4	PORTREVISION= 1	3	DISTVERSION= 8.1.2
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://gitea.com/xorm/builder/archive/:builder \	6	https://gitea.com/xorm/builder/archive/:builder \
Lines 28-34 USES= go:modules Link Here
28	USE_GITHUB= yes	27	USE_GITHUB= yes
29		28
30	USE_RC_SUBR= grafana	29	USE_RC_SUBR= grafana
31	TAG= 62e720c	30	TAG= 103f8fa
32		31
33	GO_TARGET= ./pkg/cmd/grafana-server \	32	GO_TARGET= ./pkg/cmd/grafana-server \
34	./pkg/cmd/grafana-cli	33	./pkg/cmd/grafana-cli
Lines 41-47 SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ Link Here
41	GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \	40	GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
42	GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \	41	GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
43	GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \	42	GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
44	GRAFANA_BUILDHASH=d7cfb4e56c8be9229275	43	GRAFANA_BUILDHASH=8ea303538f79ee32b68a
45		44
46	GRAFANA_USER?= grafana	45	GRAFANA_USER?= grafana
47	GRAFANA_GROUP?= grafana	46	GRAFANA_GROUP?= grafana

Lines 1-14 Link Here

(-)b/www/grafana8/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1628237187	1	TIMESTAMP = 1629702792
2	SHA256 (grafana-8.1.0.linux-amd64.tar.gz) = 3ac8c82bd34e5395f29f350e2f29ed4eab87d143f02ff12ac3d5e3683b123be8	2	SHA256 (grafana-8.1.2.linux-amd64.tar.gz) = d1fcc2c24547ac116248ac6fc932b45eef301e9ca8e7cbbe6bd73b75a69409cd
3	SIZE (grafana-8.1.0.linux-amd64.tar.gz) = 57174165	3	SIZE (grafana-8.1.2.linux-amd64.tar.gz) = 57186805
4	SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb	4	SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
5	SIZE (v0.3.6.tar.gz) = 22747	5	SIZE (v0.3.6.tar.gz) = 22747
6	SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1	6	SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
7	SIZE (v0.7.3.tar.gz) = 21163	7	SIZE (v0.7.3.tar.gz) = 21163
8	SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84	8	SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
9	SIZE (v0.8.2.tar.gz) = 413897	9	SIZE (v0.8.2.tar.gz) = 413897
10	SHA256 (grafana-grafana-v8.1.0_GH0.tar.gz) = 5ab5456b3bdf79a48ad6e5cb6ba3c7c8418f2ab01540e34c77f8fe561c1812ec	10	SHA256 (grafana-grafana-v8.1.2_GH0.tar.gz) = 068c4944089298cf30ebcf0da2a9f9e896ba690a78866c007ce7e54447d6b40a
11	SIZE (grafana-grafana-v8.1.0_GH0.tar.gz) = 11893577	11	SIZE (grafana-grafana-v8.1.2_GH0.tar.gz) = 11910424
12	SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c	12	SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c
13	SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192	13	SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192
14	SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079	14	SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079
Lines 239-246 SHA256 (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = a3a62b4964fee10a698852dea6 Link Here
239	SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960	239	SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960
240	SHA256 (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 8134e3424fe2f22707d4aefbe8bbbe00ecd9da00fa86ea75691e6d9061f0a026	240	SHA256 (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 8134e3424fe2f22707d4aefbe8bbbe00ecd9da00fa86ea75691e6d9061f0a026
241	SIZE (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 247569	241	SIZE (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 247569
242	SHA256 (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 19beb65361c52156f6dcdcd4e181162cb38462d00b7be17257b205bf660cdbea	242	SHA256 (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = a2e8138a99cf74cea3130b9fc0589f99f5f54e7851f9be2d0bbe1aa652934b67
243	SIZE (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 169593	243	SIZE (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = 170128
244	SHA256 (grafana-loki-15d417efe103_GH0.tar.gz) = 5bbd4caedfd9e57ffb64102abc992e9de3d672d387e4d6fede76f15ddc704889	244	SHA256 (grafana-loki-15d417efe103_GH0.tar.gz) = 5bbd4caedfd9e57ffb64102abc992e9de3d672d387e4d6fede76f15ddc704889
245	SIZE (grafana-loki-15d417efe103_GH0.tar.gz) = 25278521	245	SIZE (grafana-loki-15d417efe103_GH0.tar.gz) = 25278521
246	SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc	246	SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc

Lines 176-183 bin/grafana-server Link Here

(-)b/www/grafana8/pkg-plist (-2 / +3 lines)
176	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap	176	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
177	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap	177	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
178	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap	178	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap
179	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSection.test.tsx.snap
180	%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap
181	%%DATADIR%%/public/app/core/components/sidemenu/utils.test.ts	179	%%DATADIR%%/public/app/core/components/sidemenu/utils.test.ts
182	%%DATADIR%%/public/app/core/components/sidemenu/utils.ts	180	%%DATADIR%%/public/app/core/components/sidemenu/utils.ts
183	%%DATADIR%%/public/app/core/components/sql_part/sql_part.ts	181	%%DATADIR%%/public/app/core/components/sql_part/sql_part.ts
Lines 1423-1428 bin/grafana-server Link Here
1423	%%DATADIR%%/public/app/features/variables/state/setOptionFromUrl.test.ts	1421	%%DATADIR%%/public/app/features/variables/state/setOptionFromUrl.test.ts
1424	%%DATADIR%%/public/app/features/variables/state/sharedReducer.test.ts	1422	%%DATADIR%%/public/app/features/variables/state/sharedReducer.test.ts
1425	%%DATADIR%%/public/app/features/variables/state/sharedReducer.ts	1423	%%DATADIR%%/public/app/features/variables/state/sharedReducer.ts
		1424	%%DATADIR%%/public/app/features/variables/state/templateVarsChangedInUrl.test.ts
1426	%%DATADIR%%/public/app/features/variables/state/transactionReducer.test.ts	1425	%%DATADIR%%/public/app/features/variables/state/transactionReducer.test.ts
1427	%%DATADIR%%/public/app/features/variables/state/transactionReducer.ts	1426	%%DATADIR%%/public/app/features/variables/state/transactionReducer.ts
1428	%%DATADIR%%/public/app/features/variables/state/types.ts	1427	%%DATADIR%%/public/app/features/variables/state/types.ts
Lines 2534-2539 bin/grafana-server Link Here
2534	%%DATADIR%%/public/app/polyfills/old-mediaquerylist.ts	2533	%%DATADIR%%/public/app/polyfills/old-mediaquerylist.ts
2535	%%DATADIR%%/public/app/routes/GrafanaCtrl.ts	2534	%%DATADIR%%/public/app/routes/GrafanaCtrl.ts
2536	%%DATADIR%%/public/app/routes/routes.tsx	2535	%%DATADIR%%/public/app/routes/routes.tsx
		2536	%%DATADIR%%/public/app/routes/utils.test.ts
		2537	%%DATADIR%%/public/app/routes/utils.ts
2537	%%DATADIR%%/public/app/store/configureStore.ts	2538	%%DATADIR%%/public/app/store/configureStore.ts
2538	%%DATADIR%%/public/app/store/store.ts	2539	%%DATADIR%%/public/app/store/store.ts
2539	%%DATADIR%%/public/app/types/accessControl.ts	2540	%%DATADIR%%/public/app/types/accessControl.ts