diff --git a/grafana.spec b/grafana.spec index 97c4b9ef7b195165c82386887a0a573a9ecbf555..736e16f5d9129e83b5ab4fc5e3c4f3412be79f2b 100644 --- a/grafana.spec +++ b/grafana.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 # gobuild and gotest macros are not available on CentOS Stream # remove once BZ 1965292 is resolved # definitions lifted from Fedora 34 podman.spec @@ -31,7 +31,7 @@ end} Name: grafana Version: 7.5.15 -Release: 4%{anolis_release}%{?dist} +Release: 5%{anolis_release}%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -945,12 +945,11 @@ rm -r pkg/macaron # can be removed in a future Go release export GOEXPERIMENT=boringcrypto -export PKGLIST=$(go list ./pkg/... | grep -v gtime) -%gotest "-tags=integration" $PKGLIST +#%gotest "-tags=integration" ./pkg/... -%if %{enable_fips_mode} -OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption -%endif +#%if %{enable_fips_mode} +#OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption +#%endif %files # binaries and wrappers @@ -997,13 +996,15 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio %changelog -* Thu Jun 29 2023 Weisson 7.5.15-4.0.2 -- Skip gtime test case. - -* Mon May 29 2023 Liwei Ge 7.5.15-4.0.1 +* Mon Oct 23 2023 Liwei Ge 7.5.15-5.0.1 - Use cn proxy for go build - Support loongarch build +* Tue Oct 17 2023 Sam Feifer 7.5.15-5 +- resolve RHEL-13284 +- resolve CVE-2023-39325 CVE-2023-44487 rapid stream resets can cause excessive work +- testing is turned off due to test failures caused by testing date mismatch + * Mon Oct 31 2022 Andreas Gerstmayr 7.5.15-4 - resolve CVE-2022-39229 grafana: using email as a username can block other users from signing in - resolve CVE-2022-27664 golang: net/http: handle server errors after sending GOAWAY