.gitignore

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

.grafana.metadata

@@ -1,3 +1,3 @@
-4c9db312dca444023c37c7af9acd2876a7e164b8 SOURCES/grafana-9.2.10.tar.gz
+5c65a9460e0d0ecff29e397b5889b4167f046142 SOURCES/grafana-10.2.6.tar.gz
-0735c8944a2af71b4c36319e3ec80d20d3b1d923 SOURCES/grafana-vendor-9.2.10-32.tar.xz
+80512e6390fd349f9511269026061a2342f3f613 SOURCES/grafana-vendor-10.2.6-11.tar.xz
-f66e9f954173212fb43bebd00756cf3c78362ea1 SOURCES/grafana-webpack-9.2.10-21.tar.gz
+128ba33fc426b99ef66e9230a9c68925b9822b85 SOURCES/grafana-webpack-10.2.6-11.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 1e47ea7adc316e2df3d0081c2c0ebe75ddd6bda0 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
@@ -6,18 +6,19 @@ Subject: [PATCH] update grafana-cli script with distro-specific paths and
 
 
 diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli
-index dafa075a2c..eda358c425 100755
+index 7c6c46aef9..945714642b 100755
 --- a/packaging/wrappers/grafana-cli
 +++ b/packaging/wrappers/grafana-cli
-@@ -5,18 +5,19 @@
+@@ -5,7 +5,7 @@
  # the system-wide Grafana configuration that was bundled with the package as we
  # use the binary.
  
 -DEFAULT=/etc/default/grafana
 +DEFAULT=/etc/sysconfig/grafana-server
  
- GRAFANA_HOME=/usr/share/grafana
+ GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
- CONF_DIR=/etc/grafana
+ 
+@@ -13,11 +13,12 @@ CONF_DIR=/etc/grafana
  DATA_DIR=/var/lib/grafana
  PLUGINS_DIR=/var/lib/grafana/plugins
  LOG_DIR=/var/log/grafana
@@ -26,12 +27,12 @@ index dafa075a2c..eda358c425 100755
  CONF_FILE=$CONF_DIR/grafana.ini
  PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
  
--EXECUTABLE=$GRAFANA_HOME/bin/grafana-cli
+-EXECUTABLE="$GRAFANA_HOME/bin/grafana"
 +EXECUTABLE=$LIBEXEC_DIR/grafana-cli
  
  if [ ! -x $EXECUTABLE ]; then
-  echo "Program not installed or not executable"
+  echo "$EXECUTABLE not installed or not executable"
-@@ -28,12 +29,21 @@ if [ -f "$DEFAULT" ]; then
+@@ -29,14 +30,23 @@ if [ -f "$DEFAULT" ]; then
    . "$DEFAULT"
  fi
  
@@ -42,8 +43,6 @@ index dafa075a2c..eda358c425 100755
 -                        cfg:default.paths.data=${DATA_DIR} \
 -                        cfg:default.paths.logs=${LOG_DIR} \
 -                        cfg:default.paths.plugins=${PLUGINS_DIR}'"
--
--eval $EXECUTABLE "$OPTS" '$@'
 +OPTS=("--homepath=${GRAFANA_HOME}"
 +      "--config=${CONF_FILE}"
 +      "--pluginsDir=${PLUGINS_DIR}"
@@ -51,7 +50,10 @@ index dafa075a2c..eda358c425 100755
 +                         cfg:default.paths.data=${DATA_DIR} \
 +                         cfg:default.paths.logs=${LOG_DIR} \
 +                         cfg:default.paths.plugins=${PLUGINS_DIR}")
-+
+ 
+ CMD=cli
+ 
+-eval $EXECUTABLE "$CMD" "$OPTS" "$@"
 +if [ "$(id -u)" -eq 0 -o "$(id -g)" -eq 0 ]; then
 +  cd "${GRAFANA_HOME}"
 +  exec runuser -u "${GRAFANA_USER}" -- "$EXECUTABLE" "${OPTS[@]}" "$@"

SOURCES/0002-add-manpages.patch

@@ -1,4 +1,4 @@
-From c065b6608a65967bde152557566e0410238714a1 Mon Sep 17 00:00:00 2001
+From 5b6c18f715808f99c32550fc3b670fc5bf600f72 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 026c4f235fd3bfc741304a5e12e13bd1c7b85eac 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 9f7cf4a90b..e1e5468bfa 100644
 --- a/conf/defaults.ini
 +++ b/conf/defaults.ini
-@@ -196,7 +196,7 @@ row_limit = 1000000
+@@ -240,7 +240,7 @@ user_agent =
  # 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,20 +17,22 @@ 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
+@@ -249,8 +249,8 @@ reporting_distributor = grafana-labs
+ # for new versions of grafana. The check is used
  # 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.
+-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 -check_for_updates = true
++# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 +check_for_updates = false
  
  # 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 916de769f9..2f270d4940 100644
 --- a/conf/sample.ini
 +++ b/conf/sample.ini
-@@ -202,7 +202,7 @@
+@@ -247,7 +247,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,16 +41,18 @@ 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 @@
+@@ -256,8 +256,8 @@
+ # for new versions of grafana. The check is used
  # 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.
+-# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 -;check_for_updates = true
++# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 +;check_for_updates = false
  
  # Set to false to disable all checks to https://grafana.com
  # for new versions of plugins. The check is used
-@@ -356,7 +356,7 @@
+@@ -427,7 +427,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 +61,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 @@
+@@ -1411,7 +1411,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 076177ff583b8e6d92948e0a4ddde0e8992d09a3 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,123 +7,56 @@ 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 fcbc09da5e..82fdf39842 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -30,7 +30,6 @@ require (
+@@ -45,7 +45,6 @@ require (
- 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
+ 	github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild
- 	github.com/centrifugal/centrifuge v0.25.0
+ 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // @grafana/backend-platform
- 	github.com/cortexproject/cortex v1.10.1-0.20211014125347-85c378182d0d
+ 	github.com/centrifugal/centrifuge v0.30.2 // @grafana/grafana-app-platform-squad
--	github.com/crewjam/saml v0.4.9
+-	github.com/crewjam/saml v0.4.13 // @grafana/grafana-authnz-team
- 	github.com/davecgh/go-spew v1.1.1
+ 	github.com/fatih/color v1.15.0 // @grafana/backend-platform
- 	github.com/denisenkom/go-mssqldb v0.12.0
+ 	github.com/gchaincl/sqlhooks v1.3.0 // @grafana/backend-platform
- 	github.com/dop251/goja v0.0.0-20210804101310-32956a348b49
+ 	github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/grafana-authnz-team
-@@ -67,7 +66,6 @@ require (
+@@ -187,7 +186,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
--	github.com/jung-kurt/gofpdf v1.16.2
- 	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 (
  	github.com/josharian/intern v1.0.0 // indirect
  	github.com/jpillora/backoff v1.0.0 // indirect
  	github.com/mailru/easyjson v0.7.7 // indirect
 -	github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
  	github.com/mattetti/filebuffer v1.0.1 // indirect
- 	github.com/mattn/go-runewidth v0.0.9 // indirect
+ 	github.com/mattn/go-runewidth v0.0.13 // indirect
- 	github.com/miekg/dns v1.1.43 // indirect
+ 	github.com/miekg/dns v1.1.51 // 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 d05dfb55fd..b160387abe 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -665,7 +665,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
+@@ -1826,8 +1826,6 @@ github.com/grafana/pyroscope/api v0.3.0/go.mod h1:JggA80ToAAUACYGfwL49XoFk5aN5ec
- github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+ github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
- github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+ github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
- github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+ github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
--github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4=
+-github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c h1:1pHLC1ZTz7N5QI3jzCs5sqmVvAKe+JwGnpp9lQ+iUjY=
- github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
+-github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c/go.mod h1:S4+611dxnKt8z/ulbvaJzcgSHsuhjVc1QHNTcr1R7Fw=
- github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA=
+ github.com/grafana/sqlds/v2 v2.3.10 h1:HWKhE0vR6LoEiE+Is8CSZOgaB//D1yqb2ntkass9Fd4=
- github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
+ github.com/grafana/sqlds/v2 v2.3.10/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
-@@ -1376,8 +1375,6 @@ github.com/grafana/grafana-plugin-sdk-go v0.139.0 h1:2RQKM2QpSaWTtaGN6sK+R7LO7zy
+ github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b h1:mDlkqgTEJuK7vjPG44f3ZMtId5AAYLWHvBVbiGqIOOQ=
- github.com/grafana/grafana-plugin-sdk-go v0.139.0/go.mod h1:Y+Ps2sesZ62AyCnX+hzrYnyDQYe/ZZl+A8yKLOBm12c=
+@@ -2222,8 +2220,6 @@ github.com/markbates/sigtx v1.0.0/go.mod h1:QF1Hv6Ic6Ca6W+T+DL0Y/ypborFKyvUY9Hmu
- github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293 h1:dJIdfHqu+XjKz+w9zXLqXKPdp6Jjx/UPSOwdeSfWdeQ=
+ github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGfH0DQzY7w=
- github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293/go.mod h1:HVHqK+BVPa/tmL8EMhLCCrPt2a1GdJpEyxr5hgur2UI=
+ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
--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
- 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=
--github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc=
--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/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=
- github.com/philhofer/fwd v1.0.0/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/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=
 diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go
-index 72371bdab4..a7bb7abe0f 100644
+index 327e208221..426aad2a21 100644
 --- a/pkg/extensions/main.go
 +++ b/pkg/extensions/main.go
-@@ -11,13 +11,11 @@ import (
+@@ -11,7 +11,6 @@ import (
+ 	_ "github.com/beevik/etree"
  	_ "github.com/blugelabs/bluge"
  	_ "github.com/blugelabs/bluge_segment_api"
- 	_ "github.com/cortexproject/cortex/pkg/util"
 -	_ "github.com/crewjam/saml"
+ 	_ "github.com/go-jose/go-jose/v3"
  	_ "github.com/gobwas/glob"
  	_ "github.com/googleapis/gax-go/v2"
- 	_ "github.com/grafana/dskit/backoff"
- 	_ "github.com/grafana/dskit/flagext"
- 	_ "github.com/grpc-ecosystem/go-grpc-middleware"
--	_ "github.com/jung-kurt/gofpdf"
- 	_ "github.com/linkedin/goavro/v2"
- 	_ "github.com/m3db/prometheus_remote_client_golang/promremote"
- 	_ "github.com/pkg/errors"

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

@@ -1,4 +1,4 @@
-From 3709d320189b10a12a3780d15e46afd777f06554 Mon Sep 17 00:00:00 2001
+From ddd615152004e0bc5985a574c05d31778351dfa3 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,73 +7,47 @@ 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 38deb6d7de..aad5e88bf0 100644
 --- a/package.json
 +++ b/package.json
-@@ -405,8 +405,10 @@
+@@ -425,6 +425,9 @@
-     "whatwg-fetch": "3.6.2"
-   },
    "resolutions": {
+     "underscore": "1.13.6",
+     "@types/slate": "0.47.11",
 +    "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",
+     "ngtemplate-loader/loader-utils": "^2.0.0",
--    "@mdx-js/loader/loader-utils": "^2.0.0",
+     "semver@~7.0.0": "7.5.4",
-     "@types/slate": "0.47.9",
+     "semver@7.3.4": "7.5.4",
-     "@rushstack/node-core-library": "3.52.0",
-     "@rushstack/rig-package": "0.3.13",
 diff --git a/yarn.lock b/yarn.lock
-index f374e10e33..12c06ad883 100644
+index bf22ba52a1..1552ddc052 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -4571,10 +4571,10 @@ __metadata:
+@@ -10935,22 +10935,6 @@ __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:
    languageName: node
    linkType: hard
  
 -"asn1@npm:~0.2.3":
--  version: 0.2.4
+-  version: 0.2.6
--  resolution: "asn1@npm:0.2.4"
+-  resolution: "asn1@npm:0.2.6"
 -  dependencies:
--    safer-buffer: ~2.1.0
+-    safer-buffer: "npm:~2.1.0"
--  checksum: aa5d6f77b1e0597df53824c68cfe82d1d89ce41cb3520148611f025fbb3101b2d25dd6a40ad34e4fac10f6b19ed5e8628cd4b7d212261e80e83f02b39ee5663c
+-  checksum: cf629291fee6c1a6f530549939433ebf32200d7849f38b810ff26ee74235e845c0c12b2ed0f1607ac17383d19b219b69cefa009b920dab57924c5c544e495078
 -  languageName: node
 -  linkType: hard
 -
 -"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0":
 -  version: 1.0.0
 -  resolution: "assert-plus@npm:1.0.0"
--  checksum: 19b4340cb8f0e6a981c07225eacac0e9d52c2644c080198765d63398f0075f83bbc0c8e95474d54224e297555ad0d631c1dcd058adb1ddc2437b41a6b424ac64
+-  checksum: f4f991ae2df849cc678b1afba52d512a7cbf0d09613ba111e72255409ff9158550c775162a47b12d015d1b82b3c273e8e25df0e4783d3ddb008a293486d00a07
 -  languageName: node
 -  linkType: hard
 -
- "assert@npm:2.0.0":
+ "assert@npm:2.0.0, assert@npm:^2.0.0":
    version: 2.0.0
    resolution: "assert@npm:2.0.0"
-@@ -15231,15 +15215,6 @@ __metadata:
+@@ -11427,15 +11411,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -81,29 +55,29 @@ index f374e10e33..12c06ad883 100644
 -  version: 1.0.2
 -  resolution: "bcrypt-pbkdf@npm:1.0.2"
 -  dependencies:
--    tweetnacl: ^0.14.3
+-    tweetnacl: "npm:^0.14.3"
--  checksum: 4edfc9fe7d07019609ccf797a2af28351736e9d012c8402a07120c4453a3b789a15f2ee1530dc49eee8f7eb9379331a8dd4b3766042b9e502f74a68e7f662291
+-  checksum: 13a4cde058250dbf1fa77a4f1b9a07d32ae2e3b9e28e88a0c7a1827835bc3482f3e478c4a0cfd4da6ff0c46dae07da1061123a995372b32cc563d9975f975404
 -  languageName: node
 -  linkType: hard
 -
  "before-after-hook@npm:^2.2.0":
    version: 2.2.2
    resolution: "before-after-hook@npm:2.2.2"
-@@ -17053,13 +17028,6 @@ __metadata:
+@@ -12929,13 +12904,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"core-util-is@npm:1.0.2":
 -  version: 1.0.2
 -  resolution: "core-util-is@npm:1.0.2"
--  checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab
+-  checksum: d0f7587346b44a1fe6c269267e037dd34b4787191e473c3e685f507229d88561c40eb18872fabfff02977301815d474300b7bfbd15396c13c5377393f7e87ec3
 -  languageName: node
 -  linkType: hard
 -
  "core-util-is@npm:~1.0.0":
    version: 1.0.3
    resolution: "core-util-is@npm:1.0.3"
-@@ -18097,15 +18065,6 @@ __metadata:
+@@ -13857,15 +13825,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -111,15 +85,15 @@ index f374e10e33..12c06ad883 100644
 -  version: 1.14.1
 -  resolution: "dashdash@npm:1.14.1"
 -  dependencies:
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
--  checksum: 3634c249570f7f34e3d34f866c93f866c5b417f0dd616275decae08147dcdf8fccfaa5947380ccfb0473998ea3a8057c0b4cd90c875740ee685d0624b2983598
+-  checksum: 137b287fa021201ce100cef772c8eeeaaafdd2aa7282864022acf3b873021e54cb809e9c060fa164840bf54ff72d00d6e2d8da1ee5a86d7200eeefa1123a8f7f
 -  languageName: node
 -  linkType: hard
 -
- "data-urls@npm:^2.0.0":
+ "data-urls@npm:^3.0.2":
-   version: 2.0.0
+   version: 3.0.2
-   resolution: "data-urls@npm:2.0.0"
+   resolution: "data-urls@npm:3.0.2"
-@@ -18842,16 +18801,6 @@ __metadata:
+@@ -14573,16 +14532,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -127,37 +101,37 @@ index f374e10e33..12c06ad883 100644
 -  version: 0.1.2
 -  resolution: "ecc-jsbn@npm:0.1.2"
 -  dependencies:
--    jsbn: ~0.1.0
+-    jsbn: "npm:~0.1.0"
--    safer-buffer: ^2.1.0
+-    safer-buffer: "npm:^2.1.0"
--  checksum: 22fef4b6203e5f31d425f5b711eb389e4c6c2723402e389af394f8411b76a488fa414d309d866e2b577ce3e8462d344205545c88a8143cc21752a5172818888a
+-  checksum: d43591f2396196266e186e6d6928038cc11c76c3699a912cb9c13757060f7bbc7f17f47c4cb16168cdeacffc7965aef021142577e646fb3cb88810c15173eb57
 -  languageName: node
 -  linkType: hard
 -
  "ee-first@npm:1.1.1":
    version: 1.1.1
    resolution: "ee-first@npm:1.1.1"
-@@ -20489,20 +20438,6 @@ __metadata:
+@@ -15991,20 +15940,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"extsprintf@npm:1.3.0":
 -  version: 1.3.0
 -  resolution: "extsprintf@npm:1.3.0"
--  checksum: cee7a4a1e34cffeeec18559109de92c27517e5641991ec6bab849aa64e3081022903dd53084f2080d0d2530803aa5ee84f1e9de642c365452f9e67be8f958ce2
+-  checksum: 26967d6c7ecbfb5bc5b7a6c43503dc5fafd9454802037e9fa1665e41f615da4ff5918bd6cb871a3beabed01a31eca1ccd0bdfb41231f50ad50d405a430f78377
 -  languageName: node
 -  linkType: hard
 -
 -"extsprintf@npm:^1.2.0":
--  version: 1.4.0
+-  version: 1.4.1
--  resolution: "extsprintf@npm:1.4.0"
+-  resolution: "extsprintf@npm:1.4.1"
--  checksum: 184dc8a413eb4b1ff16bdce797340e7ded4d28511d56a1c9afa5a95bcff6ace154063823eaf0206dbbb0d14059d74f382a15c34b7c0636fa74a7e681295eb67e
+-  checksum: bfd6d55f3c0c04d826fe0213264b383c03f32825af6b1ff777f3f2dc49467e599361993568d75b7b19a8ea1bb08c8e7cd8c3d87d179ced91bb0dcf81ca6938e0
 -  languageName: node
 -  linkType: hard
 -
- "fast-deep-equal@npm:^3.0.0, fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
+ "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:
+@@ -16916,15 +16851,6 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -165,15 +139,15 @@ index f374e10e33..12c06ad883 100644
 -  version: 0.1.7
 -  resolution: "getpass@npm:0.1.7"
 -  dependencies:
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
 -  checksum: ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046
 -  languageName: node
 -  linkType: hard
 -
- "git-raw-commits@npm:^2.0.8":
+ "giget@npm:^1.0.0":
-   version: 2.0.11
+   version: 1.1.2
-   resolution: "git-raw-commits@npm:2.0.11"
+   resolution: "giget@npm:1.1.2"
-@@ -22832,25 +22758,10 @@ __metadata:
+@@ -18263,25 +18189,10 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -181,10 +155,10 @@ index f374e10e33..12c06ad883 100644
 -  version: 1.2.0
 -  resolution: "http-signature@npm:1.2.0"
 -  dependencies:
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
--    jsprim: ^1.2.2
+-    jsprim: "npm:^1.2.2"
--    sshpk: ^1.7.0
+-    sshpk: "npm:^1.7.0"
--  checksum: 3324598712266a9683585bb84a75dec4fd550567d5e0dd4a0fff6ff3f74348793404d3eeac4918fa0902c810eeee1a86419e4a2e92a164132dfe6b26743fb47c
+-  checksum: 2ff7112e6b0d8f08b382dfe705078c655501f2ddd76cf589d108445a9dd388a0a9be928c37108261519a7f53e6bbd1651048d74057b804807cce1ec49e87a95b
 -  languageName: node
 -  linkType: hard
 -
@@ -192,10 +166,10 @@ index f374e10e33..12c06ad883 100644
 -  version: 1.3.6
 -  resolution: "http-signature@npm:1.3.6"
 -  dependencies:
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
--    jsprim: ^2.0.2
+-    jsprim: "npm:^2.0.2"
--    sshpk: ^1.14.1
+-    sshpk: "npm:^1.14.1"
--  checksum: 10be2af4764e71fee0281392937050201ee576ac755c543f570d6d87134ce5e858663fe999a7adb3e4e368e1e356d0d7fec6b9542295b875726ff615188e7a0c
+-  checksum: 5f08e0c82174999da97114facb0d0d47e268d60b6fc10f92cb87b99d5ccccd36f79b9508c29dda0b4f4e3a1b2f7bcaf847e68ecd5da2f1fc465fcd1d054b7884
 +"http-signature@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz":
 +  version: 1.1.3
 +  resolution: "http-signature@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz"
@@ -203,47 +177,47 @@ index f374e10e33..12c06ad883 100644
    languageName: node
    linkType: hard
  
-@@ -25418,13 +25329,6 @@ __metadata:
+@@ -20609,13 +20520,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"jsbn@npm:~0.1.0":
 -  version: 0.1.1
 -  resolution: "jsbn@npm:0.1.1"
--  checksum: e5ff29c1b8d965017ef3f9c219dacd6e40ad355c664e277d31246c90545a02e6047018c16c60a00f36d561b3647215c41894f5d869ada6908a2e0ce4200c88f2
+-  checksum: 5450133242845100e694f0ef9175f44c012691a9b770b2571e677314e6f70600abb10777cdfc9a0c6a9f2ac6d134577403633de73e2fcd0f97875a67744e2d14
 -  languageName: node
 -  linkType: hard
 -
- "jsdoc-type-pratt-parser@npm:~2.2.5":
+ "jscodeshift@npm:^0.14.0":
-   version: 2.2.5
+   version: 0.14.0
-   resolution: "jsdoc-type-pratt-parser@npm:2.2.5"
+   resolution: "jscodeshift@npm:0.14.0"
-@@ -25572,13 +25476,6 @@ __metadata:
+@@ -20767,13 +20671,6 @@ __metadata:
    languageName: node
    linkType: hard
  
--"json-schema@npm:0.2.3, json-schema@npm:0.4.0":
+-"json-schema@npm:0.4.0":
 -  version: 0.4.0
 -  resolution: "json-schema@npm:0.4.0"
--  checksum: 66389434c3469e698da0df2e7ac5a3281bcff75e797a5c127db7c5b56270e01ae13d9afa3c03344f76e32e81678337a8c912bdbb75101c62e487dc3778461d72
+-  checksum: 8b3b64eff4a807dc2a3045b104ed1b9335cd8d57aa74c58718f07f0f48b8baa3293b00af4dcfbdc9144c3aafea1e97982cc27cc8e150fc5d93c540649507a458
 -  languageName: node
 -  linkType: hard
 -
  "json-source-map@npm:0.6.1":
    version: 0.6.1
    resolution: "json-source-map@npm:0.6.1"
-@@ -25709,30 +25606,6 @@ __metadata:
+@@ -20886,30 +20783,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"jsprim@npm:^1.2.2":
--  version: 1.4.1
+-  version: 1.4.2
--  resolution: "jsprim@npm:1.4.1"
+-  resolution: "jsprim@npm:1.4.2"
 -  dependencies:
--    assert-plus: 1.0.0
+-    assert-plus: "npm:1.0.0"
--    extsprintf: 1.3.0
+-    extsprintf: "npm:1.3.0"
--    json-schema: 0.2.3
+-    json-schema: "npm:0.4.0"
--    verror: 1.10.0
+-    verror: "npm:1.10.0"
--  checksum: 6bcb20ec265ae18bb48e540a6da2c65f9c844f7522712d6dfcb01039527a49414816f4869000493363f1e1ea96cbad00e46188d5ecc78257a19f152467587373
+-  checksum: df2bf234eab1b5078d01bcbff3553d50a243f7b5c10a169745efeda6344d62798bd1d85bcca6a8446f3b5d0495e989db45f9de8dae219f0f9796e70e0c776089
 -  languageName: node
 -  linkType: hard
 -
@@ -251,50 +225,27 @@ index f374e10e33..12c06ad883 100644
 -  version: 2.0.2
 -  resolution: "jsprim@npm:2.0.2"
 -  dependencies:
--    assert-plus: 1.0.0
+-    assert-plus: "npm:1.0.0"
--    extsprintf: 1.3.0
+-    extsprintf: "npm:1.3.0"
--    json-schema: 0.4.0
+-    json-schema: "npm:0.4.0"
--    verror: 1.10.0
+-    verror: "npm:1.10.0"
--  checksum: d175f6b1991e160cb0aa39bc857da780e035611986b5492f32395411879fdaf4e513d98677f08f7352dac93a16b66b8361c674b86a3fa406e2e7af6b26321838
+-  checksum: fcfca5b55f83e1b8be5f932c71754bd37afd2611f81685abd05689e8ce718a91155ff7bd5b94c65ce483a787b5c43c6d0c18c1d2259fca5bb61a3f8ea2e29c0a
 -  languageName: node
 -  linkType: hard
 -
  "jsurl@npm:^0.1.5":
    version: 0.1.5
    resolution: "jsurl@npm:0.1.5"
-@@ -26192,6 +26065,17 @@ __metadata:
+@@ -22734,7 +22607,7 @@ __metadata:
    languageName: node
    linkType: hard
  
-+"loader-utils@npm:2.0.0":
+-"node-forge@npm:^1, node-forge@npm:^1.3.1":
-+  version: 2.0.0
++"node-forge@npm:^1.3.1":
-+  resolution: "loader-utils@npm:2.0.0"
+   version: 1.3.1
-+  dependencies:
+   resolution: "node-forge@npm:1.3.1"
-+    big.js: ^5.2.2
+   checksum: 05bab6868633bf9ad4c3b1dd50ec501c22ffd69f556cdf169a00998ca1d03e8107a6032ba013852f202035372021b845603aeccd7dfcb58cdb7430013b3daa8d
-+    emojis-list: ^3.0.0
+@@ -27151,7 +27024,7 @@ __metadata:
-+    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:
-   languageName: node
-   linkType: hard
- 
--"node-forge@npm:^1":
--  version: 1.3.1
--  resolution: "node-forge@npm:1.3.1"
--  checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9
--  languageName: node
--  linkType: hard
--
- "node-gettext@npm:^3.0.0":
-   version: 3.0.0
-   resolution: "node-gettext@npm:3.0.0"
-@@ -33404,7 +33281,7 @@ __metadata:
    languageName: node
    linkType: hard
  
@@ -302,17 +253,17 @@ index f374e10e33..12c06ad883 100644
 +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
    version: 2.1.2
    resolution: "safer-buffer@npm:2.1.2"
-   checksum: cab8f25ae6f1434abee8d80023d7e72b598cf1327164ddab31003c51215526801e40b66c5e65d658a0af1e9d6478cadcb4c745f4bd6751f97d8644786c0978b0
+   checksum: 7eaf7a0cf37cc27b42fb3ef6a9b1df6e93a1c6d98c6c6702b02fe262d5fcbd89db63320793b99b21cb5348097d0a53de81bd5f4e8b86e20cc9412e3f1cfb4e83
-@@ -33623,12 +33500,10 @@ __metadata:
+@@ -27282,12 +27155,10 @@ __metadata:
    languageName: node
    linkType: hard
  
--"selfsigned@npm:^2.0.1":
+-"selfsigned@npm:^2.1.1":
--  version: 2.0.1
+-  version: 2.1.1
--  resolution: "selfsigned@npm:2.0.1"
+-  resolution: "selfsigned@npm:2.1.1"
 -  dependencies:
--    node-forge: ^1
+-    node-forge: "npm:^1"
--  checksum: 864e65c2f31ca877bce3ccdaa3bdef5e1e992b63b2a03641e00c24cd305bf2acce093431d1fed2e5ae9f526558db4be5e90baa2b3474c0428fcf7e25cc86ac93
+-  checksum: 6005206e0d005448274aceceaded5195b944f67a42b72d212a6169d2e5f4bdc87c15a3fe45732c544db8c7175702091aaf95403ad6632585294a6ec8cca63638
 +"selfsigned@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz":
 +  version: 1.1.3
 +  resolution: "selfsigned@https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.1.3.tgz"
@@ -320,49 +271,49 @@ index f374e10e33..12c06ad883 100644
    languageName: node
    linkType: hard
  
-@@ -34591,27 +34466,6 @@ __metadata:
+@@ -28053,27 +27924,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"sshpk@npm:^1.14.1, sshpk@npm:^1.7.0":
--  version: 1.16.1
+-  version: 1.17.0
--  resolution: "sshpk@npm:1.16.1"
+-  resolution: "sshpk@npm:1.17.0"
 -  dependencies:
--    asn1: ~0.2.3
+-    asn1: "npm:~0.2.3"
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
--    bcrypt-pbkdf: ^1.0.0
+-    bcrypt-pbkdf: "npm:^1.0.0"
--    dashdash: ^1.12.0
+-    dashdash: "npm:^1.12.0"
--    ecc-jsbn: ~0.1.1
+-    ecc-jsbn: "npm:~0.1.1"
--    getpass: ^0.1.1
+-    getpass: "npm:^0.1.1"
--    jsbn: ~0.1.0
+-    jsbn: "npm:~0.1.0"
--    safer-buffer: ^2.0.2
+-    safer-buffer: "npm:^2.0.2"
--    tweetnacl: ~0.14.0
+-    tweetnacl: "npm:~0.14.0"
 -  bin:
 -    sshpk-conv: bin/sshpk-conv
 -    sshpk-sign: bin/sshpk-sign
 -    sshpk-verify: bin/sshpk-verify
--  checksum: 5e76afd1cedc780256f688b7c09327a8a650902d18e284dfeac97489a735299b03c3e72c6e8d22af03dbbe4d6f123fdfd5f3c4ed6bedbec72b9529a55051b857
+-  checksum: 668c2a279a6ce66fd739ce5684e37927dd75427cc020c828a208f85890a4c400705d4ba09f32fa44efca894339dc6931941664f6f6ba36dfa543de6d006cbe9c
 -  languageName: node
 -  linkType: hard
 -
- "ssri@npm:^8.0.0, ssri@npm:^8.0.1":
+ "ssri@npm:^10.0.0, ssri@npm:^10.0.1":
-   version: 8.0.1
+   version: 10.0.5
-   resolution: "ssri@npm:8.0.1"
+   resolution: "ssri@npm:10.0.5"
-@@ -36287,13 +36141,6 @@ __metadata:
+@@ -29479,13 +29329,6 @@ __metadata:
    languageName: node
    linkType: hard
  
 -"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
 -  version: 0.14.5
 -  resolution: "tweetnacl@npm:0.14.5"
--  checksum: 6061daba1724f59473d99a7bb82e13f211cdf6e31315510ae9656fefd4779851cb927adad90f3b488c8ed77c106adc0421ea8055f6f976ff21b27c5c4e918487
+-  checksum: 04ee27901cde46c1c0a64b9584e04c96c5fe45b38c0d74930710751ea991408b405747d01dfae72f80fc158137018aea94f9c38c651cb9c318f0861a310c3679
 -  languageName: node
 -  linkType: hard
 -
  "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:
+@@ -30199,17 +30042,6 @@ __metadata:
    languageName: node
    linkType: soft
  
@@ -370,28 +321,13 @@ index f374e10e33..12c06ad883 100644
 -  version: 1.10.0
 -  resolution: "verror@npm:1.10.0"
 -  dependencies:
--    assert-plus: ^1.0.0
+-    assert-plus: "npm:^1.0.0"
--    core-util-is: 1.0.2
+-    core-util-is: "npm:1.0.2"
--    extsprintf: ^1.2.0
+-    extsprintf: "npm:^1.2.0"
--  checksum: c431df0bedf2088b227a4e051e0ff4ca54df2c114096b0c01e1cbaadb021c30a04d7dd5b41ab277bcd51246ca135bf931d4c4c796ecae7a4fef6d744ecef36ea
+-  checksum: da548149dd9c130a8a2587c9ee71ea30128d1526925707e2d01ed9c5c45c9e9f86733c66a328247cdd5f7c1516fb25b0f959ba754bfbe15072aa99ff96468a29
 -  languageName: node
 -  linkType: hard
 -
- "vfile-location@npm:^3.0.0, vfile-location@npm:^3.2.0":
+ "vinyl-fs@npm:^3.0.2":
-   version: 3.2.0
+   version: 3.0.3
-   resolution: "vfile-location@npm:3.2.0"
+   resolution: "vinyl-fs@npm:3.0.3"
-
-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-skip-marketplace-plugin-install-test.patch

@@ -1,4 +1,4 @@
-From a23cb1162fd705147489915667b83a236ad248be Mon Sep 17 00:00:00 2001
+From ed8a438d72a667844ae07804491b568ad2f5dcdd 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 4fc2295ed8..a326c40b04 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) {
+@@ -71,6 +71,7 @@ func TestIntegrationPlugins(t *testing.T) {
  		})
  
  		t.Run("Request is not forbidden if from an admin", func(t *testing.T) {

SOURCES/0007-fix-alert-test.patch

@@ -1,19 +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] fix alert test
-
-
-diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
-index 2d6e1235b6..f0eff6d2ac 100644
---- a/pkg/tests/api/alerting/api_alertmanager_test.go	2023-01-24 14:44:19.000000000 -0500
-+++ b/pkg/tests/api/alerting/api_alertmanager_test.go	2023-04-13 16:20:51.718515009 -0400
-@@ -210,7 +210,7 @@
- 		{
- 			"comment": "string",
- 			"createdBy": "string",
--			"endsAt": "2023-03-31T14:17:04.419Z",
-+			"endsAt": "2032-03-31T14:17:04.419Z",
- 			"matchers": [
- 			  {
- 				"isRegex": true,

SOURCES/0007-redact-weak-ciphers.patch

@@ -0,0 +1,30 @@
+From 7ac26d6beb2175f0d6001ca0df322ce610401cce Mon Sep 17 00:00:00 2001
+From: Stan Cox <scox@redhat.com>
+Date: Wed, 22 Jun 2022 17:05:48 +0200
+Subject: [PATCH] redact weak ciphers
+
+
+diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
+index da04044683..8a29270d4d 100644
+--- a/pkg/api/http_server.go
++++ b/pkg/api/http_server.go
+@@ -820,13 +820,13 @@ func (hs *HTTPServer) getDefaultCiphers(tlsVersion uint16, protocol string) []ui
+ 			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+ 			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+ 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
++			//			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+ 			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+-			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+-			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+-			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+-			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
++			//			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
++			//			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
++			//			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
++			//			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
++			//			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+ 		}
+ 	}
+ 	if protocol == "h2" {

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/0008-replace-faulty-slices-sort.patch

@@ -0,0 +1,40 @@
+From 3f45f26993ed94837001bb9760d7859e7a057649 Mon Sep 17 00:00:00 2001
+From: Sam Feifer <sfeifer@redhat.com>
+Date: Fri, 1 Mar 2024 15:00:55 -0500
+Subject: [PATCH] replace faulty slices sort
+
+
+diff --git a/pkg/services/sqlstore/migrator/dialect.go b/pkg/services/sqlstore/migrator/dialect.go
+index 183b619de8..da21edeafa 100644
+--- a/pkg/services/sqlstore/migrator/dialect.go
++++ b/pkg/services/sqlstore/migrator/dialect.go
+@@ -368,7 +368,8 @@ func (b *BaseDialect) InsertQuery(tableName string, row map[string]any) (string,
+ 	for col := range row {
+ 		keys = append(keys, col)
+ 	}
+-	slices.Sort[string](keys)
++	slices.Sort(keys)
++	//slices.Sort[string](keys)
+ 
+ 	// build query and values
+ 	for _, col := range keys {
+@@ -398,7 +399,8 @@ func (b *BaseDialect) UpdateQuery(tableName string, row map[string]any, where ma
+ 	for col := range row {
+ 		keys = append(keys, col)
+ 	}
+-	slices.Sort[string](keys)
++	slices.Sort(keys)
++	//slices.Sort[string](keys)
+ 
+ 	// build update query and values
+ 	for _, col := range keys {
+@@ -411,7 +413,8 @@ func (b *BaseDialect) UpdateQuery(tableName string, row map[string]any, where ma
+ 	for col := range where {
+ 		keys = append(keys, col)
+ 	}
+-	slices.Sort[string](keys)
++	slices.Sort(keys)
++	//slices.Sort[string](keys)
+ 
+ 	// build where clause and values
+ 	for _, col := range keys {

SOURCES/0009-update-wrappers-and-systemd-with-distro-paths.patch

@@ -0,0 +1,76 @@
+From 5fe02f961e67af04907dc57beda42456128ab1c8 Mon Sep 17 00:00:00 2001
+From: Sam Feifer <sfeifer@redhat.com>
+Date: Fri, 1 Mar 2024 15:05:24 -0500
+Subject: [PATCH] update wrappers and systemd with distro paths
+
+
+diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
+index e3adc3f469..b2e4aced06 100644
+--- a/packaging/rpm/systemd/grafana-server.service
++++ b/packaging/rpm/systemd/grafana-server.service
+@@ -14,7 +14,7 @@ Restart=on-failure
+ WorkingDirectory=/usr/share/grafana
+ RuntimeDirectory=grafana
+ RuntimeDirectoryMode=0750
+-ExecStart=/usr/share/grafana/bin/grafana server                                     \
++ExecStart=/usr/sbin/grafana server                                     \
+                             --config=${CONF_FILE}                                   \
+                             --pidfile=${PID_FILE_DIR}/grafana-server.pid            \
+                             --packaging=rpm                                         \
+diff --git a/packaging/wrappers/grafana b/packaging/wrappers/grafana
+index 86e0fc9faa..5c88bae4c3 100755
+--- a/packaging/wrappers/grafana
++++ b/packaging/wrappers/grafana
+@@ -5,7 +5,7 @@
+ # the system-wide Grafana configuration that was bundled with the package as we
+ # use the binary.
+ 
+-DEFAULT=/etc/default/grafana
++DEFAULT=/etc/sysconfig/grafana-server
+ 
+ GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
+ 
+@@ -13,11 +13,12 @@ CONF_DIR=/etc/grafana
+ DATA_DIR=/var/lib/grafana
+ PLUGINS_DIR=/var/lib/grafana/plugins
+ LOG_DIR=/var/log/grafana
+++LIBEXEC_DIR=/usr/libexec/grafana
+ 
+ CONF_FILE=$CONF_DIR/grafana.ini
+ PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
+ 
+-EXECUTABLE="$GRAFANA_HOME/bin/grafana"
+++EXECUTABLE=$LIBEXEC_DIR/grafana
+ 
+ if [ ! -x $EXECUTABLE ]; then
+  echo "$EXECUTABLE not installed or not executable"
+@@ -46,4 +47,13 @@ if [ "$CMD" = cli ]; then
+        --pluginsDir=${PLUGINS_DIR}"
+ fi
+ 
+-eval $EXECUTABLE "$CMD" "$OPTS" "$@"
++if [ "$(id -u)" -eq 0 -o "$(id -g)" -eq 0 ]; then
++  cd "${GRAFANA_HOME}"
++  exec runuser -u "${GRAFANA_USER}" -- "$EXECUTABLE" "$CMD" "${OPTS[@]}" "$@"
++elif [ "$(id -u -n)" = "${GRAFANA_USER}" ]; then
++  cd "${GRAFANA_HOME}"
++  exec "$EXECUTABLE" "$CMD" "${OPTS[@]}" "$@"
++else
++  echo "$0: please run this script as user \"${GRAFANA_USER}\" or root."
++  exit 5
++fi
+\ No newline at end of file
+diff --git a/packaging/wrappers/grafana-server b/packaging/wrappers/grafana-server
+index 466b0d7c69..6be356f562 100755
+--- a/packaging/wrappers/grafana-server
++++ b/packaging/wrappers/grafana-server
+@@ -7,7 +7,8 @@
+ 
+ GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
+ 
+-EXECUTABLE="$GRAFANA_HOME/bin/grafana"
++LIBEXEC_DIR=/usr/libexec/grafana
++EXECUTABLE=$LIBEXEC_DIR/grafana
+ 
+ if [ ! -x $EXECUTABLE ]; then
+  echo "$EXECUTABLE not installed or not executable"

SOURCES/0010-remove-bcrypt-references.patch

@@ -0,0 +1,108 @@
+From eb711315d4c8a81ff52984293758a47372c21b8d Mon Sep 17 00:00:00 2001
+From: Sam Feifer <sfeifer@redhat.com>
+Date: Fri, 1 Mar 2024 15:07:22 -0500
+Subject: [PATCH] remove bcrypt references
+
+
+diff --git a/pkg/services/extsvcauth/oauthserver/oasimpl/service.go b/pkg/services/extsvcauth/oauthserver/oasimpl/service.go
+index 8c5a90248d..43f6d11e08 100644
+--- a/pkg/services/extsvcauth/oauthserver/oasimpl/service.go
++++ b/pkg/services/extsvcauth/oauthserver/oasimpl/service.go
+@@ -19,7 +19,6 @@ import (
+ 	"github.com/ory/fosite/compose"
+ 	"github.com/ory/fosite/storage"
+ 	"github.com/ory/fosite/token/jwt"
+-	"golang.org/x/crypto/bcrypt"
+ 
+ 	"github.com/grafana/grafana/pkg/api/routing"
+ 	"github.com/grafana/grafana/pkg/bus"
+@@ -235,88 +234,7 @@ func (s *OAuth2ServiceImpl) RemoveExternalService(ctx context.Context, name stri
+ // it ensures that the associated service account has the correct permissions.
+ // Database consistency is not guaranteed, consider changing this in the future.
+ func (s *OAuth2ServiceImpl) SaveExternalService(ctx context.Context, registration *extsvcauth.ExternalServiceRegistration) (*extsvcauth.ExternalService, error) {
+-	if registration == nil {
+-		s.logger.Warn("RegisterExternalService called without registration")
+-		return nil, nil
+-	}
+-	slug := registration.Name
+-	s.logger.Info("Registering external service", "external service", slug)
+-
+-	// Check if the client already exists in store
+-	client, errFetchExtSvc := s.sqlstore.GetExternalServiceByName(ctx, slug)
+-	if errFetchExtSvc != nil && !errors.Is(errFetchExtSvc, oauthserver.ErrClientNotFound) {
+-		s.logger.Error("Error fetching service", "external service", slug, "error", errFetchExtSvc)
+-		return nil, errFetchExtSvc
+-	}
+-	// Otherwise, create a new client
+-	if client == nil {
+-		s.logger.Debug("External service does not yet exist", "external service", slug)
+-		client = &oauthserver.OAuthExternalService{
+-			Name:             slug,
+-			ServiceAccountID: oauthserver.NoServiceAccountID,
+-			Audiences:        s.cfg.AppURL,
+-		}
+-	}
+-
+-	// Parse registration form to compute required permissions for the client
+-	client.SelfPermissions, client.ImpersonatePermissions = s.handleRegistrationPermissions(registration)
+-
+-	if registration.OAuthProviderCfg == nil {
+-		return nil, errors.New("missing oauth provider configuration")
+-	}
+-
+-	if registration.OAuthProviderCfg.RedirectURI != nil {
+-		client.RedirectURI = *registration.OAuthProviderCfg.RedirectURI
+-	}
+-
+-	var errGenCred error
+-	client.ClientID, client.Secret, errGenCred = s.genCredentials()
+-	if errGenCred != nil {
+-		s.logger.Error("Error generating credentials", "client", client.LogID(), "error", errGenCred)
+-		return nil, errGenCred
+-	}
+-
+-	grantTypes := s.computeGrantTypes(registration.Self.Enabled, registration.Impersonation.Enabled)
+-	client.GrantTypes = strings.Join(grantTypes, ",")
+-
+-	// Handle key options
+-	s.logger.Debug("Handle key options")
+-	keys, err := s.handleKeyOptions(ctx, registration.OAuthProviderCfg.Key)
+-	if err != nil {
+-		s.logger.Error("Error handling key options", "client", client.LogID(), "error", err)
+-		return nil, err
+-	}
+-	if keys != nil {
+-		client.PublicPem = []byte(keys.PublicPem)
+-	}
+-	dto := client.ToExternalService(keys)
+-
+-	hashedSecret, err := bcrypt.GenerateFromPassword([]byte(client.Secret), bcrypt.DefaultCost)
+-	if err != nil {
+-		s.logger.Error("Error hashing secret", "client", client.LogID(), "error", err)
+-		return nil, err
+-	}
+-	client.Secret = string(hashedSecret)
+-
+-	s.logger.Debug("Save service account")
+-	saID, errSaveServiceAccount := s.saService.ManageExtSvcAccount(ctx, &serviceaccounts.ManageExtSvcAccountCmd{
+-		ExtSvcSlug:  slugify.Slugify(client.Name),
+-		Enabled:     registration.Self.Enabled,
+-		OrgID:       oauthserver.TmpOrgID,
+-		Permissions: client.SelfPermissions,
+-	})
+-	if errSaveServiceAccount != nil {
+-		return nil, errSaveServiceAccount
+-	}
+-	client.ServiceAccountID = saID
+-
+-	err = s.sqlstore.SaveExternalService(ctx, client)
+-	if err != nil {
+-		s.logger.Error("Error saving external service", "client", client.LogID(), "error", err)
+-		return nil, err
+-	}
+-	s.logger.Debug("Registered", "client", client.LogID())
+-	return dto, nil
++	panic("bcrypt cipher not available")
+ }
+ 
+ // randString generates a a cryptographically secure random string of n bytes

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/0011-fix-dompurify-CVE.patch

@@ -0,0 +1,55 @@
+diff --git a/package.json b/package.json
+index 38deb6d7dee..010a24fb451 100644
+--- a/package.json
++++ b/package.json
+@@ -432,7 +432,8 @@
+     "react-split-pane@0.1.92": "patch:react-split-pane@npm:0.1.92#.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
+     "@storybook/blocks@7.4.5": "patch:@storybook/blocks@npm%3A7.4.5#./.yarn/patches/@storybook-blocks-npm-7.4.5-5a2374564a.patch",
+     "history@4.10.1": "patch:history@npm%3A4.10.1#./.yarn/patches/history-npm-4.10.1-ee217563ae.patch",
+-    "history@^4.9.0": "patch:history@npm%3A4.10.1#./.yarn/patches/history-npm-4.10.1-ee217563ae.patch"
++    "history@^4.9.0": "patch:history@npm%3A4.10.1#./.yarn/patches/history-npm-4.10.1-ee217563ae.patch",
++    "dompurify": "^2.5.0"
+   },
+   "workspaces": {
+     "packages": [
+diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
+index 2182744e61b..4201ef58dda 100644
+--- a/packages/grafana-data/package.json
++++ b/packages/grafana-data/package.json
+@@ -41,7 +41,7 @@
+     "@types/string-hash": "1.1.1",
+     "d3-interpolate": "3.0.1",
+     "date-fns": "2.30.0",
+-    "dompurify": "^2.4.3",
++    "dompurify": "^2.5.0",
+     "eventemitter3": "5.0.1",
+     "fast_array_intersect": "1.1.0",
+     "history": "4.10.1",
+diff --git a/yarn.lock b/yarn.lock
+index bf22ba52a17..88fc4d3fbfb 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2953,7 +2953,7 @@ __metadata:
+     "@types/tinycolor2": "npm:1.4.3"
+     d3-interpolate: "npm:3.0.1"
+     date-fns: "npm:2.30.0"
+-    dompurify: "npm:^2.4.3"
++    dompurify: "npm:^2.5.0"
+     esbuild: "npm:0.18.12"
+     eventemitter3: "npm:5.0.1"
+     fast_array_intersect: "npm:1.1.0"
+@@ -14478,10 +14478,10 @@ __metadata:
+   languageName: node
+   linkType: hard
+ 
+-"dompurify@npm:^2.2.0, dompurify@npm:^2.4.3":
+-  version: 2.4.5
+-  resolution: "dompurify@npm:2.4.5"
+-  checksum: d764c2ff126b3749dad35bc34eed40f51141d7dfd620e938c92f08d68c32beeb259d06abadeee91f6e2a8c8737ce670e2124ac9a257ba3bcdc666598cebcde01
++"dompurify@npm:^2.5.0":
++  version: 2.5.7
++  resolution: "dompurify@npm:2.5.7"
++  checksum: b150ca1e28083252cd51097162dc96cb45203f7e2af1fbaa8ef32b4f4d6b605e4aa8915190d38bd0635cbbf14d13a200138cd3ec1b084096819b14c718355122
+   languageName: node
+   linkType: hard
+ 

SOURCES/0011-remove-email-lookup.patch

@@ -1,61 +0,0 @@
-commit bae86dbeb0
-Author: Ieva <ieva.vasiljeva@grafana.com>
-Date:   Tue Jun 6 17:45:31 2023 +0100
-
-    Auth: Remove Email Lookup from oauth integrations 9.2 (#898)
-    
-    backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.3.x
-
-diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
-index 22014aee43..af00c56a68 100644
---- a/pkg/api/login_oauth.go
-+++ b/pkg/api/login_oauth.go
-@@ -302,16 +302,17 @@
- 	connect social.SocialConnector,
- ) (*user.User, error) {
- 	oauthLogger.Debug("Syncing Grafana user with corresponding OAuth profile")
-+	lookupParams := models.UserLookupParams{}
-+	if hs.Cfg.OAuthAllowInsecureEmailLookup {
-+		lookupParams.Email = &extUser.Email
-+	}
-+
- 	// add/update user in Grafana
- 	cmd := &models.UpsertUserCommand{
--		ReqContext:    ctx,
--		ExternalUser:  extUser,
--		SignupAllowed: connect.IsSignupAllowed(),
--		UserLookupParams: models.UserLookupParams{
--			Email:  &extUser.Email,
--			UserID: nil,
--			Login:  nil,
--		},
-+		ReqContext:       ctx,
-+		ExternalUser:     extUser,
-+		SignupAllowed:    connect.IsSignupAllowed(),
-+		UserLookupParams: lookupParams,
- 	}
- 
- 	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
---- a/pkg/setting/setting.go
-+++ b/pkg/setting/setting.go
-@@ -318,7 +318,8 @@
- 	AuthProxySyncTTL          int
- 
- 	// OAuth
--	OAuthCookieMaxAge int
-+	OAuthCookieMaxAge             int
-+	OAuthAllowInsecureEmailLookup bool
- 
- 	// JWT Auth
- 	JWTAuthEnabled                 bool
-@@ -1256,6 +1256,8 @@
- 		return err
- 	}
- 
-+	cfg.OAuthAllowInsecureEmailLookup = auth.Key("oauth_allow_insecure_email_lookup").MustBool(false)
-+
- 	const defaultMaxLifetime = "30d"
- 	maxLifetimeDurationVal := valueAsString(auth, "login_maximum_lifetime_duration", defaultMaxLifetime)
- 	cfg.LoginMaxLifetime, err = gtime.ParseDuration(maxLifetimeDurationVal)

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/0012-fix-jwt-CVE.patch

@@ -0,0 +1,28 @@
+diff --git a/go.mod b/go.mod
+index fcbc09da5e6..1771902bc1c 100644
+--- a/go.mod
++++ b/go.mod
+@@ -164,7 +164,7 @@ require (
+ 	github.com/go-openapi/spec v0.20.9 // indirect
+ 	github.com/go-openapi/swag v0.22.4 // indirect
+ 	github.com/go-openapi/validate v0.22.1 // indirect
+-	github.com/golang-jwt/jwt/v4 v4.5.0 // @grafana/backend-platform
++	github.com/golang-jwt/jwt/v4 v4.5.2 // @grafana/backend-platform
+ 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+ 	github.com/golang/glog v1.1.2 // indirect
+ 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+diff --git a/go.sum b/go.sum
+index d05dfb55fd4..3a045f712eb 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1593,8 +1593,9 @@ github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw
+ github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+ github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+ github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
++github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
++github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+ github.com/golang-migrate/migrate/v4 v4.7.0 h1:gONcHxHApDTKXDyLH/H97gEHmpu1zcnnbAaq2zgrPrs=
+ github.com/golang-migrate/migrate/v4 v4.7.0/go.mod h1:Qvut3N4xKWjoH3sokBccML6WyHSnggXm/DvMMnTsQIc=
+ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=

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

@@ -1,18 +1,14 @@
-From 9900159635d616f01fb1be98ef94145637d06d07 Mon Sep 17 00:00:00 2001
+From 2d4314b5ca1e527a3420fad11d3f1a25351700d4 Mon Sep 17 00:00:00 2001
 From: Sam Feifer <sfeifer@redhat.com>
-Date: Tue, 13 May 2025 11:33:22 -0400
+Date: Wed, 7 May 2025 16:27:08 -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
+index e1e5468bfa3..4221144bf54 100644
 --- a/conf/defaults.ini
 +++ b/conf/defaults.ini
-@@ -310,7 +310,7 @@ x_xss_protection = true
+@@ -363,7 +363,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.
@@ -22,10 +18,10 @@ index 2d6e1235b60..cf1ce8a962f 100644
  # 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
+index 51d2b6c512b..fd588b48225 100644
 --- a/conf/sample.ini
 +++ b/conf/sample.ini
-@@ -310,7 +310,7 @@
+@@ -364,7 +364,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.
@@ -34,6 +30,3 @@ index 227c90e895d..19afa036b9b 100644
  
  # 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/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-Fix-CVE-2026-21721.patch

@@ -0,0 +1,49 @@
+From 3efa5e004426fed8f25ec513f2dce4658e3b6564 Mon Sep 17 00:00:00 2001
+From: Sam Feifer <sfeifer@redhat.com>
+Date: Mon, 16 Feb 2026 15:35:19 -0500
+Subject: [PATCH] Fix CVE-2026-21721
+
+---
+ pkg/api/api.go | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/pkg/api/api.go b/pkg/api/api.go
+index 3db3cbafe73..b8c1dd5736e 100644
+--- a/pkg/api/api.go
++++ b/pkg/api/api.go
+@@ -461,12 +461,13 @@ func (hs *HTTPServer) registerRoutes() {
+ 			dashboardRoute.Get("/uid/:uid", authorize(ac.EvalPermission(dashboards.ActionDashboardsRead)), routing.Wrap(hs.GetDashboard))
+ 			dashboardRoute.Delete("/uid/:uid", authorize(ac.EvalPermission(dashboards.ActionDashboardsDelete)), routing.Wrap(hs.DeleteDashboardByUID))
+ 			dashboardRoute.Group("/uid/:uid", func(dashUidRoute routing.RouteRegister) {
++				dashUIDScope := dashboards.ScopeDashboardsProvider.GetResourceScopeUID(ac.Parameter(":uid"))
+ 				dashUidRoute.Get("/versions", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.GetDashboardVersions))
+ 				dashUidRoute.Post("/restore", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.RestoreDashboardVersion))
+ 				dashUidRoute.Get("/versions/:id", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.GetDashboardVersion))
+ 				dashUidRoute.Group("/permissions", func(dashboardPermissionRoute routing.RouteRegister) {
+-					dashboardPermissionRoute.Get("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsRead)), routing.Wrap(hs.GetDashboardPermissionList))
+-					dashboardPermissionRoute.Post("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite)), routing.Wrap(hs.UpdateDashboardPermissions))
++					dashboardPermissionRoute.Get("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsRead, dashUIDScope)), routing.Wrap(hs.GetDashboardPermissionList))
++					dashboardPermissionRoute.Post("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite, dashUIDScope)), routing.Wrap(hs.UpdateDashboardPermissions))
+ 				})
+ 			})
+ 
+@@ -481,13 +482,14 @@ func (hs *HTTPServer) registerRoutes() {
+ 
+ 			// Deprecated: use /uid/:uid API instead.
+ 			dashboardRoute.Group("/id/:dashboardId", func(dashIdRoute routing.RouteRegister) {
++				dashIDScope := dashboards.ScopeDashboardsProvider.GetResourceScope(ac.Parameter(":dashboardId"))
+ 				dashIdRoute.Get("/versions", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.GetDashboardVersions))
+ 				dashIdRoute.Get("/versions/:id", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.GetDashboardVersion))
+ 				dashIdRoute.Post("/restore", authorize(ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.RestoreDashboardVersion))
+ 
+ 				dashIdRoute.Group("/permissions", func(dashboardPermissionRoute routing.RouteRegister) {
+-					dashboardPermissionRoute.Get("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsRead)), routing.Wrap(hs.GetDashboardPermissionList))
+-					dashboardPermissionRoute.Post("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite)), routing.Wrap(hs.UpdateDashboardPermissions))
++					dashboardPermissionRoute.Get("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsRead, dashIDScope)), routing.Wrap(hs.GetDashboardPermissionList))
++					dashboardPermissionRoute.Post("/", authorize(ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite, dashIDScope)), routing.Wrap(hs.UpdateDashboardPermissions))
+ 				})
+ 			})
+ 		})
+-- 
+2.52.0
+

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/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

@@ -107,37 +107,29 @@ index 0000000000..e244fb5663
 +	panic("boringcrypto: not available")
 +}
 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 @@
+@@ -19,8 +19,11 @@ pbkdf2.Key.
- package pbkdf2
+ 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 @@
+@@ -40,6 +43,10 @@ import (
- // derived based on the method described as PBKDF2 with the HMAC variant using
+ // Using a higher iteration count will increase the cost of an exhaustive
- // the supplied hash function.
+ // 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)
+ 	prf := hmac.New(h, password)
- 	if err != nil {
+ 	hashLen := prf.Size()
- 		// FIPS 140 enforcement, or an invalid key length.
+ 	numBlocks := (keyLen + hashLen - 1) / hashLen
-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

SOURCES/1004-vendor-Redacted-Url-in-logs.patch

@@ -0,0 +1,51 @@
+diff --git a/vendor/github.com/hashicorp/go-retryablehttp/client.go b/vendor/github.com/hashicorp/go-retryablehttp/client.go
+index f40d241..765a828 100644
+--- a/vendor/github.com/hashicorp/go-retryablehttp/client.go
++++ b/vendor/github.com/hashicorp/go-retryablehttp/client.go
+@@ -584,9 +584,9 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
+ 	if logger != nil {
+ 		switch v := logger.(type) {
+ 		case LeveledLogger:
+-			v.Debug("performing request", "method", req.Method, "url", req.URL)
++			v.Debug("performing request", "method", req.Method, "url", req.URL.Redacted())
+ 		case Logger:
+-			v.Printf("[DEBUG] %s %s", req.Method, req.URL)
++			v.Printf("[DEBUG] %s %s", req.Method, req.URL.Redacted())
+ 		}
+ 	}
+ 
+@@ -641,9 +641,9 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
+ 		if err != nil {
+ 			switch v := logger.(type) {
+ 			case LeveledLogger:
+-				v.Error("request failed", "error", err, "method", req.Method, "url", req.URL)
++				v.Error("request failed", "error", err, "method", req.Method, "url", req.URL.Redacted())
+ 			case Logger:
+-				v.Printf("[ERR] %s %s request failed: %v", req.Method, req.URL, err)
++				v.Printf("[ERR] %s %s request failed: %v", req.Method, req.URL.Redacted(), err)
+ 			}
+ 		} else {
+ 			// Call this here to maintain the behavior of logging all requests,
+@@ -679,7 +679,7 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
+ 
+ 		wait := c.Backoff(c.RetryWaitMin, c.RetryWaitMax, i, resp)
+ 		if logger != nil {
+-			desc := fmt.Sprintf("%s %s", req.Method, req.URL)
++			desc := fmt.Sprintf("%s %s", req.Method, req.URL.Redacted())
+ 			if resp != nil {
+ 				desc = fmt.Sprintf("%s (status: %d)", desc, resp.StatusCode)
+ 			}
+@@ -735,11 +735,11 @@ func (c *Client) Do(req *Request) (*http.Response, error) {
+ 	// communicate why
+ 	if err == nil {
+ 		return nil, fmt.Errorf("%s %s giving up after %d attempt(s)",
+-			req.Method, req.URL, attempt)
++			req.Method, req.URL.Redacted(), attempt)
+ 	}
+ 
+ 	return nil, fmt.Errorf("%s %s giving up after %d attempt(s): %w",
+-		req.Method, req.URL, attempt, err)
++		req.Method, req.URL.Redacted(), attempt, err)
+ }
+ 
+ // Try to read the response body so we can reuse this connection.

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,7 @@ 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 < ../0012-fix-jwt-CVE.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
@@ -32,9 +31,28 @@ make gen-go
 rm -r vendor/golang.org/x/crypto/bcrypt
 rm -r vendor/golang.org/x/crypto/blowfish
 rm -r vendor/golang.org/x/crypto/cast5
-rm -r vendor/golang.org/x/crypto/openpgp/elgamal
+rm -r vendor/golang.org/x/crypto/acme
-rm    vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
+rm -r vendor/golang.org/x/crypto/argon2
-rm -r vendor/golang.org/x/crypto/pkcs12/internal/rc2
+rm -r vendor/golang.org/x/crypto/blake2b
+rm -r vendor/golang.org/x/crypto/chacha20
+rm -r vendor/golang.org/x/crypto/chacha20poly1305
+rm -r vendor/golang.org/x/crypto/cryptobyte
+rm -r vendor/golang.org/x/crypto/curve25519
+rm -r vendor/golang.org/x/crypto/ed25519
+rm -r vendor/golang.org/x/crypto/hkdf
+rm -r vendor/golang.org/x/crypto/internal
+rm -r vendor/golang.org/x/crypto/md4
+rm -r vendor/golang.org/x/crypto/nacl
+rm -r vendor/golang.org/x/crypto/openpgp
+rm -r vendor/golang.org/x/crypto/pkcs12
+rm -r vendor/golang.org/x/crypto/poly1305
+rm -r vendor/golang.org/x/crypto/salsa20
+rm -r vendor/golang.org/x/crypto/scrypt
+rm -r vendor/golang.org/x/crypto/sha3
+
+# Remove unused code under apsl licenses
+rm -r vendor/modernc.org/libc
+rm -r vendor/modernc.org/sqlite
 
 # List bundled dependencies
 awk '$2 ~ /^v/ && $4 != "indirect" {print "Provides: bundled(golang(" $1 ")) = " substr($2, 2)}' go.mod | \
@@ -42,7 +60,7 @@ 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
+patch -p1 --fuzz=0 < ../0011-fix-dompurify-CVE.patch
 export HUSKY=0
 yarn install --frozen-lockfile
 
@@ -67,3 +85,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:39
 
 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

@@ -5,6 +5,7 @@
 
 /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)
+/usr/sbin/grafana				        --	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)

SOURCES/grafana.sysusers

@@ -1,2 +1,2 @@
 #Type Name    ID GECOS                  Home directory
-u     grafana -  "Grafana user account" /usr/share/grafana
+u     grafana -  "Grafana user account" /var/lib/grafana

SOURCES/grafana.te

@@ -27,13 +27,6 @@ gen_tunable(grafana_can_tcp_connect_elasticsearch_port, false)
 ## </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
@@ -41,6 +34,19 @@ gen_tunable(grafana_can_tcp_connect_postgresql_port, false)
 ## </desc>
 gen_tunable(grafana_can_tcp_connect_prometheus_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 ldap's tcp port           
+## </p>            
+## </desc>  
+gen_tunable(grafana_can_tcp_connect_ldap_port, false)
 
 type grafana_t;
 type grafana_exec_t;
@@ -95,6 +101,9 @@ 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 grafana_var_lib_t:file { execute execute_no_trans };
+allow grafana_t grafana_var_lib_t:file map;
+
 allow grafana_t self:unix_stream_socket connectto;
 
 allow grafana_t self:netlink_route_socket { create bind getattr nlmsg_read };
@@ -117,6 +126,14 @@ optional_policy(`
 	allow grafana_t smtp_port_t:tcp_socket name_connect;
 ')
 
+optional_policy(`
+	require {
+		type ntop_port_t;
+		class tcp_socket { name_bind };
+	}
+	allow grafana_t ntop_port_t:tcp_socket name_bind;
+')
+
 optional_policy(`
 	require {
 		type usr_t;
@@ -136,6 +153,14 @@ optional_policy(`
 	allow grafana_t postgresql_var_run_t:sock_file write;
 ')
 
+optional_policy(`
+	require {
+		type proc_net_t;
+		class lnk_file { read };
+	}
+	allow grafana_t proc_net_t:lnk_file read;
+')
+
 optional_policy(`
 	require {
 		type autofs_t;
@@ -144,6 +169,14 @@ optional_policy(`
 	allow grafana_t autofs_t:dir getattr;
 ')
 
+optional_policy(`
+	require {
+		type postfix_local_t;
+		class dir { search };
+	}
+	allow postfix_local_t grafana_var_lib_t:dir search;
+')
+
 manage_dirs_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
 manage_files_pattern(grafana_t, grafana_conf_t, grafana_conf_t)
 
@@ -215,6 +248,10 @@ tunable_policy(`grafana_can_tcp_connect_postgresql_port',` # Postgresql default
 	corenet_tcp_connect_postgresql_port(grafana_t)
 ')
 
+tunable_policy(`grafana_can_tcp_connect_ldap_port',`
+	corenet_tcp_connect_ldap_port(grafana_t)
+')
+
 optional_policy(`
     systemd_private_tmp(grafana_tmp_t)
 ')