From c1faa2f8219cd955b795f1d3583e9ea2da6a4f83 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Mon, 23 Oct 2023 11:40:20 +0800 Subject: [PATCH 1/3] update to grafana-7.5.15-5 --- grafana.spec | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/grafana.spec b/grafana.spec index 97c4b9e..44ef884 100644 --- a/grafana.spec +++ b/grafana.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.2 # 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 +30,7 @@ end} Name: grafana Version: 7.5.15 -Release: 4%{anolis_release}%{?dist} +Release: 5%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -122,10 +121,6 @@ BuildRequires: nodejs >= 1:14, yarnpkg BuildRequires: openssl-devel %endif -%ifarch loongarch64 -BuildRequires: golang-vendored-golang.org -%endif - # omit golang debugsource, see BZ995136 and related %global dwz_low_mem_die_limit 0 %global _debugsource_template %{nil} @@ -809,8 +804,6 @@ ln -s %{_builddir}/%{name}-%{version} \ # Build the frontend %if %{compile_frontend} %{SOURCE5} -# export GO111MODULE=off -go env -w GOPROXY=https://goproxy.cn %endif # Build the backend @@ -821,10 +814,6 @@ export GOPATH=%{_builddir} # "imports crypto/boring: build constraints exclude all Go files in /usr/lib/golang/src/crypto/boring" # can be removed in a future Go release export GOEXPERIMENT=boringcrypto -%ifarch loongarch64 -rm -rf vendor/golang.org/x/sys -cp -arp %{_datadir}/golang/vendor/golang.org/x/sys/ vendor/golang.org/x/ -%endif # see grafana-X.X.X/build.go export LDFLAGS="-X main.version=%{version} -X main.buildstamp=${SOURCE_DATE_EPOCH}" @@ -945,12 +934,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,12 +985,10 @@ 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 -- 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 -- Gitee From 61a1115583b1a2703941175579dd948682c625e1 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Tue, 26 Apr 2022 17:07:50 +0800 Subject: [PATCH 2/3] build: use cn proxy for go build # Conflicts: # grafana.spec --- grafana.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grafana.spec b/grafana.spec index 44ef884..2734a80 100644 --- a/grafana.spec +++ b/grafana.spec @@ -1,3 +1,4 @@ +%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 @@ -30,7 +31,7 @@ end} Name: grafana Version: 7.5.15 -Release: 5%{?dist} +Release: 5%{anolis_release}%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -804,6 +805,8 @@ ln -s %{_builddir}/%{name}-%{version} \ # Build the frontend %if %{compile_frontend} %{SOURCE5} +# export GO111MODULE=off +go env -w GOPROXY=https://goproxy.cn %endif # Build the backend @@ -985,6 +988,9 @@ export GOEXPERIMENT=boringcrypto %changelog +* Mon Oct 23 2023 Liwei Ge 7.5.15-5.0.1 +- Use cn proxy for go 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 -- Gitee From 614154b00004e48f9c6e414db6ef1706cfca73dc Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Wed, 28 Dec 2022 20:40:59 +0800 Subject: [PATCH 3/3] spec: support loongarch build --- grafana.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/grafana.spec b/grafana.spec index 2734a80..736e16f 100644 --- a/grafana.spec +++ b/grafana.spec @@ -122,6 +122,10 @@ BuildRequires: nodejs >= 1:14, yarnpkg BuildRequires: openssl-devel %endif +%ifarch loongarch64 +BuildRequires: golang-vendored-golang.org +%endif + # omit golang debugsource, see BZ995136 and related %global dwz_low_mem_die_limit 0 %global _debugsource_template %{nil} @@ -817,6 +821,10 @@ export GOPATH=%{_builddir} # "imports crypto/boring: build constraints exclude all Go files in /usr/lib/golang/src/crypto/boring" # can be removed in a future Go release export GOEXPERIMENT=boringcrypto +%ifarch loongarch64 +rm -rf vendor/golang.org/x/sys +cp -arp %{_datadir}/golang/vendor/golang.org/x/sys/ vendor/golang.org/x/ +%endif # see grafana-X.X.X/build.go export LDFLAGS="-X main.version=%{version} -X main.buildstamp=${SOURCE_DATE_EPOCH}" @@ -990,6 +998,7 @@ export GOEXPERIMENT=boringcrypto %changelog * 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 -- Gitee