From 171ce90ada27afcb2e8541116d159e7bcda49271 Mon Sep 17 00:00:00 2001
From: Andreas Gerstmayr <andreas@gerstmayr.me>
Date: Fri, 5 Jun 2020 20:27:18 +0200
Subject: [PATCH] Rebase to grafana-6.7.4

Resolves: #1843964
Fixes: CVE-2020-13379
---
 grafana.rpmlintrc |  6 +++++-
 grafana.spec      | 10 +++++++++-
 sources           |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/grafana.rpmlintrc b/grafana.rpmlintrc
index 9a72590..c6b221d 100644
--- a/grafana.rpmlintrc
+++ b/grafana.rpmlintrc
@@ -1,6 +1,10 @@
 addFilter("W: non-standard-gid.* grafana")
 addFilter("W: non-standard-uid.* grafana")
 addFilter("E: script-without-shebang .*\.json")
-addFilter("E: zero-length .*\.scss")
+addFilter("E: zero-length /usr/share/grafana/public/.*")
 addFilter("W: log-files-without-logrotate .*")
 addFilter("W: no-documentation")
+addFilter("E: non-readable /etc/grafana/grafana.ini 640")
+addFilter("E: non-readable /etc/grafana/ldap.toml 640")
+addFilter("E: non-standard-dir-perm /var/lib/grafana 750")
+addFilter("W: dangerous-command-in-%post chown")
diff --git a/grafana.spec b/grafana.spec
index 51c73c2..fa38f0f 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -23,7 +23,7 @@ end}
 %endif
 
 Name:             grafana
-Version:          6.7.3
+Version:          6.7.4
 Release:          1%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
@@ -62,6 +62,10 @@ Patch9:           009-pkg-fix-xorm-import.patch
 # Intersection of go_arches and nodejs_arches
 ExclusiveArch:    %{grafana_arches}
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1752991
+# unfortunately the golang_arches macro of go-srpm-macros doesn't reflect that change yet
+ExcludeArch:      i686
+
 # omit golang debugsource, see BZ995136 and related
 %global           dwz_low_mem_die_limit 0
 %global           _debugsource_template %{nil}
@@ -627,6 +631,10 @@ export GO111MODULE=off
 
 
 %changelog
+* Fri Jun 05 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-1
+- update to 6.7.4 tagged upstream community sources, see CHANGELOG
+- security fix for CVE-2020-13379
+
 * Tue Apr 28 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.3-1
 - update to 6.7.3 tagged upstream community sources, see CHANGELOG
 - add scripts to list Go dependencies and bundled npmjs dependencies
diff --git a/sources b/sources
index 3c36ab7..b8dbdff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9130e622cf096caed547ca3ca371a892  grafana-6.7.3.tar.gz
-4b77b2d6e6aae50441131b0dd53bf617  grafana_webpack-6.7.3.tar.gz
+b9331a128ccb918cb3b9f8c5180eea93  grafana-6.7.4.tar.gz
+5bdff3edbc6d875600b9c61fb5055f07  grafana_webpack-6.7.4.tar.gz