diff --git a/.gitignore b/.gitignore index fb060cc..4e0b824 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/grafana-6.7.3.tar.gz -SOURCES/grafana_webpack-6.7.3.tar.gz +SOURCES/grafana-6.7.4.tar.gz +SOURCES/grafana_webpack-6.7.4.tar.gz diff --git a/.grafana.metadata b/.grafana.metadata index cbf7dbd..9dce1c8 100644 --- a/.grafana.metadata +++ b/.grafana.metadata @@ -1,2 +1,2 @@ -cd15a32c97cad74170baf35fda5cdb63dda71189 SOURCES/grafana-6.7.3.tar.gz -497241edb4421d19f87bbfd048d45521fe055f01 SOURCES/grafana_webpack-6.7.3.tar.gz +8bd02ed09feb9479a7f933408420354a3785dc9e SOURCES/grafana-6.7.4.tar.gz +58bbf1928f44025278fe6a576c786fc5a8db78b0 SOURCES/grafana_webpack-6.7.4.tar.gz diff --git a/SPECS/grafana.spec b/SPECS/grafana.spec index 51c73c2..fa38f0f 100644 --- a/SPECS/grafana.spec +++ b/SPECS/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 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 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