Accepting request 1165668 from home:witekbedyk:branches:server:monitoring

Update to version 10.3.5  
CVE-2024-1313,bsc#1222155

OBS-URL: https://build.opensuse.org/request/show/1165668
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=132

Makefile

@@ -10,7 +10,7 @@ clean:
 	rm -f $(NAME)-*.tar $(NAME)-*.tar.gz
 
 tar:
-	osc service disabledrun
+	osc service manualrun
 	@version=$$( awk '/^Version:/ {print $$2}' $(SPEC) ) && \
 	echo "Package version is $$version" && \
 	basename=$(NAME)-$$version && \

_service

@@ -1,18 +1,18 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="url">https://github.com/grafana/grafana</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v10.3.3</param>
+    <param name="revision">v10.3.5</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="compression">gz</param>
     <param name="file">grafana*.tar</param>
   </service>
-  <service name="set_version" mode="disabled">
+  <service name="set_version" mode="manual">
     <param name="basename">grafana</param>
   </service>
 </services>

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/grafana/grafana</param>
-    <param name="changesrevision">252761264e22ece57204b327f9130d3b44592c01</param>
+    <param name="changesrevision">6db35ad6b4075cf214594fc62f4a3faa3484be01</param>
   </service>
 </servicedata>

grafana-10.3.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e870b1ac37c9b7a74a8270b354654eca1f8005fe52aa8f524b8efe546a7d8610
-size 77173350

grafana-10.3.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:948098bb573e9bf1b788aaec813d71f6654a8d4fd8ef61e736fddfb9204fc6fa
+size 77195322

grafana.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Wed Apr 03 09:07:16 UTC 2024 - witold.bedyk@suse.com
+
+- Packaging improvements:
+  * Changed deprecated `disabled` service mode to `manual`
+  * Drop golang-packaging macros
+  * Drop explicit mod=vendor as it is enabled automatically
+
+- Update to version 10.3.5:
+  Bugfixes:
+  * Security CVE-2024-1313: Require same organisation when
+    deleting snapshots (bsc#1222155)
+  * Alerting: Marshal incoming json.RawMessage in diff
+  * Postgres: Allow disabling SNI on SSL-enabled connections
+  * Elasticsearch: Fix legend for alerting, expressions and
+    previously frontend queries
+  * Alerting: Fix preview getting the correct queries from the form
+  * Dashboard: Fix issue where out-of-view shared query panels
+    caused blank dependent panels
+
+- Update to version 10.3.4:
+  Breaking change:
+  * Domain validation between the response token id `hd` claim and
+    the `allowed_domains` configuration setting for Google OAuth
+    has been improved. This feature can be disabled through the
+    configuration toggle `validate_hd`. Anyone using the legacy
+    Google OAuth configuration should disable this validation if
+    the ID Token response doesn't have the HD parameter.
+
+  Bugfixes:
+  * LDAP: Fix LDAP users authenticated via auth proxy not being
+    able to use LDAP active sync
+  * Tempo: Add template variable interpolation for filters
+  * Elasticsearch: Fix adhoc filters not applied in frontend mode
+  * Dashboards: Fixes issue where panels would not refresh if time
+    range updated while in panel view mode
+  * AuthProxy: Invalidate previous cached item for user when
+    changes are made to any header
+  * LibraryPanels/RBAC: Fix issue where folder scopes weren't being
+    correctly inherited
+  * LibraryPanels: Fix issue with repeated library panels
+  * Plugins: Don't auto prepend app sub url to plugin asset paths
+  * Elasticsearch: Set middlewares from Grafana's
+    httpClientProvider
+  * Folders: Fix failure to update folder in SQLite
+  * Loki/Elastic: Assert queryfix value to always be string
+
 -------------------------------------------------------------------
 Thu Feb 29 11:25:49 UTC 2024 - daniel@molkentin.de
 

grafana.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           grafana
-Version:        10.3.3
+Version:        10.3.5
 Release:        0
 Summary:        The open-source platform for monitoring and observability
 License:        AGPL-3.0-only
@@ -38,7 +38,6 @@ Source4:        Makefile
 Source5:        0001-Add-source-code-reference.patch
 BuildRequires:  fdupes
 BuildRequires:  git-core
-BuildRequires:  golang-packaging
 BuildRequires:  wire
 BuildRequires:  golang(API) >= 1.21
 Requires(post): %fillup_prereq
@@ -63,29 +62,21 @@ dashboards and data with teams.
 %setup -q -T -D -a 1 -n grafana-%{version}
 
 %build
-%goprep github.com/grafana/grafana
+%ifnarch ppc64
-# Manual build in order to inject ldflags so grafana correctly displays
+export GOFLAGS="-buildmode=pie"
-# the version in the footer of each page.  Note that we're only injecting
+%endif
-# main.version, not main.commit or main.buildstamp as is done in the upstream
+wire gen -tags 'oss' ./pkg/server
-# build.go, because we don't have access to the git commit history here.
+go build -o . -ldflags '-X main.version=%{version}' ./pkg/cmd/...
-# (The %%gobuild macro can't take quoted strings; they get split up when
-# expanded to $extra_flags in process_build() in /usr/lib/rpm/golang.sh.)
-export IMPORTPATH="github.com/grafana/grafana"
-export BUILDFLAGS="-v -p 4 -x -buildmode=pie -mod=vendor"
-export GOPATH=%{_builddir}/go:%{_builddir}/contrib
-export GOBIN=%{_builddir}/go/bin
-wire gen -tags 'oss' ./pkg/server ./pkg/cmd/grafana-cli/runner
-go install $BUILDFLAGS -ldflags '-X main.version=%{version}' $IMPORTPATH/pkg/cmd/...
 
 %install
-%goinstall
 
 # install binaries and service
+install -Dm755 %{name} %{buildroot}%{_libexecdir}/%{name}/%{name}
+install -Dm755 %{name}-server %{buildroot}%{_libexecdir}/%{name}/%{name}-server
+install -Dm755 %{name}-cli %{buildroot}%{_libexecdir}/%{name}/%{name}-cli
 install -Dm644 {packaging/rpm/systemd/,%{buildroot}%{_unitdir}/}%{name}-server.service
 install -dm755 %{buildroot}%{_sbindir}
-install -dm755 %{buildroot}%{_libexecdir}/%{name}
 install -m755 --target-directory=%{buildroot}%{_sbindir} packaging/wrappers/%{name}*
-mv --target-directory=%{buildroot}%{_libexecdir}/%{name} %{buildroot}/%{_bindir}/%{name}*
 
 # create "rc symlink" (https://en.opensuse.org/openSUSE:Systemd_packaging_guidelines#rc_symlink)
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server

vendor.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3591878d746cc55cb5c8dc91d28a3d297ba6f64759ade20e4279170dd4ccaed
+oid sha256:686a03dc420c44160098f6cce26ec24304820684e6834d4e3b31f47954c7ba39
-size 53975008
+size 54076020