Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grafana for openSUSE:Factory checked in at 2026-06-23 17:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grafana (Old) and /work/SRC/openSUSE:Factory/.grafana.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grafana" Tue Jun 23 17:43:32 2026 rev:90 rq:1361365 version:12.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/grafana/grafana.changes 2026-06-16 18:33:09.286979109 +0200 +++ /work/SRC/openSUSE:Factory/.grafana.new.1956/grafana.changes 2026-06-23 17:46:15.133563842 +0200 @@ -1,0 +2,86 @@ +Tue Jun 23 12:25:41 UTC 2026 - Witek Bedyk <[email protected]> + +- Require Go >= 1.26 for building +- Add UI web assets as additional source tarball + +------------------------------------------------------------------- +Thu Jun 18 14:10:51 UTC 2026 - Witek Bedyk <[email protected]> + +- Update to version 12.4.4: + * Security and quality updates. + * Various bug fixes and enhancements. + +- Update to version 12.4.3: + * Analytics: Keep internal dashboard id. + * Go: Update to 1.25.9. + * Reporting: Correctly apply appSubURL to report settings + requests. + * Alerting: Document Grafana HA Alertmanager cluster metrics + prefix change. + +- Update to version 12.4.2: + * Various bug fixes and performance improvements. + * Dependency updates to core plugins and UI libraries. + +- Update to version 12.4.1: + * Bug fixes and minor quality-of-life enhancements. + * Updates to data source provisioning and dashboard schemas. + +- Update to version 12.4.0: + * Introduced dynamic dashboards in public preview. + * Added a new side toolbar that replaces the second top toolbar + to provide additional vertical space. + * Added the ability to create dashboards from templates using + sample data. + * Revamped the gauge visualization with rounded bars, + configurable bar thickness, and endpoint markers. + * Added support to map one variable to multiple values. + * CVE-2025-12141: Fixed information leakage in Grafana Alerting + (bsc#1262187) + +- Update to version 12.3.0: + * Released a completely redesigned logs visualization. + * Added the ability to export dashboards directly as PNG images. + * Introduced an interactive learning experience within the + Grafana UI. + * Added a Switch template variable type to quickly toggle between + values in queries. + * Added functionality to style table cells using CSS properties + via the field cell option. + +- Update to version 12.2.0: + * Routine feature enhancements, minor bug fixes, and security + patches. + +- Update to version 12.1.0: + * Added support for Entra Workload Identity to enhance + authentication capabilities with federated credentials. + * Redesigned the alert rule list page. + * Renamed Mute Timings to Active Time Intervals in Grafana + Alerting. + * Added support for Service Account Impersonation in the BigQuery + data source. + * Introduced the Grafana Advisor in public preview. + +- Update to version 12.0.0: + * BREAKING: Removed AngularJS and all deprecated UI Extensions + APIs. + * BREAKING: Enforced stricter version compatibility checks in + plugin CLI install commands. + * BREAKING: Enabled the failWrongDSUID feature flag by default, + which rejects data sources with incorrect UIDs. + * MIGRATION: Triggered a full-table rewrite for the annotation + table, which may temporarily increase disk usage. + * Introduced a new dashboard schema to replace the original + single grid layout. + +- Removed patches: + * 0002-Drop-zanzana.patch + * 0004-Bump-expr-lang.patch + * 0006-Fix-CVE-2026-21725.patch + * 0007-Bump-github.com-go-jose-go-jose.patch + * 0008-Bump-github.com-apache-thrift.patch + * 0009-Bump-golang.org-x-net.patch +- Rebased 0005-Bump-edwards25519.patch + +------------------------------------------------------------------- Old: ---- 0002-Drop-zanzana.patch 0004-Bump-expr-lang.patch 0006-Fix-CVE-2026-21725.patch 0007-Bump-github.com-go-jose-go-jose.patch 0008-Bump-github.com-apache-thrift.patch 0009-Bump-golang.org-x-net.patch grafana-11.6.14+security04.tar.gz New: ---- grafana-12.4.4.tar.gz ui-12.4.4.tar.gz ----------(Old B)---------- Old:- Removed patches: * 0002-Drop-zanzana.patch * 0004-Bump-expr-lang.patch Old: * 0002-Drop-zanzana.patch * 0004-Bump-expr-lang.patch * 0006-Fix-CVE-2026-21725.patch Old: * 0004-Bump-expr-lang.patch * 0006-Fix-CVE-2026-21725.patch * 0007-Bump-github.com-go-jose-go-jose.patch Old: * 0006-Fix-CVE-2026-21725.patch * 0007-Bump-github.com-go-jose-go-jose.patch * 0008-Bump-github.com-apache-thrift.patch Old: * 0007-Bump-github.com-go-jose-go-jose.patch * 0008-Bump-github.com-apache-thrift.patch * 0009-Bump-golang.org-x-net.patch Old: * 0008-Bump-github.com-apache-thrift.patch * 0009-Bump-golang.org-x-net.patch - Rebased 0005-Bump-edwards25519.patch ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grafana.spec ++++++ --- /var/tmp/diff_new_pack.sp5aGN/_old 2026-06-23 17:46:18.985698141 +0200 +++ /var/tmp/diff_new_pack.sp5aGN/_new 2026-06-23 17:46:18.985698141 +0200 @@ -22,31 +22,26 @@ %endif Name: grafana -Version: 11.6.14+security04 +Version: 12.4.4 Release: 0 Summary: The open-source platform for monitoring and observability License: AGPL-3.0-only Group: System/Monitoring -URL: http://grafana.org/ -Source: %{name}-%{version}.tar.gz +URL: https://github.com/grafana/grafana +Source: %{URL}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.gz -Source2: %{name}-rpmlintrc +Source2: ui-%{version}.tar.gz +Source3: %{name}-rpmlintrc # Instructions on the build process -Source3: README +Source4: README # Makefile to automate build process -Source4: Makefile -Source5: 0001-Add-source-code-reference.patch -Patch2: 0002-Drop-zanzana.patch +Source5: Makefile +Source6: 0001-Add-source-code-reference.patch Patch3: 0003-Use-bash-instead-of-env.patch -Patch4: 0004-Bump-expr-lang.patch Patch5: 0005-Bump-edwards25519.patch -Patch6: 0006-Fix-CVE-2026-21725.patch -Patch7: 0007-Bump-github.com-go-jose-go-jose.patch -Patch8: 0008-Bump-github.com-apache-thrift.patch -Patch9: 0009-Bump-golang.org-x-net.patch BuildRequires: fdupes BuildRequires: git-core -BuildRequires: golang(API) >= 1.25 +BuildRequires: golang(API) >= 1.26 Requires(post): %fillup_prereq Requires: group(grafana) Requires: user(grafana) @@ -63,7 +58,8 @@ %prep %setup -q -n grafana-%{version} -%autosetup -T -D -a 1 -p1 -n grafana-%{version} +%setup -T -D -a 1 -n grafana-%{version} +%autosetup -T -D -a 2 -p1 -n grafana-%{version} # Check if frontend assets have been built test -d public/build ++++++ 0005-Bump-edwards25519.patch ++++++ --- /var/tmp/diff_new_pack.sp5aGN/_old 2026-06-23 17:46:19.041700094 +0200 +++ /var/tmp/diff_new_pack.sp5aGN/_new 2026-06-23 17:46:19.045700233 +0200 @@ -1,90 +1,104 @@ -From 25a9c949ed518c0cc6c457e299aa79ecb34ae6fe Mon Sep 17 00:00:00 2001 -From: Witek Bedyk <[email protected]> -Date: Tue, 31 Mar 2026 17:26:51 +0200 -Subject: [PATCH] Bump filippo.io/edwards25519 to version 1.1.1 +From 3b24a4aa224244057db2b9348910f50ec4360df6 Mon Sep 17 00:00:00 2001 +From: Matheus Macabu <[email protected]> +Date: Tue, 10 Mar 2026 16:57:20 +0100 +Subject: [PATCH] Dependencies: Update filippo.io/edwards25519 to v1.2.0 + (#119916) -Fixes CVE-2026-26958 +* Dependencies: Update filippo.io/edwards25519 to v1.2.0 + +* make update-workspace --- - pkg/storage/unified/apistore/go.mod | 2 +- - pkg/storage/unified/apistore/go.sum | 3 +++ - pkg/storage/unified/resource/go.mod | 2 +- - pkg/storage/unified/resource/go.sum | 2 ++ - pkg/util/xorm/go.sum | 2 -- - 5 files changed, 7 insertions(+), 4 deletions(-) + apps/advisor/go.mod | 2 +- + apps/advisor/go.sum | 3 ++- + apps/dashvalidator/go.mod | 2 +- + apps/dashvalidator/go.sum | 4 ++-- + apps/plugins/go.mod | 1 + + apps/plugins/go.sum | 4 ++-- + 6 files changed, 9 insertions(+), 7 deletions(-) -diff --git a/pkg/storage/unified/apistore/go.mod b/pkg/storage/unified/apistore/go.mod -index 9c8e0fae339..e21bd575fcf 100644 ---- a/pkg/storage/unified/apistore/go.mod -+++ b/pkg/storage/unified/apistore/go.mod -@@ -41,7 +41,7 @@ require ( - cloud.google.com/go/spanner v1.76.1 // indirect - cloud.google.com/go/storage v1.52.0 // indirect - dario.cat/mergo v1.0.1 // indirect +diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod +index aff1a6236f5..ac3ed41673f 100644 +--- a/apps/advisor/go.mod ++++ b/apps/advisor/go.mod +@@ -62,7 +62,7 @@ require ( + cel.dev/expr v0.25.1 // indirect + cloud.google.com/go/compute/metadata v0.9.0 // indirect + dario.cat/mergo v1.0.2 // indirect - filippo.io/edwards25519 v1.1.0 // indirect -+ filippo.io/edwards25519 v1.1.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect -diff --git a/pkg/storage/unified/apistore/go.sum b/pkg/storage/unified/apistore/go.sum -index 4a0532a0c38..c4d20b8cd0b 100644 ---- a/pkg/storage/unified/apistore/go.sum -+++ b/pkg/storage/unified/apistore/go.sum -@@ -624,6 +624,8 @@ dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= ++ filippo.io/edwards25519 v1.2.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect +diff --git a/apps/advisor/go.sum b/apps/advisor/go.sum +index cbac2c84d0f..bf23c05a8b1 100644 +--- a/apps/advisor/go.sum ++++ b/apps/advisor/go.sum +@@ -75,8 +75,9 @@ cuelang.org/go v0.11.1/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0= + dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= + dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= - filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -+filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw= -+filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= - gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= - git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= ++filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= ++filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= + gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= + gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= -@@ -947,6 +949,7 @@ github.com/elazarl/goproxy v1.7.1 h1:1P7LPSxbqtNxusFnXclj6O56pjfq1xOQZ6a0mwwKUlY - github.com/elazarl/goproxy v1.7.1/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE= - github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= - github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= - github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= - github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= - github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod -index 31d9a325388..3c4a021245e 100644 ---- a/pkg/storage/unified/resource/go.mod -+++ b/pkg/storage/unified/resource/go.mod -@@ -43,7 +43,7 @@ require ( - cloud.google.com/go/monitoring v1.24.1 // indirect - cloud.google.com/go/spanner v1.76.1 // indirect - cloud.google.com/go/storage v1.52.0 // indirect +diff --git a/apps/dashvalidator/go.mod b/apps/dashvalidator/go.mod +index a01817f3f00..02c0ea94f2f 100644 +--- a/apps/dashvalidator/go.mod ++++ b/apps/dashvalidator/go.mod +@@ -11,7 +11,7 @@ require ( + ) + + require ( - filippo.io/edwards25519 v1.1.0 // indirect -+ filippo.io/edwards25519 v1.1.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect -diff --git a/pkg/storage/unified/resource/go.sum b/pkg/storage/unified/resource/go.sum -index ff941a38597..c7d1f2388c5 100644 ---- a/pkg/storage/unified/resource/go.sum -+++ b/pkg/storage/unified/resource/go.sum -@@ -624,6 +624,8 @@ dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= - dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= - filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= - filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -+filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw= -+filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= - gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= - git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= ++ filippo.io/edwards25519 v1.2.0 // indirect + github.com/Machiel/slugify v1.0.1 // indirect + github.com/Masterminds/semver/v3 v3.4.0 // indirect + github.com/ProtonMail/go-crypto v1.3.0 // indirect +diff --git a/apps/dashvalidator/go.sum b/apps/dashvalidator/go.sum +index 2af47c8a21a..2ff7c9b45b1 100644 +--- a/apps/dashvalidator/go.sum ++++ b/apps/dashvalidator/go.sum +@@ -5,8 +5,8 @@ cuelang.org/go v0.11.1 h1:pV+49MX1mmvDm8Qh3Za3M786cty8VKPWzQ1Ho4gZRP0= + cuelang.org/go v0.11.1/go.mod h1:PBY6XvPUswPPJ2inpvUozP9mebDVTXaeehQikhZPBz0= + dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= + dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= +-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= ++filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= ++filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= + gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= + gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= -diff --git a/pkg/util/xorm/go.sum b/pkg/util/xorm/go.sum -index 61346d9e28f..5b07c110db4 100644 ---- a/pkg/util/xorm/go.sum -+++ b/pkg/util/xorm/go.sum -@@ -611,8 +611,6 @@ cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vf - cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= - cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= - dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +diff --git a/apps/plugins/go.mod b/apps/plugins/go.mod +index 409a6f2e134..7d64bfb6b89 100644 +--- a/apps/plugins/go.mod ++++ b/apps/plugins/go.mod +@@ -30,6 +30,7 @@ require ( + + require ( + cel.dev/expr v0.25.1 // indirect ++ filippo.io/edwards25519 v1.2.0 // indirect + github.com/Machiel/slugify v1.0.1 // indirect + github.com/Masterminds/semver/v3 v3.4.0 // indirect + github.com/NYTimes/gziphandler v1.1.1 // indirect +diff --git a/apps/plugins/go.sum b/apps/plugins/go.sum +index e7fee0622fa..030bdf1d199 100644 +--- a/apps/plugins/go.sum ++++ b/apps/plugins/go.sum +@@ -2,8 +2,8 @@ cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= + cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= + cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= + cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= - gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= - git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= - github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= ++filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= + github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= + github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= + github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -- 2.51.0 ++++++ Makefile ++++++ --- /var/tmp/diff_new_pack.sp5aGN/_old 2026-06-23 17:46:19.081701488 +0200 +++ /var/tmp/diff_new_pack.sp5aGN/_new 2026-06-23 17:46:19.093701907 +0200 @@ -1,53 +1,59 @@ NAME = grafana SPEC = $(NAME).spec -default: verify-deps clean tar +# Define a safe, colon-free path for NVM +NVM_DIR = /tmp/grafana-nvm-build + +default: clean verify-deps install-nvm tar verify-deps: @which yarn >/dev/null 2>&1 || ( echo "yarn not found; run \`sudo npm install -g yarn\`" && false ) +install-nvm: + @echo "Installing NVM locally into $(NVM_DIR)..." + @set -e; \ + mkdir -p "$(NVM_DIR)"; \ + export NVM_DIR="$(NVM_DIR)"; \ + curl -f -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh | bash + clean: - rm -f $(NAME)-*.tar $(NAME)-*.tar.gz + rm -f $(NAME)-*.tar $(NAME)-*.tar.gz ui-*.tar.gz + rm -rf "$(NVM_DIR)" tar: - osc service manualrun - @version=$$( awk '/^Version:/ {print $$2}' $(SPEC) ) && \ - echo "Package version is $$version" && \ - basename=$(NAME)-$$version && \ - tar=$$basename.tar && \ - tmpdir=$$(mktemp -d -p .) && \ - cd $$tmpdir && \ - gunzip ../$$tar.gz && \ - tar -xf ../$$tar && \ - # recreate tarball explicitly in a format that handles long filenames \ - tar --format=posix -cf ../$$tar $$basename && \ - cd $$basename && \ + @set -e; \ + export NVM_DIR="$(NVM_DIR)"; \ + . "$$NVM_DIR/nvm.sh"; \ + osc service manualrun; \ + version=$$( awk '/^Version:/ {print $$2}' $(SPEC) ); \ + echo "Package version is $$version"; \ + basename=$(NAME)-$$version; \ + tar=$$basename.tar; \ + webassets_tarball=ui-$$version.tar.gz; \ + tmpdir=$$(mktemp -d -p .); \ + cd $$tmpdir; \ + tar xzf ../$$tar.gz; \ + cd $$basename; \ # Patches for the JS frontend go after here \ - patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch && \ + patch --no-backup-if-mismatch -p1 -i ../../0001-Add-source-code-reference.patch; \ # End patches section \ # Patches for Go modules go after here \ - patch --no-backup-if-mismatch -p1 -i ../../0002-Drop-zanzana.patch && \ - patch --no-backup-if-mismatch -p1 -i ../../0004-Bump-expr-lang.patch && \ - patch --no-backup-if-mismatch -p1 -i ../../0005-Bump-edwards25519.patch && \ - patch --no-backup-if-mismatch -p1 -i ../../0007-Bump-github.com-go-jose-go-jose.patch && \ - patch --no-backup-if-mismatch -p1 -i ../../0008-Bump-github.com-apache-thrift.patch && \ - patch --no-backup-if-mismatch -p1 -i ../../0009-Bump-golang.org-x-net.patch && \ + patch --no-backup-if-mismatch -p1 -i ../../0005-Bump-edwards25519.patch; \ # End of Go modules patches section \ - go mod download && \ - go mod verify && \ - go work vendor && \ - tar --format=posix -cf ../../vendor.tar vendor && \ + go mod download; \ + go mod verify; \ + go work vendor; \ + tar --format=posix -cf ../../vendor.tar vendor; \ # avoid ".git can't be found" \ - git init && \ + git init; \ # avoid "FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory" \ - export NODE_OPTIONS=--max_old_space_size=8192 && \ - yarn install --immutable && \ - yarn run build && \ - cd .. && \ - echo "Updating $$basename/public in tarball..." && \ - tar -rf ../$$tar $$basename/public && \ - cd .. && \ - gzip $$tar && \ - gzip -f vendor.tar && \ + export NODE_OPTIONS=--max_old_space_size=8192; \ + nvm install; \ + yarn install --immutable; \ + yarn run build; \ + echo "Updating $$basename/public in tarball..."; \ + tar czf ../../$$webassets_tarball public; \ + cd ../..; \ + gzip -f vendor.tar; \ rm -rf $$tmpdir ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sp5aGN/_old 2026-06-23 17:46:19.153703999 +0200 +++ /var/tmp/diff_new_pack.sp5aGN/_new 2026-06-23 17:46:19.161704278 +0200 @@ -1,20 +1,4 @@ <services> - <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="versionrewrite-replacement">\1\2</param> - <param name="revision">v11.6.14+security-04</param> - </service> - <service name="recompress" mode="manual"> - <param name="compression">gz</param> - <param name="file">grafana*.tar</param> - </service> - <service name="set_version" mode="manual"> - <param name="basename">grafana</param> - <param name="version">11.6.14+security04</param> - </service> + <service name="download_files" mode="manual" /> </services> ++++++ grafana-11.6.14+security04.tar.gz -> grafana-12.4.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/grafana/grafana-11.6.14+security04.tar.gz /work/SRC/openSUSE:Factory/.grafana.new.1956/grafana-12.4.4.tar.gz differ: char 4, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/grafana/vendor.tar.gz /work/SRC/openSUSE:Factory/.grafana.new.1956/vendor.tar.gz differ: char 5, line 1
