Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/grafana.git#8b048a5bf5e5e75dc52ea4411b0605c55a171ceb

002-manpages.patch

@@ -4,7 +4,7 @@ index 0000000000..7ac2af882c
 --- /dev/null
 +++ b/docs/man/man1/grafana-cli.1
 @@ -0,0 +1,60 @@
-+.TH GRAFANA "1" "November 2020" "Grafana cli version 7.3.3" "User Commands"
++.TH GRAFANA "1" "December 2020" "Grafana cli version 7.3.6" "User Commands"
 +.SH NAME
 +grafana-cli \- command line administration for the Grafana metrics dashboard and graph editor
 +.SH DESCRIPTION
@@ -70,7 +70,7 @@ index 0000000000..c616268b31
 --- /dev/null
 +++ b/docs/man/man1/grafana-server.1
 @@ -0,0 +1,84 @@
-+.TH VERSION "1" "November 2020" "Version 7.3.3" "User Commands"
++.TH VERSION "1" "December 2020" "Version 7.3.6" "User Commands"
 +.SH NAME
 +grafana-server \- back-end server for the Grafana metrics dashboard and graph editor
 +.SH DESCRIPTION

005-pin-yarn-version.patch

@@ -0,0 +1,13 @@
+diff --git a/package.json b/package.json
+index ce11ba6de8..a3210762ed 100644
+--- a/package.json
++++ b/package.json
+@@ -314,6 +314,7 @@
+     "node": ">=12 <13"
+   },
+   "volta": {
+-    "node": "12.19.0"
++    "node": "12.19.0",
++    "yarn": "1.22.10"
+   }
+ }

006-remove-saml-dependency.patch

@@ -0,0 +1,39 @@
+diff --git a/go.mod b/go.mod
+index bb073996ac..c1b6c3219c 100644
+--- a/go.mod
++++ b/go.mod
+@@ -19,7 +19,6 @@ require (
+ 	github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3
+ 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
+ 	github.com/centrifugal/centrifuge v0.11.0
+-	github.com/crewjam/saml v0.4.4-0.20201214083806-0dd2422c212e
+ 	github.com/davecgh/go-spew v1.1.1
+ 	github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec
+ 	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
+diff --git a/go.sum b/go.sum
+index c79d983b88..f45fa68f41 100644
+--- a/go.sum
++++ b/go.sum
+@@ -228,10 +228,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY
+ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+ github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs=
+-github.com/crewjam/saml v0.4.1 h1:ZNSRJvdbypQDY2uApMngeIHNcxS6UCRAgiw3S+pmgRU=
+-github.com/crewjam/saml v0.4.1/go.mod h1:vHcshzXm2WkPOV1dcToZa99cCB1h3nPiKLtLYK+erBE=
+-github.com/crewjam/saml v0.4.4-0.20201214083806-0dd2422c212e h1:CFIpybPh+vrxRD6R3t2BCV9hdtlOQudsj1vB1ECXOo4=
+-github.com/crewjam/saml v0.4.4-0.20201214083806-0dd2422c212e/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S68bk=
+ github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
+ github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
+ github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
+diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go
+index 337f6566f8..b15c3f907b 100644
+--- a/pkg/extensions/main.go
++++ b/pkg/extensions/main.go
+@@ -5,7 +5,6 @@ import (
+ 	// remove the cron (v1) dependency
+ 
+ 	_ "github.com/beevik/etree"
+-	_ "github.com/crewjam/saml"
+ 	_ "github.com/gobwas/glob"
+ 	"github.com/grafana/grafana/pkg/registry"
+ 	"github.com/grafana/grafana/pkg/services/licensing"

README.md

@@ -12,7 +12,7 @@ The grafana package
 * run rpm linter: `rpkg lint -r grafana.rpmlintrc`
 * run local builds with different OS versions: `./run_container_build.sh fedora-version`
 * run a scratch build: `fedpkg scratch-build --srpm`
-* upload new source tarballs: `fedpkg new-sources *.tar.gz`
+* upload new source tarballs: `fedpkg new-sources *.tar.gz *.tar.xz`
 
 ## Backporting
 * create the patch

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

grafana.spec

@@ -1,15 +1,3 @@
-%if 0%{?rhel}
-# emulate macros defined by the go-rpm-macros package
-# https://pagure.io/go-rpm-macros/blob/master/f/rpm/macros.d/macros.go-compilers-golang
-%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**};
-%define gotestextldflags %__global_ldflags %{?__golang_extldflags}
-%define gotest() GO111MODULE=off go test -buildmode pie -compiler gc -ldflags "${LDFLAGS:-}%{?currentgoldflags} -extldflags '%{gotestextldflags}'" %{?**};
-%endif
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1752991
-# unfortunately the go_arches macro doesn't reflect that change yet
-ExcludeArch:      i686
-
 %global grafana_arches %{lua: go_arches = {}
   for arch in rpm.expand("%{go_arches}"):gmatch("%S+") do
     go_arches[arch] = 1
@@ -20,12 +8,21 @@ ExcludeArch:      i686
   end
 end}
 
+# gobuild and gotest macros are defined in go-rpm-macros, which is not available on RHEL
+# definitions lifted from Fedora 34 podman.spec
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%endif
+%if ! 0%{?gotest:1}
+%define gotest() GO111MODULE=off go test -buildmode pie -compiler gc -ldflags "${LDFLAGS:-} -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" %{?**};
+%endif
+
 # Specify if the frontend will be compiled as part of the build or
 # is attached as a webpack tarball (in case of an unsuitable nodejs version on the build system)
 %define compile_frontend 0
 
 Name:             grafana
-Version:          7.3.4
+Version:          7.3.6
 Release:          1%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
@@ -68,11 +65,14 @@ Patch3:           003-remove-dashboard-abspath-test.patch
 # therefore loading this memory dump fails on s390x
 Patch4:           004-skip-x86-goldenfiles-tests.patch
 
+Patch5:           005-pin-yarn-version.patch
+Patch6:           006-remove-saml-dependency.patch
+
 # Intersection of go_arches and nodejs_arches
 ExclusiveArch:    %{grafana_arches}
 
 BuildRequires:    git, systemd, golang, go-srpm-macros
-%if 0%{?fedora}
+%if 0%{?fedora} >= 31
 BuildRequires:    go-rpm-macros
 %endif
 %if %{compile_frontend}
@@ -95,36 +95,36 @@ Requires(pre):    shadow-utils
 Recommends: grafana-pcp
 %endif
 
-Obsoletes:        grafana-cloudwatch < 7.3.4-1
+Obsoletes:        grafana-cloudwatch < 7.1.1-1
-Obsoletes:        grafana-elasticsearch < 7.3.4-1
+Obsoletes:        grafana-elasticsearch < 7.1.1-1
-Obsoletes:        grafana-azure-monitor < 7.3.4-1
+Obsoletes:        grafana-azure-monitor < 7.1.1-1
-Obsoletes:        grafana-graphite < 7.3.4-1
+Obsoletes:        grafana-graphite < 7.1.1-1
-Obsoletes:        grafana-influxdb < 7.3.4-1
+Obsoletes:        grafana-influxdb < 7.1.1-1
-Obsoletes:        grafana-loki < 7.3.4-1
+Obsoletes:        grafana-loki < 7.1.1-1
-Obsoletes:        grafana-mssql < 7.3.4-1
+Obsoletes:        grafana-mssql < 7.1.1-1
-Obsoletes:        grafana-mysql < 7.3.4-1
+Obsoletes:        grafana-mysql < 7.1.1-1
-Obsoletes:        grafana-opentsdb < 7.3.4-1
+Obsoletes:        grafana-opentsdb < 7.1.1-1
-Obsoletes:        grafana-postgres < 7.3.4-1
+Obsoletes:        grafana-postgres < 7.1.1-1
-Obsoletes:        grafana-prometheus < 7.3.4-1
+Obsoletes:        grafana-prometheus < 7.1.1-1
-Obsoletes:        grafana-stackdriver < 7.3.4-1
+Obsoletes:        grafana-stackdriver < 7.1.1-1
-Provides:         grafana-cloudwatch = 7.3.4-1
+Provides:         grafana-cloudwatch = 7.1.1-1
-Provides:         grafana-elasticsearch = 7.3.4-1
+Provides:         grafana-elasticsearch = 7.1.1-1
-Provides:         grafana-azure-monitor = 7.3.4-1
+Provides:         grafana-azure-monitor = 7.1.1-1
-Provides:         grafana-graphite = 7.3.4-1
+Provides:         grafana-graphite = 7.1.1-1
-Provides:         grafana-influxdb = 7.3.4-1
+Provides:         grafana-influxdb = 7.1.1-1
-Provides:         grafana-loki = 7.3.4-1
+Provides:         grafana-loki = 7.1.1-1
-Provides:         grafana-mssql = 7.3.4-1
+Provides:         grafana-mssql = 7.1.1-1
-Provides:         grafana-mysql = 7.3.4-1
+Provides:         grafana-mysql = 7.1.1-1
-Provides:         grafana-opentsdb = 7.3.4-1
+Provides:         grafana-opentsdb = 7.1.1-1
-Provides:         grafana-postgres = 7.3.4-1
+Provides:         grafana-postgres = 7.1.1-1
-Provides:         grafana-prometheus = 7.3.4-1
+Provides:         grafana-prometheus = 7.1.1-1
-Provides:         grafana-stackdriver = 7.3.4-1
+Provides:         grafana-stackdriver = 7.1.1-1
 
 # vendored golang and node.js build dependencies
 # this is for security purposes, if nodejs-foo ever needs an update,
 # affected packages can be easily identified.
 # Note: generated by the Makefile (see README.md)
-Provides: bundled(golang(cloud.google.com/go/storage)) = 1.8.0
+Provides: bundled(golang(cloud.google.com/go/storage)) = 1.10.0
 Provides: bundled(golang(github.com/BurntSushi/toml)) = 0.3.1
 Provides: bundled(golang(github.com/VividCortex/mysqlerr)) = 0.0.0-20170204212430.6c6b55f8796f
 Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.33.12
@@ -132,7 +132,6 @@ Provides: bundled(golang(github.com/beevik/etree)) = 1.1.0
 Provides: bundled(golang(github.com/benbjohnson/clock)) = 0.0.0-20161215174838.7dc76406b6d3
 Provides: bundled(golang(github.com/bradfitz/gomemcache)) = 0.0.0-20190913173617.a41fca850d0b
 Provides: bundled(golang(github.com/centrifugal/centrifuge)) = 0.11.0
-Provides: bundled(golang(github.com/crewjam/saml)) = 0.4.1
 Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
 Provides: bundled(golang(github.com/denisenkom/go-mssqldb)) = 0.0.0-20200620013148.b91950f658ec
 Provides: bundled(golang(github.com/facebookgo/inject)) = 0.0.0-20180706035515.f23751cae28b
@@ -144,8 +143,8 @@ Provides: bundled(golang(github.com/go-macaron/session)) = 0.0.0-20190805070824.
 Provides: bundled(golang(github.com/go-sql-driver/mysql)) = 1.5.0
 Provides: bundled(golang(github.com/go-stack/stack)) = 1.8.0
 Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3
-Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.2
+Provides: bundled(golang(github.com/golang/protobuf)) = 1.4.3
-Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.0
+Provides: bundled(golang(github.com/google/go-cmp)) = 0.5.2
 Provides: bundled(golang(github.com/gosimple/slug)) = 1.4.2
 Provides: bundled(golang(github.com/grafana/grafana-plugin-model)) = 0.0.0-20190930120109.1fc953a61fb4
 Provides: bundled(golang(github.com/grafana/grafana-plugin-sdk-go)) = 0.79.0
@@ -166,12 +165,12 @@ Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.11.0
 Provides: bundled(golang(github.com/opentracing/opentracing-go)) = 1.2.0
 Provides: bundled(golang(github.com/patrickmn/go-cache)) = 2.1.0+incompatible
 Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1
-Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.7.1
+Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.8.0
 Provides: bundled(golang(github.com/prometheus/client_model)) = 0.2.0
-Provides: bundled(golang(github.com/prometheus/common)) = 0.10.0
+Provides: bundled(golang(github.com/prometheus/common)) = 0.14.0
 Provides: bundled(golang(github.com/robfig/cron)) = 0.0.0-20180505203441.b41be1df6967
 Provides: bundled(golang(github.com/robfig/cron/v3)) = 3.0.0
-Provides: bundled(golang(github.com/russellhaering/goxmldsig)) = 0.0.0-20200902171629.2e1fbc2c5593
+Provides: bundled(golang(github.com/russellhaering/goxmldsig)) = 1.1.0
 Provides: bundled(golang(github.com/smartystreets/goconvey)) = 1.6.4
 Provides: bundled(golang(github.com/stretchr/testify)) = 1.6.1
 Provides: bundled(golang(github.com/teris-io/shortid)) = 0.0.0-20171029131806.771a37caa5cf
@@ -180,13 +179,15 @@ Provides: bundled(golang(github.com/ua-parser/uap-go)) = 0.0.0-20190826212731.da
 Provides: bundled(golang(github.com/uber/jaeger-client-go)) = 2.25.0+incompatible
 Provides: bundled(golang(github.com/unknwon/com)) = 1.0.1
 Provides: bundled(golang(github.com/urfave/cli/v2)) = 2.1.1
+Provides: bundled(golang(github.com/weaveworks/common)) = 0.0.0-20201119133501.0619918236ec
 Provides: bundled(golang(github.com/xorcare/pointer)) = 1.1.0
 Provides: bundled(golang(github.com/yudai/gojsondiff)) = 1.0.0
-Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20200820211705.5c72a883971a
+Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0-20201208171446.5f87f3452ae9
-Provides: bundled(golang(golang.org/x/net)) = 0.0.0-20200813134508.3edf25e44fcc
+Provides: bundled(golang(golang.org/x/net)) = 0.0.0-20201022231255.08b38378de70
-Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200107190931.bf48bf16ab8d
+Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200902213428.5d25da1a8d43
-Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20200625203802.6e8e738ad208
+Provides: bundled(golang(golang.org/x/sync)) = 0.0.0-20201020160332.67f06af15bc9
-Provides: bundled(golang(google.golang.org/grpc)) = 1.30.0
+Provides: bundled(golang(golang.org/x/time)) = 0.0.0-20200630173020.3af7569d3a1e
+Provides: bundled(golang(google.golang.org/grpc)) = 1.33.1
 Provides: bundled(golang(gopkg.in/ini.v1)) = 1.51.0
 Provides: bundled(golang(gopkg.in/ldap.v3)) = 3.0.2
 Provides: bundled(golang(gopkg.in/macaron.v1)) = 1.3.9
@@ -445,6 +446,8 @@ rm -r plugins-bundled
 %ifarch s390x
 %patch4 -p1
 %endif
+%patch5 -p1
+%patch6 -p1
 
 # Set up build subdirs and links
 mkdir -p %{_builddir}/src/github.com/grafana
@@ -620,19 +623,30 @@ export TZ=GMT
 
 
 %changelog
+* Mon Dec 21 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 7.3.6-1
+- update to 7.3.6 tagged upstream community sources, see CHANGELOG
+- remove dependency on SAML (not supported in the open source version of Grafana)
+
 * Wed Nov 25 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 7.3.4-1
 - update to 7.3.4 tagged upstream community sources, see CHANGELOG
-- bundle golang dependencies
+
+* Tue Nov 10 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 7.3.1-1
+- update to 7.3.1 tagged upstream community sources, see CHANGELOG
 - optionally bundle node.js dependencies and build and test frontend as part of the specfile
-- merge all datasources into main grafana package
+- change default provisioning path to /etc/grafana/provisioning (changed in version 7.1.1-1)
-- change default provisioning path to /etc/grafana/provisioning
 - resolve https://bugzilla.redhat.com/show_bug.cgi?id=1843170
 
-* Thu Aug 20 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-3
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.1-2
-- apply patch for CVE-2020-13430 also to sources, not only to compiled webpack
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Wed Aug 19 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-2
+* Thu Jul 30 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 7.1.1-1
-- security fix for CVE-2020-13430
+- update to 7.1.1 tagged upstream community sources, see CHANGELOG
+- merge all datasources into main grafana package
+- bundle golang dependencies
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Fri Jun 05 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-1
 - update to 6.7.4 tagged upstream community sources, see CHANGELOG

sources

@@ -1,3 +1,3 @@
-6b9f76a23ca47e1f902f398bee5630c8  grafana-7.3.4.tar.gz
+SHA512 (grafana-7.3.6.tar.gz) = c500565c6cd7b7f3a7d8c1d4924b9ba576db2a765ad184e9bd32373ebbb8792c1812b6c866ba652634f134105af59ddaf023f0da44c067bb77112bcd431a30b4
-4e70175518dabed438421b3e73394841  grafana-vendor-7.3.4.tar.xz
+SHA512 (grafana-webpack-7.3.6.tar.gz) = 83ac952ff3870625450badbe42edcfdde45d142e31825e8cfe556b56c6c6d81776e46c0efc8ba9ca9ce49ab939ea998b563caba33ab438324dec7e696d30bb05
-fbbb00a1e7df6cf3296ffa85b886b2e4  grafana-webpack-7.3.4.tar.gz
+SHA512 (grafana-vendor-7.3.6.tar.xz) = 46879283457f41225e41854ea1908dd3718dbbc5c2a5cace6d775de71ce225be2fcdd50fa8a244335486d390a0b38dfce1f05202ac7f6730a8c3e4e2812ab7d7