diff --git a/www/grafana/Makefile b/www/grafana/Makefile index 07dc5b15d8d7..2f8f008f190d 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,94 +1,93 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 10.4.1 -PORTREVISION= 4 +DISTVERSION= 10.4.5 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}:public \ go.mod:gomod \ pkg/util/xorm/go.mod:gomod MAINTAINER= drtr0jan@yandex.ru COMMENT= Dashboard and graph editor for multiple data stores WWW= https://grafana.com/grafana/ \ https://github.com/grafana/grafana LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 i386 riscv64 BUILD_DEPENDS= wire:devel/go-wire RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:1.21,modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= d3ce857 +TAG= 17cbd42 GO_MODULE= github.com/grafana/grafana GO_TARGET= ./pkg/cmd/grafana \ ./pkg/cmd/grafana-server \ ./pkg/cmd/grafana-cli GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" CONFLICTS_INSTALL= grafana* SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANA_DATADIR=${GRAFANA_DATADIR} \ GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana USERS= ${GRAFANA_USER} GROUPS= ${GRAFANA_GROUP} PLIST_SUB= ${SUB_LIST} GRAFANA_DATADIR?= /var/db/${PORTNAME} GRAFANA_HOMEDIR?= ${DATADIR} GRAFANA_LOGDIR?= /var/log/${PORTNAME} GRAFANA_PLUGINDIR?= ${GRAFANA_DATADIR}/plugins GRAFANA_PROVISIONINGDIR?= ${ETCDIR}/provisioning post-patch: @${REINPLACE_CMD} \ -e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \ -e 's|;logs = /var/log/grafana|logs = ${GRAFANA_LOGDIR}|g' \ -e 's|;plugins = /var/lib/grafana/plugins|plugins = ${GRAFANA_PLUGINDIR}|g' \ -e 's|;provisioning = conf/provisioning|provisioning = ${GRAFANA_PROVISIONINGDIR}|g' \ ${WRKSRC}/conf/sample.ini pre-build: @(cd ${GO_WRKSRC}; \ ${ECHO_MSG} "===> Generating wire_gen.go"; \ ${SETENV} ${MAKE_ENV} ${GO_ENV} wire gen -tags "oss" ./pkg/server ) post-install: ${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR} ${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf ${MKDIR} ${STAGEDIR}${GRAFANA_DATADIR} ${MKDIR} ${STAGEDIR}${GRAFANA_PLUGINDIR} .for dir in access-control alerting dashboards datasources notifiers plugins ${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir} .endfor ${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR} ( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} ) .for dir in input-datasource ${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} ( cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}/plugins-bundled/internal/${dir}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${GRAFANA_HOMEDIR}/plugins-bundled/internal/${dir} ) .endfor ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini ${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample ${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml ${STAGEDIR}${ETCDIR}/ldap.toml.sample ${FIND} ${STAGEDIR}${DATADIR}/public -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} .include diff --git a/www/grafana/distinfo b/www/grafana/distinfo index 42246c3c11aa..3584fd154232 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1711390031 -SHA256 (go/www_grafana/grafana-grafana-v10.4.1_GH0/grafana-10.4.1.linux-amd64.tar.gz) = e6fb188d42556e7330165d1df46ebda920371640c24dad486cff71008f164127 -SIZE (go/www_grafana/grafana-grafana-v10.4.1_GH0/grafana-10.4.1.linux-amd64.tar.gz) = 119601993 -SHA256 (go/www_grafana/grafana-grafana-v10.4.1_GH0/go.mod) = b41fd5b72ac95c4312560d791b519f5eb352d2e54aac6e07a08cfecaef579b0a -SIZE (go/www_grafana/grafana-grafana-v10.4.1_GH0/go.mod) = 30923 -SHA256 (go/www_grafana/grafana-grafana-v10.4.1_GH0/pkg/util/xorm/go.mod) = 3d10f62daeec5bdd173ecade9841919787ff706fb8f286c90a423cd82a44ac5f -SIZE (go/www_grafana/grafana-grafana-v10.4.1_GH0/pkg/util/xorm/go.mod) = 184 -SHA256 (go/www_grafana/grafana-grafana-v10.4.1_GH0/grafana-grafana-v10.4.1_GH0.tar.gz) = aa1c33b07e2f42ed50c52db772c7be89a56c1e93b433e567dd400a35e9ed706e -SIZE (go/www_grafana/grafana-grafana-v10.4.1_GH0/grafana-grafana-v10.4.1_GH0.tar.gz) = 29108795 +TIMESTAMP = 1720812688 +SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 20089e2fb313df92249c6892d00577318e00defd43a31e5ddcefda9f02b4914e +SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-10.4.5.linux-amd64.tar.gz) = 119510444 +SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 4f295efaef23d3e1d3e72fce4f826bf1f7cafca84d82778d05f99c179ae9714c +SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/go.mod) = 30926 +SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 3d10f62daeec5bdd173ecade9841919787ff706fb8f286c90a423cd82a44ac5f +SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/pkg/util/xorm/go.mod) = 184 +SHA256 (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 864ca27ccf7c2fcd19a9cc5f6eafa32a44df9cf54b50046c4a1306884d4b9196 +SIZE (go/www_grafana/grafana-grafana-v10.4.5_GH0/grafana-grafana-v10.4.5_GH0.tar.gz) = 29162880