FreeBSD Bugzilla – Attachment 235378 Details for
Bug 265330
www/grafana{8,9}: Update to 8.5.9 and 9.0.3 (Fixes security vulnerability)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
grafana9.diff
grafana9.diff (text/plain), 15.79 KB, created by
Boris Korzun
on 2022-07-20 08:16:24 UTC
(
hide
)
Description:
grafana9.diff
Filename:
MIME Type:
Creator:
Boris Korzun
Created:
2022-07-20 08:16:24 UTC
Size:
15.79 KB
patch
obsolete
>diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile >index 1b3255415ade..9b6766500143 100644 >--- a/www/grafana9/Makefile >+++ b/www/grafana9/Makefile >@@ -1,7 +1,6 @@ > PORTNAME= grafana > DISTVERSIONPREFIX= v >-DISTVERSION= 9.0.2 >-PORTREVISION= 1 >+DISTVERSION= 9.0.3 > CATEGORIES= www > MASTER_SITES= https://dl.grafana.com/oss/release/:public \ > https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod >@@ -25,7 +24,7 @@ USES= cpe go:modules > USE_GITHUB= yes > > USE_RC_SUBR= grafana >-TAG= 0641b5d >+TAG= 023f925 > > GO_MODULE= github.com/grafana/grafana > GO_TARGET= ./pkg/cmd/grafana-server \ >diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo >index 79e0f769332a..5f47ba9f50c7 100644 >--- a/www/grafana9/distinfo >+++ b/www/grafana9/distinfo >@@ -1,7 +1,7 @@ >-TIMESTAMP = 1656443884 >-SHA256 (go/www_grafana9/grafana-grafana-v9.0.2_GH0/grafana-9.0.2.linux-amd64.tar.gz) = 50dd7927c1313e47a30f531d0e3f145297c485666865a97a6c936427dd8a55fd >-SIZE (go/www_grafana9/grafana-grafana-v9.0.2_GH0/grafana-9.0.2.linux-amd64.tar.gz) = 79887781 >-SHA256 (go/www_grafana9/grafana-grafana-v9.0.2_GH0/go.mod) = a84b5b1b3e321ef645d4da02224c9a90cc13ca79a456795c4b7b1c4df2afa178 >-SIZE (go/www_grafana9/grafana-grafana-v9.0.2_GH0/go.mod) = 16817 >-SHA256 (go/www_grafana9/grafana-grafana-v9.0.2_GH0/grafana-grafana-v9.0.2_GH0.tar.gz) = 77607c4b215164d74ff8e8d75e2a2b72edbaa0afb6e968120b1c3aa508315c29 >-SIZE (go/www_grafana9/grafana-grafana-v9.0.2_GH0/grafana-grafana-v9.0.2_GH0.tar.gz) = 19275491 >+TIMESTAMP = 1657870972 >+SHA256 (go/www_grafana9/grafana-grafana-v9.0.3_GH0/grafana-9.0.3.linux-amd64.tar.gz) = 9765d30b43b121e503e2c8cce30f56b13f6ce5a9068d6a459a7667988fef4840 >+SIZE (go/www_grafana9/grafana-grafana-v9.0.3_GH0/grafana-9.0.3.linux-amd64.tar.gz) = 79863142 >+SHA256 (go/www_grafana9/grafana-grafana-v9.0.3_GH0/go.mod) = a84b5b1b3e321ef645d4da02224c9a90cc13ca79a456795c4b7b1c4df2afa178 >+SIZE (go/www_grafana9/grafana-grafana-v9.0.3_GH0/go.mod) = 16817 >+SHA256 (go/www_grafana9/grafana-grafana-v9.0.3_GH0/grafana-grafana-v9.0.3_GH0.tar.gz) = 5700977116fbf592039068cc2b4ff8a3d36b0f99f0570cf4196fe3ba71957b4e >+SIZE (go/www_grafana9/grafana-grafana-v9.0.3_GH0/grafana-grafana-v9.0.3_GH0.tar.gz) = 19221715 >diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist >index 99cf25b208af..be98d1c15a52 100644 >--- a/www/grafana9/pkg-plist >+++ b/www/grafana9/pkg-plist >@@ -2197,7 +2197,6 @@ bin/grafana-server > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/MetricNamespaceField.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/MetricsQueryEditor.tsx >-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/NewDimensionFields.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/TimeGrainField.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/TopField.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts >@@ -2207,7 +2206,6 @@ bin/grafana-server > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/QueryEditor.test.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/QueryEditor.tsx >-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/QueryTypeField.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/index.tsx > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/usePreparedQuery.ts > %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryHeader.tsx >@@ -3359,8 +3357,8 @@ bin/grafana-server > %%DATADIR%%/public/build/2898.ee30259e67861985f3ac.js > %%DATADIR%%/public/build/2898.ee30259e67861985f3ac.js.LICENSE.txt > %%DATADIR%%/public/build/2898.ee30259e67861985f3ac.js.map >-%%DATADIR%%/public/build/2949.c29d29c0c9b465809eee.js >-%%DATADIR%%/public/build/2949.c29d29c0c9b465809eee.js.map >+%%DATADIR%%/public/build/2949.153ca6b910fb0089ff40.js >+%%DATADIR%%/public/build/2949.153ca6b910fb0089ff40.js.map > %%DATADIR%%/public/build/3109.f9ae9a721ebd3d2bc8d5.js > %%DATADIR%%/public/build/3109.f9ae9a721ebd3d2bc8d5.js.LICENSE.txt > %%DATADIR%%/public/build/3109.f9ae9a721ebd3d2bc8d5.js.map >@@ -3421,9 +3419,9 @@ bin/grafana-server > %%DATADIR%%/public/build/4018.d6ced1ac45379a7a9890.js > %%DATADIR%%/public/build/4018.d6ced1ac45379a7a9890.js.LICENSE.txt > %%DATADIR%%/public/build/4018.d6ced1ac45379a7a9890.js.map >-%%DATADIR%%/public/build/4027.8dfc68b1a209650f62f9.js >-%%DATADIR%%/public/build/4027.8dfc68b1a209650f62f9.js.LICENSE.txt >-%%DATADIR%%/public/build/4027.8dfc68b1a209650f62f9.js.map >+%%DATADIR%%/public/build/4027.01fc91c6c52d332b25c7.js >+%%DATADIR%%/public/build/4027.01fc91c6c52d332b25c7.js.LICENSE.txt >+%%DATADIR%%/public/build/4027.01fc91c6c52d332b25c7.js.map > %%DATADIR%%/public/build/4061.74e07961d07e02685621.js > %%DATADIR%%/public/build/4061.74e07961d07e02685621.js.LICENSE.txt > %%DATADIR%%/public/build/4061.74e07961d07e02685621.js.map >@@ -3435,9 +3433,9 @@ bin/grafana-server > %%DATADIR%%/public/build/4149.7e0850afb95ad68daedd.js > %%DATADIR%%/public/build/4149.7e0850afb95ad68daedd.js.LICENSE.txt > %%DATADIR%%/public/build/4149.7e0850afb95ad68daedd.js.map >-%%DATADIR%%/public/build/4165.a9b358b834ad650ad17b.js >-%%DATADIR%%/public/build/4165.a9b358b834ad650ad17b.js.LICENSE.txt >-%%DATADIR%%/public/build/4165.a9b358b834ad650ad17b.js.map >+%%DATADIR%%/public/build/4165.3b964a0e5f30590b4692.js >+%%DATADIR%%/public/build/4165.3b964a0e5f30590b4692.js.LICENSE.txt >+%%DATADIR%%/public/build/4165.3b964a0e5f30590b4692.js.map > %%DATADIR%%/public/build/427.1cacd87909381cf09f25.js > %%DATADIR%%/public/build/427.1cacd87909381cf09f25.js.LICENSE.txt > %%DATADIR%%/public/build/427.1cacd87909381cf09f25.js.map >@@ -3464,9 +3462,6 @@ bin/grafana-server > %%DATADIR%%/public/build/474.750597ccc4879f01446e.js > %%DATADIR%%/public/build/474.750597ccc4879f01446e.js.LICENSE.txt > %%DATADIR%%/public/build/474.750597ccc4879f01446e.js.map >-%%DATADIR%%/public/build/4902.331bf177ac0b86d7f476.js >-%%DATADIR%%/public/build/4902.331bf177ac0b86d7f476.js.LICENSE.txt >-%%DATADIR%%/public/build/4902.331bf177ac0b86d7f476.js.map > %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js > %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.LICENSE.txt > %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.map >@@ -3586,8 +3581,8 @@ bin/grafana-server > %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js > %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js.LICENSE.txt > %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js.map >-%%DATADIR%%/public/build/8960.9890385b7d11c92b9280.js >-%%DATADIR%%/public/build/8960.9890385b7d11c92b9280.js.map >+%%DATADIR%%/public/build/8960.f4684cfb9d427d035845.js >+%%DATADIR%%/public/build/8960.f4684cfb9d427d035845.js.map > %%DATADIR%%/public/build/8969.ed5c339f5775e8b723b8.js > %%DATADIR%%/public/build/8969.ed5c339f5775e8b723b8.js.LICENSE.txt > %%DATADIR%%/public/build/8969.ed5c339f5775e8b723b8.js.map >@@ -3604,8 +3599,8 @@ bin/grafana-server > %%DATADIR%%/public/build/9104.fd16558b8dbcf348e1f5.js > %%DATADIR%%/public/build/9104.fd16558b8dbcf348e1f5.js.LICENSE.txt > %%DATADIR%%/public/build/9104.fd16558b8dbcf348e1f5.js.map >-%%DATADIR%%/public/build/9168.28cf79aecc6e76cbeb95.js >-%%DATADIR%%/public/build/9168.28cf79aecc6e76cbeb95.js.map >+%%DATADIR%%/public/build/9168.ef33458a94f37200941b.js >+%%DATADIR%%/public/build/9168.ef33458a94f37200941b.js.map > %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js > %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js.LICENSE.txt > %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js.map >@@ -3625,10 +3620,13 @@ bin/grafana-server > %%DATADIR%%/public/build/957.2ed581c4e92208ec51e4.js.map > %%DATADIR%%/public/build/9586.765861b89116524c9aec.js > %%DATADIR%%/public/build/9586.765861b89116524c9aec.js.map >-%%DATADIR%%/public/build/97.7e976d9dfaf3b3e213b2.js >-%%DATADIR%%/public/build/97.7e976d9dfaf3b3e213b2.js.map >+%%DATADIR%%/public/build/97.955595094420aee4b206.js >+%%DATADIR%%/public/build/97.955595094420aee4b206.js.map > %%DATADIR%%/public/build/9705.5e0913e1227370857d7a.js > %%DATADIR%%/public/build/9705.5e0913e1227370857d7a.js.map >+%%DATADIR%%/public/build/9809.fda1ab8a7d47805687a6.js >+%%DATADIR%%/public/build/9809.fda1ab8a7d47805687a6.js.LICENSE.txt >+%%DATADIR%%/public/build/9809.fda1ab8a7d47805687a6.js.map > %%DATADIR%%/public/build/9848.7c39428bbaa18e95ee82.js > %%DATADIR%%/public/build/9848.7c39428bbaa18e95ee82.js.LICENSE.txt > %%DATADIR%%/public/build/9848.7c39428bbaa18e95ee82.js.map >@@ -3644,8 +3642,8 @@ bin/grafana-server > %%DATADIR%%/public/build/AlertGroups.98ab02c233dab193b78e.js.map > %%DATADIR%%/public/build/AlertRuleList.127ffbe22c8c11985cdc.js > %%DATADIR%%/public/build/AlertRuleList.127ffbe22c8c11985cdc.js.map >-%%DATADIR%%/public/build/AlertRuleListIndex.3a18b8b44ecf8b15b232.js >-%%DATADIR%%/public/build/AlertRuleListIndex.3a18b8b44ecf8b15b232.js.map >+%%DATADIR%%/public/build/AlertRuleListIndex.9cec8b2b3fa934d35f27.js >+%%DATADIR%%/public/build/AlertRuleListIndex.9cec8b2b3fa934d35f27.js.map > %%DATADIR%%/public/build/AlertSilences.5c41dd28003455689d75.js > %%DATADIR%%/public/build/AlertSilences.5c41dd28003455689d75.js.map > %%DATADIR%%/public/build/AlertTabCtrl.eb9861cada4d823eed40.js >@@ -3675,12 +3673,12 @@ bin/grafana-server > %%DATADIR%%/public/build/CloudAdminPage.53112753380f843c0d2e.js.map > %%DATADIR%%/public/build/CreateTeam.73c8a6ba12c99f27c0a9.js > %%DATADIR%%/public/build/CreateTeam.73c8a6ba12c99f27c0a9.js.map >-%%DATADIR%%/public/build/DashboardImport.03d2a48d9fb4cce77967.js >-%%DATADIR%%/public/build/DashboardImport.03d2a48d9fb4cce77967.js.map >+%%DATADIR%%/public/build/DashboardImport.eb3a3448f35ab8116a37.js >+%%DATADIR%%/public/build/DashboardImport.eb3a3448f35ab8116a37.js.map > %%DATADIR%%/public/build/DashboardListPage.4edf25537c58e0b7c069.js > %%DATADIR%%/public/build/DashboardListPage.4edf25537c58e0b7c069.js.map >-%%DATADIR%%/public/build/DashboardPage.53b203c85adb3a57b1ac.js >-%%DATADIR%%/public/build/DashboardPage.53b203c85adb3a57b1ac.js.map >+%%DATADIR%%/public/build/DashboardPage.71115c67c7439b35e783.js >+%%DATADIR%%/public/build/DashboardPage.71115c67c7439b35e783.js.map > %%DATADIR%%/public/build/DataSourceDashboards.5a3cd174db3226094ea8.js > %%DATADIR%%/public/build/DataSourceDashboards.5a3cd174db3226094ea8.js.map > %%DATADIR%%/public/build/DataSourceSettingsPage.c968388d22c7258c1511.js >@@ -3769,10 +3767,10 @@ bin/grafana-server > %%DATADIR%%/public/build/UsersListPage.9b63bff5372bebea07b7.js.map > %%DATADIR%%/public/build/alertmanagerPlugin.f2abcf686c9ac0a4bcb1.js > %%DATADIR%%/public/build/alertmanagerPlugin.f2abcf686c9ac0a4bcb1.js.map >-%%DATADIR%%/public/build/app.4f1e2e0ad150c4263b4c.js >-%%DATADIR%%/public/build/app.4f1e2e0ad150c4263b4c.js.map >-%%DATADIR%%/public/build/azureMonitorPlugin.320e977ad6fe44144e20.js >-%%DATADIR%%/public/build/azureMonitorPlugin.320e977ad6fe44144e20.js.map >+%%DATADIR%%/public/build/app.6e1383c4cebd0dd8ad2f.js >+%%DATADIR%%/public/build/app.6e1383c4cebd0dd8ad2f.js.map >+%%DATADIR%%/public/build/azureMonitorPlugin.dcdd38e4ee204b628148.js >+%%DATADIR%%/public/build/azureMonitorPlugin.dcdd38e4ee204b628148.js.map > %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js > %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js.map > %%DATADIR%%/public/build/canvasPanel.0699b14dc04956d607e8.js >@@ -3787,13 +3785,13 @@ bin/grafana-server > %%DATADIR%%/public/build/elasticsearchPlugin.088f0f9cf1a569c3df3c.js.map > %%DATADIR%%/public/build/explore-feature-toggle-page.5825b60e5977b5006b57.js > %%DATADIR%%/public/build/explore-feature-toggle-page.5825b60e5977b5006b57.js.map >-%%DATADIR%%/public/build/explore.9e73e28ed9b7d683870e.js >-%%DATADIR%%/public/build/explore.9e73e28ed9b7d683870e.js.map >+%%DATADIR%%/public/build/explore.a59ed286d5af3586a0f2.js >+%%DATADIR%%/public/build/explore.a59ed286d5af3586a0f2.js.map > %%DATADIR%%/public/build/fa56cd4c6b700e0392d0.ttf > %%DATADIR%%/public/build/geomapPanel.3b19bb4cbc2d262b5f56.js > %%DATADIR%%/public/build/geomapPanel.3b19bb4cbc2d262b5f56.js.map >-%%DATADIR%%/public/build/grafana.dark.aa5870505532d2a6f5be.css >-%%DATADIR%%/public/build/grafana.light.bf287b40b23a8f1fc19c.css >+%%DATADIR%%/public/build/grafana.dark.4abbc783977ac5086f80.css >+%%DATADIR%%/public/build/grafana.light.974ddb06f8133af58758.css > %%DATADIR%%/public/build/grafanaPlugin.8c35c5624175da57dce3.js > %%DATADIR%%/public/build/grafanaPlugin.8c35c5624175da57dce3.js.map > %%DATADIR%%/public/build/graphPlugin.72043d1c88cb05e9cdc9.js >@@ -3804,13 +3802,13 @@ bin/grafana-server > %%DATADIR%%/public/build/heatmapPlugin.023404025d5e6228a049.js.map > %%DATADIR%%/public/build/iconPanel.f9129614ef572cb76841.js > %%DATADIR%%/public/build/iconPanel.f9129614ef572cb76841.js.map >-%%DATADIR%%/public/build/influxdbPlugin.94c35fd39f967eb67896.js >-%%DATADIR%%/public/build/influxdbPlugin.94c35fd39f967eb67896.js.map >+%%DATADIR%%/public/build/influxdbPlugin.b76d815b7be79e3aa808.js >+%%DATADIR%%/public/build/influxdbPlugin.b76d815b7be79e3aa808.js.map > %%DATADIR%%/public/build/jaegerPlugin.3f61070f7389bacb6ab3.js > %%DATADIR%%/public/build/jaegerPlugin.3f61070f7389bacb6ab3.js.map > %%DATADIR%%/public/build/light.5426d998b6eeec3b6f31.js >-%%DATADIR%%/public/build/lokiPlugin.d4fbe3b6c1170914f04b.js >-%%DATADIR%%/public/build/lokiPlugin.d4fbe3b6c1170914f04b.js.map >+%%DATADIR%%/public/build/lokiPlugin.37cda7d0251bc5f31adf.js >+%%DATADIR%%/public/build/lokiPlugin.37cda7d0251bc5f31adf.js.map > %%DATADIR%%/public/build/mixedPlugin.d12c346debc311e81817.js > %%DATADIR%%/public/build/mixedPlugin.d12c346debc311e81817.js.map > %%DATADIR%%/public/build/mssqlPlugin.3ed9f6af8e8372075bfd.js >@@ -3823,22 +3821,22 @@ bin/grafana-server > %%DATADIR%%/public/build/postgresPlugin.a5e612f2f16299f505c3.js.map > %%DATADIR%%/public/build/prom-query-field.a56ce0f103998b8fcab2.js > %%DATADIR%%/public/build/prom-query-field.a56ce0f103998b8fcab2.js.map >-%%DATADIR%%/public/build/prometheusPlugin.7b0a1304a647cc99f09a.js >-%%DATADIR%%/public/build/prometheusPlugin.7b0a1304a647cc99f09a.js.map >+%%DATADIR%%/public/build/prometheusPlugin.69fcbfaa39c1b3e8e533.js >+%%DATADIR%%/public/build/prometheusPlugin.69fcbfaa39c1b3e8e533.js.map > %%DATADIR%%/public/build/react-monaco-editor.54510753028e9861ffa6.js > %%DATADIR%%/public/build/react-monaco-editor.54510753028e9861ffa6.js.map > %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js > %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.LICENSE.txt > %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.map >-%%DATADIR%%/public/build/runtime.a4033f61be9eeec1cfdb.js >-%%DATADIR%%/public/build/runtime.a4033f61be9eeec1cfdb.js.map >+%%DATADIR%%/public/build/runtime.58beb2672e553c9c8e23.js >+%%DATADIR%%/public/build/runtime.58beb2672e553c9c8e23.js.map > %%DATADIR%%/public/build/static/img/codicon.56dba998.ttf > %%DATADIR%%/public/build/tableOldPlugin.8cc901e4b2a126e67fa7.js > %%DATADIR%%/public/build/tableOldPlugin.8cc901e4b2a126e67fa7.js.map >-%%DATADIR%%/public/build/tempoPlugin.a1d454bc00b75d2ee6e1.js >-%%DATADIR%%/public/build/tempoPlugin.a1d454bc00b75d2ee6e1.js.map >-%%DATADIR%%/public/build/testDataDSPlugin.49ded95193eaf80478a0.js >-%%DATADIR%%/public/build/testDataDSPlugin.49ded95193eaf80478a0.js.map >+%%DATADIR%%/public/build/tempoPlugin.051e0f80703efe256d27.js >+%%DATADIR%%/public/build/tempoPlugin.051e0f80703efe256d27.js.map >+%%DATADIR%%/public/build/testDataDSPlugin.44edb42994ac41b2458c.js >+%%DATADIR%%/public/build/testDataDSPlugin.44edb42994ac41b2458c.js.map > %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js > %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js.LICENSE.txt > %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js.map
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
drtr0jan
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 265330
:
235377
|
235378
|
235380
|
235405