From 9423e897a5567f20a42f0beb4adad40522b0eb4858cea3b7aeb909d3de6d0eb3 Mon Sep 17 00:00:00 2001 From: Joao Cavalheiro Date: Thu, 30 Apr 2020 16:15:02 +0000 Subject: [PATCH 1/2] Accepting request 799304 from home:SchoolGuy:branches:server:monitoring - This version fixes bsc#1170557 and its corresponding CVE-2020-12245 - Update to version 6.7.3 - Admin: Fix Synced via LDAP message for non-LDAP external users. #23477, @alexanderzobnin - Alerting: Fixes notifications for alerts with empty message in Google Hangouts notifier. #23559, @hugohaggmark - AuthProxy: Fixes bug where long username could not be cached.. #22926, @jcmcken - Dashboard: Fix saving dashboard when editing raw dashboard JSON model. #23314, @peterholmberg - Dashboard: Try to parse 8 and 15 digit numbers as timestamps if parsing of time range as date fails. #21694, @jessetan - DashboardListPanel: Fixed problem with empty panel after going into edit mode (General folder filter being automatically added) . #23426, @torkelo - Data source: Handle datasource withCredentials option properly. #23380, @hvtuananh - Security: Fix annotation popup XSS vulnerability. #23813, @torkelo - Server: Exit Grafana with status code 0 if no error. #23312, @aknuds1 - TablePanel: Fix XSS issue in header column rename (backport). #23814, @torkelo - Variables: Fixes error when setting adhoc variable values. #23580, @hugohaggmark - Update to version 6.7.2: (see installed changelog for the full list of changes) - BackendSrv: Adds config to response to fix issue for external plugins that used this property . #23032, @torkelo - Dashboard: Fixed issue with saving new dashboard after changing title . #23104, @dprokop - DataLinks: make sure we use the correct datapoint when dataset contains null value.. #22981, @mckn - Plugins: Fixed issue for plugins that imported dateMath util . #23069, @mckn - Security: Fix for dashboard snapshot original dashboard link could contain XSS vulnerability in url. #23254, @torkelo - Variables: Fixes issue with too many queries being issued for nested template variables after value change. #23220, @torkelo - Plugins: Expose promiseToDigest. #23249, @torkelo - Reporting (Enterprise): Fixes issue updating a report created by someone else OBS-URL: https://build.opensuse.org/request/show/799304 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=34 --- _service | 6 +++--- _servicedata | 2 +- grafana-6.7.1.tar.gz | 3 --- grafana-6.7.3.tar.gz | 3 +++ grafana.changes | 31 +++++++++++++++++++++++++++++++ grafana.spec | 2 +- vendor.tar.gz | 4 ++-- 7 files changed, 41 insertions(+), 10 deletions(-) delete mode 100644 grafana-6.7.1.tar.gz create mode 100644 grafana-6.7.3.tar.gz diff --git a/_service b/_service index 308565b..cd838b0 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/grafana/grafana git .git - 6.7.1 - v6.7.1 + 6.7.3 + v6.7.3 enable @@ -15,6 +15,6 @@ grafana - grafana-6.7.1.tar.gz + grafana-6.7.3.tar.gz diff --git a/_servicedata b/_servicedata index 35f07a1..32f4230 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/grafana/grafana - 3fa63cfc34668781c7f9b3caafe6d9d400b06b7f + 423a25fc3280922ae9d9834ad3079e5672e5c1fa \ No newline at end of file diff --git a/grafana-6.7.1.tar.gz b/grafana-6.7.1.tar.gz deleted file mode 100644 index 8963f83..0000000 --- a/grafana-6.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7298427d8bfe59251992f5b209dac9ed7eaea4de38b58394b05593d0b97c1090 -size 28179599 diff --git a/grafana-6.7.3.tar.gz b/grafana-6.7.3.tar.gz new file mode 100644 index 0000000..fc4f6fb --- /dev/null +++ b/grafana-6.7.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:130633b75b3bdc61db61f307a0087a76e7bc13078254d46f997b31e3b7edf18f +size 29296919 diff --git a/grafana.changes b/grafana.changes index 2cee268..e77442d 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Apr 28 10:00:58 UTC 2020 - Enno Gotthold + +- This version fixes bsc#1170557 and its corresponding CVE-2020-12245 +- Update to version 6.7.3 + - Admin: Fix Synced via LDAP message for non-LDAP external users. #23477, @alexanderzobnin + - Alerting: Fixes notifications for alerts with empty message in Google Hangouts notifier. #23559, @hugohaggmark + - AuthProxy: Fixes bug where long username could not be cached.. #22926, @jcmcken + - Dashboard: Fix saving dashboard when editing raw dashboard JSON model. #23314, @peterholmberg + - Dashboard: Try to parse 8 and 15 digit numbers as timestamps if parsing of time range as date fails. #21694, @jessetan + - DashboardListPanel: Fixed problem with empty panel after going into edit mode (General folder filter being automatically added) . #23426, @torkelo + - Data source: Handle datasource withCredentials option properly. #23380, @hvtuananh + - Security: Fix annotation popup XSS vulnerability. #23813, @torkelo + - Server: Exit Grafana with status code 0 if no error. #23312, @aknuds1 + - TablePanel: Fix XSS issue in header column rename (backport). #23814, @torkelo + - Variables: Fixes error when setting adhoc variable values. #23580, @hugohaggmark + +------------------------------------------------------------------- +Mon Apr 06 12:00:17 UTC 2020 - egotthold@suse.com + +- Update to version 6.7.2: + (see installed changelog for the full list of changes) + - BackendSrv: Adds config to response to fix issue for external plugins that used this property . #23032, @torkelo + - Dashboard: Fixed issue with saving new dashboard after changing title . #23104, @dprokop + - DataLinks: make sure we use the correct datapoint when dataset contains null value.. #22981, @mckn + - Plugins: Fixed issue for plugins that imported dateMath util . #23069, @mckn + - Security: Fix for dashboard snapshot original dashboard link could contain XSS vulnerability in url. #23254, @torkelo + - Variables: Fixes issue with too many queries being issued for nested template variables after value change. #23220, @torkelo + - Plugins: Expose promiseToDigest. #23249, @torkelo + - Reporting (Enterprise): Fixes issue updating a report created by someone else + ------------------------------------------------------------------- Fri Mar 20 20:02:56 UTC 2020 - Johannes Kastl diff --git a/grafana.spec b/grafana.spec index 488eca6..b9a86a9 100644 --- a/grafana.spec +++ b/grafana.spec @@ -26,7 +26,7 @@ %endif Name: grafana -Version: 6.7.1 +Version: 6.7.3 Release: 0 Summary: Dashboards and editors for Graphite, InfluxDB, OpenTSDB License: Apache-2.0 diff --git a/vendor.tar.gz b/vendor.tar.gz index ea1067f..6cfd539 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8df0e9b7d000aa569dcdb45547670bfa86f2cd2c4076f0748501bf4cecb77843 -size 8510131 +oid sha256:d568ae2cb1c02b56250c075a3f522173d40f4481c7b27274f074f42563f2d5d8 +size 8595334 From 1226120e9426c06e4c5b9ab7d75afa24e1c5f0fbec0f9b44fd1892b6824a76ec Mon Sep 17 00:00:00 2001 From: Joao Cavalheiro Date: Thu, 30 Apr 2020 16:17:59 +0000 Subject: [PATCH 2/2] Fix changelog entry ordering OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=35 --- grafana.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana.changes b/grafana.changes index e77442d..6a5e91e 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Apr 28 10:00:58 UTC 2020 - Enno Gotthold -- This version fixes bsc#1170557 and its corresponding CVE-2020-12245 - Update to version 6.7.3 + - This version fixes bsc#1170557 and its corresponding CVE-2020-12245 - Admin: Fix Synced via LDAP message for non-LDAP external users. #23477, @alexanderzobnin - Alerting: Fixes notifications for alerts with empty message in Google Hangouts notifier. #23559, @hugohaggmark - AuthProxy: Fixes bug where long username could not be cached.. #22926, @jcmcken