diff --git a/.gitignore b/.gitignore index 0b10e48..6aeacdf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/grafana-10.2.6.tar.gz -SOURCES/grafana-vendor-10.2.6-9.tar.xz -SOURCES/grafana-webpack-10.2.6-9.tar.gz +SOURCES/grafana-vendor-10.2.6-11.tar.xz +SOURCES/grafana-webpack-10.2.6-11.tar.gz diff --git a/.grafana.metadata b/.grafana.metadata index 407fc5f..cc46226 100644 --- a/.grafana.metadata +++ b/.grafana.metadata @@ -1,3 +1,3 @@ 5c65a9460e0d0ecff29e397b5889b4167f046142 SOURCES/grafana-10.2.6.tar.gz -80512e6390fd349f9511269026061a2342f3f613 SOURCES/grafana-vendor-10.2.6-9.tar.xz -128ba33fc426b99ef66e9230a9c68925b9822b85 SOURCES/grafana-webpack-10.2.6-9.tar.gz +80512e6390fd349f9511269026061a2342f3f613 SOURCES/grafana-vendor-10.2.6-11.tar.xz +128ba33fc426b99ef66e9230a9c68925b9822b85 SOURCES/grafana-webpack-10.2.6-11.tar.gz diff --git a/SOURCES/build_frontend.sh b/SOURCES/build_frontend.sh old mode 100644 new mode 100755 diff --git a/SOURCES/create_bundles.sh b/SOURCES/create_bundles.sh old mode 100644 new mode 100755 diff --git a/SOURCES/create_bundles_in_container.sh b/SOURCES/create_bundles_in_container.sh old mode 100644 new mode 100755 diff --git a/SOURCES/list_bundled_nodejs_packages.py b/SOURCES/list_bundled_nodejs_packages.py old mode 100644 new mode 100755 diff --git a/SPECS/grafana.spec b/SPECS/grafana.spec index 09989ca..f6c4115 100644 --- a/SPECS/grafana.spec +++ b/SPECS/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 10.2.6 -Release: 9%{?dist} +Release: 11%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -36,13 +36,13 @@ Source0: https://github.com/grafana/grafana/archive/v%{version}/%{name} # Source1 contains the bundled Go and Node.js dependencies # Note: In case there were no changes to this tarball, the NVR of this tarball # lags behind the NVR of this package. -Source1: grafana-vendor-%{version}-9.tar.xz +Source1: grafana-vendor-%{version}-11.tar.xz %if %{compile_frontend} == 0 # Source2 contains the precompiled frontend # Note: In case there were no changes to this tarball, the NVR of this tarball # lags behind the NVR of this package. -Source2: grafana-webpack-%{version}-9.tar.gz +Source2: grafana-webpack-%{version}-11.tar.gz %endif # Source3 contains the systemd-sysusers configuration @@ -1030,17 +1030,17 @@ fi %{_datadir}/selinux/*/grafana.pp %changelog -* Tue Mar 25 2025 Sam Feifer 10.2.6-9 -- Resolves RHEL-84634: CVE-2025-30204 +* Tue Mar 25 2025 Sam Feifer 10.2.6-11 +- Resolves RHEL-84636: CVE-2025-30204 -* Wed Jan 29 2025 Sam Feifer 10.2.6-8 -- Resolves RHEL-75922: grafana selinux issue with autofs_t +* Wed Jan 29 2025 Sam Feifer 10.2.6-10 +- Resolves RHEL-75919: grafana selinux issue with autofs_t -* Wed Oct 16 2024 Sam Feifer 10.2.6-7 -- Resolves RHEL-62308: CVE-2024-47875 +* Thu Dec 5 2024 Sam Feifer 10.2.6-9 +- Resolves RHEL-69939: allow mssql datasource in selinux policy -* Fri Sep 27 2024 Sam Feifer 10.2.6-6 -- Resolves: RHEL-57927 +* Wed Oct 16 2024 Sam Feifer 10.2.6-8 +- Resolves RHEL-62312: CVE-2024-47875 * Fri Jul 19 2024 Lauren Chilton 10.2.6-5 - Resolves RHEL-47185