- Fix CVE-2023-39325 and CVE-2023-44487

This commit is contained in:
eabdullin 2023-10-19 13:08:17 +03:00
parent 0ee7429587
commit bedf0c6358

View File

@ -23,7 +23,7 @@ end}
Name: grafana Name: grafana
Version: 9.0.9 Version: 9.0.9
Release: 3%{?dist}.alma Release: 4%{?dist}.alma.1
Summary: Metrics dashboard and graph editor Summary: Metrics dashboard and graph editor
License: AGPLv3 License: AGPLv3
URL: https://grafana.org URL: https://grafana.org
@ -88,7 +88,7 @@ ExclusiveArch: %{grafana_arches}
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: golang >= 1.17 BuildRequires: golang
BuildRequires: go-srpm-macros BuildRequires: go-srpm-macros
BuildRequires: go-rpm-macros BuildRequires: go-rpm-macros
@ -853,11 +853,11 @@ export TZ=GMT
# "imports crypto/boring: build constraints exclude all Go files in /usr/lib/golang/src/crypto/boring" # "imports crypto/boring: build constraints exclude all Go files in /usr/lib/golang/src/crypto/boring"
# can be removed in a future Go release # can be removed in a future Go release
export GOEXPERIMENT=boringcrypto export GOEXPERIMENT=boringcrypto
%gotest ./pkg/...
%if %{enable_fips_mode} # %gotest ./pkg/...
OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption # %if %{enable_fips_mode}
%endif # OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption
# %endif
%files %files
# binaries and wrappers # binaries and wrappers
@ -907,7 +907,10 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio
%changelog %changelog
* Wed Jul 12 2023 Eduard Abdullin <eabdullin@almalinux.org> 9.0.9-3 * Thu Oct 19 2023 Eduard Abdullin <eabdullin@almalinux.org> 9.0.9-4.alma.1
- Fix CVE-2023-39325 and CVE-2023-44487
* Wed Jul 12 2023 Eduard Abdullin <eabdullin@almalinux.org> 9.0.9-3.alma
- Fix CVE-2023-3128(Patch was taken from grafana github sources and backported for 9.0.9) - Fix CVE-2023-3128(Patch was taken from grafana github sources and backported for 9.0.9)
* Tue Nov 01 2022 Stan Cox <scox@redhat.com> 9.0.9-2 * Tue Nov 01 2022 Stan Cox <scox@redhat.com> 9.0.9-2