From 1a6c0ebf4249448bebbbdca3d34a0563ac7c7933 Mon Sep 17 00:00:00 2001
From: Andreas Gerstmayr <andreas@gerstmayr.me>
Date: Thu, 20 Aug 2020 11:49:32 +0200
Subject: [PATCH] apply patch for CVE-2020-13430 also to sources, not only to
 compiled webpack

Related: #1850427
---
 grafana.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/grafana.spec b/grafana.spec
index c0c362d..1becb51 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -24,7 +24,7 @@ end}
 
 Name:             grafana
 Version:          6.7.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          ASL 2.0
 URL:              https://grafana.org
@@ -386,6 +386,8 @@ The Grafana stackdriver datasource.
 %patch9 -p1
 %endif
 
+%patch10 -p1
+
 # Set up build subdirs and links
 mkdir -p %{_builddir}/src/github.com/grafana
 ln -sf %{_builddir}/%{name}-%{version} \
@@ -632,6 +634,9 @@ export GO111MODULE=off
 
 
 %changelog
+* Thu Aug 20 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-3
+- apply patch for CVE-2020-13430 also to sources, not only to compiled webpack
+
 * Wed Aug 19 2020 Andreas Gerstmayr <agerstmayr@redhat.com> 6.7.4-2
 - security fix for CVE-2020-13430