Sync from SUSE:SLFO:1.1 golang-github-prometheus-prometheus revision fd025ad47268f4b04398da2141c2c63c

0001-Do-not-force-the-pure-Go-name-resolver.patch

@@ -1,4 +1,4 @@
-From bc9decb6a9f56a70d49e935e2a0207c20d2b2a2c Mon Sep 17 00:00:00 2001
+From de6a642d171890fb0360fed67fd7313f13ea4b37 Mon Sep 17 00:00:00 2001
 From: Jan Fajerski <jfajerski@suse.com>
 Date: Fri, 8 Feb 2019 09:17:06 +0100
 Subject: [PATCH] Do not force the pure Go name resolver
@@ -10,16 +10,16 @@ on OS and environment variables.
 This allows, among other things, to use Prometheus to scrape mDNS targets.
 
 Signed-off-by: Jan Fajerski <jfajerski@suse.com>
-Signed-off-by: Johannes Kastl <git@johannes-kastl.de>
+Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
 ---
- .promu.yml | 2 +-
+ .promu.yml | 3 +--
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/.promu.yml b/.promu.yml
-index 0aa51d6d315..06c9c579d8e 100644
+index f724dc34f..ccce0d5a2 100644
 --- a/.promu.yml
 +++ b/.promu.yml
-@@ -12,12 +12,12 @@ build:
+@@ -12,13 +12,12 @@ build:
            path: ./cmd/promtool
      tags:
          all:
@@ -29,7 +29,11 @@ index 0aa51d6d315..06c9c579d8e 100644
          windows:
              - builtinassets
              - stringlabels
+-    flags: -a
 +    flags: -mod=vendor -a
      ldflags: |
          -X github.com/prometheus/common/version.Version={{.Version}}
          -X github.com/prometheus/common/version.Revision={{.Revision}}
+-- 
+2.40.1
+

0003-Bump-go-retryablehttp.patch

@@ -1,61 +0,0 @@
-From 07cff5bee27a832e4d4902911ea0ebbea0518113 Mon Sep 17 00:00:00 2001
-From: Daniel Mellado <dmellado@redhat.com>
-Date: Tue, 25 Jun 2024 16:31:03 +0200
-Subject: [PATCH] Bump go-retryablehttp to fix basic auth creds leak
-
-This PR updates go-retryablehttp to version 0.7.7, even if it's used as
-an indirect import. Versions previous to that can didn't sanitize urls,
-discussed at HDCSEC-2024-12 [1]
-
-[1] https://discuss.hashicorp.com/t/hcsec-2024-12-go-retryablehttp-can-leak-basic-auth-credentials-to-log-files/68027
-
-Signed-off-by: Daniel Mellado <dmellado@redhat.com>
----
- go.mod | 4 ++--
- go.sum | 9 ++++-----
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 8caf80727b7..f4cf5828015 100644
---- a/go.mod
-+++ b/go.mod
-@@ -145,10 +145,10 @@ require (
- 	github.com/hashicorp/cronexpr v1.1.2 // indirect
- 	github.com/hashicorp/errwrap v1.1.0 // indirect
- 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
--	github.com/hashicorp/go-hclog v1.5.0 // indirect
-+	github.com/hashicorp/go-hclog v1.6.3 // indirect
- 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
- 	github.com/hashicorp/go-multierror v1.1.1 // indirect
--	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
-+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
- 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
- 	github.com/hashicorp/golang-lru v0.6.0 // indirect
- 	github.com/hashicorp/serf v0.10.1 // indirect
-diff --git a/go.sum b/go.sum
-index 06db002f55b..956b9d89492 100644
---- a/go.sum
-+++ b/go.sum
-@@ -369,9 +369,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
- github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
- github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
- github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
--github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
--github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c=
--github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-+github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
-+github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
- github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
- github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
- github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-@@ -383,8 +382,8 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+
- github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
- github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
- github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
--github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
--github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
-+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
-+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
- github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
- github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
- github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=

0004-Bump-go-net.patch

@@ -1,112 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 8caf80727..67267394e 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,8 @@
- module github.com/prometheus/prometheus
- 
--go 1.21
-+go 1.23.0
-+
-+toolchain go1.24.2
- 
- require (
- 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
-@@ -73,10 +75,10 @@ require (
- 	go.uber.org/automaxprocs v1.5.3
- 	go.uber.org/goleak v1.3.0
- 	go.uber.org/multierr v1.11.0
--	golang.org/x/net v0.26.0
-+	golang.org/x/net v0.39.0
- 	golang.org/x/oauth2 v0.21.0
--	golang.org/x/sync v0.7.0
--	golang.org/x/sys v0.21.0
-+	golang.org/x/sync v0.13.0
-+	golang.org/x/sys v0.32.0
- 	golang.org/x/time v0.5.0
- 	golang.org/x/tools v0.22.0
- 	google.golang.org/api v0.183.0
-@@ -184,11 +186,11 @@ require (
- 	go.opencensus.io v0.24.0 // indirect
- 	go.opentelemetry.io/otel/metric v1.27.0 // indirect
- 	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
--	golang.org/x/crypto v0.24.0 // indirect
-+	golang.org/x/crypto v0.37.0 // indirect
- 	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
- 	golang.org/x/mod v0.18.0 // indirect
--	golang.org/x/term v0.21.0 // indirect
--	golang.org/x/text v0.16.0 // indirect
-+	golang.org/x/term v0.31.0 // indirect
-+	golang.org/x/text v0.24.0 // indirect
- 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
- 	gopkg.in/inf.v0 v0.9.1 // indirect
- 	gopkg.in/ini.v1 v1.67.0 // indirect
-diff --git a/go.sum b/go.sum
-index 06db002f5..58711b558 100644
---- a/go.sum
-+++ b/go.sum
-@@ -774,8 +774,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
- golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
- golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
--golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
--golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
-+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
- golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-@@ -857,8 +857,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
- golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
- golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
- golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
--golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
--golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-@@ -880,8 +880,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
--golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
--golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
- golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-@@ -947,16 +947,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
--golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
--golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
- golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
- golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
- golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
- golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
--golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
--golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
-+golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-+golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
- golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-@@ -968,8 +968,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
- golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
- golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
- golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
--golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
--golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
- golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

Makefile

@@ -16,19 +16,8 @@ tar:
 	wd=$$(pwd) && \
 	tmpdir=$$(mktemp -d -p /tmp) && \
 	cd $$tmpdir && \
-       gunzip $$wd/$$tar.gz && \
+	tar -zxf $$wd/$$tar.gz && \
-	tar -xf $$wd/$$tar && \
-	# recreate tarball explicitly in a format that handles long filenames \
-	tar --format=posix -cf $$wd/$$tar $$basename && \
 	cd $$basename && \
-	# Patches for Go modules go after here \
-	patch --no-backup-if-mismatch -p1 -i $$wd/0003-Bump-go-retryablehttp.patch && \
-	patch --no-backup-if-mismatch -p1 -i $$wd/0004-Bump-go-net.patch && \
-	# End of Go modules patches section \
-	go mod download && \
-	go mod verify && \
-	go mod vendor && \
-	tar --format=posix -cf $$wd/vendor.tar vendor && \
         make assets npm_licenses assets-compress && \
 	tar -cf $$wd/$$web_ui web/ui/static/react && \
         find web/ui/static -type f -name '*.gz' -exec tar -rf $$wd/$$web_ui "{}" \; && \
@@ -37,7 +26,5 @@ tar:
 	echo "Creating web assets tarball" && \
 	mv $$basename/npm_licenses.tar.bz2 $$wd && \
 	cd $$wd && \
-	gzip $$tar && \
 	gzip -f $$web_ui && \
-	gzip -f vendor.tar && \
 	rm -rf $$tmpdir

PACKAGING_README.md

@@ -5,5 +5,11 @@ needs the assets for the web UI. These can be generated by the
 `Makefile` that is present in this package.
 To do that, you need to have `make` and `npm` installed locally.
 
+1. Change the version in the `_service` file
+2. Change the version in the spec file
+3. Run `make`
+4. Create a changelog entry
+5. Commit the changes as usual
+
 For the OBS workflow you also need `obs-service-go_modules` as well
 as `obs-service-tar_scm` and `obs-service-recompress`.

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v2.53.4</param>
+    <param name="revision">v2.47.2</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="match-tag">v2*</param>
   </service>
@@ -13,6 +13,6 @@
     <param name="compression">gz</param>
   </service>
   <service name="go_modules" mode="manual">
-    <param name="archive">prometheus-2.53.4.tar.gz</param>
+    <param name="archive">prometheus-2.47.2.tar.gz</param>
   </service>
 </services>

golang-github-prometheus-prometheus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package golang-github-prometheus-prometheus
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 # Copyright (c) 2017 Silvio Moioli <moio@suse.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -27,7 +27,7 @@
 %endif
 
 Name:           golang-github-prometheus-prometheus
-Version:        2.53.4
+Version:        2.47.2
 Release:        0
 Summary:        The Prometheus monitoring system and time series database
 License:        Apache-2.0
@@ -47,10 +47,6 @@ Source9:        PACKAGING_README.md
 Patch1:         0001-Do-not-force-the-pure-Go-name-resolver.patch
 # Lifted from Debian's prometheus package
 Patch2:         0002-Default-settings.patch
-# https://github.com/prometheus/prometheus/pull/14373
-Patch3:         0003-Bump-go-retryablehttp.patch
-# https://github.com/prometheus/prometheus/pull/16520
-Patch4:         0004-Bump-go-net.patch
 BuildRequires:  fdupes
 %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
 BuildRequires:  firewall-macros
@@ -59,7 +55,8 @@ BuildRequires:  firewall-macros
 # with -buildmode=pie
 BuildRequires:  glibc-devel-static
 BuildRequires:  golang-github-prometheus-promu >= 0.14.0
-BuildRequires:  golang(API) >= 1.23
+BuildRequires:  golang-packaging
+BuildRequires:  golang(API) >= 1.21
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1500
 Recommends:     firewalld-prometheus-config
@@ -71,6 +68,8 @@ Provides:       prometheus = %{version}
 ExcludeArch:    s390
 %systemd_ordering
 
+%go_nostrip
+
 %description
 Prometheus's main features are:
  - a multi-dimensional data model (time series identified by metric name and key/value pairs)
@@ -86,15 +85,8 @@ Prometheus's main features are:
 %autosetup -D -a2 -p1 -n prometheus-%{version}
 
 %build
-%ifarch i586 s390x armv7hl armv7l armv7l:armv6l:armv5tel armv6hl
+%goprep github.com/prometheus/prometheus
-export BUILD_CGO_FLAG="--cgo"
+GOPATH=%{_builddir}/go promu build -v
-%endif
-export GOFLAGS="-buildmode=pie"
-promu build -v $BUILD_CGO_FLAG
-
-%check
-./prometheus --version
-./promtool --version
 
 %install
 install -D -m0755 %{_builddir}/prometheus-%{version}/prometheus %{buildroot}/%{_bindir}/prometheus
@@ -122,6 +114,7 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/data
 install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
 
 install -D -m0644 %{SOURCE7} %{buildroot}/%{_defaultlicensedir}/%{name}/npm_licenses.tar.bz2
+%gofilelist
 
 %fdupes %{buildroot}/%{_prefix}