diff --git a/0012-coredump-selinux-error.patch b/0012-coredump-selinux-error.patch new file mode 100644 index 0000000..5bdcc5b --- /dev/null +++ b/0012-coredump-selinux-error.patch @@ -0,0 +1,13 @@ +diff --git a/pkg/framework/coremodel/helpers.go b/pkg/framework/coremodel/helpers.go +index 20d111edba..6655f81cee 100644 +--- a/pkg/framework/coremodel/helpers.go ++++ b/pkg/framework/coremodel/helpers.go +@@ -26,7 +26,7 @@ func init() { + var err error + defaultFramework, err = doLoadFrameworkCUE(cuectx.ProvideCUEContext()) + if err != nil { +- panic(err) ++// panic(err) + } + } + diff --git a/grafana.spec b/grafana.spec index e72bbc7..fee8b2e 100644 --- a/grafana.spec +++ b/grafana.spec @@ -25,7 +25,7 @@ end} Name: grafana Version: 9.2.10 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Metrics dashboard and graph editor License: AGPL-3.0-only URL: https://grafana.org @@ -77,6 +77,7 @@ Patch8: 0008-graphite-functions-xss.patch Patch9: 0009-redact-weak-ciphers.patch Patch10: 0010-skip-tests.patch Patch11: 0011-remove-email-lookup.patch +Patch12: 0012-coredump-selinux-error.patch # Patches affecting the vendor tarball Patch1001: 1001-vendor-patch-removed-backend-crypto.patch @@ -763,6 +764,7 @@ cp -p %{SOURCE8} %{SOURCE9} %{SOURCE10} SELinux %patch -P 9 -p1 %patch -P 10 -p1 %patch -P 11 -p1 +%patch -P 12 -p1 %patch -P 1001 -p1 %if %{enable_fips_mode} @@ -1006,6 +1008,11 @@ fi %{_datadir}/selinux/*/grafana.pp %changelog +* Thu Dec 14 2023 Sam Feifer 9.2.10-13 +- Resolves RHEL-19296 +- Fixes coredump issue introduced by selinux +- Patches out call to panic when trying to walk "/" directory + * Thu Nov 30 2023 Sam Feifer 9.2.10-12 - Resolves RHEL-7505 - Fixes additional selinux denials found when testing on certain architectures