From nobody Wed Oct 27 09:08:28 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BF026182DBFE; Wed, 27 Oct 2021 09:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfNCJ50Ncz3pYX; Wed, 27 Oct 2021 09:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CF5F580E; Wed, 27 Oct 2021 09:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R98Slw078120; Wed, 27 Oct 2021 09:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R98Sbh078119; Wed, 27 Oct 2021 09:08:28 GMT (envelope-from git) Date: Wed, 27 Oct 2021 09:08:28 GMT Message-Id: <202110270908.19R98Sbh078119@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 6d7306b05858 - 2021Q4 - www/grafana8: Update to 8.1.6 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 6d7306b058583f4b39036c9c2c5c73f2297318bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d7306b058583f4b39036c9c2c5c73f2297318bb commit 6d7306b058583f4b39036c9c2c5c73f2297318bb Author: Boris Korzun AuthorDate: 2021-10-27 08:30:01 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-27 09:07:44 +0000 www/grafana8: Update to 8.1.6 ReleaseNotes: https://grafana.com/blog/2021/10/05/grafana-7.5.11-and-8.1.6-released-with-critical-security-fix/ PR: 258962 Security: CVE-2021-39226 (cherry picked from commit 725c5eb1df6a47cad84a95b05ee2460868a93096) --- www/grafana8/Makefile | 13 ++++++------- www/grafana8/Makefile.modules | 3 ++- www/grafana8/distinfo | 16 +++++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile index a398b223b068..b0c7a2cb01ce 100644 --- a/www/grafana8/Makefile +++ b/www/grafana8/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 8.1.5 +DISTVERSION= 8.1.7 CATEGORIES= www MASTER_SITES+= https://dl.grafana.com/oss/release/:public \ https://gitea.com/xorm/builder/archive/:builder \ @@ -27,20 +27,19 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= c725a42 +TAG= 34b8880 -GO_TARGET= ./pkg/cmd/grafana-server \ - ./pkg/cmd/grafana-cli +GO_TARGET= ./pkg/cmd/grafana-cli ./pkg/cmd/grafana-server GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ - GRAFANA_GROUP=${GRAFANA_GROUP} \ +SUB_LIST= GRAFANA_BUILDHASH=8037849dbb02d3339929 \ GRAFANA_DATADIR=${GRAFANA_DATADIR} \ + GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \ - GRAFANA_BUILDHASH=4bfd7b0ee99616560b7a + GRAFANA_USER=${GRAFANA_USER} GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules index e529a704787b..fd74065c8db6 100644 --- a/www/grafana8/Makefile.modules +++ b/www/grafana8/Makefile.modules @@ -34,6 +34,7 @@ GH_TUPLE= \ cuelang:cue:v0.3.2:cuelang_cue/vendor/cuelang.org/go \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ deepmap:oapi-codegen:v1.3.13:deepmap_oapi_codegen/vendor/github.com/deepmap/oapi-codegen \ + dgryski:go-rendezvous:9f7001d12a5f:dgryski_go_rendezvous/vendor/github.com/dgryski/go-rendezvous \ docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \ dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ edsrzf:mmap-go:v1.0.0:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \ @@ -68,7 +69,7 @@ GH_TUPLE= \ go-openapi:strfmt:v0.20.1:go_openapi_strfmt/vendor/github.com/go-openapi/strfmt \ go-openapi:swag:v0.19.15:go_openapi_swag/vendor/github.com/go-openapi/swag \ go-openapi:validate:v0.20.2:go_openapi_validate/vendor/github.com/go-openapi/validate \ - go-redis:redis:v5.2.9:go_redis_redis/vendor/gopkg.in/redis.v5 \ + go-redis:redis:v8.11.3:go_redis_redis_v8/vendor/github.com/go-redis/redis/v8 \ go-sourcemap:sourcemap:v2.1.3:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \ go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \ diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo index 5e052a101faf..3bcfba22b26a 100644 --- a/www/grafana8/distinfo +++ b/www/grafana8/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1632226213 -SHA256 (grafana-8.1.5.linux-amd64.tar.gz) = c84ee6857de97989d3762634630289ed232fcf88979af267733d34daf7455c58 -SIZE (grafana-8.1.5.linux-amd64.tar.gz) = 57202054 +TIMESTAMP = 1633548315 +SHA256 (grafana-8.1.7.linux-amd64.tar.gz) = 05aaa2874b152d252966a3dc70b0a53948ae627ba5a6b29fe60ec14d1a8ccbf3 +SIZE (grafana-8.1.7.linux-amd64.tar.gz) = 56240059 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.5_GH0.tar.gz) = 8b821910affa5ba3d2b72f77aff05a4c5150e9cccd1416d7621fbe2ea3aaa2c8 -SIZE (grafana-grafana-v8.1.5_GH0.tar.gz) = 11938061 +SHA256 (grafana-grafana-v8.1.7_GH0.tar.gz) = 08179d4cc19d689ee8e2ca2d903f26f768fe2092d7145912ead46c3335c8d90d +SIZE (grafana-grafana-v8.1.7_GH0.tar.gz) = 11939217 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 @@ -79,6 +79,8 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = c206f58011623e4d6c5a158b0cef563426694bb1bf0b9cbe03be7180986706da SIZE (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = 135335 +SHA256 (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 29584550745fd4b8fce2e2f3def7b9d9ffe2b86cf9b6596b53a660c9bbfe27b6 +SIZE (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 1699 SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514 SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba @@ -147,8 +149,8 @@ SHA256 (go-openapi-swag-v0.19.15_GH0.tar.gz) = 5d22d5a44970926178102eb80926f4cbf SIZE (go-openapi-swag-v0.19.15_GH0.tar.gz) = 35515 SHA256 (go-openapi-validate-v0.20.2_GH0.tar.gz) = 40145ab360fd08dc30396acdee8c7b46541f90b8613ad53b98a5786f439cf186 SIZE (go-openapi-validate-v0.20.2_GH0.tar.gz) = 463309 -SHA256 (go-redis-redis-v5.2.9_GH0.tar.gz) = 494f474925e89749124445cdebc5affd741f7532d2a4d6e4e2069b17d74f4fd2 -SIZE (go-redis-redis-v5.2.9_GH0.tar.gz) = 69991 +SHA256 (go-redis-redis-v8.11.3_GH0.tar.gz) = bb7878312056b1981f3a717cf4d0ea8b5c0a255d2e082b104c4b7e7a7dc1a3ea +SIZE (go-redis-redis-v8.11.3_GH0.tar.gz) = 146502 SHA256 (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 9e5d9e6f1b7facedd58ef8bb2af86ddf906bfc0c3f377934603e900b21490956 SIZE (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 6479 SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28