From fae044a3e7489a852eb8b6dd70e4db425d149a08 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Oct 2021 14:21:02 +0000 Subject: [PATCH] import grafana-7.5.10-1.el8 --- .gitignore | 6 +- .grafana.metadata | 6 +- SOURCES/002-manpages.patch | 4 +- ...-patch-unused-backend-crypto.vendor.patch} | 0 .../{010-fips.patch => 010-fips.cond.patch} | 0 SOURCES/Makefile | 71 ++++++++++--------- SPECS/grafana.spec | 30 +++++--- 7 files changed, 65 insertions(+), 52 deletions(-) rename SOURCES/{009-patch-unused-backend-crypto.patch => 009-patch-unused-backend-crypto.vendor.patch} (100%) rename SOURCES/{010-fips.patch => 010-fips.cond.patch} (100%) diff --git a/.gitignore b/.gitignore index 8d9599f..e5ae55a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/grafana-7.5.9.tar.gz -SOURCES/grafana-vendor-7.5.9-2.tar.xz -SOURCES/grafana-webpack-7.5.9-2.tar.gz +SOURCES/grafana-7.5.10.tar.gz +SOURCES/grafana-vendor-7.5.10-1.tar.xz +SOURCES/grafana-webpack-7.5.10-1.tar.gz diff --git a/.grafana.metadata b/.grafana.metadata index af2fa86..03f3ec2 100644 --- a/.grafana.metadata +++ b/.grafana.metadata @@ -1,3 +1,3 @@ -e658bc3706a71a2a77f34755ac362fd506d7b1a0 SOURCES/grafana-7.5.9.tar.gz -8fc46c12ac1bae0f2e0434e8fdf71e61e922c74a SOURCES/grafana-vendor-7.5.9-2.tar.xz -28052475c9cb45ac6523479ab9fd3da4ba678400 SOURCES/grafana-webpack-7.5.9-2.tar.gz +bb531789cb0dd0d3c9a2494a5924c64d12194d2f SOURCES/grafana-7.5.10.tar.gz +804c0d639055608f3788ea84b6f94bca9fe8f1ca SOURCES/grafana-vendor-7.5.10-1.tar.xz +8b52042f89703513945aa2086e5838cc425533c7 SOURCES/grafana-webpack-7.5.10-1.tar.gz diff --git a/SOURCES/002-manpages.patch b/SOURCES/002-manpages.patch index ccc1385..e87d709 100644 --- a/SOURCES/002-manpages.patch +++ b/SOURCES/002-manpages.patch @@ -4,7 +4,7 @@ index 0000000000..7ac2af882c --- /dev/null +++ b/docs/man/man1/grafana-cli.1 @@ -0,0 +1,60 @@ -+.TH GRAFANA "1" "June 2021" "Grafana cli version 7.5.9" "User Commands" ++.TH GRAFANA "1" "September 2021" "Grafana cli version 7.5.10" "User Commands" +.SH NAME +grafana-cli \- command line administration for the Grafana metrics dashboard and graph editor +.SH DESCRIPTION @@ -70,7 +70,7 @@ index 0000000000..c616268b31 --- /dev/null +++ b/docs/man/man1/grafana-server.1 @@ -0,0 +1,72 @@ -+.TH VERSION "1" "June 2021" "Version 7.5.9" "User Commands" ++.TH VERSION "1" "September 2021" "Version 7.5.10" "User Commands" +.SH NAME +grafana-server \- back-end server for the Grafana metrics dashboard and graph editor +.SH DESCRIPTION diff --git a/SOURCES/009-patch-unused-backend-crypto.patch b/SOURCES/009-patch-unused-backend-crypto.vendor.patch similarity index 100% rename from SOURCES/009-patch-unused-backend-crypto.patch rename to SOURCES/009-patch-unused-backend-crypto.vendor.patch diff --git a/SOURCES/010-fips.patch b/SOURCES/010-fips.cond.patch similarity index 100% rename from SOURCES/010-fips.patch rename to SOURCES/010-fips.cond.patch diff --git a/SOURCES/Makefile b/SOURCES/Makefile index acd932c..eff9c98 100644 --- a/SOURCES/Makefile +++ b/SOURCES/Makefile @@ -1,19 +1,17 @@ -ifndef VER - $(error VER is undefined) -endif -ifndef REL - $(error REL is undefined) -endif +VERSION := $(shell rpm --specfile *.spec --qf '%{VERSION}\n' | head -1) +RELEASE := $(shell rpm --specfile *.spec --qf '%{RELEASE}\n' | head -1 | cut -d. -f1) NAME := grafana RPM_NAME := $(NAME) -SOURCE_DIR := $(NAME)-$(VER) -SOURCE_TAR := $(NAME)-$(VER).tar.gz -VENDOR_TAR := $(RPM_NAME)-vendor-$(VER)-$(REL).tar.xz -WEBPACK_TAR := $(RPM_NAME)-webpack-$(VER)-$(REL).tar.gz +SOURCE_DIR := $(NAME)-$(VERSION) +SOURCE_TAR := $(NAME)-$(VERSION).tar.gz +VENDOR_TAR := $(RPM_NAME)-vendor-$(VERSION)-$(RELEASE).tar.xz +WEBPACK_TAR := $(RPM_NAME)-webpack-$(VERSION)-$(RELEASE).tar.gz -ALL_PATCHES := $(wildcard *.patch) -PATCHES_TO_APPLY := $(filter-out 009-patch-unused-backend-crypto.patch 010-fips.patch,$(ALL_PATCHES)) +ALL_PATCHES := $(sort $(wildcard *.patch)) +VENDOR_PATCHES := $(sort $(wildcard *.vendor.patch)) +COND_PATCHES := $(sort $(wildcard *.cond.patch)) +REGULAR_PATCHES := $(filter-out $(VENDOR_PATCHES) $(COND_PATCHES),$(ALL_PATCHES)) all: $(SOURCE_TAR) $(VENDOR_TAR) $(WEBPACK_TAR) @@ -21,43 +19,46 @@ $(SOURCE_TAR): spectool -g $(RPM_NAME).spec $(VENDOR_TAR): $(SOURCE_TAR) - rm -rf grafana-$(VER) - tar xfz grafana-$(VER).tar.gz + rm -rf $(SOURCE_DIR) + tar xf $(SOURCE_TAR) - # patches can affect Go or Node.js dependencies, or the webpack - for patch in $(PATCHES_TO_APPLY); do patch -d grafana-$(VER) -p1 --fuzz=0 < $$patch; done + # Patches to apply before vendoring + for patch in $(REGULAR_PATCHES); do echo applying $$patch ...; patch -d $(SOURCE_DIR) -p1 --fuzz=0 < $$patch; done # Go - cd grafana-$(VER) && go mod vendor -v + cd $(SOURCE_DIR) && go mod vendor -v # Remove unused crypto - rm grafana-$(VER)/vendor/golang.org/x/crypto/cast5/cast5.go - rm grafana-$(VER)/vendor/golang.org/x/crypto/ed25519/ed25519.go - rm grafana-$(VER)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go - rm grafana-$(VER)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go - rm grafana-$(VER)/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go - rm grafana-$(VER)/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go - awk '$$2~/^v/ && $$4 != "indirect" {print "Provides: bundled(golang(" $$1 ")) = " substr($$2, 2)}' grafana-$(VER)/go.mod | \ + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/cast5/cast5.go + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/ed25519.go + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go + rm $(SOURCE_DIR)/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go + awk '$$2~/^v/ && $$4 != "indirect" {print "Provides: bundled(golang(" $$1 ")) = " substr($$2, 2)}' $(SOURCE_DIR)/go.mod | \ sed -E 's/=(.*)-(.*)-(.*)/=\1-\2.\3/g' > $@.manifest # Node.js - cd grafana-$(VER) && yarn install --pure-lockfile + cd $(SOURCE_DIR) && yarn install --pure-lockfile # Remove files with licensing issues - find grafana-$(VER) -type d -name 'node-notifier' -prune -exec rm -r {} \; - find grafana-$(VER) -type d -name 'property-information' -prune -exec rm -r {} \; - find grafana-$(VER) -type f -name '*.exe' -delete - rm -r grafana-$(VER)/node_modules/visjs-network/examples - ./list_bundled_nodejs_packages.py grafana-$(VER)/ >> $@.manifest + find $(SOURCE_DIR) -type d -name 'node-notifier' -prune -exec rm -r {} \; + find $(SOURCE_DIR) -type d -name 'property-information' -prune -exec rm -r {} \; + find $(SOURCE_DIR) -type f -name '*.exe' -delete + rm -r $(SOURCE_DIR)/node_modules/visjs-network/examples + ./list_bundled_nodejs_packages.py $(SOURCE_DIR) >> $@.manifest + + # Patches to apply after vendoring + for patch in $(VENDOR_PATCHES); do echo applying $$patch ...; patch -d $(SOURCE_DIR) -p1 --fuzz=0 < $$patch; done # Create tarball - XZ_OPT=-9 tar cfJ $@ \ - grafana-$(VER)/vendor \ - $$(find grafana-$(VER) -type d -name "node_modules" -prune) + time XZ_OPT=-9 tar cJf $@ \ + $(SOURCE_DIR)/vendor \ + $$(find $(SOURCE_DIR) -type d -name "node_modules" -prune) $(WEBPACK_TAR): $(VENDOR_TAR) - cd grafana-$(VER) && \ + cd $(SOURCE_DIR) && \ ../build_frontend.sh - tar cfz $@ grafana-$(VER)/public/build grafana-$(VER)/public/views grafana-$(VER)/plugins-bundled + tar cfz $@ $(SOURCE_DIR)/public/build $(SOURCE_DIR)/public/views $(SOURCE_DIR)/plugins-bundled clean: rm -rf *.tar.gz *.tar.xz *.manifest *.rpm $(NAME)-*/ diff --git a/SPECS/grafana.spec b/SPECS/grafana.spec index eb3a2a4..dee3dcf 100644 --- a/SPECS/grafana.spec +++ b/SPECS/grafana.spec @@ -1,3 +1,13 @@ +# gobuild and gotest macros are not available on CentOS Stream +# remove once BZ 1965292 is resolved +# definitions lifted from Fedora 34 podman.spec +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif +%if ! 0%{?gotest:1} +%define gotest() GO111MODULE=off go test -buildmode pie -compiler gc -ldflags "${LDFLAGS:-} -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" %{?**}; +%endif + %global grafana_arches %{lua: go_arches = {} for arch in rpm.expand("%{go_arches}"):gmatch("%S+") do go_arches[arch] = 1 @@ -19,8 +29,8 @@ end} %endif Name: grafana -Version: 7.5.9 -Release: 3%{?dist} +Version: 7.5.10 +Release: 1%{?dist} Summary: Metrics dashboard and graph editor License: ASL 2.0 URL: https://grafana.org @@ -30,14 +40,14 @@ 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 the Grafana package. -Source1: grafana-vendor-%{version}-2.tar.xz +# lags behind the NVR of this package. +Source1: grafana-vendor-%{version}-1.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 the Grafana package. -Source2: grafana-webpack-%{version}-2.tar.gz +# lags behind the NVR of this package. +Source2: grafana-webpack-%{version}-1.tar.gz %endif # Source3 contains Grafana configuration defaults for distributions @@ -75,11 +85,11 @@ Patch8: 008-remove-unused-frontend-crypto.patch # The Makefile removes a few files with crypto implementations # from the vendor tarball, which are not used in Grafana. # This patch removes all references to the deleted files. -Patch9: 009-patch-unused-backend-crypto.patch +Patch9: 009-patch-unused-backend-crypto.vendor.patch # This patch modifies the x/crypto/pbkdf2 function to use OpenSSL # if FIPS mode is enabled. -Patch10: 010-fips.patch +Patch10: 010-fips.cond.patch # Intersection of go_arches and nodejs_arches ExclusiveArch: %{grafana_arches} @@ -475,7 +485,6 @@ rm -r plugins-bundled %patch5 -p1 %patch6 -p1 %patch8 -p1 -%patch9 -p1 %if %{enable_fips_mode} %patch10 -p1 %endif @@ -657,6 +666,9 @@ GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryption %changelog +* Thu Sep 30 2021 Andreas Gerstmayr 7.5.10-1 +- update to 7.5.10 tagged upstream community sources, see CHANGELOG + * Mon Aug 16 2021 Andreas Gerstmayr 7.5.9-3 - rebuild to resolve CVE-2021-34558