testing/grafana: upgrade to 6.4.3

3 files changed, 15 insertions, 17 deletions

diff --git a/testing/grafana/APKBUILD b/testing/grafana/APKBUILD
index f140471c4c..8bf98ad415 100644
--- a/testing/grafana/APKBUILD
+++ b/testing/grafana/APKBUILD
@@ -1,19 +1,19 @@
 # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
 # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
 pkgname=grafana
-pkgver=6.4.1
+pkgver=6.4.3
 pkgrel=0
-_commit=4ba8388f3 # git rev-parse --short HEAD
-_stamp=1570000580 # git --no-pager show -s --format=%ct
+_commit=3a2bfb7e38 # git rev-parse --short HEAD
+_stamp=1571218329 # git --no-pager show -s --format=%ct
 pkgdesc="Open source, feature rich metrics dashboard and graph editor"
 url="https://grafana.com"
 arch="x86_64" # Builds are slow on arm archs, x86 requires python2.
 license="Apache-2.0"
 makedepends="go nodejs yarn"
-options="chmod-clean"
+options="chmod-clean" # Can be replaced with -modcacherw in go1.14
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/$pkgname/archive/v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana/archive/v$pkgver.tar.gz
 	go.mod go.sum apk.go $pkgname.initd $pkgname.confd"
 builddir=$srcdir
 
@@ -43,7 +43,7 @@ build() {
 
 check() {
 	# Skipped tests do not work in module mode.
-	go test $(go list github.com/grafana/grafana/pkg/... | egrep -v '(provisioning/dashboards)|(infra/log)|(grafana-cli/commands)')
+	go test $(go list github.com/grafana/grafana/pkg/... | grep -Ev '(provisioning/dashboards)|(infra/log)|(grafana-cli/commands)')
 }
 
 package() {
@@ -56,9 +56,9 @@ package() {
 	cp -r "$builddir/$pkgname-$pkgver/conf" "$builddir/$pkgname-$pkgver/public" "$pkgdir/usr/share/$pkgname/"
 }
 
-sha512sums="facedd72dcb92ff9b2a65016c8a6b93b636eb5b848949ebd248626be70baf5b47544e2fc515e41825e2ace9a6485e610c5151d3fc27559d61acaa35a711aa462  grafana-6.4.1.tar.gz
-69c3dce70cecefa17df90d30a511b2583b2efb8e45957e4d36b0fb73bf100d69e0940ac5d45a1ffacdc4b7c8e31a23fa51aa460a795cf50b8af535aa04178869  go.mod
-0903a1d69db40c3436023a533b3a131fa4b7a6b13e0f2ebf815054cd9fa47dd359a1a89334e96a937e86a9a4342950b572afdc5b2ca960d1e0fd36d0bb5c546d  go.sum
+sha512sums="50eb98fd7144db0648dbe7bc03fa18a95afb88e5655235922c590a4e092edf19071cbe45e810db8b54647217aa51afd0b66650f13d8036212e8347fb347fcb2f  grafana-6.4.3.tar.gz
+02ae5ee6e7b349aaeefc3c794f9b78704352785c8bea54fdce3c02c62150003bb734d963fb564548bf70d300597084b50ef42b2dc97ae19238e57ab23cf65f06  go.mod
+7c7c02726688590d3a4140acb261c463500e5a07f23f839af2886204afe11e4ff0039e32cf9a73ebe40772c2cee8baadb97498e3ce9b552353e4618804371d50  go.sum
 8fff794134b497c1d272ac69972bb468849007cb32b9255d792b74a58aea7be739d3db348da686a26fb092244c614a300dfffafb74c58a34a7c7505138158b19  apk.go
 b0a781e1b1e33741a97e231c761b1200239c6f1235ffbe82311fe883387eb23bef262ad68256ebd6cf87d74298041b53b947ea7a493cfa5aa814b2a1c5181e13  grafana.initd
 c2afa7f6baf8f468fbd781b0522cbff173bb0c3964eb08fc4a0951d034e8a1f3f9c14798e2ac487b3c20db834110883db8162039b18195e97bb9f4bc5baffc33  grafana.confd"
diff --git a/testing/grafana/go.mod b/testing/grafana/go.mod
index 127a57a8f9..d04cee1cd6 100644
--- a/testing/grafana/go.mod
+++ b/testing/grafana/go.mod
@@ -3,6 +3,6 @@ module apk
 go 1.13
 
 require (
-	github.com/grafana/grafana v1.9.2-0.20191002071620-4ba8388f3a70
-	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect
+	github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809
+	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
 )
diff --git a/testing/grafana/go.sum b/testing/grafana/go.sum
index 9dd10236b1..18af5eb8d9 100644
--- a/testing/grafana/go.sum
+++ b/testing/grafana/go.sum
@@ -97,10 +97,8 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gosimple/slug v1.4.2 h1:jDmprx3q/9Lfk4FkGZtvzDQ9Cj9eAmsjzeQGp24PeiQ=
 github.com/gosimple/slug v1.4.2/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0=
-github.com/grafana/grafana v1.9.2-0.20191001093748-c3b3ad4380bb h1:rFy+apuaBKWhNpWlNhE6jpYxbudsZzpU7KFMeUZRYN4=
-github.com/grafana/grafana v1.9.2-0.20191001093748-c3b3ad4380bb/go.mod h1:16UfS8qT/ztbeCALwOgEhOelXO9RacezFzbVGQcFPWA=
-github.com/grafana/grafana v1.9.2-0.20191002071620-4ba8388f3a70 h1:E/2OUun9sNvGJvmS3Tzotrlxe1YMgEbdCU8YN1aVAqM=
-github.com/grafana/grafana v1.9.2-0.20191002071620-4ba8388f3a70/go.mod h1:16UfS8qT/ztbeCALwOgEhOelXO9RacezFzbVGQcFPWA=
+github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809 h1:RBwo7NE/vsWtLYJnnpYk34GlP5HnC5ZJX+tcRWwBwOU=
+github.com/grafana/grafana v1.9.2-0.20191016093209-3a2bfb7e3809/go.mod h1:16UfS8qT/ztbeCALwOgEhOelXO9RacezFzbVGQcFPWA=
 github.com/grafana/grafana-plugin-model v0.0.0-20180518082423-84176c64269d h1:J3XXvgaMHzZ+gC/pStYNc6k+LjPuhPeAevwgN0AqTeM=
 github.com/grafana/grafana-plugin-model v0.0.0-20180518082423-84176c64269d/go.mod h1:26i1retIKRnMtFVuSmJe6N6D1d1ifdzOMi507YjCYm4=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
@@ -296,8 +294,8 @@ golang.org/x/tools v0.0.0-20190802220118-1d1727260058/go.mod h1:jcCCGcm9btYwXyDq
 golang.org/x/tools v0.0.0-20190805222050-c5a2fd39b72a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=