[arch-commits] Commit in grafana/trunk (PKGBUILD golang-xerrors.patch)

[Jelle van der Waa]

    Date: Thursday, March 19, 2020 @ 19:34:16
  Author: jelle
Revision: 601119

upgpkg: grafana 6.7.0-1

Upstream update.

Modified:
  grafana/trunk/PKGBUILD
Deleted:
  grafana/trunk/golang-xerrors.patch

----------------------+
 PKGBUILD             |    9 ++++++---
 golang-xerrors.patch |   26 --------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-19 19:25:57 UTC (rev 601118)
+++ PKGBUILD	2020-03-19 19:34:16 UTC (rev 601119)
@@ -3,8 +3,8 @@
 # Contributor: Gilles Hamel <hamelg at laposte dot net>
 
 pkgname=grafana
-pkgver=6.6.2
-pkgrel=2
+pkgver=6.7.0
+pkgrel=1
 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
 url='https://grafana.com/'
 arch=('x86_64')
@@ -22,7 +22,10 @@
             '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850'
             '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4'
             'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab')
-validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB" "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA")
+validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB"
+              "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA"
+              "622E7A764E0C94351E061C57F8D44788D50B48DF"
+              "DABB1A96E7C885CDD7F4A86B68D2B272EFDB2E81") # https://github.com/aknuds1.gpg
 
 prepare() {
   cd $pkgname

Deleted: golang-xerrors.patch
===================================================================
--- golang-xerrors.patch	2020-03-19 19:25:57 UTC (rev 601118)
+++ golang-xerrors.patch	2020-03-19 19:34:16 UTC (rev 601119)
@@ -1,26 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 1c90cfe4fa..3223ff3b27 100644
---- a/go.mod
-+++ b/go.mod
-@@ -72,7 +72,7 @@ require (
- 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
- 	golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914
- 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
--	golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
-+	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
- 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
- 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
- 	gopkg.in/ini.v1 v1.46.0
-diff --git a/go.sum b/go.sum
-index 476d52572b..e50d2db15e 100644
---- a/go.sum
-+++ b/go.sum
-@@ -302,6 +302,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-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 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
- google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
- google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=