.gitignore

@@ -1,3 +1,3 @@
-SOURCES/grafana-9.2.10.tar.gz
-SOURCES/grafana-vendor-9.2.10-32.tar.xz
-SOURCES/grafana-webpack-9.2.10-21.tar.gz
+SOURCES/grafana-9.0.9.tar.gz
+SOURCES/grafana-vendor-9.0.9-1.tar.xz
+SOURCES/grafana-webpack-9.0.9-1.tar.gz

.grafana.metadata

@@ -1,3 +1,3 @@
-4c9db312dca444023c37c7af9acd2876a7e164b8 SOURCES/grafana-9.2.10.tar.gz
-0735c8944a2af71b4c36319e3ec80d20d3b1d923 SOURCES/grafana-vendor-9.2.10-32.tar.xz
-f66e9f954173212fb43bebd00756cf3c78362ea1 SOURCES/grafana-webpack-9.2.10-21.tar.gz
+4676eecab36973d5b3cb7ba23b929364c91b7ed8 SOURCES/grafana-9.0.9.tar.gz
+7f0a2e8ac4431208b57781f849d6f5b79d339468 SOURCES/grafana-vendor-9.0.9-1.tar.xz
+08a5daeb99590879c606fb7e7badf7a80823990b SOURCES/grafana-webpack-9.0.9-1.tar.gz

SOURCES/0001-update-grafana-cli-script-with-distro-specific-paths.patch

@@ -1,4 +1,4 @@
-From 226822e64ed4badb22e18740e6db411617b42bb7 Mon Sep 17 00:00:00 2001
+From 2ad9b1bd641eab2daae9c461656a56c8c2688485 Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Wed, 22 Jun 2022 16:57:52 +0200
 Subject: [PATCH] update grafana-cli script with distro-specific paths and
@@ -52,7 +52,7 @@ index dafa075a2c..eda358c425 100755
 +                         cfg:default.paths.logs=${LOG_DIR} \
 +                         cfg:default.paths.plugins=${PLUGINS_DIR}")
 +
-+if [ "$(id -u)" -eq 0 -o "$(id -g)" -eq 0 ]; then
++if [ "$(id -u)" -eq 0 ]; then
 +  cd "${GRAFANA_HOME}"
 +  exec runuser -u "${GRAFANA_USER}" -- "$EXECUTABLE" "${OPTS[@]}" "$@"
 +elif [ "$(id -u -n)" = "${GRAFANA_USER}" ]; then

SOURCES/0002-add-manpages.patch

@@ -1,4 +1,4 @@
-From c065b6608a65967bde152557566e0410238714a1 Mon Sep 17 00:00:00 2001
+From ecac3e25a416bd66b19bc3074f9583dfd965a919 Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Wed, 22 Jun 2022 17:01:09 +0200
 Subject: [PATCH] add manpages

SOURCES/0003-update-default-configuration.patch

@@ -1,14 +1,14 @@
-From 3236aa416f6d1b109bff1fdd4127292988fb199c Mon Sep 17 00:00:00 2001
+From a84194c2f7929bd78303daf04a56ab32cd9c4bb3 Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Wed, 22 Jun 2022 17:05:48 +0200
 Subject: [PATCH] update default configuration
 
 
 diff --git a/conf/defaults.ini b/conf/defaults.ini
-index 2d6e1235b6..f0eff6d2ac 100644
+index dbb7143be4..4a3cf0a21d 100644
 --- a/conf/defaults.ini
 +++ b/conf/defaults.ini
-@@ -196,7 +196,7 @@ row_limit = 1000000
+@@ -190,7 +190,7 @@ row_limit = 1000000
  # No ip addresses are being tracked, only simple counters to track
  # running instances, dashboard and error counts. It is very helpful to us.
  # Change this option to false to disable reporting.
@@ -17,7 +17,7 @@ index 2d6e1235b6..f0eff6d2ac 100644
  
  # The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
  reporting_distributor = grafana-labs
-@@ -206,7 +206,7 @@ reporting_distributor = grafana-labs
+@@ -200,7 +200,7 @@ reporting_distributor = grafana-labs
  # in some UI views to notify that a grafana update exists.
  # This option does not cause any auto updates, nor send any information
  # only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
@@ -27,10 +27,10 @@ index 2d6e1235b6..f0eff6d2ac 100644
  # Set to false to disable all checks to https://grafana.com
  # for new versions of plugins. The check is used
 diff --git a/conf/sample.ini b/conf/sample.ini
-index 227c90e895..dc9fd6a3a5 100644
+index d44532f346..1ede932e1e 100644
 --- a/conf/sample.ini
 +++ b/conf/sample.ini
-@@ -202,7 +202,7 @@
+@@ -196,7 +196,7 @@
  # No ip addresses are being tracked, only simple counters to track
  # running instances, dashboard and error counts. It is very helpful to us.
  # Change this option to false to disable reporting.
@@ -39,7 +39,7 @@ index 227c90e895..dc9fd6a3a5 100644
  
  # The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
  ;reporting_distributor = grafana-labs
-@@ -212,7 +212,7 @@
+@@ -206,7 +206,7 @@
  # in some UI views to notify that a grafana update exists.
  # This option does not cause any auto updates, nor send any information
  # only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
@@ -48,7 +48,7 @@ index 227c90e895..dc9fd6a3a5 100644
  
  # Set to false to disable all checks to https://grafana.com
  # for new versions of plugins. The check is used
-@@ -356,7 +356,7 @@
+@@ -338,7 +338,7 @@
  
  # Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
  # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -57,7 +57,7 @@ index 227c90e895..dc9fd6a3a5 100644
  
  # Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
  ;default_home_dashboard_path =
-@@ -1094,7 +1094,7 @@
+@@ -1028,7 +1028,7 @@
  ;enable_alpha = false
  ;app_tls_skip_verify_insecure = false
  # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.

SOURCES/0004-remove-unused-backend-dependencies.patch

@@ -1,4 +1,4 @@
-From 944d07247d07b433777ee6ab46bc55cc1d9debe8 Mon Sep 17 00:00:00 2001
+From 7139240c52b69fde8b893bf73fb6a4910d65f30b Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Wed, 22 Jun 2022 17:18:56 +0200
 Subject: [PATCH] remove unused backend dependencies
@@ -7,18 +7,18 @@ saml and gofpdf are not used in the OSS edition of Grafana
 after editing `pkg/extensions/main.go`, run `go mod tidy`
 
 diff --git a/go.mod b/go.mod
-index 03c00985c4..faedd337d3 100644
+index 951745c95f..5b1379fa98 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -30,7 +30,6 @@ require (
+@@ -27,7 +27,6 @@ require (
  	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
- 	github.com/centrifugal/centrifuge v0.25.0
+ 	github.com/centrifugal/centrifuge v0.19.0
  	github.com/cortexproject/cortex v1.10.1-0.20211014125347-85c378182d0d
--	github.com/crewjam/saml v0.4.9
+-	github.com/crewjam/saml v0.4.6-0.20210521115923-29c6295245bd
  	github.com/davecgh/go-spew v1.1.1
  	github.com/denisenkom/go-mssqldb v0.12.0
  	github.com/dop251/goja v0.0.0-20210804101310-32956a348b49
-@@ -67,7 +66,6 @@ require (
+@@ -63,7 +62,6 @@ require (
  	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097
  	github.com/jmespath/go-jmespath v0.4.0
  	github.com/json-iterator/go v1.1.12
@@ -26,7 +26,7 @@ index 03c00985c4..faedd337d3 100644
  	github.com/lib/pq v1.10.4
  	github.com/linkedin/goavro/v2 v2.10.0
  	github.com/m3db/prometheus_remote_client_golang v0.4.4
-@@ -192,7 +190,6 @@ require (
+@@ -191,7 +189,6 @@ require (
  	github.com/josharian/intern v1.0.0 // indirect
  	github.com/jpillora/backoff v1.0.0 // indirect
  	github.com/mailru/easyjson v0.7.7 // indirect
@@ -34,20 +34,11 @@ index 03c00985c4..faedd337d3 100644
  	github.com/mattetti/filebuffer v1.0.1 // indirect
  	github.com/mattn/go-runewidth v0.0.9 // indirect
  	github.com/miekg/dns v1.1.43 // indirect
-@@ -208,7 +205,7 @@
- 	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
- 	github.com/pmezard/go-difflib v1.0.0 // indirect
- 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
--	github.com/prometheus/exporter-toolkit v0.7.1 // indirect
-+	github.com/prometheus/exporter-toolkit v0.7.3 // indirect
- 	github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
- 	github.com/prometheus/procfs v0.8.0 // indirect
- 	github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect
 diff --git a/go.sum b/go.sum
-index e3b45a9f35..b98dc78c57 100644
+index 0f2ad00d37..19e3489ca1 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -665,7 +665,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
+@@ -740,7 +740,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
  github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
  github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
  github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -55,16 +46,40 @@ index e3b45a9f35..b98dc78c57 100644
  github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
  github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
  github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
-@@ -1376,8 +1375,6 @@ github.com/grafana/grafana-plugin-sdk-go v0.139.0 h1:2RQKM2QpSaWTtaGN6sK+R7LO7zy
- github.com/grafana/grafana-plugin-sdk-go v0.139.0/go.mod h1:Y+Ps2sesZ62AyCnX+hzrYnyDQYe/ZZl+A8yKLOBm12c=
- github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293 h1:dJIdfHqu+XjKz+w9zXLqXKPdp6Jjx/UPSOwdeSfWdeQ=
- github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293/go.mod h1:HVHqK+BVPa/tmL8EMhLCCrPt2a1GdJpEyxr5hgur2UI=
--github.com/grafana/saml v0.4.9-0.20230102094056-b61b9eb7c8b7 h1:cujJQ3XV6IK7Y96VpYurd2EpI5rfMRFcuyGqUlk+030=
--github.com/grafana/saml v0.4.9-0.20230102094056-b61b9eb7c8b7/go.mod h1:9Zh6dWPtB3MSzTRt8fIFH60Z351QQ+s7hCU3J/tTlA4=
- github.com/grafana/thema v0.0.0-20220817114012-ebeee841c104 h1:dYpwFYIChrMfpq3wDa/ZBxAbUGSW5NYmYBeSezhaoao=
- github.com/grafana/thema v0.0.0-20220817114012-ebeee841c104/go.mod h1:fCV1rqv6XRQg2GfIQ7pU9zdxd5fLRcEBCnrDVwlK+ZY=
- github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6 h1:I9dh1MXGX0wGyxdV/Sl7+ugnki4Dfsy8lv2s5Yf887o=
-@@ -1664,8 +1661,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
+@@ -766,7 +765,6 @@ github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2
+ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+-github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
+ github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
+ github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
+ github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
+@@ -923,7 +921,6 @@ github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c/go.mod h1:WQX
+ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+-github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c=
+ github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
+ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
+ github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15/go.mod h1:tPg4cp4nseejPd+UKxtCVQ2hUxNTZ7qQZJa7CLriIeo=
+@@ -1459,8 +1456,6 @@ github.com/grafana/grafana-plugin-sdk-go v0.138.0 h1:uJWNwHL4RoQF3axoi3RDSwoNu/K
+ github.com/grafana/grafana-plugin-sdk-go v0.138.0/go.mod h1:Y+Ps2sesZ62AyCnX+hzrYnyDQYe/ZZl+A8yKLOBm12c=
+ github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa h1:+pXjAxavVR2FKKNsuuCXGCWEj8XGc1Af6SPiyBpzU2A=
+ github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa/go.mod h1:0O8o/juxNSKN/e+DzWDTRkl7Zm8CkZcz0NDqEdojlrk=
+-github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b h1:YiSGp34F4V0G08HHx1cJBf2GVgwYAkXQjzuVs1t8jYk=
+-github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b/go.mod h1:q83kyQoMD0vhy+RzFLlbw0UgHJ6TAihQpuXvdFmm4s4=
+ github.com/grafana/sqlds/v2 v2.3.7/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
+ github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751 h1:5PpsfN52XA0hxOjD/qQ0QNiEkp9Y9Tb+yz/Hj9fyL4M=
+ github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751/go.mod h1:KuqTKX9lfM87uu9vt9DS/q+REqSrAm2xYMnBBvlmevA=
+@@ -1766,7 +1761,6 @@ github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52Cu
+ github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
+ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+-github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+ github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
+ github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+ github.com/joncrlsn/dque v2.2.1-0.20200515025108-956d14155fa2+incompatible/go.mod h1:hDZb8oMj3Kp8MxtbNLg9vrtAUDHjgI1yZvqivT4O8Iw=
+@@ -1801,8 +1795,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
  github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
  github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
  github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -72,56 +87,55 @@ index e3b45a9f35..b98dc78c57 100644
 -github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0=
  github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
  github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
- github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-@@ -1787,8 +1782,6 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
+ github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo=
+@@ -1930,8 +1922,6 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
+ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
  github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
  github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
- github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk=
 -github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
 -github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
  github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
  github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
  github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-@@ -2066,7 +2059,6 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
- github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
+@@ -2239,7 +2229,6 @@ github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHu
  github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+ github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
  github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
 -github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
  github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
+ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
  github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
- github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-@@ -2156,8 +2148,9 @@ github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdD
- github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
- github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
- github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
--github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y=
- github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
-+github.com/prometheus/exporter-toolkit v0.7.3 h1:IYBn0CTGi/nYxstdTUKysuSofUNJ3DQW3FmZ/Ub6rgU=
-+github.com/prometheus/exporter-toolkit v0.7.3/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
- github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 h1:dTUS1vaLWq+Y6XKOTnrFpoVsQKLCbCp1OLj24TDi7oM=
- github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc=
- github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-@@ -2696,7 +2688,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
- golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
- golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
- golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
--golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+@@ -2433,7 +2422,6 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+ github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+ github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+-github.com/russellhaering/goxmldsig v1.1.0/go.mod h1:QK8GhXPB3+AfuCrfo0oRISa9NfzeCpWmxeGnqEpDF9o=
+ github.com/russellhaering/goxmldsig v1.1.1 h1:vI0r2osGF1A9PLvsGdPUAGwEIrKa4Pj5sesSBsebIxM=
+ github.com/russellhaering/goxmldsig v1.1.1/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw=
+ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
+@@ -2747,7 +2735,6 @@ github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX
+ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
+ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
+ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+-github.com/zenazn/goji v1.0.1/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+ github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
+ github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+ gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go
-index 72371bdab4..a7bb7abe0f 100644
+index adcaff8ca6..c3110f590e 100644
 --- a/pkg/extensions/main.go
 +++ b/pkg/extensions/main.go
-@@ -11,13 +11,11 @@ import (
- 	_ "github.com/blugelabs/bluge"
- 	_ "github.com/blugelabs/bluge_segment_api"
+@@ -9,7 +9,6 @@ import (
+ 	_ "github.com/Azure/go-autorest/autorest/adal"
+ 	_ "github.com/beevik/etree"
  	_ "github.com/cortexproject/cortex/pkg/util"
 -	_ "github.com/crewjam/saml"
  	_ "github.com/gobwas/glob"
  	_ "github.com/googleapis/gax-go/v2"
  	_ "github.com/grafana/dskit/backoff"
- 	_ "github.com/grafana/dskit/flagext"
+@@ -17,7 +16,6 @@ import (
+ 	_ "github.com/grafana/loki/clients/pkg/promtail/client"
+ 	_ "github.com/grafana/loki/pkg/logproto"
  	_ "github.com/grpc-ecosystem/go-grpc-middleware"
 -	_ "github.com/jung-kurt/gofpdf"
  	_ "github.com/linkedin/goavro/v2"

SOURCES/0005-remove-unused-frontend-crypto.patch

@@ -1,4 +1,4 @@
-From 3709d320189b10a12a3780d15e46afd777f06554 Mon Sep 17 00:00:00 2001
+From 0ee0768a196ba12b860b4a0920f729d5ce50ea3e Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Wed, 22 Jun 2022 17:36:47 +0200
 Subject: [PATCH] remove unused frontend crypto
@@ -7,53 +7,39 @@ update `package.json` and then run `yarn install` to update the
 `yarn.lock` lockfile
 
 diff --git a/package.json b/package.json
-index e26f95d855..91d71f1414 100644
+index 5e2875090b..137a307f14 100644
 --- a/package.json
 +++ b/package.json
-@@ -405,8 +405,10 @@
+@@ -396,6 +396,9 @@
      "whatwg-fetch": "3.6.2"
    },
    "resolutions": {
 +    "crypto-browserify": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz",
 +    "selfsigned": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz",
 +    "http-signature": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz",
-     "underscore": "1.13.4",
--    "@mdx-js/loader/loader-utils": "^2.0.0",
+     "underscore": "1.13.3",
      "@types/slate": "0.47.9",
-     "@rushstack/node-core-library": "3.52.0",
-     "@rushstack/rig-package": "0.3.13",
+     "@microsoft/api-extractor-model": "7.17.3",
 diff --git a/yarn.lock b/yarn.lock
-index f374e10e33..12c06ad883 100644
+index 8132e0f942..b41c0efb1b 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -4571,10 +4571,10 @@ __metadata:
-   languageName: node
-   linkType: hard
- 
--"@braintree/sanitize-url@npm:6.0.0":
--  version: 6.0.0
--  resolution: "@braintree/sanitize-url@npm:6.0.0"
--  checksum: 409ce7709dc1a0c67bc887d20af1becd4145d5c62cc5124b1c4c1f3ea2a8d69b0ee9f582d446469c6f5294b56442b99048cbbba6861dd5c834d4e019b95e1f40
-+"@braintree/sanitize-url@npm:^6.0.0":
-+  version: 6.0.2
-+  resolution: "@braintree/sanitize-url@npm:6.0.2"
-+  checksum: 6a9dfd4081cc96516eeb281d1a83d3b5f1ad3d2837adf968fcc2ba18889ee833554f9c641b4083c36d3360a932e4504ddf25b0b51e9933c3742622df82cf7c9a
-   languageName: node
-   linkType: hard
- 
-@@ -5375,7 +5375,7 @@ __metadata:
-   version: 0.0.0-use.local
-   resolution: "@grafana/data@workspace:packages/grafana-data"
-   dependencies:
--    "@braintree/sanitize-url": 6.0.0
-+    "@braintree/sanitize-url": ^6.0.0
-     "@grafana/schema": 9.2.8
-     "@grafana/tsconfig": ^1.2.0-rc1
-     "@rollup/plugin-commonjs": 22.0.1
-@@ -14511,22 +14511,6 @@ __metadata:
+@@ -12256,34 +12256,6 @@ __metadata:
    languageName: node
    linkType: hard
  
+-"asn1.js@npm:^5.2.0":
+-  version: 5.4.1
+-  resolution: "asn1.js@npm:5.4.1"
+-  dependencies:
+-    bn.js: ^4.0.0
+-    inherits: ^2.0.1
+-    minimalistic-assert: ^1.0.0
+-    safer-buffer: ^2.1.0
+-  checksum: 3786a101ac6f304bd4e9a7df79549a7561950a13d4bcaec0c7790d44c80d147c1a94ba3d4e663673406064642a40b23fcd6c82a9952468e386c1a1376d747f9a
+-  languageName: node
+-  linkType: hard
+-
 -"asn1@npm:~0.2.3":
 -  version: 0.2.4
 -  resolution: "asn1@npm:0.2.4"
@@ -73,7 +59,7 @@ index f374e10e33..12c06ad883 100644
  "assert@npm:2.0.0":
    version: 2.0.0
    resolution: "assert@npm:2.0.0"
-@@ -15231,15 +15215,6 @@ __metadata:
+@@ -12870,15 +12842,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -89,7 +75,144 @@ index f374e10e33..12c06ad883 100644
  "before-after-hook@npm:^2.2.0":
    version: 2.2.2
    resolution: "before-after-hook@npm:2.2.2"
-@@ -17053,13 +17028,6 @@ __metadata:
+@@ -12970,20 +12933,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
+-  version: 4.12.0
+-  resolution: "bn.js@npm:4.12.0"
+-  checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
+-  languageName: node
+-  linkType: hard
+-
+-"bn.js@npm:^5.0.0, bn.js@npm:^5.1.1":
+-  version: 5.2.0
+-  resolution: "bn.js@npm:5.2.0"
+-  checksum: 6117170393200f68b35a061ecbf55d01dd989302e7b3c798a3012354fa638d124f0b2f79e63f77be5556be80322a09c40339eda6413ba7468524c0b6d4b4cb7a
+-  languageName: node
+-  linkType: hard
+-
+ "body-parser@npm:1.19.0":
+   version: 1.19.0
+   resolution: "body-parser@npm:1.19.0"
+@@ -13108,13 +13057,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"brorand@npm:^1.0.1, brorand@npm:^1.1.0":
+-  version: 1.1.0
+-  resolution: "brorand@npm:1.1.0"
+-  checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be
+-  languageName: node
+-  linkType: hard
+-
+ "browser-process-hrtime@npm:^1.0.0":
+   version: 1.0.0
+   resolution: "browser-process-hrtime@npm:1.0.0"
+@@ -13129,70 +13071,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
+-  version: 1.2.0
+-  resolution: "browserify-aes@npm:1.2.0"
+-  dependencies:
+-    buffer-xor: ^1.0.3
+-    cipher-base: ^1.0.0
+-    create-hash: ^1.1.0
+-    evp_bytestokey: ^1.0.3
+-    inherits: ^2.0.1
+-    safe-buffer: ^5.0.1
+-  checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104
+-  languageName: node
+-  linkType: hard
+-
+-"browserify-cipher@npm:^1.0.0":
+-  version: 1.0.1
+-  resolution: "browserify-cipher@npm:1.0.1"
+-  dependencies:
+-    browserify-aes: ^1.0.4
+-    browserify-des: ^1.0.0
+-    evp_bytestokey: ^1.0.0
+-  checksum: 2d8500acf1ee535e6bebe808f7a20e4c3a9e2ed1a6885fff1facbfd201ac013ef030422bec65ca9ece8ffe82b03ca580421463f9c45af6c8415fd629f4118c13
+-  languageName: node
+-  linkType: hard
+-
+-"browserify-des@npm:^1.0.0":
+-  version: 1.0.2
+-  resolution: "browserify-des@npm:1.0.2"
+-  dependencies:
+-    cipher-base: ^1.0.1
+-    des.js: ^1.0.0
+-    inherits: ^2.0.1
+-    safe-buffer: ^5.1.2
+-  checksum: b15a3e358a1d78a3b62ddc06c845d02afde6fc826dab23f1b9c016e643e7b1fda41de628d2110b712f6a44fb10cbc1800bc6872a03ddd363fb50768e010395b7
+-  languageName: node
+-  linkType: hard
+-
+-"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.0.1":
+-  version: 4.1.0
+-  resolution: "browserify-rsa@npm:4.1.0"
+-  dependencies:
+-    bn.js: ^5.0.0
+-    randombytes: ^2.0.1
+-  checksum: 155f0c135873efc85620571a33d884aa8810e40176125ad424ec9d85016ff105a07f6231650914a760cca66f29af0494087947b7be34880dd4599a0cd3c38e54
+-  languageName: node
+-  linkType: hard
+-
+-"browserify-sign@npm:^4.0.0":
+-  version: 4.2.1
+-  resolution: "browserify-sign@npm:4.2.1"
+-  dependencies:
+-    bn.js: ^5.1.1
+-    browserify-rsa: ^4.0.1
+-    create-hash: ^1.2.0
+-    create-hmac: ^1.1.7
+-    elliptic: ^6.5.3
+-    inherits: ^2.0.4
+-    parse-asn1: ^5.1.5
+-    readable-stream: ^3.6.0
+-    safe-buffer: ^5.2.0
+-  checksum: 0221f190e3f5b2d40183fa51621be7e838d9caa329fe1ba773406b7637855f37b30f5d83e52ff8f244ed12ffe6278dd9983638609ed88c841ce547e603855707
+-  languageName: node
+-  linkType: hard
+-
+ "browserify-zlib@npm:^0.2.0":
+   version: 0.2.0
+   resolution: "browserify-zlib@npm:0.2.0"
+@@ -13294,13 +13172,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"buffer-xor@npm:^1.0.3":
+-  version: 1.0.3
+-  resolution: "buffer-xor@npm:1.0.3"
+-  checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a
+-  languageName: node
+-  linkType: hard
+-
+ "buffer@npm:^4.3.0":
+   version: 4.9.2
+   resolution: "buffer@npm:4.9.2"
+@@ -13896,16 +13767,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
+-  version: 1.0.4
+-  resolution: "cipher-base@npm:1.0.4"
+-  dependencies:
+-    inherits: ^2.0.1
+-    safe-buffer: ^5.0.1
+-  checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e
+-  languageName: node
+-  linkType: hard
+-
+ "cjs-module-lexer@npm:^1.0.0":
+   version: 1.2.2
+   resolution: "cjs-module-lexer@npm:1.2.2"
+@@ -14806,13 +14667,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -103,7 +226,85 @@ index f374e10e33..12c06ad883 100644
  "core-util-is@npm:~1.0.0":
    version: 1.0.3
    resolution: "core-util-is@npm:1.0.3"
-@@ -18097,15 +18065,6 @@ __metadata:
+@@ -14882,16 +14736,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"create-ecdh@npm:^4.0.0":
+-  version: 4.0.4
+-  resolution: "create-ecdh@npm:4.0.4"
+-  dependencies:
+-    bn.js: ^4.1.0
+-    elliptic: ^6.5.3
+-  checksum: 0dd7fca9711d09e152375b79acf1e3f306d1a25ba87b8ff14c2fd8e68b83aafe0a7dd6c4e540c9ffbdd227a5fa1ad9b81eca1f233c38bb47770597ba247e614b
+-  languageName: node
+-  linkType: hard
+-
+ "create-emotion@npm:^10.0.14, create-emotion@npm:^10.0.27":
+   version: 10.0.27
+   resolution: "create-emotion@npm:10.0.27"
+@@ -14904,33 +14748,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
+-  version: 1.2.0
+-  resolution: "create-hash@npm:1.2.0"
+-  dependencies:
+-    cipher-base: ^1.0.1
+-    inherits: ^2.0.1
+-    md5.js: ^1.3.4
+-    ripemd160: ^2.0.1
+-    sha.js: ^2.4.0
+-  checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9
+-  languageName: node
+-  linkType: hard
+-
+-"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
+-  version: 1.1.7
+-  resolution: "create-hmac@npm:1.1.7"
+-  dependencies:
+-    cipher-base: ^1.0.3
+-    create-hash: ^1.1.0
+-    inherits: ^2.0.1
+-    ripemd160: ^2.0.0
+-    safe-buffer: ^5.0.1
+-    sha.js: ^2.4.8
+-  checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed
+-  languageName: node
+-  linkType: hard
+-
+ "create-require@npm:^1.1.0":
+   version: 1.1.1
+   resolution: "create-require@npm:1.1.1"
+@@ -14962,22 +14779,10 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"crypto-browserify@npm:^3.11.0":
+-  version: 3.12.0
+-  resolution: "crypto-browserify@npm:3.12.0"
+-  dependencies:
+-    browserify-cipher: ^1.0.0
+-    browserify-sign: ^4.0.0
+-    create-ecdh: ^4.0.0
+-    create-hash: ^1.1.0
+-    create-hmac: ^1.1.0
+-    diffie-hellman: ^5.0.0
+-    inherits: ^2.0.1
+-    pbkdf2: ^3.0.3
+-    public-encrypt: ^4.0.0
+-    randombytes: ^2.0.0
+-    randomfill: ^1.0.3
+-  checksum: c1609af82605474262f3eaa07daa0b2140026bd264ab316d4bf1170272570dbe02f0c49e29407fe0d3634f96c507c27a19a6765fb856fed854a625f9d15618e2
++"crypto-browserify@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz":
++  version: 1.1.3
++  resolution: "crypto-browserify@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz"
++  checksum: e233cb660c0eac1172e3c4da249aeaae92b222e9b870d64a427c7212833a1634e56e2f7601989b1a6a6cd0e8841ff3776cd18f8b56dfc20257b893987d624920
+   languageName: node
+   linkType: hard
+ 
+@@ -15928,15 +15733,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -119,7 +320,42 @@ index f374e10e33..12c06ad883 100644
  "data-urls@npm:^2.0.0":
    version: 2.0.0
    resolution: "data-urls@npm:2.0.0"
-@@ -18842,16 +18801,6 @@ __metadata:
+@@ -16251,16 +16047,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"des.js@npm:^1.0.0":
+-  version: 1.0.1
+-  resolution: "des.js@npm:1.0.1"
+-  dependencies:
+-    inherits: ^2.0.1
+-    minimalistic-assert: ^1.0.0
+-  checksum: 1ec2eedd7ed6bd61dd5e0519fd4c96124e93bb22de8a9d211b02d63e5dd152824853d919bb2090f965cc0e3eb9c515950a9836b332020d810f9c71feb0fd7df4
+-  languageName: node
+-  linkType: hard
+-
+ "destroy@npm:~1.0.4":
+   version: 1.0.4
+   resolution: "destroy@npm:1.0.4"
+@@ -16397,17 +16183,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"diffie-hellman@npm:^5.0.0":
+-  version: 5.0.3
+-  resolution: "diffie-hellman@npm:5.0.3"
+-  dependencies:
+-    bn.js: ^4.1.0
+-    miller-rabin: ^4.0.0
+-    randombytes: ^2.0.0
+-  checksum: 0e620f322170c41076e70181dd1c24e23b08b47dbb92a22a644f3b89b6d3834b0f8ee19e37916164e5eb1ee26d2aa836d6129f92723995267250a0b541811065
+-  languageName: node
+-  linkType: hard
+-
+ "dir-glob@npm:^2.2.2":
+   version: 2.2.2
+   resolution: "dir-glob@npm:2.2.2"
+@@ -16694,16 +16469,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -136,7 +372,47 @@ index f374e10e33..12c06ad883 100644
  "ee-first@npm:1.1.1":
    version: 1.1.1
    resolution: "ee-first@npm:1.1.1"
-@@ -20489,20 +20438,6 @@ __metadata:
+@@ -16748,21 +16513,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"elliptic@npm:^6.5.3":
+-  version: 6.5.4
+-  resolution: "elliptic@npm:6.5.4"
+-  dependencies:
+-    bn.js: ^4.11.9
+-    brorand: ^1.1.0
+-    hash.js: ^1.0.0
+-    hmac-drbg: ^1.0.1
+-    inherits: ^2.0.4
+-    minimalistic-assert: ^1.0.1
+-    minimalistic-crypto-utils: ^1.0.1
+-  checksum: d56d21fd04e97869f7ffcc92e18903b9f67f2d4637a23c860492fbbff5a3155fd9ca0184ce0c865dd6eb2487d234ce9551335c021c376cd2d3b7cb749c7d10f4
+-  languageName: node
+-  linkType: hard
+-
+ "emitter-component@npm:^1.1.1":
+   version: 1.1.1
+   resolution: "emitter-component@npm:1.1.1"
+@@ -17716,17 +17466,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3":
+-  version: 1.0.3
+-  resolution: "evp_bytestokey@npm:1.0.3"
+-  dependencies:
+-    md5.js: ^1.3.4
+-    node-gyp: latest
+-    safe-buffer: ^5.1.1
+-  checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45
+-  languageName: node
+-  linkType: hard
+-
+ "exec-sh@npm:^0.3.2":
+   version: 0.3.6
+   resolution: "exec-sh@npm:0.3.6"
+@@ -18006,20 +17745,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -157,7 +433,7 @@ index f374e10e33..12c06ad883 100644
  "fast-deep-equal@npm:^3.0.0, fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
    version: 3.1.3
    resolution: "fast-deep-equal@npm:3.1.3"
-@@ -21462,15 +21397,6 @@ __metadata:
+@@ -19046,15 +18771,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -171,9 +447,55 @@ index f374e10e33..12c06ad883 100644
 -  linkType: hard
 -
  "git-raw-commits@npm:^2.0.8":
-   version: 2.0.11
-   resolution: "git-raw-commits@npm:2.0.11"
-@@ -22832,25 +22758,10 @@ __metadata:
+   version: 2.0.10
+   resolution: "git-raw-commits@npm:2.0.10"
+@@ -19887,27 +19603,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"hash-base@npm:^3.0.0":
+-  version: 3.1.0
+-  resolution: "hash-base@npm:3.1.0"
+-  dependencies:
+-    inherits: ^2.0.4
+-    readable-stream: ^3.6.0
+-    safe-buffer: ^5.2.0
+-  checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc
+-  languageName: node
+-  linkType: hard
+-
+-"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
+-  version: 1.1.7
+-  resolution: "hash.js@npm:1.1.7"
+-  dependencies:
+-    inherits: ^2.0.3
+-    minimalistic-assert: ^1.0.1
+-  checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f
+-  languageName: node
+-  linkType: hard
+-
+ "hast-to-hyperscript@npm:^9.0.0":
+   version: 9.0.1
+   resolution: "hast-to-hyperscript@npm:9.0.1"
+@@ -20043,17 +19738,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"hmac-drbg@npm:^1.0.1":
+-  version: 1.0.1
+-  resolution: "hmac-drbg@npm:1.0.1"
+-  dependencies:
+-    hash.js: ^1.0.3
+-    minimalistic-assert: ^1.0.0
+-    minimalistic-crypto-utils: ^1.0.1
+-  checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0
+-  languageName: node
+-  linkType: hard
+-
+ "hoist-non-react-statics@npm:3.3.2, hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2":
+   version: 3.3.2
+   resolution: "hoist-non-react-statics@npm:3.3.2"
+@@ -20394,25 +20078,10 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -203,7 +525,7 @@ index f374e10e33..12c06ad883 100644
    languageName: node
    linkType: hard
  
-@@ -25418,13 +25329,6 @@ __metadata:
+@@ -22562,13 +22231,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -217,7 +539,7 @@ index f374e10e33..12c06ad883 100644
  "jsdoc-type-pratt-parser@npm:~2.2.5":
    version: 2.2.5
    resolution: "jsdoc-type-pratt-parser@npm:2.2.5"
-@@ -25572,13 +25476,6 @@ __metadata:
+@@ -22683,13 +22345,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -231,7 +553,7 @@ index f374e10e33..12c06ad883 100644
  "json-source-map@npm:0.6.1":
    version: 0.6.1
    resolution: "json-source-map@npm:0.6.1"
-@@ -25709,30 +25606,6 @@ __metadata:
+@@ -22793,30 +22448,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -262,25 +584,66 @@ index f374e10e33..12c06ad883 100644
  "jsurl@npm:^0.1.5":
    version: 0.1.5
    resolution: "jsurl@npm:0.1.5"
-@@ -26192,6 +26065,17 @@ __metadata:
+@@ -23818,17 +23449,6 @@ __metadata:
    languageName: node
    linkType: hard
  
-+"loader-utils@npm:2.0.0":
-+  version: 2.0.0
-+  resolution: "loader-utils@npm:2.0.0"
-+  dependencies:
-+    big.js: ^5.2.2
-+    emojis-list: ^3.0.0
-+    json5: ^2.1.2
-+  checksum: 6856423131b50b6f5f259da36f498cfd7fc3c3f8bb17777cf87fdd9159e797d4ba4288d9a96415fd8da62c2906960e88f74711dee72d03a9003bddcd0d364a51
-+  languageName: node
-+  linkType: hard
-+
- "loader-utils@npm:^2.0.0":
-   version: 2.0.3
-   resolution: "loader-utils@npm:2.0.3"
-@@ -27755,13 +27639,6 @@ __metadata:
+-"md5.js@npm:^1.3.4":
+-  version: 1.3.5
+-  resolution: "md5.js@npm:1.3.5"
+-  dependencies:
+-    hash-base: ^3.0.0
+-    inherits: ^2.0.1
+-    safe-buffer: ^5.1.2
+-  checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c
+-  languageName: node
+-  linkType: hard
+-
+ "mdast-squeeze-paragraphs@npm:^4.0.0":
+   version: 4.0.0
+   resolution: "mdast-squeeze-paragraphs@npm:4.0.0"
+@@ -24108,18 +23728,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"miller-rabin@npm:^4.0.0":
+-  version: 4.0.1
+-  resolution: "miller-rabin@npm:4.0.1"
+-  dependencies:
+-    bn.js: ^4.0.0
+-    brorand: ^1.0.1
+-  bin:
+-    miller-rabin: bin/miller-rabin
+-  checksum: 00cd1ab838ac49b03f236cc32a14d29d7d28637a53096bf5c6246a032a37749c9bd9ce7360cbf55b41b89b7d649824949ff12bc8eee29ac77c6b38eada619ece
+-  languageName: node
+-  linkType: hard
+-
+ "mime-db@npm:1.50.0, mime-db@npm:>= 1.43.0 < 2":
+   version: 1.50.0
+   resolution: "mime-db@npm:1.50.0"
+@@ -24247,20 +23855,13 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
++"minimalistic-assert@npm:^1.0.0":
+   version: 1.0.1
+   resolution: "minimalistic-assert@npm:1.0.1"
+   checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
+   languageName: node
+   linkType: hard
+ 
+-"minimalistic-crypto-utils@npm:^1.0.1":
+-  version: 1.0.1
+-  resolution: "minimalistic-crypto-utils@npm:1.0.1"
+-  checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed
+-  languageName: node
+-  linkType: hard
+-
+ "minimatch@npm:3.0.4, minimatch@npm:^3.0.4":
+   version: 3.0.4
+   resolution: "minimatch@npm:3.0.4"
+@@ -24903,13 +24504,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -294,7 +657,120 @@ index f374e10e33..12c06ad883 100644
  "node-gettext@npm:^3.0.0":
    version: 3.0.0
    resolution: "node-gettext@npm:3.0.0"
-@@ -33404,7 +33281,7 @@ __metadata:
+@@ -26024,19 +25618,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.5":
+-  version: 5.1.6
+-  resolution: "parse-asn1@npm:5.1.6"
+-  dependencies:
+-    asn1.js: ^5.2.0
+-    browserify-aes: ^1.0.0
+-    evp_bytestokey: ^1.0.0
+-    pbkdf2: ^3.0.3
+-    safe-buffer: ^5.1.1
+-  checksum: 9243311d1f88089bc9f2158972aa38d1abd5452f7b7cabf84954ed766048fe574d434d82c6f5a39b988683e96fb84cd933071dda38927e03469dc8c8d14463c7
+-  languageName: node
+-  linkType: hard
+-
+ "parse-entities@npm:^2.0.0":
+   version: 2.0.0
+   resolution: "parse-entities@npm:2.0.0"
+@@ -26258,19 +25839,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"pbkdf2@npm:^3.0.3":
+-  version: 3.1.2
+-  resolution: "pbkdf2@npm:3.1.2"
+-  dependencies:
+-    create-hash: ^1.1.2
+-    create-hmac: ^1.1.4
+-    ripemd160: ^2.0.1
+-    safe-buffer: ^5.0.1
+-    sha.js: ^2.4.8
+-  checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92
+-  languageName: node
+-  linkType: hard
+-
+ "pend@npm:~1.2.0":
+   version: 1.2.0
+   resolution: "pend@npm:1.2.0"
+@@ -27959,20 +27527,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"public-encrypt@npm:^4.0.0":
+-  version: 4.0.3
+-  resolution: "public-encrypt@npm:4.0.3"
+-  dependencies:
+-    bn.js: ^4.1.0
+-    browserify-rsa: ^4.0.0
+-    create-hash: ^1.1.0
+-    parse-asn1: ^5.0.0
+-    randombytes: ^2.0.1
+-    safe-buffer: ^5.1.2
+-  checksum: 215d446e43cef021a20b67c1df455e5eea134af0b1f9b8a35f9e850abf32991b0c307327bc5b9bc07162c288d5cdb3d4a783ea6c6640979ed7b5017e3e0c9935
+-  languageName: node
+-  linkType: hard
+-
+ "pump@npm:^2.0.0":
+   version: 2.0.1
+   resolution: "pump@npm:2.0.1"
+@@ -28181,7 +27735,7 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0":
++"randombytes@npm:^2.1.0":
+   version: 2.1.0
+   resolution: "randombytes@npm:2.1.0"
+   dependencies:
+@@ -28190,16 +27744,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"randomfill@npm:^1.0.3":
+-  version: 1.0.4
+-  resolution: "randomfill@npm:1.0.4"
+-  dependencies:
+-    randombytes: ^2.0.5
+-    safe-buffer: ^5.1.0
+-  checksum: 33734bb578a868d29ee1b8555e21a36711db084065d94e019a6d03caa67debef8d6a1bfd06a2b597e32901ddc761ab483a85393f0d9a75838f1912461d4dbfc7
+-  languageName: node
+-  linkType: hard
+-
+ "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
+   version: 1.2.1
+   resolution: "range-parser@npm:1.2.1"
+@@ -30443,16 +29987,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
+-  version: 2.0.2
+-  resolution: "ripemd160@npm:2.0.2"
+-  dependencies:
+-    hash-base: ^3.0.0
+-    inherits: ^2.0.1
+-  checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393
+-  languageName: node
+-  linkType: hard
+-
+ "rollup-plugin-copy@npm:3.4.0":
+   version: 3.4.0
+   resolution: "rollup-plugin-copy@npm:3.4.0"
+@@ -30638,7 +30172,7 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
++"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
+   version: 5.2.1
+   resolution: "safe-buffer@npm:5.2.1"
+   checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
+@@ -30654,7 +30188,7 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -303,7 +779,7 @@ index f374e10e33..12c06ad883 100644
    version: 2.1.2
    resolution: "safer-buffer@npm:2.1.2"
    checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
-@@ -33623,12 +33500,10 @@ __metadata:
+@@ -30891,12 +30425,10 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -320,7 +796,26 @@ index f374e10e33..12c06ad883 100644
    languageName: node
    linkType: hard
  
-@@ -34591,27 +34466,6 @@ __metadata:
+@@ -31133,18 +30665,6 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
+-  version: 2.4.11
+-  resolution: "sha.js@npm:2.4.11"
+-  dependencies:
+-    inherits: ^2.0.1
+-    safe-buffer: ^5.0.1
+-  bin:
+-    sha.js: ./bin.js
+-  checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07
+-  languageName: node
+-  linkType: hard
+-
+ "shallow-clone@npm:^3.0.0":
+   version: 3.0.1
+   resolution: "shallow-clone@npm:3.0.1"
+@@ -31830,27 +31350,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -345,10 +840,10 @@ index f374e10e33..12c06ad883 100644
 -  languageName: node
 -  linkType: hard
 -
- "ssri@npm:^8.0.0, ssri@npm:^8.0.1":
-   version: 8.0.1
-   resolution: "ssri@npm:8.0.1"
-@@ -36287,13 +36141,6 @@ __metadata:
+ "ssri@npm:^6.0.1":
+   version: 6.0.2
+   resolution: "ssri@npm:6.0.2"
+@@ -33509,13 +33008,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -362,7 +857,7 @@ index f374e10e33..12c06ad883 100644
  "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
    version: 0.4.0
    resolution: "type-check@npm:0.4.0"
-@@ -37042,17 +36889,6 @@ __metadata:
+@@ -34329,17 +33821,6 @@ __metadata:
    languageName: node
    linkType: soft
  
@@ -380,18 +875,3 @@ index f374e10e33..12c06ad883 100644
  "vfile-location@npm:^3.0.0, vfile-location@npm:^3.2.0":
    version: 3.2.0
    resolution: "vfile-location@npm:3.2.0"
-
-diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
-index e26f95d855..91d71f1414 100644
---- a/packages/grafana-data/package.json
-+++ b/packages/grafana-data/package.json
-@@ -33,7 +33,7 @@
-     "typecheck": "tsc --emitDeclarationOnly false --noEmit"
-   },
-   "dependencies": {
--    "@braintree/sanitize-url": "6.0.0",
-+    "@braintree/sanitize-url": "^6.0.0",
-     "@grafana/schema": "9.2.8",
-     "@types/d3-interpolate": "^1.4.0",
-     "d3-interpolate": "1.4.0",
-

SOURCES/0006-notifications-use-HMAC-SHA256-to-generate-password-r.patch

@@ -0,0 +1,358 @@
+From 5749f50533225b5d38fed1ed86b1c893cc0466b5 Mon Sep 17 00:00:00 2001
+From: Andreas Gerstmayr <agerstmayr@redhat.com>
+Date: Thu, 25 Nov 2021 18:49:52 +0100
+Subject: [PATCH] notifications: use HMAC-SHA256 to generate password reset
+ tokens
+
+* changes the time limit code generation function to use HMAC-SHA256
+  instead of SHA-1
+* multiple new testcases
+
+diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go
+index 32cd5dd7cd..72d33e3814 100644
+--- a/pkg/services/notifications/codes.go
++++ b/pkg/services/notifications/codes.go
+@@ -1,48 +1,53 @@
+ package notifications
+ 
+ import (
+-	"crypto/sha1" // #nosec
++	"crypto/hmac"
++	"crypto/sha256"
+ 	"encoding/hex"
+ 	"fmt"
++	"strconv"
+ 	"time"
+ 
+-	"github.com/unknwon/com"
+-
+ 	"github.com/grafana/grafana/pkg/models"
+ 	"github.com/grafana/grafana/pkg/setting"
+ )
+ 
+-const timeLimitCodeLength = 12 + 6 + 40
++const timeLimitStartDateLength = 12
++const timeLimitMinutesLength = 6
++const timeLimitHmacLength = 64
++const timeLimitCodeLength = timeLimitStartDateLength + timeLimitMinutesLength + timeLimitHmacLength
+ 
+ // create a time limit code
+-// code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string
+-func createTimeLimitCode(data string, minutes int, startInf interface{}) (string, error) {
++// code format: 12 length date time string + 6 minutes string + 64 HMAC-SHA256 encoded string
++func createTimeLimitCode(payload string, minutes int, startStr string) (string, error) {
+ 	format := "200601021504"
+ 
+ 	var start, end time.Time
+-	var startStr, endStr string
++	var endStr string
+ 
+-	if startInf == nil {
++	if startStr == "" {
+ 		// Use now time create code
+ 		start = time.Now()
+ 		startStr = start.Format(format)
+ 	} else {
+ 		// use start string create code
+-		startStr = startInf.(string)
+-		start, _ = time.ParseInLocation(format, startStr, time.Local)
+-		startStr = start.Format(format)
++		var err error
++		start, err = time.ParseInLocation(format, startStr, time.Local)
++		if err != nil {
++			return "", err
++		}
+ 	}
+ 
+ 	end = start.Add(time.Minute * time.Duration(minutes))
+ 	endStr = end.Format(format)
+ 
+-	// create sha1 encode string
+-	sh := sha1.New()
+-	if _, err := sh.Write([]byte(data + setting.SecretKey + startStr + endStr +
+-		com.ToStr(minutes))); err != nil {
+-		return "", err
++	// create HMAC-SHA256 encoded string
++	key := []byte(setting.SecretKey)
++	h := hmac.New(sha256.New, key)
++	if _, err := h.Write([]byte(payload + startStr + endStr)); err != nil {
++		return "", fmt.Errorf("cannot create hmac: %v", err)
+ 	}
+-	encoded := hex.EncodeToString(sh.Sum(nil))
++	encoded := hex.EncodeToString(h.Sum(nil))
+ 
+ 	code := fmt.Sprintf("%s%06d%s", startStr, minutes, encoded)
+ 	return code, nil
+@@ -50,29 +55,32 @@ func createTimeLimitCode(data string, minutes int, startInf interface{}) (string
+ 
+ // verify time limit code
+ func validateUserEmailCode(cfg *setting.Cfg, user *models.User, code string) (bool, error) {
+-	if len(code) <= 18 {
++	if len(code) < timeLimitCodeLength {
+ 		return false, nil
+ 	}
+ 
+-	minutes := cfg.EmailCodeValidMinutes
+ 	code = code[:timeLimitCodeLength]
+ 
+ 	// split code
+-	start := code[:12]
+-	lives := code[12:18]
+-	if d, err := com.StrTo(lives).Int(); err == nil {
+-		minutes = d
++	startStr := code[:timeLimitStartDateLength]
++	minutesStr := code[timeLimitStartDateLength : timeLimitStartDateLength+timeLimitMinutesLength]
++	minutes, err := strconv.Atoi(minutesStr)
++	if err != nil {
++		return false, fmt.Errorf("invalid time limit code: %v", err)
+ 	}
+ 
+ 	// right active code
+-	data := com.ToStr(user.Id) + user.Email + user.Login + user.Password + user.Rands
+-	retCode, err := createTimeLimitCode(data, minutes, start)
++	payload := strconv.FormatInt(user.Id, 10) + user.Email + user.Login + user.Password + user.Rands
++	expectedCode, err := createTimeLimitCode(payload, minutes, startStr)
+ 	if err != nil {
+ 		return false, err
+ 	}
+-	if retCode == code && minutes > 0 {
++	if hmac.Equal([]byte(code), []byte(expectedCode)) && minutes > 0 {
+ 		// check time is expired or not
+-		before, _ := time.ParseInLocation("200601021504", start, time.Local)
++		before, err := time.ParseInLocation("200601021504", startStr, time.Local)
++		if err != nil {
++			return false, err
++		}
+ 		now := time.Now()
+ 		if before.Add(time.Minute*time.Duration(minutes)).Unix() > now.Unix() {
+ 			return true, nil
+@@ -93,15 +101,15 @@ func getLoginForEmailCode(code string) string {
+ 	return string(b)
+ }
+ 
+-func createUserEmailCode(cfg *setting.Cfg, u *models.User, startInf interface{}) (string, error) {
++func createUserEmailCode(cfg *setting.Cfg, user *models.User, startStr string) (string, error) {
+ 	minutes := cfg.EmailCodeValidMinutes
+-	data := com.ToStr(u.Id) + u.Email + u.Login + u.Password + u.Rands
+-	code, err := createTimeLimitCode(data, minutes, startInf)
++	payload := strconv.FormatInt(user.Id, 10) + user.Email + user.Login + user.Password + user.Rands
++	code, err := createTimeLimitCode(payload, minutes, startStr)
+ 	if err != nil {
+ 		return "", err
+ 	}
+ 
+ 	// add tail hex username
+-	code += hex.EncodeToString([]byte(u.Login))
++	code += hex.EncodeToString([]byte(user.Login))
+ 	return code, nil
+ }
+diff --git a/pkg/services/notifications/codes_test.go b/pkg/services/notifications/codes_test.go
+index a314c8deca..be9b68ca69 100644
+--- a/pkg/services/notifications/codes_test.go
++++ b/pkg/services/notifications/codes_test.go
+@@ -1,7 +1,10 @@
+ package notifications
+ 
+ import (
++	"fmt"
++	"strconv"
+ 	"testing"
++	"time"
+ 
+ 	"github.com/grafana/grafana/pkg/models"
+ 	"github.com/grafana/grafana/pkg/setting"
+@@ -9,18 +12,126 @@ import (
+ 	"github.com/stretchr/testify/require"
+ )
+ 
++func TestTimeLimitCodes(t *testing.T) {
++	cfg := setting.NewCfg()
++	cfg.EmailCodeValidMinutes = 120
++	user := &models.User{Id: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"}
++
++	format := "200601021504"
++	mailPayload := strconv.FormatInt(user.Id, 10) + user.Email + user.Login + user.Password + user.Rands
++	tenMinutesAgo := time.Now().Add(-time.Minute * 10)
++
++	tests := []struct {
++		desc    string
++		payload string
++		start   time.Time
++		minutes int
++		valid   bool
++	}{
++		{
++			desc:    "code generated 10 minutes ago, 5 minutes valid",
++			payload: mailPayload,
++			start:   tenMinutesAgo,
++			minutes: 5,
++			valid:   false,
++		},
++		{
++			desc:    "code generated 10 minutes ago, 9 minutes valid",
++			payload: mailPayload,
++			start:   tenMinutesAgo,
++			minutes: 9,
++			valid:   false,
++		},
++		{
++			desc:    "code generated 10 minutes ago, 10 minutes valid",
++			payload: mailPayload,
++			start:   tenMinutesAgo,
++			minutes: 10,
++			// code was valid exactly 10 minutes since evaluating the tenMinutesAgo assignment
++			// by the time this test is run the code is already expired
++			valid: false,
++		},
++		{
++			desc:    "code generated 10 minutes ago, 11 minutes valid",
++			payload: mailPayload,
++			start:   tenMinutesAgo,
++			minutes: 11,
++			valid:   true,
++		},
++		{
++			desc:    "code generated 10 minutes ago, 20 minutes valid",
++			payload: mailPayload,
++			start:   tenMinutesAgo,
++			minutes: 20,
++			valid:   true,
++		},
++		{
++			desc:    "code generated 10 minutes ago, 20 minutes valid, tampered payload",
++			payload: mailPayload[:len(mailPayload)-1] + "x",
++			start:   tenMinutesAgo,
++			minutes: 20,
++			valid:   false,
++		},
++	}
++
++	for _, test := range tests {
++		t.Run(test.desc, func(t *testing.T) {
++			code, err := createTimeLimitCode(test.payload, test.minutes, test.start.Format(format))
++			require.NoError(t, err)
++
++			isValid, err := validateUserEmailCode(cfg, user, code)
++			require.NoError(t, err)
++			require.Equal(t, test.valid, isValid)
++		})
++	}
++
++	t.Run("tampered minutes", func(t *testing.T) {
++		code, err := createTimeLimitCode(mailPayload, 5, tenMinutesAgo.Format(format))
++		require.NoError(t, err)
++
++		// code is expired
++		isValid, err := validateUserEmailCode(cfg, user, code)
++		require.NoError(t, err)
++		require.Equal(t, false, isValid)
++
++		// let's try to extend the code by tampering the minutes
++		code = code[:12] + fmt.Sprintf("%06d", 20) + code[18:]
++		isValid, err = validateUserEmailCode(cfg, user, code)
++		require.NoError(t, err)
++		require.Equal(t, false, isValid)
++	})
++
++	t.Run("tampered start string", func(t *testing.T) {
++		code, err := createTimeLimitCode(mailPayload, 5, tenMinutesAgo.Format(format))
++		require.NoError(t, err)
++
++		// code is expired
++		isValid, err := validateUserEmailCode(cfg, user, code)
++		require.NoError(t, err)
++		require.Equal(t, false, isValid)
++
++		// let's try to extend the code by tampering the start string
++		oneMinuteAgo := time.Now().Add(-time.Minute)
++
++		code = oneMinuteAgo.Format(format) + code[12:]
++		isValid, err = validateUserEmailCode(cfg, user, code)
++		require.NoError(t, err)
++		require.Equal(t, false, isValid)
++	})
++}
++
+ func TestEmailCodes(t *testing.T) {
+ 	t.Run("When generating code", func(t *testing.T) {
+ 		cfg := setting.NewCfg()
+ 		cfg.EmailCodeValidMinutes = 120
+ 
+ 		user := &models.User{Id: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"}
+-		code, err := createUserEmailCode(cfg, user, nil)
++		code, err := createUserEmailCode(cfg, user, "")
+ 		require.NoError(t, err)
+ 
+ 		t.Run("getLoginForCode should return login", func(t *testing.T) {
+ 			login := getLoginForEmailCode(code)
+-			require.Equal(t, login, "asd")
++			require.Equal(t, "asd", login)
+ 		})
+ 
+ 		t.Run("Can verify valid code", func(t *testing.T) {
+@@ -29,7 +140,7 @@ func TestEmailCodes(t *testing.T) {
+ 			require.True(t, isValid)
+ 		})
+ 
+-		t.Run("Cannot verify in-valid code", func(t *testing.T) {
++		t.Run("Cannot verify invalid code", func(t *testing.T) {
+ 			code = "ASD"
+ 			isValid, err := validateUserEmailCode(cfg, user, code)
+ 			require.NoError(t, err)
+diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
+index 84a0d42cb6..52facd0992 100644
+--- a/pkg/services/notifications/notifications.go
++++ b/pkg/services/notifications/notifications.go
+@@ -168,7 +168,7 @@ func (ns *NotificationService) SendEmailCommandHandler(ctx context.Context, cmd
+ }
+ 
+ func (ns *NotificationService) SendResetPasswordEmail(ctx context.Context, cmd *models.SendResetPasswordEmailCommand) error {
+-	code, err := createUserEmailCode(ns.Cfg, cmd.User, nil)
++	code, err := createUserEmailCode(ns.Cfg, cmd.User, "")
+ 	if err != nil {
+ 		return err
+ 	}
+diff --git a/pkg/services/notifications/notifications_test.go b/pkg/services/notifications/notifications_test.go
+index 71970e20a0..6f4b318fe0 100644
+--- a/pkg/services/notifications/notifications_test.go
++++ b/pkg/services/notifications/notifications_test.go
+@@ -2,6 +2,7 @@ package notifications
+ 
+ import (
+ 	"context"
++	"regexp"
+ 	"testing"
+ 
+ 	"github.com/grafana/grafana/pkg/bus"
+@@ -185,7 +186,8 @@ func TestSendEmailAsync(t *testing.T) {
+ 
+ 	t.Run("When sending reset email password", func(t *testing.T) {
+ 		sut, _ := createSut(t, bus)
+-		err := sut.SendResetPasswordEmail(context.Background(), &models.SendResetPasswordEmailCommand{User: &models.User{Email: "asd@asd.com"}})
++		user := models.User{Email: "asd@asd.com", Login: "asd@asd.com"}
++		err := sut.SendResetPasswordEmail(context.Background(), &models.SendResetPasswordEmailCommand{User: &user})
+ 		require.NoError(t, err)
+ 
+ 		sentMsg := <-sut.mailQueue
+@@ -194,6 +196,21 @@ func TestSendEmailAsync(t *testing.T) {
+ 		assert.Equal(t, "Reset your Grafana password - asd@asd.com", sentMsg.Subject)
+ 		assert.NotContains(t, sentMsg.Body["text/html"], "Subject")
+ 		assert.NotContains(t, sentMsg.Body["text/plain"], "Subject")
++
++		// find code in mail
++		r, _ := regexp.Compile(`code=(\w+)`)
++		match := r.FindString(sentMsg.Body["text/plain"])
++		code := match[len("code="):]
++
++		// verify code
++		query := models.ValidateResetPasswordCodeQuery{Code: code}
++		getUserByLogin := func(ctx context.Context, login string) (*models.User, error) {
++			query := models.GetUserByLoginQuery{LoginOrEmail: login}
++			query.Result = &user
++			return query.Result, nil
++		}
++		err = sut.ValidateResetPasswordCode(context.Background(), &query, getUserByLogin)
++		require.NoError(t, err)
+ 	})
+ 
+ 	t.Run("When SMTP disabled in configuration", func(t *testing.T) {

SOURCES/0007-skip-marketplace-plugin-install-test.patch

@@ -1,4 +1,4 @@
-From a23cb1162fd705147489915667b83a236ad248be Mon Sep 17 00:00:00 2001
+From 03a5c7f452efb1dbf605bba8caf3e86e15888c25 Mon Sep 17 00:00:00 2001
 From: Andreas Gerstmayr <agerstmayr@redhat.com>
 Date: Thu, 23 Jun 2022 17:00:46 +0200
 Subject: [PATCH] skip marketplace plugin install test
@@ -8,10 +8,10 @@ Network connectivity is disabled in the build environment for security
 reasons, therefore we need to disable this test.
 
 diff --git a/pkg/tests/api/plugins/api_plugins_test.go b/pkg/tests/api/plugins/api_plugins_test.go
-index 0d62275c4b..c237aa9389 100644
+index e86ce50830..fd60fbe67c 100644
 --- a/pkg/tests/api/plugins/api_plugins_test.go
 +++ b/pkg/tests/api/plugins/api_plugins_test.go
-@@ -56,6 +56,7 @@ func TestPlugins(t *testing.T) {
+@@ -55,6 +55,7 @@ func TestPlugins(t *testing.T) {
  		})
  
  		t.Run("Request is not forbidden if from an admin", func(t *testing.T) {

SOURCES/0008-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch

@@ -0,0 +1,20 @@
+From dc4e1c882d28db17064bd4fb788775a86ebfe066 Mon Sep 17 00:00:00 2001
+From: Andreas Gerstmayr <agerstmayr@redhat.com>
+Date: Mon, 27 Jun 2022 17:12:27 +0200
+Subject: [PATCH] Prometheus: Fix integer overflow in rate interval calculation
+ on 32-bit architectures
+
+
+diff --git a/pkg/tsdb/prometheus/buffered/time_series_query.go b/pkg/tsdb/prometheus/buffered/time_series_query.go
+index 40db2d9100..0af2d3ecab 100644
+--- a/pkg/tsdb/prometheus/buffered/time_series_query.go
++++ b/pkg/tsdb/prometheus/buffered/time_series_query.go
+@@ -326,7 +326,7 @@ func calculateRateInterval(interval time.Duration, scrapeInterval string, interv
+ 		return time.Duration(0)
+ 	}
+ 
+-	rateInterval := time.Duration(int(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
++	rateInterval := time.Duration(int64(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
+ 	return rateInterval
+ }
+ 

SOURCES/0008-graphite-functions-xss.patch

@@ -1,31 +0,0 @@
-From 05df8dcac715113517b81b1995ab1f0b69017f4a Mon Sep 17 00:00:00 2001
-From: ismail simsek <ismailsimsek09@gmail.com>
-Date: Thu, 16 Mar 2023 23:16:03 +0100
-Subject: [PATCH] graphite functions xss
-
-commit e59427c074
-    [v9.2.x] Fix xss in Graphite functions tooltip (#810)
-
-    Fix xss in Graphite functions tooltip (#804)
-
-    (cherry picked from commit 87aad3f11836f810ee1fdfee27827e746ef36055)
-
-    Co-authored-by: Ludovic Viaud <ludovic.viaud@gmail.com>
-
-diff --git a/public/app/plugins/datasource/graphite/components/FunctionEditorControls.tsx b/public/app/plugins/datasource/graphite/components/FunctionEditorControls.tsx
-index facd0b2511..d4d41da720 100644
---- a/public/app/plugins/datasource/graphite/components/FunctionEditorControls.tsx
-+++ b/public/app/plugins/datasource/graphite/components/FunctionEditorControls.tsx
-@@ -11,11 +11,9 @@ export interface FunctionEditorControlsProps {
- }
- 
- const FunctionDescription = React.lazy(async () => {
--  // @ts-ignore
--  const { default: rst2html } = await import(/* webpackChunkName: "rst2html" */ 'rst2html');
-   return {
-     default(props: { description?: string }) {
--      return <div dangerouslySetInnerHTML={{ __html: rst2html(props.description ?? '') }} />;
-+      return <div>{props.description}</div>;
-     },
-   };
- });

SOURCES/0009-Prometheus-Fix-integer-overflow-in-rate-interval-cal.patch

@@ -0,0 +1,20 @@
+From 09be2f6709e7d05a2f75756c5f58b0602b54af72 Mon Sep 17 00:00:00 2001
+From: Andreas Gerstmayr <agerstmayr@redhat.com>
+Date: Tue, 5 Jul 2022 17:04:13 +0200
+Subject: [PATCH] Prometheus: Fix integer overflow in rate interval calculation
+ on 32-bit architectures 2
+
+
+diff --git a/pkg/tsdb/prometheus/models/query.go b/pkg/tsdb/prometheus/models/query.go
+index bdd48d08ed..aa2b1f9945 100644
+--- a/pkg/tsdb/prometheus/models/query.go
++++ b/pkg/tsdb/prometheus/models/query.go
+@@ -181,7 +181,7 @@ func calculateRateInterval(interval time.Duration, scrapeInterval string, interv
+ 		return time.Duration(0)
+ 	}
+ 
+-	rateInterval := time.Duration(int(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
++	rateInterval := time.Duration(int64(math.Max(float64(interval+scrapeIntervalDuration), float64(4)*float64(scrapeIntervalDuration))))
+ 	return rateInterval
+ }
+ 

SOURCES/0010-skip-tests.patch

@@ -1,71 +0,0 @@
-From 3236aa416f6d1b109bff1fdd4127292988fb199c Mon Sep 17 00:00:00 2001
-From: Stan Cox <scox@redhat.com>
-Date: Wed, 22 Jun 2022 17:05:48 +0200
-Subject: [PATCH] skip tests
-
-These tests are problematic on s390 but lint complains about patches
-in an %ifarch block so apply to all architectures.
-
-diff --git a/pkg/services/ngalert/notifier/alertmanager_test.go b/pkg/services/ngalert/notifier/alertmanager_test.go
---- a/pkg/services/ngalert/notifier/alertmanager_test.go	2023-06-04 22:38:26.566930436 -0400
-+++ b/pkg/services/ngalert/notifier/alertmanager_test.go	2023-06-06 13:25:43.785556819 -0400
-@@ -54,6 +54,7 @@
- }
- 
- func TestPutAlert(t *testing.T) {
-+	t.Skip("Skip testing TestPutAlert")
- 	am := setupAMTest(t)
- 
- 	startTime := time.Now()
-@@ -350,6 +351,7 @@
- // implement a custom maintenance function for silences, because we snapshot
- // our data differently, so we test that functionality.
- func TestSilenceCleanup(t *testing.T) {
-+	t.Skip("Skip testing TestSilenceCleanup")
- 	require := require.New(t)
- 
- 	oldRetention := retentionNotificationsAndSilences
-diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go
---- a/pkg/services/ngalert/state/manager_test.go	2023-06-04 22:38:26.570930475 -0400
-+++ b/pkg/services/ngalert/state/manager_test.go	2023-06-06 13:26:47.588172342 -0400
-@@ -78,6 +78,7 @@
- }
- 
- func TestProcessEvalResults(t *testing.T) {
-+	t.Skip("Skip testing TestProcessEvalResults")
- 	evaluationTime, err := time.Parse("2006-01-02", "2021-03-25")
- 	if err != nil {
- 		t.Fatalf("error parsing date format: %s", err.Error())
-diff --git a/pkg/services/ngalert/schedule/schedule_test.go b/pkg/services/ngalert/schedule/schedule_test.go
---- a/pkg/services/ngalert/schedule/schedule_test.go	2023-06-04 22:38:26.569930465 -0400
-+++ b/pkg/services/ngalert/schedule/schedule_test.go	2023-06-06 13:27:14.475431726 -0400
-@@ -130,6 +130,7 @@
- }
- 
- func TestAlertingTicker(t *testing.T) {
-+	t.Skip("Skip testing TestAlertingTicker")
- 	ctx := context.Background()
- 	_, dbstore := tests.SetupTestEnv(t, 1)
- 
-diff --git a/pkg/infra/filestorage/fs_integration_test.go b/pkg/infra/filestorage/fs_integration_test.go
---- a/pkg/infra/filestorage/fs_integration_test.go	2023-06-04 22:38:26.539930172 -0400
-+++ b/pkg/infra/filestorage/fs_integration_test.go	2023-06-06 13:27:48.535760305 -0400
-@@ -169,6 +169,7 @@
- }
- 
- func TestIntegrationFsStorage(t *testing.T) {
-+	t.Skip("Skip testing TestIntegrationFsStorage")
- 	if testing.Short() {
- 		t.Skip("skipping integration test")
- 	}
-diff --git a/pkg/tests/api/alerting/api_prometheus_test.go b/pkg/tests/api/alerting/api_prometheus_test.go
---- a/pkg/tests/api/alerting/api_prometheus_test.go	2023-06-04 22:38:26.588930651 -0400
-+++ b/pkg/tests/api/alerting/api_prometheus_test.go	2023-06-06 13:28:13.260998838 -0400
-@@ -25,6 +25,7 @@
- )
- 
- func TestPrometheusRules(t *testing.T) {
-+	t.Skip("Skip testing TestPrometheusRules")
- 	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
- 		DisableLegacyAlerting: true,
- 		EnableUnifiedAlerting: true,

SOURCES/0010-v9.0.x-Login-email-before-username-57406.patch

@@ -0,0 +1,100 @@
+From 74f3c59f7096b5c31d5c218310b20775eb111d0f Mon Sep 17 00:00:00 2001
+From: Karl Persson <kalle.persson@grafana.com>
+Date: Fri, 21 Oct 2022 14:15:21 +0200
+Subject: [PATCH] [v9.0.x] Login email before username (#57406)
+
+* Add test for username/login field conflict
+
+* Swap order of login fields
+
+Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
+
+diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
+index 9cd80da396..00e3ddc2df 100644
+--- a/pkg/services/sqlstore/user.go
++++ b/pkg/services/sqlstore/user.go
+@@ -170,20 +170,24 @@ func (ss *SQLStore) GetUserByLogin(ctx context.Context, query *models.GetUserByL
+ 			return models.ErrUserNotFound
+ 		}
+ 
+-		// Try and find the user by login first.
+-		// It's not sufficient to assume that a LoginOrEmail with an "@" is an email.
++		var has bool
++		var err error
+ 		user := &models.User{Login: query.LoginOrEmail}
+-		has, err := sess.Where(notServiceAccountFilter(ss)).Get(user)
+-
+-		if err != nil {
+-			return err
+-		}
+ 
+-		if !has && strings.Contains(query.LoginOrEmail, "@") {
+-			// If the user wasn't found, and it contains an "@" fallback to finding the
+-			// user by email.
++		// Since username can be an email address, attempt login with email address
++		// first if the login field has the "@" symbol.
++		if strings.Contains(query.LoginOrEmail, "@") {
+ 			user = &models.User{Email: query.LoginOrEmail}
+ 			has, err = sess.Get(user)
++
++			if err != nil {
++				return err
++			}
++		}
++
++		// Lookup the login field instead of email field
++		if !has {
++			has, err = sess.Where(notServiceAccountFilter(ss)).Get(user)
+ 		}
+ 
+ 		if err != nil {
+diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
+index d3803fa0c9..da23a7cca9 100644
+--- a/pkg/services/sqlstore/user_test.go
++++ b/pkg/services/sqlstore/user_test.go
+@@ -51,6 +51,45 @@ func TestIntegrationUserDataAccess(t *testing.T) {
+ 		require.False(t, query.Result.IsDisabled)
+ 	})
+ 
++	t.Run("Get User by login - user_2 uses user_1.email as login", func(t *testing.T) {
++		ss = InitTestDB(t)
++
++		// create user_1
++		cmd := models.CreateUserCommand{
++			Email:      "user_1@mail.com",
++			Name:       "user_1",
++			Login:      "user_1",
++			Password:   "user_1_password",
++			IsDisabled: true,
++		}
++		user_1, err := ss.CreateUser(context.Background(), cmd)
++		require.Nil(t, err)
++
++		// create user_2
++		cmd = models.CreateUserCommand{
++			Email:      "user_2@mail.com",
++			Name:       "user_2",
++			Login:      "user_1@mail.com",
++			Password:   "user_2_password",
++			IsDisabled: true,
++		}
++		user_2, err := ss.CreateUser(context.Background(), cmd)
++		require.Nil(t, err)
++
++		// query user database for user_1 email
++		query := models.GetUserByLoginQuery{LoginOrEmail: "user_1@mail.com"}
++		err = ss.GetUserByLogin(context.Background(), &query)
++		require.Nil(t, err)
++
++		// expect user_1 as result
++		require.Equal(t, user_1.Email, query.Result.Email)
++		require.Equal(t, user_1.Login, query.Result.Login)
++		require.Equal(t, user_1.Name, query.Result.Name)
++		require.NotEqual(t, user_2.Email, query.Result.Email)
++		require.NotEqual(t, user_2.Login, query.Result.Login)
++		require.NotEqual(t, user_2.Name, query.Result.Name)
++	})
++
+ 	t.Run("Testing DB - creates and loads disabled user", func(t *testing.T) {
+ 		ss = InitTestDB(t)
+ 		cmd := models.CreateUserCommand{

SOURCES/0012-CVE-2023-3128.patch

@@ -1,18 +1,20 @@
-commit bae86dbeb0
-Author: Ieva <ieva.vasiljeva@grafana.com>
-Date:   Tue Jun 6 17:45:31 2023 +0100
+From 150a1d2777ea86253e6f800a2ee6273b92295ed9 Mon Sep 17 00:00:00 2001
+From: eabdullin <ed.abdullin.1@gmail.com>
+Date: Wed, 12 Jul 2023 15:31:00 +0300
+Subject: [PATCH] CVE-2023-3128
 
-    Auth: Remove Email Lookup from oauth integrations 9.2 (#898)
-    
-    backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.3.x
+---
+ pkg/api/login_oauth.go | 17 +++++++++--------
+ pkg/setting/setting.go |  5 ++++-
+ 2 files changed, 13 insertions(+), 9 deletions(-)
 
 diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
-index 22014aee43..af00c56a68 100644
+index b422baf..f124252 100644
 --- a/pkg/api/login_oauth.go
 +++ b/pkg/api/login_oauth.go
-@@ -302,16 +302,17 @@
+@@ -299,16 +299,17 @@ func (hs *HTTPServer) SyncUser(
  	connect social.SocialConnector,
- ) (*user.User, error) {
+ ) (*models.User, error) {
  	oauthLogger.Debug("Syncing Grafana user with corresponding OAuth profile")
 +	lookupParams := models.UserLookupParams{}
 +	if hs.Cfg.OAuthAllowInsecureEmailLookup {
@@ -37,10 +39,10 @@ index 22014aee43..af00c56a68 100644
  
  	if err := hs.Login.UpsertUser(ctx.Req.Context(), cmd); err != nil {
 diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
-index 20e8f78a2f..03aa5c17d8 100644
+index ba2c4bb..6b5c948 100644
 --- a/pkg/setting/setting.go
 +++ b/pkg/setting/setting.go
-@@ -318,7 +318,8 @@
+@@ -312,7 +312,8 @@ type Cfg struct {
  	AuthProxySyncTTL          int
  
  	// OAuth
@@ -49,8 +51,8 @@ index 20e8f78a2f..03aa5c17d8 100644
 +	OAuthAllowInsecureEmailLookup bool
  
  	// JWT Auth
- 	JWTAuthEnabled                 bool
-@@ -1256,6 +1256,8 @@
+ 	JWTAuthEnabled       bool
+@@ -1255,6 +1256,8 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
  		return err
  	}
  

SOURCES/0012-coredump-selinux-error.patch

@@ -1,13 +0,0 @@
-diff --git a/pkg/framework/coremodel/helpers.go b/pkg/framework/coremodel/helpers.go
-index 20d111edba..6655f81cee 100644
---- a/pkg/framework/coremodel/helpers.go
-+++ b/pkg/framework/coremodel/helpers.go
-@@ -26,7 +26,7 @@ func init() {
- 	var err error
- 	defaultFramework, err = doLoadFrameworkCUE(cuectx.ProvideCUEContext())
- 	if err != nil {
--		panic(err)
-+//		panic(err)
- 	}
- }
- 

SOURCES/0013-snapshot-delete-check-org.patch

@@ -1,21 +0,0 @@
-From 9c1236ba6e7d4c6506c62adeb830d9e56db7f425 Mon Sep 17 00:00:00 2001
-From: Sam Feifer <sfeifer@redhat.com>
-Date: Thu, 28 Mar 2024 13:24:35 -0400
-Subject: [PATCH] snapshot delete check org
-
-
-diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
-index 47ae50544a..0007e89ccb 100644
---- a/pkg/api/dashboard_snapshot.go
-+++ b/pkg/api/dashboard_snapshot.go
-@@ -328,6 +328,10 @@ func (hs *HTTPServer) DeleteDashboardSnapshot(c *models.ReqContext) response.Res
- 		return response.Error(http.StatusNotFound, "Failed to get dashboard snapshot", nil)
- 	}
- 
-+	if query.Result.OrgId != c.OrgID {
-+		return response.Error(http.StatusUnauthorized, "OrgID mismatch", nil)
-+	}
-+
- 	if query.Result.External {
- 		err := deleteExternalDashboardSnapshot(query.Result.ExternalDeleteUrl)
- 		if err != nil {

SOURCES/0014-resolve-dompurify-CVE.patch

@@ -1,58 +0,0 @@
-diff --git a/package.json b/package.json
-index e26f95d855a..14b3826a64d 100644
---- a/package.json
-+++ b/package.json
-@@ -316,7 +316,7 @@
-     "dangerously-set-html-content": "1.0.9",
-     "date-fns": "2.29.1",
-     "debounce-promise": "3.1.2",
--    "dompurify": "^2.4.1",
-+    "dompurify": "^2.5.0",
-     "emotion": "11.0.0",
-     "eventemitter3": "4.0.7",
-     "fast-deep-equal": "^3.1.3",
-@@ -422,7 +422,8 @@
-     "@storybook/react/webpack": "5.74.0",
-     "ngtemplate-loader/loader-utils": "^2.0.0",
-     "node-fetch": "2.6.7",
--    "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch"
-+    "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch",
-+    "dompurify": "^2.5.0"
-   },
-   "workspaces": {
-     "packages": [
-diff --git a/yarn.lock b/yarn.lock
-index f374e10e333..834cfee2642 100644
---- a/yarn.lock
-+++ b/yarn.lock
-@@ -18739,17 +18739,10 @@ __metadata:
-   languageName: node
-   linkType: hard
- 
--"dompurify@npm:^2.2.0":
--  version: 2.3.8
--  resolution: "dompurify@npm:2.3.8"
--  checksum: dc7b32ee57a03fe5166a850071200897cc13fa069287a709e3b2138052d73ec09a87026b9e28c8d2f254a74eaa52ef30644e98e54294c30acbca2a53f1bbc5f4
--  languageName: node
--  linkType: hard
--
--"dompurify@npm:^2.4.1":
--  version: 2.4.1
--  resolution: "dompurify@npm:2.4.1"
--  checksum: 1169177465b3cbb25a44322937fba549f6c4e1a91b83245d144471be26619c835cccf0f8e20aa78c25ac11a06efd17cc1b9db9cacadceb78a4c08a1029eafee5
-+"dompurify@npm:^2.5.0":
-+  version: 2.5.7
-+  resolution: "dompurify@npm:2.5.7"
-+  checksum: 9652139743130b5ebaf5278fadec06d9b3920019b80c205565b9b8d52cd0cea90ff690c1994c5c0da5bc9d57a94dc19236cdf1ccabdc1c6cff7c255e1e597031
-   languageName: node
-   linkType: hard
- 
-@@ -21953,7 +21946,7 @@ __metadata:
-     dangerously-set-html-content: 1.0.9
-     date-fns: 2.29.1
-     debounce-promise: 3.1.2
--    dompurify: ^2.4.1
-+    dompurify: ^2.5.0
-     emotion: 11.0.0
-     enzyme: 3.11.0
-     enzyme-to-json: 3.6.2

SOURCES/0015-update-go-git-version.patch

@@ -1,741 +0,0 @@
-From ac22c0d4885eb4aef88089267b0363c7a0c43840 Mon Sep 17 00:00:00 2001
-From: root <root@kvm-05-guest19.lab.eng.rdu2.dc.redhat.com>
-Date: Tue, 14 Jan 2025 11:18:02 -0500
-Subject: [PATCH] update go-git version
-
----
- .bingo/Variables.mk |   6 +-
- .bingo/wire.mod     |   4 +-
- .bingo/wire.sum     |  53 +++++++++++++++
- go.mod              |  58 ++++++++--------
- go.sum              | 157 ++++++++++++++++++++++++++++----------------
- 5 files changed, 190 insertions(+), 88 deletions(-)
-
-diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
-index 7181d61fe20..5b8ecb90ab0 100644
---- a/.bingo/Variables.mk
-+++ b/.bingo/Variables.mk
-@@ -41,9 +41,9 @@ $(SWAGGER): $(BINGO_DIR)/swagger.mod
- 	@echo "(re)installing $(GOBIN)/swagger-v0.30.2"
- 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
- 
--WIRE := $(GOBIN)/wire-v0.5.0
-+WIRE := $(GOBIN)/wire-v0.6.0
- $(WIRE): $(BINGO_DIR)/wire.mod
- 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
--	@echo "(re)installing $(GOBIN)/wire-v0.5.0"
--	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
-+	@echo "(re)installing $(GOBIN)/wire-v0.6.0"
-+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.6.0 "github.com/google/wire/cmd/wire"
- 
-diff --git a/.bingo/wire.mod b/.bingo/wire.mod
-index fc39b30da16..947ccebda59 100644
---- a/.bingo/wire.mod
-+++ b/.bingo/wire.mod
-@@ -1,5 +1,5 @@
- module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
- 
--go 1.16
-+go 1.21
- 
--require github.com/google/wire v0.5.0 // cmd/wire
-+require github.com/google/wire v0.6.0 // cmd/wire
-diff --git a/.bingo/wire.sum b/.bingo/wire.sum
-index 6d4b4b38644..be6e646d063 100644
---- a/.bingo/wire.sum
-+++ b/.bingo/wire.sum
-@@ -1,13 +1,66 @@
- github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
- github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
- github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-+github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
-+github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
- github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
- github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-+github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
-+github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
- golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-+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.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-+golang.org/x/sync v0.0.0-20190423024810-112230192c58/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.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
- golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-+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.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-+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.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
- golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s=
- golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-diff --git a/go.mod b/go.mod
-index 03c00985c45..414dff16a61 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,8 @@
- module github.com/grafana/grafana
- 
--go 1.19
-+go 1.21
-+
-+toolchain go1.21.13
- 
- // Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes).
- // We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities.
-@@ -37,7 +39,7 @@ require (
- 	github.com/fatih/color v1.13.0
- 	github.com/gchaincl/sqlhooks v1.3.0
- 	github.com/getsentry/sentry-go v0.13.0
--	github.com/go-git/go-git/v5 v5.4.2
-+	github.com/go-git/go-git/v5 v5.13.0
- 	github.com/go-kit/kit v0.11.0
- 	github.com/go-openapi/strfmt v0.21.3
- 	github.com/go-redis/redis/v8 v8.11.4
-@@ -49,9 +51,9 @@ require (
- 	github.com/gogo/protobuf v1.3.2
- 	github.com/golang/mock v1.6.0
- 	github.com/golang/snappy v0.0.4
--	github.com/google/go-cmp v0.5.8
-+	github.com/google/go-cmp v0.6.0
- 	github.com/google/uuid v1.3.0
--	github.com/google/wire v0.5.0
-+	github.com/google/wire v0.6.0
- 	github.com/gorilla/websocket v1.5.0
- 	github.com/gosimple/slug v1.12.0
- 	github.com/grafana/cuetsy v0.0.4-0.20220714174355-ebd987fdab27
-@@ -88,7 +90,7 @@ require (
- 	github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac
- 	github.com/robfig/cron/v3 v3.0.1
- 	github.com/russellhaering/goxmldsig v1.1.1
--	github.com/stretchr/testify v1.8.0
-+	github.com/stretchr/testify v1.10.0
- 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
- 	github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f
- 	github.com/uber/jaeger-client-go v2.29.1+incompatible
-@@ -104,13 +106,13 @@ require (
- 	go.opentelemetry.io/otel/exporters/jaeger v1.0.0
- 	go.opentelemetry.io/otel/sdk v1.6.3
- 	go.opentelemetry.io/otel/trace v1.6.3
--	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
--	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d
--	golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
-+	golang.org/x/crypto v0.31.0
-+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-+	golang.org/x/net v0.33.0 // indirect
- 	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
--	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
-+	golang.org/x/sync v0.10.0
- 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858
--	golang.org/x/tools v0.1.12
-+	golang.org/x/tools v0.23.0
- 	gonum.org/v1/gonum v0.11.0
- 	google.golang.org/api v0.74.0
- 	google.golang.org/grpc v1.45.0
-@@ -216,11 +218,11 @@ require (
- 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
- 	github.com/segmentio/encoding v0.3.5
- 	github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
--	github.com/sergi/go-diff v1.1.0 // indirect
-+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
- 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
- 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
--	github.com/sirupsen/logrus v1.8.1 // indirect
--	github.com/stretchr/objx v0.4.0 // indirect
-+	github.com/sirupsen/logrus v1.9.0 // indirect
-+	github.com/stretchr/objx v0.5.2 // indirect
- 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
- 	github.com/valyala/bytebufferpool v1.0.0 // indirect
- 	github.com/weaveworks/promrus v1.2.0 // indirect
-@@ -229,8 +231,8 @@ require (
- 	go.opencensus.io v0.23.0 // indirect
- 	go.uber.org/atomic v1.9.0
- 	go.uber.org/goleak v1.1.12 // indirect
--	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
--	golang.org/x/text v0.4.0
-+	golang.org/x/sys v0.28.0 // indirect
-+	golang.org/x/text v0.21.0
- 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
- 	google.golang.org/appengine v1.6.7 // indirect
- 	google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
-@@ -263,10 +265,13 @@ require (
- 
- require (
- 	cloud.google.com/go v0.100.2 // indirect
-+	dario.cat/mergo v1.0.0 // indirect
- 	github.com/armon/go-metrics v0.3.10 // indirect
- 	github.com/bmatcuk/doublestar v1.1.1 // indirect
- 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
-+	github.com/cloudflare/circl v1.3.7 // indirect
- 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-+	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
- 	github.com/drone/drone-yaml v0.0.0-20190729072335-70fa398b3560 // indirect
- 	github.com/google/go-querystring v1.1.0 // indirect
- 	github.com/google/gofuzz v1.2.0 // indirect
-@@ -275,8 +280,10 @@ require (
- 	github.com/hashicorp/memberlist v0.4.0 // indirect
- 	github.com/mattn/go-colorable v0.1.12 // indirect
- 	github.com/mitchellh/mapstructure v1.4.3 // indirect
-+	github.com/pjbgf/sha1cd v0.3.0 // indirect
- 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
- 	github.com/segmentio/asm v1.1.4 // indirect
-+	github.com/skeema/knownhosts v1.3.0 // indirect
- 	go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
- )
- 
-@@ -286,10 +293,9 @@ require (
- 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.22.0 // indirect
- 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.2.1 // indirect
- 	github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
--	github.com/Microsoft/go-winio v0.5.2 // indirect
--	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
-+	github.com/Microsoft/go-winio v0.6.1 // indirect
-+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
- 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
--	github.com/acomagu/bufpipe v1.0.3 // indirect
- 	github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
- 	github.com/bits-and-blooms/bitset v1.2.0 // indirect
- 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
-@@ -303,36 +309,34 @@ require (
- 	github.com/containerd/containerd v1.6.6 // indirect
- 	github.com/coreos/go-semver v0.3.0 // indirect
- 	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
--	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
--	github.com/emirpasic/gods v1.12.0 // indirect
-+	github.com/elazarl/goproxy v1.2.1 // indirect
-+	github.com/emirpasic/gods v1.18.1 // indirect
- 	github.com/fsnotify/fsnotify v1.5.4 // indirect
- 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
--	github.com/go-git/gcfg v1.5.0 // indirect
--	github.com/go-git/go-billy/v5 v5.3.1 // indirect
-+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
- 	github.com/go-logr/logr v1.2.3 // indirect
- 	github.com/go-logr/stdr v1.2.2 // indirect
- 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
- 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
--	github.com/imdario/mergo v0.3.12 // indirect
- 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
--	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
-+	github.com/kevinburke/ssh_config v1.2.0 // indirect
- 	github.com/klauspost/compress v1.15.2 // indirect
- 	github.com/kylelemons/godebug v1.1.0 // indirect
- 	github.com/labstack/echo/v4 v4.9.0 // indirect
- 	github.com/labstack/gommon v0.3.1 // indirect
--	github.com/mitchellh/go-homedir v1.1.0 // indirect
- 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
- 	github.com/mschoch/smat v0.2.0 // indirect
- 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
- 	github.com/pierrec/lz4/v4 v4.1.8 // indirect
- 	github.com/valyala/fasttemplate v1.2.1 // indirect
- 	github.com/wk8/go-ordered-map v1.0.0
--	github.com/xanzy/ssh-agent v0.3.0 // indirect
-+	github.com/xanzy/ssh-agent v0.3.3 // indirect
- 	github.com/xlab/treeprint v1.1.0 // indirect
- 	github.com/yudai/pp v2.0.1+incompatible // indirect
- 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect
- 	go.opentelemetry.io/proto/otlp v0.15.0 // indirect
--	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-+	golang.org/x/mod v0.19.0 // indirect
- 	gopkg.in/warnings.v0 v0.1.2 // indirect
- 	k8s.io/api v0.22.5 // indirect
- 	k8s.io/apimachinery v0.22.5 // indirect
-diff --git a/go.sum b/go.sum
-index e3b45a9f35e..2fb3ef8a1bc 100644
---- a/go.sum
-+++ b/go.sum
-@@ -86,6 +86,8 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.10/go.mod h1:I5htMbyta491eUx
- contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
- cuelang.org/go v0.4.3 h1:W3oBBjDTm7+IZfCKZAmC8uDG0eYfJL4Pp/xbbCMKaVo=
- cuelang.org/go v0.4.3/go.mod h1:7805vR9H+VoBNdWFdI7jyDR3QLUPp4+naHfbcgp55HI=
-+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
- dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
- dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
- docker.io/go-docker v1.0.0/go.mod h1:7tiAn5a0LFmjbPDbyTPOaTTOuG1ZRNXdPA6RvKY+fpY=
-@@ -236,8 +238,9 @@ github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugX
- github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
- github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
- github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
--github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
- github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
- github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
- github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
- github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
-@@ -255,8 +258,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8
- github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
- github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
- github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
--github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
--github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-+github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-+github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
- github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
- github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
- github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-@@ -276,8 +279,6 @@ github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrU
- github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
- github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
- github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
--github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
--github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
- github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
- github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
- github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-@@ -298,8 +299,8 @@ github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9
- github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
- github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
- github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
--github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
--github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
-+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
- github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
- github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
- github.com/antonmedv/expr v1.8.9/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8=
-@@ -512,6 +513,8 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
- github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
- github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
- github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
- github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
- github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
- github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-@@ -670,6 +673,8 @@ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v
- github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
- github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
- github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
-+github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
-+github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
- github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
- github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
- github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
-@@ -798,18 +803,16 @@ github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6
- github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
- github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
- github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
--github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac h1:XDAn206aIqKPdF5YczuuJXSQPx+WOen0Pxbxp5Fq8Pg=
--github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
--github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
--github.com/elazarl/goproxy/ext v0.0.0-20220115173737-adb46da277ac h1:9yrT5tmn9Zc0ytWPASlaPwQfQMQYnRf0RSDe1XvHw0Q=
-+github.com/elazarl/goproxy v1.2.1 h1:njjgvO6cRG9rIqN2ebkqy6cQz2Njkx7Fsfv/zIZqgug=
-+github.com/elazarl/goproxy v1.2.1/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
- github.com/ema/qdisc v0.0.0-20190904071900-b82c76788043/go.mod h1:ix4kG2zvdUd8kEKSW0ZTr1XLks0epFpI4j745DXxlNE=
- github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
- github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
- github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
- github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
- github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
--github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
--github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
- github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
- 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=
-@@ -842,7 +845,6 @@ github.com/felixge/fgprof v0.9.1/go.mod h1:7/HK6JFtFaARhIljgP2IV8rJLIoHDoOYoUphs
- github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
- github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
- github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
--github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
- github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
- github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
- github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-@@ -877,8 +879,8 @@ github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ER
- github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
- github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
- github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
--github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
--github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
-+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
- github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
- github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
- github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
-@@ -887,19 +889,19 @@ github.com/go-chi/chi v4.1.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxm
- github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
- github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
- github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
-+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
- github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
- github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
- github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
- github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
--github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
--github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
--github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
--github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
--github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
--github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8=
--github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
--github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
--github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
-+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
-+github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-+github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-+github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
-+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
-+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-+github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-+github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw=
- github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
- github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
- github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-@@ -1243,8 +1245,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
- github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
--github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
- github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
- github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
- github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
- github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
-@@ -1296,14 +1299,16 @@ github.com/google/pprof v0.0.0-20210827144239-02619b876842/go.mod h1:kpwsk12EmLe
- github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
- github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
- github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-+github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
- github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
- github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
- github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
- github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
- github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
- github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
--github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
- github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
-+github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
-+github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
- github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
- github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
- github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-@@ -1670,8 +1675,8 @@ github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F
- github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
- github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
- github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
--github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
--github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-+github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
-+github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
- github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
- github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
- github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-@@ -1703,8 +1708,9 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
- github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
- github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
- github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
--github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
- github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
- github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
- github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
- github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-@@ -1782,7 +1788,6 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
- github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
- github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
- github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
--github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
- github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
- github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
- github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
-@@ -1997,8 +2002,9 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
- github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
- github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
- github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
--github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
- github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
-+github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
- github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
- github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
- github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
-@@ -2074,6 +2080,9 @@ github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
- github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
- github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
- github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
-+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
- github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
- github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
- github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-@@ -2217,14 +2226,14 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
- github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
- github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
- github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
--github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
- github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
- github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
- github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
- github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
- github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
--github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
- github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
- github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
- github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U=
- github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
-@@ -2268,8 +2277,9 @@ github.com/sercand/kuberesolver v2.1.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJP
- github.com/sercand/kuberesolver v2.4.0+incompatible h1:WE2OlRf6wjLxHwNkkFLQGaZcVLEXjMjBPjjEU5vksH8=
- github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ=
- github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
--github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
- github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
- github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
- github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
- github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-@@ -2291,8 +2301,11 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
- github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
- github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
- github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
--github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
- github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-+github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-+github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
- github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
- github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
- github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-@@ -2343,8 +2356,9 @@ github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+
- github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
--github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
- github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
- github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
- github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
- github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-@@ -2356,8 +2370,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
- github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
--github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
- github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
- github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
- github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
- github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-@@ -2459,8 +2474,8 @@ github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr
- github.com/wk8/go-ordered-map v1.0.0 h1:BV7z+2PaK8LTSd/mWgY12HyMAo5CEgkHqbkVq2thqr8=
- github.com/wk8/go-ordered-map v1.0.0/go.mod h1:9ZIbRunKbuvfPKyBP1SIKLcXNlv74YCOZ3t3VTS6gRk=
- github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
--github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
--github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
-+github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
-+github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
- github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
- github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
- github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
-@@ -2651,7 +2666,6 @@ golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnf
- golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
--golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
- golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
- golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-@@ -2688,7 +2702,6 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP
- golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
- golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
- golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
--golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
- golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
- golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
- golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-@@ -2700,8 +2713,11 @@ golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0
- golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
--golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
- golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
- golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-@@ -2721,8 +2737,8 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
- golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
- golang.org/x/exp v0.0.0-20200821190819-94841d0725da/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
- golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
--golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d h1:vtUKgx8dahOomfFzLREU8nSv25YHnTgLBn4rDnWZdU0=
--golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
-+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
-+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
- golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
- golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
- golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-@@ -2761,8 +2777,12 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
- golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
- golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
- golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
--golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
- golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-@@ -2831,7 +2851,6 @@ golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v
- golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
- golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
- golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
--golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
- golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
- golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-@@ -2853,8 +2872,12 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su
- golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
- golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
- golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
--golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
--golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-+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.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-@@ -2897,8 +2920,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
- golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
--golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
- 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.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
- golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- 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=
-@@ -3033,7 +3060,6 @@ golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7w
- golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
--golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
- golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-@@ -3070,14 +3096,25 @@ golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBc
- golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
- golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
- golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
--golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
- 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.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
-+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
- golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- 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=
-@@ -3089,8 +3126,12 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
--golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
--golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-+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.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
- 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=
-@@ -3210,8 +3251,12 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
--golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
- golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- 
-2.43.5
-

SOURCES/0016-fix-macaron-version-error.patch

@@ -1,23 +0,0 @@
-From 30d5b7ddf398799652420d636ed4ae2027447107 Mon Sep 17 00:00:00 2001
-From: root <root@kvm-05-guest19.lab.eng.rdu2.dc.redhat.com>
-Date: Tue, 14 Jan 2025 16:12:21 -0500
-Subject: [PATCH] fix macaron version error
-
----
- pkg/web/macaron.go | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/pkg/web/macaron.go b/pkg/web/macaron.go
-index 774f4d2d499..46ccd84f5eb 100644
---- a/pkg/web/macaron.go
-+++ b/pkg/web/macaron.go
-@@ -1,6 +1,3 @@
--//go:build go1.3
--// +build go1.3
--
- // Copyright 2014 The Macaron Authors
- //
- // Licensed under the Apache License, Version 2.0 (the "License"): you may
--- 
-2.43.5
-

SOURCES/0017-fix-CVE-2025-4123.patch

@@ -1,39 +0,0 @@
-From 9900159635d616f01fb1be98ef94145637d06d07 Mon Sep 17 00:00:00 2001
-From: Sam Feifer <sfeifer@redhat.com>
-Date: Tue, 13 May 2025 11:33:22 -0400
-Subject: [PATCH] fix CVE-2025-4123
-
----
- conf/defaults.ini | 2 +-
- conf/sample.ini   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/conf/defaults.ini b/conf/defaults.ini
-index 2d6e1235b60..cf1ce8a962f 100644
---- a/conf/defaults.ini
-+++ b/conf/defaults.ini
-@@ -310,7 +310,7 @@ x_xss_protection = true
- 
- # Enable adding the Content-Security-Policy header to your requests.
- # CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
--content_security_policy = false
-+content_security_policy = true
- 
- # Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
- # $NONCE in the template includes a random nonce.
-diff --git a/conf/sample.ini b/conf/sample.ini
-index 227c90e895d..19afa036b9b 100644
---- a/conf/sample.ini
-+++ b/conf/sample.ini
-@@ -310,7 +310,7 @@
- 
- # Enable adding the Content-Security-Policy header to your requests.
- # CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
--;content_security_policy = false
-+;content_security_policy = true
- 
- # Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
- # $NONCE in the template includes a random nonce.
--- 
-2.49.0
-

SOURCES/0018-fix-x-net-CVE.patch

@@ -1,179 +0,0 @@
-diff --git a/.bingo/wire.mod b/.bingo/wire.mod
-index 947cceb..cc59b83 100644
---- a/.bingo/wire.mod
-+++ b/.bingo/wire.mod
-@@ -1,5 +1,5 @@
- module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
- 
--go 1.21
-+go 1.25
- 
--require github.com/google/wire v0.6.0 // cmd/wire
-+require github.com/google/wire v0.7.0 // cmd/wire
-diff --git a/.bingo/wire.sum b/.bingo/wire.sum
-index be6e646..8cc1c58 100644
---- a/.bingo/wire.sum
-+++ b/.bingo/wire.sum
-@@ -7,6 +7,8 @@ github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
- github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
- github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
- github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
-+github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
-+github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
- github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-diff --git a/go.mod b/go.mod
-index 6375eca..9a1a48a 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,8 +1,6 @@
- module github.com/grafana/grafana
- 
--go 1.21
--
--toolchain go1.21.13
-+go 1.25.0
- 
- // Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes).
- // We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities.
-@@ -104,13 +102,13 @@ require (
- 	go.opentelemetry.io/otel/exporters/jaeger v1.0.0
- 	go.opentelemetry.io/otel/sdk v1.6.3
- 	go.opentelemetry.io/otel/trace v1.6.3
--	golang.org/x/crypto v0.31.0
-+	golang.org/x/crypto v0.51.0
- 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
--	golang.org/x/net v0.33.0 // indirect
-+	golang.org/x/net v0.55.0 // indirect
- 	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
--	golang.org/x/sync v0.10.0
-+	golang.org/x/sync v0.20.0
- 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858
--	golang.org/x/tools v0.23.0
-+	golang.org/x/tools v0.44.0
- 	gonum.org/v1/gonum v0.11.0
- 	google.golang.org/api v0.74.0
- 	google.golang.org/grpc v1.45.0
-@@ -228,8 +226,8 @@ require (
- 	go.opencensus.io v0.23.0 // indirect
- 	go.uber.org/atomic v1.9.0
- 	go.uber.org/goleak v1.1.12 // indirect
--	golang.org/x/sys v0.28.0 // indirect
--	golang.org/x/text v0.21.0
-+	golang.org/x/sys v0.45.0 // indirect
-+	golang.org/x/text v0.37.0
- 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
- 	google.golang.org/appengine v1.6.7 // indirect
- 	google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
-@@ -282,6 +280,7 @@ require (
- 	github.com/segmentio/asm v1.1.4 // indirect
- 	github.com/skeema/knownhosts v1.3.0 // indirect
- 	go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
-+	golang.org/x/tools/godoc v0.1.0-deprecated // indirect
- )
- 
- require (
-@@ -333,7 +332,7 @@ require (
- 	github.com/yudai/pp v2.0.1+incompatible // indirect
- 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect
- 	go.opentelemetry.io/proto/otlp v0.15.0 // indirect
--	golang.org/x/mod v0.19.0 // indirect
-+	golang.org/x/mod v0.35.0 // indirect
- 	gopkg.in/warnings.v0 v0.1.2 // indirect
- 	k8s.io/api v0.22.5 // indirect
- 	k8s.io/apimachinery v0.22.5 // indirect
-diff --git a/go.sum b/go.sum
-index e93de3b..9b66c28 100644
---- a/go.sum
-+++ b/go.sum
-@@ -2708,8 +2708,8 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0
- golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
- golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
- golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
--golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
--golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-+golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
-+golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
- golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
- golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-@@ -2773,8 +2773,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
- golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
- golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
- golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
--golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
--golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-+golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-+golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
- golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-@@ -2868,8 +2868,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.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
- golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
--golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
--golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-@@ -2916,8 +2916,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
- golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
- golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
--golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
--golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
- golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
- 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=
-@@ -3095,8 +3095,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
--golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
--golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
- golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-@@ -3105,8 +3105,8 @@ 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.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
- golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
--golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
--golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-+golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-+golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
- golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- 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=
-@@ -3122,8 +3122,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.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
- golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
--golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
--golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-+golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-+golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
- 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=
-@@ -3247,8 +3247,10 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
- golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
- golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
- golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
--golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
--golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
-+golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-+golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
-+golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk=
-+golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg=
- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

SOURCES/0019-update-go-billy-version.patch

@@ -1,119 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 9a1a48a..9ce9855 100644
---- a/go.mod
-+++ b/go.mod
-@@ -48,7 +48,7 @@ require (
- 	github.com/gogo/protobuf v1.3.2
- 	github.com/golang/mock v1.6.0
- 	github.com/golang/snappy v0.0.4
--	github.com/google/go-cmp v0.6.0
-+	github.com/google/go-cmp v0.7.0
- 	github.com/google/uuid v1.3.0
- 	github.com/google/wire v0.6.0
- 	github.com/gorilla/websocket v1.5.0
-@@ -86,7 +86,7 @@ require (
- 	github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac
- 	github.com/robfig/cron/v3 v3.0.1
- 	github.com/russellhaering/goxmldsig v1.1.1
--	github.com/stretchr/testify v1.10.0
-+	github.com/stretchr/testify v1.11.1
- 	github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
- 	github.com/ua-parser/uap-go v0.0.0-20211112212520-00c877edfe0f
- 	github.com/uber/jaeger-client-go v2.29.1+incompatible
-@@ -103,7 +103,7 @@ require (
- 	go.opentelemetry.io/otel/sdk v1.6.3
- 	go.opentelemetry.io/otel/trace v1.6.3
- 	golang.org/x/crypto v0.51.0
--	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
-+	golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
- 	golang.org/x/net v0.55.0 // indirect
- 	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
- 	golang.org/x/sync v0.20.0
-@@ -266,7 +266,7 @@ require (
- 	github.com/buildkite/yaml v2.1.0+incompatible // indirect
- 	github.com/cloudflare/circl v1.3.7 // indirect
- 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
--	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
-+	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
- 	github.com/drone/drone-yaml v0.0.0-20190729072335-70fa398b3560 // indirect
- 	github.com/google/go-querystring v1.1.0 // indirect
- 	github.com/google/gofuzz v1.2.0 // indirect
-@@ -310,7 +310,7 @@ require (
- 	github.com/fsnotify/fsnotify v1.5.4 // indirect
- 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
- 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
--	github.com/go-git/go-billy/v5 v5.6.0 // indirect
-+	github.com/go-git/go-billy/v5 v5.9.0 // indirect
- 	github.com/go-logr/logr v1.2.3 // indirect
- 	github.com/go-logr/stdr v1.2.2 // indirect
- 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-diff --git a/go.sum b/go.sum
-index 9b66c28..fad36b7 100644
---- a/go.sum
-+++ b/go.sum
-@@ -672,8 +672,8 @@ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v
- github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
- github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
- github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
--github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
--github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-+github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
-+github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
- github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
- github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
- github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
-@@ -895,8 +895,8 @@ github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2H
- github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
- github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
- github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
--github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
--github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
-+github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA=
-+github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw=
- github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
- github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
- github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E=
-@@ -1245,8 +1245,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
- github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
- github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
- github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
--github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
--github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
- github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
- github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
- github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
-@@ -2225,8 +2225,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
- github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
- github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
- github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
--github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
--github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
- github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
- github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U=
- github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
-@@ -2364,8 +2364,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
- github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
--github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
--github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
- github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
- github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
- github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-@@ -2729,8 +2729,8 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
- golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
- golang.org/x/exp v0.0.0-20200821190819-94841d0725da/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
- golang.org/x/exp v0.0.0-20210126221216-84987778548c/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
--golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
--golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
-+golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
-+golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
- golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
- golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
- golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=

SOURCES/0020-fix-CVE-2026-42127.patch

@@ -1,170 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sam Feifer <sfeifer@redhat.com>
-Date: Tue, 05 Aug 2026 00:00:00 +0000
-Subject: [PATCH] fix(web/bind): cap the request body size and validate public
- dashboard access
-
-Cap request body size in Bind() with MaxBytesReader (100 MiB limit).
-Add specific body size limits (10 KiB) for public dashboard save and
-query endpoints. Validate access token before processing query request
-body.
-
-GL-Vuln: VUL-2026-0074
-GL-Vuln: VUL-2026-0077
----
- pkg/services/publicdashboards/api/api.go      | 15 ++++++++
- pkg/services/publicdashboards/api/api_test.go  |  1 +
- pkg/web/binding.go                             |  6 +++-
- pkg/web/binding_test.go                        | 58 ++++++++++++++++++++++++++
- 4 files changed, 79 insertions(+), 1 deletion(-)
-
-diff --git a/pkg/services/publicdashboards/api/api.go b/pkg/services/publicdashboards/api/api.go
---- a/pkg/services/publicdashboards/api/api.go
-+++ b/pkg/services/publicdashboards/api/api.go
-@@ -21,6 +21,12 @@ import (
- 	"github.com/grafana/grafana/pkg/web"
- )
-
-+// The struct size the request body unmarshals to is a few bytes and much deviation from that would mean a malformed body.
-+const (
-+	maxQueryBodySize  = 10 * 1024 // 10 KiB
-+	maxMutateBodySize = 10 * 1024 // 10 KiB
-+)
-+
- type Api struct {
- 	PublicDashboardService publicdashboards.Service
- 	RouteRegister          routing.RouteRegister
-@@ -130,6 +136,8 @@ func (api *Api) SavePublicDashboardConfig(c *models.ReqContext) response.Respons
- 		api.handleError(http.StatusBadRequest, "no dashboardUid", dashboards.ErrDashboardIdentifierNotSet)
- 	}
-
-+	c.Req.Body = http.MaxBytesReader(c.Resp, c.Req.Body, maxMutateBodySize)
-+
- 	pubdash := &PublicDashboard{}
- 	if err := web.Bind(c.Req, pubdash); err != nil {
- 		return response.Error(http.StatusBadRequest, "bad request data", err)
-@@ -156,6 +164,13 @@ func (api *Api) SavePublicDashboardConfig(c *models.ReqContext) response.Respons
- // QueryPublicDashboard returns all results for a given panel on a public dashboard
- // POST /api/public/dashboard/:accessToken/panels/:panelId/query
- func (api *Api) QueryPublicDashboard(c *models.ReqContext) response.Response {
-+	accessToken := web.Params(c.Req)[":accessToken"]
-+	if _, err := api.PublicDashboardService.AccessTokenExists(c.Req.Context(), accessToken); err != nil {
-+		return api.handleError(http.StatusInternalServerError, "error validating access token", err)
-+	}
-+
-+	c.Req.Body = http.MaxBytesReader(c.Resp, c.Req.Body, maxQueryBodySize)
-+
- 	panelId, err := strconv.ParseInt(web.Params(c.Req)[":panelId"], 10, 64)
- 	if err != nil {
- 		return response.Error(http.StatusBadRequest, "invalid panel ID", err)
-diff --git a/pkg/services/publicdashboards/api/api_test.go b/pkg/services/publicdashboards/api/api_test.go
---- a/pkg/services/publicdashboards/api/api_test.go
-+++ b/pkg/services/publicdashboards/api/api_test.go
-@@ -421,6 +421,7 @@ func TestAPIQueryPublicDashboard(t *testing.T) {
- 	setup := func(enabled bool) (*web.Mux, *publicdashboards.FakePublicDashboardService) {
- 		service := publicdashboards.NewFakePublicDashboardService(t)
-+		service.On("AccessTokenExists", mock.Anything, "abc123").Return(true, nil).Maybe()
- 		cfg := setting.NewCfg()
- 		cfg.RBACEnabled = false
- 
- 		testServer := setupTestServer(
-diff --git a/pkg/web/binding.go b/pkg/web/binding.go
---- a/pkg/web/binding.go
-+++ b/pkg/web/binding.go
-@@ -10,6 +10,9 @@ import (
- 	"reflect"
- )
-
-+// MaxBindBodyBytes caps the size of a JSON request body that Bind will read
-+const MaxBindBodyBytes = 100 << 20
-+
- // Bind deserializes JSON payload from the request
- func Bind(req *http.Request, v interface{}) error {
- 	if req.Body != nil {
-@@ -21,7 +24,8 @@ func Bind(req *http.Request, v interface{}) error {
- 			return errors.New("bad content type")
- 		}
- 		defer func() { _ = req.Body.Close() }()
--		err = json.NewDecoder(req.Body).Decode(v)
-+		body := http.MaxBytesReader(nil, req.Body, MaxBindBodyBytes)
-+		err = json.NewDecoder(body).Decode(v)
- 		if err != nil && !errors.Is(err, io.EOF) {
- 			return err
- 		}
-diff --git a/pkg/web/binding_test.go b/pkg/web/binding_test.go
---- a/pkg/web/binding_test.go
-+++ b/pkg/web/binding_test.go
-@@ -2,6 +2,10 @@ package web
-
- import (
- 	"errors"
-+	"io"
-+	"net/http"
-+	"net/http/httptest"
-+	"strings"
- 	"testing"
- )
-
-@@ -61,6 +65,60 @@ func (sv *StructWithPointerValidation) Validate() error {
- 	return nil
- }
-
-+type BindTarget struct {
-+	Message string `json:"message"`
-+}
-+
-+// Used to verify that Bind does not try to allocate the whole body on the heap
-+type endlessReader struct {
-+	prefix []byte
-+	read   int64
-+}
-+
-+func (r *endlessReader) Read(p []byte) (int, error) {
-+	if len(r.prefix) > 0 {
-+		n := copy(p, r.prefix)
-+		r.prefix = r.prefix[n:]
-+		r.read += int64(n)
-+		return n, nil
-+	}
-+	for i := range p {
-+		p[i] = 'A'
-+	}
-+	r.read += int64(len(p))
-+	return len(p), nil
-+}
-+
-+func TestBindRejectsOversizedBody(t *testing.T) {
-+	body := &endlessReader{prefix: []byte(`{"message":"`)}
-+	req := httptest.NewRequest(http.MethodPost, "/", body)
-+	req.Header.Set("Content-Type", "application/json")
-+
-+	var target BindTarget
-+	err := Bind(req, &target)
-+	if err == nil {
-+		t.Fatal("expected Bind to reject oversized body, got nil error")
-+	}
-+
-+	if body.read > MaxBindBodyBytes+(1<<20) {
-+		t.Fatalf("Bind read %d bytes, want at most ~%d", body.read, MaxBindBodyBytes)
-+	}
-+}
-+
-+func TestBindAcceptsBodyWithinLimit(t *testing.T) {
-+	payload := `{"message":"` + strings.Repeat("A", 1024) + `"}`
-+	req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(payload))
-+	req.Header.Set("Content-Type", "application/json")
-+
-+	var target BindTarget
-+	if err := Bind(req, &target); err != nil && !errors.Is(err, io.EOF) {
-+		t.Fatalf("Bind failed on small body: %v", err)
-+	}
-+	if len(target.Message) != 1024 {
-+		t.Fatalf("unexpected message length: got %d, want 1024", len(target.Message))
-+	}
-+}
-+
- func TestValidationSuccess(t *testing.T) {
- 	var nilInterface *StructWithPointerValidation
-
---
-2.43.0

SOURCES/0021-fix-CVE-2026-33377.patch

@@ -1,30 +0,0 @@
-From f148c91d20df4ec08efce16043ed2c09ace960cf Mon Sep 17 00:00:00 2001
-From: lmchilton <lauren.chilton26@gmail.com>
-Date: Thu, 6 Aug 2026 12:32:54 -0400
-Subject: [PATCH] patch
-
----
- pkg/services/dashboards/service/dashboard_service.go | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
-index b74ba9b7d26..ea82eb3d09c 100644
---- a/pkg/services/dashboards/service/dashboard_service.go
-+++ b/pkg/services/dashboards/service/dashboard_service.go
-@@ -439,8 +439,11 @@ func (dr *DashboardServiceImpl) ImportDashboard(ctx context.Context, dto *dashbo
- 		return nil, err
- 	}
- 
--	if err := dr.setDefaultPermissions(ctx, dto, dash, false); err != nil {
--		dr.log.Error("Could not make user admin", "dashboard", dash.Title, "user", dto.User.UserID, "error", err)
-+	// new dashboard created
-+	if dto.Dashboard.Id == 0 {
-+		if err := dr.setDefaultPermissions(ctx, dto, dash, false); err != nil {
-+			dr.log.Error("Could not make user admin", "dashboard", dash.Title, "user", dto.User.UserID, "error", err)
-+		}
- 	}
- 
- 	return dash, nil
--- 
-2.54.0
-

SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch

@@ -2,7 +2,6 @@ use pbkdf2 from OpenSSL if FIPS mode is enabled
 
 This patch modifies the x/crypto/pbkdf2 function to use OpenSSL
 if FIPS mode is enabled.
-DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
 
 diff --git a/vendor/golang.org/x/crypto/internal/boring/boring.go b/vendor/golang.org/x/crypto/internal/boring/boring.go
 new file mode 100644
@@ -23,7 +22,7 @@ index 0000000000..5a06918832
 +
 +package boring
 +
-+// #include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl/v2/goopenssl.h"
++// #include "openssl_pbkdf2.h"
 +// #cgo LDFLAGS: -ldl
 +import "C"
 +import (
@@ -39,14 +38,14 @@ index 0000000000..5a06918832
 +	emptySha256 = sha256.Sum256([]byte{})
 +)
 +
-+func hashToMD(h hash.Hash) C.GO_EVP_MD_PTR {
++func hashToMD(h hash.Hash) *C.GO_EVP_MD {
 +	emptyHash := h.Sum([]byte{})
 +
 +	switch {
 +	case bytes.Equal(emptyHash, emptySha1[:]):
-+		return C.go_openssl_EVP_sha1()
++		return C._goboringcrypto_EVP_sha1()
 +	case bytes.Equal(emptyHash, emptySha256[:]):
-+		return C.go_openssl_EVP_sha256()
++		return C._goboringcrypto_EVP_sha256()
 +	}
 +	return nil
 +}
@@ -78,7 +77,7 @@ index 0000000000..5a06918832
 +	}
 +
 +	out := make([]byte, keyLen)
-+	ok := C.go_openssl_PKCS5_PBKDF2_HMAC(charptr(password), C.int(len(password)), ucharptr(salt), C.int(len(salt)), C.int(iter), md, C.int(keyLen), ucharptr(out))
++	ok := C._goboringcrypto_PKCS5_PBKDF2_HMAC(charptr(password), C.int(len(password)), ucharptr(salt), C.int(len(salt)), C.int(iter), md, C.int(keyLen), ucharptr(out))
 +	if ok != 1 {
 +		panic("boringcrypto: PKCS5_PBKDF2_HMAC failed")
 +	}
@@ -106,38 +105,41 @@ index 0000000000..e244fb5663
 +func Pbkdf2Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
 +	panic("boringcrypto: not available")
 +}
+diff --git a/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h b/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h
+new file mode 100644
+index 0000000000..6dfdf10424
+--- /dev/null
++++ b/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h
+@@ -0,0 +1,5 @@
++#include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h"
++
++DEFINEFUNC(int, PKCS5_PBKDF2_HMAC,
++    (const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, EVP_MD *digest, int keylen, unsigned char *out),
++    (pass, passlen, salt, saltlen, iter, digest, keylen, out))
 diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
-index 04a3487cf1..b20657944e 100644
+index 593f653008..799a611f94 100644
 --- a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
 +++ b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
-@@ -12,8 +12,11 @@
- package pbkdf2
-
+@@ -19,8 +19,11 @@ pbkdf2.Key.
+ package pbkdf2 // import "golang.org/x/crypto/pbkdf2"
+ 
  import (
 +	"crypto/boring"
- 	"crypto/pbkdf2"
+ 	"crypto/hmac"
  	"hash"
 +
 +	xboring "golang.org/x/crypto/internal/boring"
  )
-
+ 
  // Key derives a key from the password, salt and iteration count, returning a
-@@ -21,6 +24,10 @@
- // derived based on the method described as PBKDF2 with the HMAC variant using
- // the supplied hash function.
+@@ -40,6 +43,10 @@ import (
+ // Using a higher iteration count will increase the cost of an exhaustive
+ // search but will also make derivation proportionally slower.
  func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
 +	if boring.Enabled() {
 +		return xboring.Pbkdf2Key(password, salt, iter, keyLen, h)
 +	}
 +
- 	out, err := pbkdf2.Key(h, string(password), salt, iter, keyLen)
- 	if err != nil {
- 		// FIPS 140 enforcement, or an invalid key length.
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 1234567890..abcdef1234 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -1506,2 +1506,3 @@
- golang.org/x/crypto/internal/alias
-+golang.org/x/crypto/internal/boring
- golang.org/x/crypto/internal/poly1305
+ 	prf := hmac.New(h, password)
+ 	hashLen := prf.Size()
+ 	numBlocks := (keyLen + hashLen - 1) / hashLen

SOURCES/1004-vendor-fix-idna-unicode-version-gate.patch

@@ -1,12 +0,0 @@
-diff --git a/vendor/golang.org/x/net/idna/idna.go b/vendor/golang.org/x/net/idna/idna.go
---- a/vendor/golang.org/x/net/idna/idna.go
-+++ b/vendor/golang.org/x/net/idna/idna.go
-@@ -400,7 +400,7 @@
- 				// Spec says keep the old label.
- 				continue
- 			}
--			if unicode16 && err == nil && len(u) > 0 && isASCII(u) {
-+			if err == nil && len(u) > 0 && isASCII(u) {
- 				err = punyError(enc)
- 			}
- 			isBidi = isBidi || bidirule.DirectionString(u) != bidi.LeftToRight

SOURCES/create_bundles.sh

@@ -7,6 +7,7 @@ SOURCE_DATE_EPOCH=$((CHANGELOGTIME - CHANGELOGTIME % 86400))
 SOURCE_DIR=grafana-$VERSION
 SOURCE_TAR=grafana-$VERSION.tar.gz
 VENDOR_TAR=grafana-vendor-$VERSION-$RELEASE.tar.xz
+WEBPACK_TAR=grafana-webpack-$VERSION-$RELEASE.tar.gz
 
 
 ## Download and extract source tarball
@@ -20,9 +21,6 @@ pushd "${SOURCE_DIR}"
 
 # Vendor Go dependencies
 patch -p1 --fuzz=0 < ../0004-remove-unused-backend-dependencies.patch
-patch -p1 --fuzz=0 < ../0015-update-go-git-version.patch
-patch -p1 --fuzz=0 < ../0018-fix-x-net-CVE.patch
-patch -p1 --fuzz=0 < ../0019-update-go-billy-version.patch
 go mod vendor
 
 # Generate Go files
@@ -42,7 +40,6 @@ awk '$2 ~ /^v/ && $4 != "indirect" {print "Provides: bundled(golang(" $1 ")) = "
 
 # Vendor Node.js dependencies
 patch -p1 --fuzz=0 < ../0005-remove-unused-frontend-crypto.patch
-patch -p1 --fuzz=0 < ../0014-resolve-dompurify-CVE.patch
 export HUSKY=0
 yarn install --frozen-lockfile
 
@@ -67,3 +64,22 @@ XZ_OPT=-9 tar \
     "${SOURCE_DIR}/.pnp.cjs" \
     "${SOURCE_DIR}/.yarn/cache" \
     "${SOURCE_DIR}/.yarn/unplugged"
+
+
+## Create webpack
+pushd "${SOURCE_DIR}"
+../build_frontend.sh
+popd
+
+# Create tarball
+tar \
+    --sort=name \
+    --mtime="@${SOURCE_DATE_EPOCH}" --clamp-mtime \
+    --owner=0 --group=0 --numeric-owner \
+    -czf "${WEBPACK_TAR}" \
+    "${SOURCE_DIR}/plugins-bundled" \
+    "${SOURCE_DIR}/public/build" \
+    "${SOURCE_DIR}/public/img" \
+    "${SOURCE_DIR}/public/lib" \
+    "${SOURCE_DIR}/public/locales" \
+    "${SOURCE_DIR}/public/views"

SOURCES/create_bundles_in_container.sh

@@ -6,7 +6,7 @@
 #
 
 cat <<EOF | podman build -t grafana-build -f - .
-FROM fedora:44
+FROM fedora:35
 
 RUN dnf upgrade -y && \
     dnf install -y rpmdevtools python3-packaging python3-pyyaml make golang nodejs yarnpkg
@@ -15,9 +15,9 @@ RUN dnf upgrade -y && \
 ENV GOPROXY=https://proxy.golang.org,direct
 
 WORKDIR /tmp/grafana-build
-COPY grafana.spec create_vendor_bundle.sh build_frontend.sh list_bundled_nodejs_packages.py *.patch .
+COPY grafana.spec create_bundles.sh build_frontend.sh list_bundled_nodejs_packages.py *.patch .
 RUN mkdir bundles
-CMD ./create_vendor_bundle.sh && mv *.tar.* bundles
+CMD ./create_bundles.sh && mv *.tar.* bundles
 EOF
 
 podman run --name grafana-build --replace "$@" grafana-build

SOURCES/create_webpack_bundle.sh

@@ -1,50 +0,0 @@
-#!/bin/bash -eux
-VERSION=$(rpm --specfile ./*.spec --qf '%{VERSION}\n' | head -1)
-RELEASE=$(rpm --specfile ./*.spec --qf '%{RELEASE}\n' | head -1 | cut -d. -f1)
-CHANGELOGTIME=$(rpm --specfile ./*.spec --qf '%{CHANGELOGTIME}\n' | head -1)
-SOURCE_DATE_EPOCH=$((CHANGELOGTIME - CHANGELOGTIME % 86400))
-
-SOURCE_DIR=grafana-$VERSION
-SOURCE_TAR=grafana-$VERSION.tar.gz
-VENDOR_TAR=grafana-vendor-$VERSION-$RELEASE.tar.xz
-WEBPACK_TAR=grafana-webpack-$VERSION-$RELEASE.tar.gz
-
-
-## Download and extract source tarball
-spectool -g grafana.spec
-rm -rf "${SOURCE_DIR}"
-tar xf "${SOURCE_TAR}"
-
-## Create vendor bundle
-pushd "${SOURCE_DIR}"
-
-# Vendor Node.js dependencies
-patch -p1 --fuzz=0 < ../0005-remove-unused-frontend-crypto.patch
-patch -p1 --fuzz=0 < ../0014-resolve-dompurify-CVE.patch
-export HUSKY=0
-yarn install --frozen-lockfile
-
-# Remove files with licensing issues
-find .yarn -name 'node-notifier' -prune -exec rm -r {} \;
-find .yarn -name 'nodemon' -prune -exec rm -r {} \;
-
-popd
-
-
-## Create webpack
-pushd "${SOURCE_DIR}"
-../build_frontend.sh
-popd
-
-# Create tarball
-tar \
-    --sort=name \
-    --mtime="@${SOURCE_DATE_EPOCH}" --clamp-mtime \
-    --owner=0 --group=0 --numeric-owner \
-    -czf "${WEBPACK_TAR}" \
-    "${SOURCE_DIR}/plugins-bundled" \
-    "${SOURCE_DIR}/public/build" \
-    "${SOURCE_DIR}/public/img" \
-    "${SOURCE_DIR}/public/lib" \
-    "${SOURCE_DIR}/public/locales" \
-    "${SOURCE_DIR}/public/views"

SOURCES/create_webpack_bundle_in_container.sh

@@ -1,24 +0,0 @@
-#!/bin/bash -eu
-#
-# create vendor and webpack bundles inside a container (for reproducibility)
-# using a Go cache:
-#   ./create_bundles_in_container.sh --security-opt label=disable -v $(pwd)/.gocache:/root/go
-#
-
-cat <<EOF | podman build -t grafana-build -f - .
-FROM fedora:36
-
-RUN dnf upgrade -y && \
-    dnf install -y rpmdevtools python3-packaging python3-pyyaml make golang nodejs yarnpkg
-
-# https://groups.google.com/g/golang-nuts/c/MVtHZUtZru4
-ENV GOPROXY=https://proxy.golang.org,direct
-
-WORKDIR /tmp/grafana-build
-COPY grafana.spec create_webpack_bundle.sh build_frontend.sh list_bundled_nodejs_packages.py *.patch .
-RUN mkdir bundles
-CMD ./create_webpack_bundle.sh && mv *.tar.* bundles
-EOF
-
-podman run --name grafana-build --replace "$@" grafana-build
-podman cp grafana-build:bundles/. .

SOURCES/grafana.fc

@@ -1,24 +0,0 @@
-/etc/systemd/system/grafana-server.service		--	gen_context(system_u:object_r:grafana_unit_file_t,s0)
-/usr/lib/systemd/system/grafana-server.service		--	gen_context(system_u:object_r:grafana_unit_file_t,s0)
-
-/etc/grafana(/.*)?						gen_context(system_u:object_r:grafana_conf_t,s0)
-
-/usr/sbin/grafana-cli					--	gen_context(system_u:object_r:grafana_exec_t,s0)
-/usr/sbin/grafana-server				--	gen_context(system_u:object_r:grafana_exec_t,s0)
-
-/var/lib/grafana(/.*)?						gen_context(system_u:object_r:grafana_var_lib_t,s0)
-#/var/lib/grafana/grafana.db				--	gen_context(system_u:object_r:grafana_db_t,s0)
-
-/var/log/grafana(/.*)?						gen_context(system_u:object_r:grafana_log_t,s0)
-
-/var/run/grafana(/.*)?			--	gen_context(system_u:object_r:grafana_var_run_t,s0)
-
-#/var/lib/grafana/plugins(/.*)?					gen_context(system_u:object_r:grafana_plugin_t,s0)
-
-/usr/share/grafana/bin/grafana				--	gen_context(system_u:object_r:grafana_exec_t,s0)
-/usr/share/grafana/bin/grafana-cli			--	gen_context(system_u:object_r:grafana_exec_t,s0)
-/usr/share/grafana/bin/grafana-server			--	gen_context(system_u:object_r:grafana_exec_t,s0)
-
-#define context for pcp plugin
-#/usr/share/performancecopilot-pcp-app/datasources/redis/pcp_redis_datasource_(.*)           -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)
-/usr/libexec/grafana-pcp/datasources/redis/pcp_redis_datasource_(.*)           -- gen_context(system_u:object_r:grafana_pcp_exec_t,s0)

SOURCES/grafana.if

@@ -1,141 +0,0 @@
-## <summary>policy for grafana</summary>
-
-########################################
-## <summary>
-##	Execute grafana_exec_t in the grafana domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`grafana_domtrans',`
-	gen_require(`
-		type grafana_t, grafana_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, grafana_exec_t, grafana_t)
-')
-
-########################################
-## <summary>
-##      Allow domain to name_connect to grafana port. Default :3000
-## </summary>
-## <param name="domain">
-## <summary>
-##      Domain allowed access
-## </summary>
-## </param>
-#
-interface(`connect_grafana_port',`
-        gen_require(`
-		class tcp_socket name_connect;
-                type grafana_port_t;
-        ')
-
-	allow $1 grafana_port_t:tcp_socket name_connect;
-')
-
-#######################################
-## <summary>
-##	Read grafana database.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`grafana_read_db',`
-	gen_require(`
-		type grafana_db_t;
-	')
-
-	files_search_var_lib($1)
-	search_dirs_pattern($1, grafana_var_lib_t, grafana_var_lib_t)	
-	read_files_pattern($1, grafana_db_t, grafana_db_t)
-')
-
-######################################
-## <summary>
-##	Execute grafana in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`grafana_exec',`
-	gen_require(`
-		type grafana_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, grafana_exec_t)
-')
-########################################
-## <summary>
-##	Execute grafana server in the grafana domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`grafana_systemctl',`
-	gen_require(`
-		type grafana_t;
-		type grafana_unit_file_t;
-	')
-
-	systemd_exec_systemctl($1)
-        systemd_read_fifo_file_passwd_run($1)
-	allow $1 grafana_unit_file_t:file read_file_perms;
-	allow $1 grafana_unit_file_t:service manage_service_perms;
-
-	ps_process_pattern($1, grafana_t)
-')
-
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an grafana environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="role">
-##	<summary>
-##	Role allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`grafana_admin',`
-	gen_require(`
-	type grafana_t;
-	type grafana_unit_file_t;
-	')
-
-	allow $1 grafana_t:process { signal_perms };
-	ps_process_pattern($1, grafana_t)
-
-	tunable_policy(`deny_ptrace',`',`
-        	allow $1 grafana_t:process ptrace;
-    	')
-
-	grafana_systemctl($1)
-	admin_pattern($1, grafana_unit_file_t)
-	allow $1 grafana_unit_file_t:service all_service_perms;
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')

SOURCES/grafana.te

@@ -1,220 +0,0 @@
-policy_module(grafana, 1.0.4)
-
-########################################
-#
-# Declarations
-#
-#permissive grafana_t;
-
-## <desc>
-## <p>
-## Allow grafana to be used with a reverse proxy
-## </p>
-## </desc>
-gen_tunable(grafana_can_reverse_proxy, false)
-
-## <desc>
-## <p>
-## Allow grafana to connect to elasticsearch's default tcp port of 9200
-## </p>
-## </desc>
-gen_tunable(grafana_can_tcp_connect_elasticsearch_port, false)
-
-## <desc>
-## <p>
-## Allow grafana to connect to mysql's default tcp port of 3306
-## </p>
-## </desc>
-gen_tunable(grafana_can_tcp_connect_mysql_port, false)
-
-## <desc>
-## <p>
-## Allow grafana to connect to postgresql's default tcp port of 5432
-## </p>
-## </desc>
-gen_tunable(grafana_can_tcp_connect_postgresql_port, false)
-
-## <desc>
-## <p>
-## Allow grafana to connect to prometheus' default tcp port of 9090
-## </p>
-## </desc>
-gen_tunable(grafana_can_tcp_connect_prometheus_port, false)
-
-
-type grafana_t;
-type grafana_exec_t;
-init_daemon_domain(grafana_t, grafana_exec_t)
-init_nnp_daemon_domain(grafana_t)
-
-type grafana_unit_file_t;
-systemd_unit_file(grafana_unit_file_t)
-
-type grafana_conf_t;
-files_config_file(grafana_conf_t)
-
-type grafana_db_t;
-files_config_file(grafana_db_t)
-
-type grafana_tmp_t;
-files_tmp_file(grafana_tmp_t)
-
-type grafana_tmpfs_t;
-files_tmpfs_file(grafana_tmpfs_t)
-
-type grafana_log_t;
-logging_log_file(grafana_log_t)
-
-type grafana_var_run_t;
-files_pid_file(grafana_var_run_t)
-
-type grafana_var_lib_t;
-files_type(grafana_var_lib_t)
-
-type grafana_port_t;
-corenet_port(grafana_port_t)
-
-type grafana_pcp_exec_t;
-corecmd_executable_file(grafana_pcp_exec_t)
-can_exec(grafana_t, grafana_pcp_exec_t)
-
-# Ports 32768-60999 (pcp port is 44322)
-corenet_tcp_connect_all_ephemeral_ports(grafana_t)
-grafana_exec(grafana_t)
-
-# Allow grafana to connect to mssql's default tcp port of 1433 
-corenet_tcp_connect_mssql_port(grafana_t)
-
-########################################
-#
-# grafana local policy
-#
-allow grafana_t self:tcp_socket create_stream_socket_perms;
-allow grafana_t self:udp_socket create_stream_socket_perms;
-allow grafana_t self:unix_dgram_socket create_socket_perms;
-
-allow grafana_t grafana_port_t:tcp_socket { name_bind name_connect };
-
-allow grafana_t self:unix_stream_socket connectto;
-
-allow grafana_t self:netlink_route_socket { create bind getattr nlmsg_read };
-
-optional_policy(`
-	require {
-		type cgroup_t;
-		class dir { search };
-		class file { open read };
-	}
-	allow grafana_t cgroup_t:dir search;
-	allow grafana_t cgroup_t:file { open read };
-')
-
-optional_policy(`
-	require {
-		type smtp_port_t;
-		class tcp_socket { name_connect };
-	}
-	allow grafana_t smtp_port_t:tcp_socket name_connect;
-')
-
-optional_policy(`
-	require {
-		type usr_t;
-		class file { execute execute_no_trans };
-	}
-	allow grafana_t usr_t:file { execute execute_no_trans };
-')
-
-optional_policy(`
-	require {
-		type postgresql_t;
-		type postgresql_var_run_t;
-		class unix_stream_socket { connectto };
-		class sock_file { write };
-	}
-	allow grafana_t postgresql_t:unix_stream_socket connectto;
-	allow grafana_t postgresql_var_run_t:sock_file write;
-')
-
-optional_policy(`
-	require {
-		type autofs_t;
-		class dir {getattr};
-	}
-	allow grafana_t autofs_t:dir getattr;
-')
-
-manage_dirs_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
-manage_files_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
-
-manage_dirs_pattern(grafana_t, grafana_db_t, grafana_db_t)
-manage_files_pattern(grafana_t, grafana_db_t, grafana_db_t)
-
-manage_dirs_pattern(grafana_t, grafana_tmp_t, grafana_tmp_t)
-manage_files_pattern(grafana_t, grafana_tmp_t, grafana_tmp_t)
-manage_sock_files_pattern(grafana_t, grafana_tmp_t, grafana_tmp_t)
-files_tmp_filetrans(grafana_t, grafana_tmp_t, { dir file sock_file })
-
-manage_dirs_pattern(grafana_t, grafana_tmpfs_t, grafana_tmpfs_t)
-manage_files_pattern(grafana_t, grafana_tmpfs_t, grafana_tmpfs_t)
-fs_tmpfs_filetrans(grafana_t, grafana_tmpfs_t, {dir file})
-
-manage_dirs_pattern(grafana_t, grafana_log_t, grafana_log_t)
-manage_files_pattern(grafana_t, grafana_log_t, grafana_log_t)
-logging_log_filetrans(grafana_t, grafana_log_t, { dir file })
-
-manage_dirs_pattern(grafana_t, grafana_var_run_t, grafana_var_run_t)
-manage_files_pattern(grafana_t, grafana_var_run_t, grafana_var_run_t)
-files_pid_filetrans(grafana_t, grafana_var_run_t, { dir file })
-
-manage_dirs_pattern(grafana_t, grafana_var_lib_t, grafana_var_lib_t)
-manage_files_pattern(grafana_t, grafana_var_lib_t, grafana_var_lib_t)
-manage_lnk_files_pattern(grafana_t, grafana_var_lib_t, grafana_var_lib_t)
-files_var_lib_filetrans(grafana_t, grafana_var_lib_t, { dir file })
-
-
-corenet_tcp_connect_http_port(grafana_t)
-corenet_tcp_bind_generic_node(grafana_t)
-
-kernel_dgram_send(grafana_t)
-kernel_read_net_sysctls(grafana_t)
-kernel_read_system_state(grafana_t)
-
-auth_read_passwd(grafana_t)
-
-dev_read_sysfs(grafana_t)
-
-sysnet_read_config(grafana_t)
-
-logging_send_syslog_msg(grafana_t)
-
-miscfiles_read_generic_certs(grafana_t)
-
-tunable_policy(`grafana_can_reverse_proxy',`
-	gen_require(`
-		type httpd_t;
-	')
-
-	connect_grafana_port(httpd_t) # Reverse proxy support
-	corenet_tcp_connect_http_port(grafana_t)
-')
-
-tunable_policy(`grafana_can_tcp_connect_elasticsearch_port',` # Elasticsearch default tcp port 9200
-	corenet_tcp_connect_wap_wsp_port(grafana_t)
-')
-
-tunable_policy(`grafana_can_tcp_connect_mysql_port',` # Mysql default tcp port 3306
-	corenet_tcp_connect_mysqld_port(grafana_t)
-')
-
-tunable_policy(`grafana_can_tcp_connect_prometheus_port',` # Prometheus default tcp port 9090
-	corenet_tcp_connect_websm_port(grafana_t)
-')
-
-tunable_policy(`grafana_can_tcp_connect_postgresql_port',` # Postgresql default tcp port 5432
-	corenet_tcp_connect_postgresql_port(grafana_t)
-')
-
-optional_policy(`
-    systemd_private_tmp(grafana_tmp_t)
-')

SOURCES/list_bundled_nodejs_packages.py

@@ -25,7 +25,6 @@ def read_declared_pkgs(package_json_path):
 
 
 def read_installed_pkgs(yarn_lock_path):
-    bad_version_strings = ['0.0.0-use.local', '7.0.1-patch.1']
     with open(yarn_lock_path) as f:
         lockfile = yaml.safe_load(f)
         for pkg_decl, meta in lockfile.items():
@@ -34,8 +33,7 @@ def read_installed_pkgs(yarn_lock_path):
                     continue
                 pkg_name = pkg[: pkg.index("@", 1)]
                 pkg_version = meta["version"]
-                if pkg_version not in bad_version_strings:
-                    yield (pkg_name, pkg_version)
+                yield (pkg_name, pkg_version)
 
 
 def list_provides(declared_pkgs, installed_pkgs):