pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/grafana
Module Name: pkgsrc
Committed By: jperkin
Date: Tue Feb 20 12:43:19 UTC 2024
Modified Files:
pkgsrc/www/grafana: distinfo go-modules.mk
Added Files:
pkgsrc/www/grafana/patches: patch-go.mod patch-go.sum
Log Message:
grafana: Restore illumos support.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/grafana/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/grafana/go-modules.mk
cvs rdiff -u -r0 -r1.8 pkgsrc/www/grafana/patches/patch-go.mod \
pkgsrc/www/grafana/patches/patch-go.sum
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/grafana/distinfo
diff -u pkgsrc/www/grafana/distinfo:1.45 pkgsrc/www/grafana/distinfo:1.46
--- pkgsrc/www/grafana/distinfo:1.45 Thu Feb 15 13:24:06 2024
+++ pkgsrc/www/grafana/distinfo Tue Feb 20 12:43:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2024/02/15 13:24:06 wiz Exp $
+$NetBSD: distinfo,v 1.46 2024/02/20 12:43:19 jperkin Exp $
BLAKE2s (bazil.org_fuse_@v_v0.0.0-20160811212531-371fbbdaa898.mod) = ff8095283662ae2d2a1968bf429516c54586b1a6c4dc744657162e6781aa8ece
SHA512 (bazil.org_fuse_@v_v0.0.0-20160811212531-371fbbdaa898.mod) = 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
@@ -2403,27 +2403,24 @@ Size (github.com_blevesearch_vellum_@v_v
BLAKE2s (github.com_blevesearch_vellum_@v_v1.0.7.zip) = 2a2ac515b4b1e18e1cb900a7d18097fec1c6ea204029df8935fbf5d46d02dc7a
SHA512 (github.com_blevesearch_vellum_@v_v1.0.7.zip) = 59d6c419fa7e0a32cdf9386cca3690c4090f3d6b1cf8ab6a9a53fe479f68a91d9ecc4931eb238459d1545642da62c4bf0b208794a831fcd69b717d528715cf7a
Size (github.com_blevesearch_vellum_@v_v1.0.7.zip) = 298214 bytes
-BLAKE2s (github.com_blugelabs_bluge_@v_v0.1.9.mod) = a80eda75ff0a1f76e354f33c1cff1093a84ebf19a23ecf424d1cc9f1d80a4233
-SHA512 (github.com_blugelabs_bluge_@v_v0.1.9.mod) = fed9d7cd86f2e83aba22b855dff4a45c637429668f7f3ac4b6bd7510021436742c115ebc8c31b699bfd732a6d91c43e5bce19e8292438f477da7d5fe0ff35c29
-Size (github.com_blugelabs_bluge_@v_v0.1.9.mod) = 765 bytes
-BLAKE2s (github.com_blugelabs_bluge_@v_v0.1.9.zip) = 1840471c5006799cba2bb32175a334b849fb146fa858c34a784254c8a032f203
-SHA512 (github.com_blugelabs_bluge_@v_v0.1.9.zip) = 40926d42f812e44a0f7a7491e60dd5140043e7341d983f85209ad68475be6cbd39da8c7820e428f0208a07c0697ee87122ba703a7168b296e6602598e0109263
-Size (github.com_blugelabs_bluge_@v_v0.1.9.zip) = 688179 bytes
BLAKE2s (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.mod) = 660c25f3182b49a28e5bf7a4db5218b17ab6c4e3ae84f7eba398c8706510a529
SHA512 (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.mod) = 4d8641b458f0081de125927288aca7841315ed43036321a016441620d77a98c1db609ce6b93d3c6d3d0ffbf28a9cac0a6bb4f2902780b7873eb34e6266866351
Size (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.mod) = 156 bytes
BLAKE2s (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.zip) = 1fa79db9fa87794a43d459754812b41a5cb4ed0a8f4d01ee48a8118fb30faa4e
SHA512 (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.zip) = 4669202cd4b543b7cd8b4e4c0a8a2afb7185fe6b2c593c6972a22451bb664b67d269c9aa921aeb5c85a041f6bd2b8185b1fdaf4e3e513d21a75cab3b8a91c5ff
Size (github.com_blugelabs_bluge_segment_api_@v_v0.2.0.zip) = 16885 bytes
-BLAKE2s (github.com_blugelabs_ice_@v_v0.2.0.mod) = cec311bdec307c34ff0a9555508ce0f7fcf69c1a04e35dc2b115baa5b527eb28
-SHA512 (github.com_blugelabs_ice_@v_v0.2.0.mod) = 57f80233e630250abd7908ad9c32061ea02a7fccdd4e2e95926a0b222c1a638fb56ce68a71e87ee2200eb686ed1301decc54f20190ddfaf49a91a997d6e80f8e
-Size (github.com_blugelabs_ice_@v_v0.2.0.mod) = 283 bytes
BLAKE2s (github.com_blugelabs_ice_@v_v1.0.0.mod) = 1e97ee80e5b978def26c18c1ccd99df17c7917e6c1a47c0bca5932202b671f27
SHA512 (github.com_blugelabs_ice_@v_v1.0.0.mod) = 7ca7aeefac88e749a7c28c1e1c5566f681d99933937ca0ee925a4710ca16bde1108c8e1daed05420ff3a953db10afe1f08d50011ee231a5f83a0b1f662448af1
Size (github.com_blugelabs_ice_@v_v1.0.0.mod) = 283 bytes
BLAKE2s (github.com_blugelabs_ice_@v_v1.0.0.zip) = f9422fb68e9eaca886624eebeda45d09c5c5d413e6805705493b2a5f6910cc6d
SHA512 (github.com_blugelabs_ice_@v_v1.0.0.zip) = 5d4d2b34b6b4244789433b81a70ca4cd5029681b1dc0c51578f0f0e9809dee840a2e1c3f4ab1f060c3b8dc8b298792ca7e9716863bb48ad10c29c86c8a70ab5f
Size (github.com_blugelabs_ice_@v_v1.0.0.zip) = 90566 bytes
+BLAKE2s (github.com_blugelabs_ice_v2_@v_v2.0.1.mod) = cf2399b2240ac317de20f017b83d9041d403afddfe1d3840fc7137e9712053a8
+SHA512 (github.com_blugelabs_ice_v2_@v_v2.0.1.mod) = caa7e251431428685a8d1d9736e0065f286cd35113b0584466ebaf3bda2eaf9738505b3d0b31ee0a0e5b1933b81634013fa4767087088daf85664d60e62b3f10
+Size (github.com_blugelabs_ice_v2_@v_v2.0.1.mod) = 292 bytes
+BLAKE2s (github.com_blugelabs_ice_v2_@v_v2.0.1.zip) = 1154805b1ca31f5d86fca56a356c1368bb7919aab72b05eb880df295f4e44f03
+SHA512 (github.com_blugelabs_ice_v2_@v_v2.0.1.zip) = d6cdde5f3db1b836a3d39db8d5e941d4d3fe2748bc2750febf1dc13bbcf718e7c12ad8da606ee3905e93ddb5d99fece78188dfeb884eca6300faa69aeddf7032
+Size (github.com_blugelabs_ice_v2_@v_v2.0.1.zip) = 95038 bytes
BLAKE2s (github.com_bmatcuk_doublestar_@v_v1.1.1.mod) = 6607625046ac5d3fed6e92a47755b67e9aff5e02f43d62d0a5a2d459b68a6e5b
SHA512 (github.com_bmatcuk_doublestar_@v_v1.1.1.mod) = 28bb5603cd1ae1fd97e7589e790f4afe4e7369c4b4c3afe46e0d90aa15e0a621dbb66cc4789696689c2124ef4e1d81c4f4a7a1cb54e986ced77e129de853e588
Size (github.com_bmatcuk_doublestar_@v_v1.1.1.mod) = 37 bytes
@@ -6054,6 +6051,18 @@ Size (github.com_josharian_intern_@v_v1.
BLAKE2s (github.com_josharian_intern_@v_v1.0.0.zip) = 0a91811816ba12473c4f1eda565f0271f8512bff0d5b5736523dc6b887720556
SHA512 (github.com_josharian_intern_@v_v1.0.0.zip) = 5343e0a259d658899f8eb93035f9677e96f559726ecadb284271ee60e171666ce8c824182cb5d08b3626eb1d539c381c33f6944ade735210ade30158b028c1d9
Size (github.com_josharian_intern_@v_v1.0.0.zip) = 2648 bytes
+BLAKE2s (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.mod) = a9fe4c010a21f4c875c000899c3f6e9a7ca068541b40b53a2ddcb3dfe4d1d900
+SHA512 (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.mod) =
fe4487b081152c4c5c7027436f170647242ffe2162cc3422ca94f5f5709d910ad583ea9f3866d2b9f3eb2c7933f5926ed6ae3dd691160844fe935277e5c4ee49
+Size (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.mod) = 6090 bytes
+BLAKE2s (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.zip) = 48a802b6fadb78f1cb90ea9aa8f92ef69412f8ec90f04e6713cb8fab79ccb367
+SHA512 (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.zip) =
36b062fa5921bcfba7673ad3ee6f5438146f2bb8298e3c089710c0af3ac05afc8a214711e4bbdad34262ea2fd760678ff24aa26af08064714d64d2d141494deb
+Size (github.com_jperkin_apiserver_@v_v0.0.0-20240219180422-2d63424797e0.zip) = 2310710 bytes
+BLAKE2s (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.mod) = 0bbeca5e136d125bfdbfcde198ce20268982bb0ec8d489bb701956db6f2b6f7e
+SHA512 (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.mod) =
3cf1467938158ee8eaebea0cffc5c43702222fb989a58d395a53cd7e59ed5aa8a2ae26b8cadb44644aaaf6696ce5b6e2273e8a517f1225538cdb749558dccb22
+Size (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.mod) = 801 bytes
+BLAKE2s (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.zip) = b7ccaee7d383c5f54e21d95e43c3ad6e8ba6c67ecedd02db967ba3bf6e7936ba
+SHA512 (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.zip) =
d93cfc0ef92204aafbf57a0569dccf195a7a95d390c0a1e91ea41d7d6ec856dbd283796c6ff34649930cba6f4d30f1ebbe47bf5ba536c57c52446ef5eacc5922
+Size (github.com_jperkin_bluge_@v_v0.0.0-20221115155924-ffd91b43c395.zip) = 710421 bytes
BLAKE2s (github.com_jpillora_backoff_@v_v1.0.0.mod) = 096f14513c52095ec786d8bdf5c10b245c4122c7e287ab22d2b8c9eba514cb27
SHA512 (github.com_jpillora_backoff_@v_v1.0.0.mod) = 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
Size (github.com_jpillora_backoff_@v_v1.0.0.mod) = 44 bytes
@@ -6198,6 +6207,9 @@ Size (github.com_klauspost_compress_@v_v
BLAKE2s (github.com_klauspost_compress_@v_v1.15.1.mod) = 185a92e5148d38cb058fc46f436a98eb242e854d26822dc7fe8b48cb114bebb7
SHA512 (github.com_klauspost_compress_@v_v1.15.1.mod) = 169f465555b08e51a41783d4e2740c09d1a19b146b3ff99a8ca32b008569adedf6515b3f6d94aca6e11e98c0dd47ff561926daf2ba5f5d24dcba3407eda6aefc
Size (github.com_klauspost_compress_@v_v1.15.1.mod) = 46 bytes
+BLAKE2s (github.com_klauspost_compress_@v_v1.15.2.mod) = b21ad47b1b1836a319df2838b2ea95b388f640b2cf27f2c1f1e8defcfbc1d0d2
+SHA512 (github.com_klauspost_compress_@v_v1.15.2.mod) = 7f716057ef4d74b3e9dfde34b57695ebc7ced48e57307e8e8cdcc120a67fdcaf319caff87b864eca8fcd432f517a12523f3f11cd7ecfc76e33c740b9c56b6327
+Size (github.com_klauspost_compress_@v_v1.15.2.mod) = 46 bytes
BLAKE2s (github.com_klauspost_compress_@v_v1.15.9.mod) = b21ad47b1b1836a319df2838b2ea95b388f640b2cf27f2c1f1e8defcfbc1d0d2
SHA512 (github.com_klauspost_compress_@v_v1.15.9.mod) = 7f716057ef4d74b3e9dfde34b57695ebc7ced48e57307e8e8cdcc120a67fdcaf319caff87b864eca8fcd432f517a12523f3f11cd7ecfc76e33c740b9c56b6327
Size (github.com_klauspost_compress_@v_v1.15.9.mod) = 46 bytes
@@ -12102,12 +12114,6 @@ Size (k8s.io_apimachinery_@v_v0.29.0.mod
BLAKE2s (k8s.io_apimachinery_@v_v0.29.0.zip) = b1116846480f375af3bbaae269ee467866e85a4b827b5af6cc8e729d19e17f8d
SHA512 (k8s.io_apimachinery_@v_v0.29.0.zip) = 603e2b9e6625e6999d7d4ab6eb3c8e0ee44517af01ed1cf5320a6626961be5bb62f29eaf14442af65aa3b515a4901b1ee5becd1b9cecedb9110626bcf3d788a6
Size (k8s.io_apimachinery_@v_v0.29.0.zip) = 1018021 bytes
-BLAKE2s (k8s.io_apiserver_@v_v0.29.0.mod) = c7feb2da637b813303f5c8cecb90d72f3a2ed01dcd24db87129be7b49fa41d44
-SHA512 (k8s.io_apiserver_@v_v0.29.0.mod) = 35f0eef94b233fa99409d3b3330aa95ce44fea7fe5c3300f45031868e0fcac187390c095f7d26c9b09505ad80886efa3606279870fb2471c35fd10c45f845e1e
-Size (k8s.io_apiserver_@v_v0.29.0.mod) = 5820 bytes
-BLAKE2s (k8s.io_apiserver_@v_v0.29.0.zip) = 404e05c4f128c8707bc35cb857b8466db52700ad4795e352f16d9c0f1947a86f
-SHA512 (k8s.io_apiserver_@v_v0.29.0.zip) = 748443f28485eeca6c90594b0093fe3e35e0585d61d8995188324afe8b4d049408772b73e455ea614fcd842e521f18d898ba820fc2a0d2eea21b3298a416e425
-Size (k8s.io_apiserver_@v_v0.29.0.zip) = 2227846 bytes
BLAKE2s (k8s.io_client-go_@v_v0.26.2.mod) = 0bb4ef351e32159038395f57f7d999fad888803a5aaa62d39d0bb03578e458fa
SHA512 (k8s.io_client-go_@v_v0.26.2.mod) = 494b179bf4b02e10e98dbbb5d8a4bd0905ce800358a8a0f6d74200795eee0ae7a538dced8a3a3e3b67512c85845cc8c99fa104a0435c0c6d58d730f52c3c7133
Size (k8s.io_client-go_@v_v0.26.2.mod) = 2322 bytes
@@ -12412,5 +12418,7 @@ BLAKE2s (xorm.io_core_@v_v0.7.3.zip) = 5
SHA512 (xorm.io_core_@v_v0.7.3.zip) = 55a07d5a03f8eff5b6dc735c31516070fcea93039d541907a7254e89c57b68f43196afc64df924b7ec26bd74de7983b145f6466b8b5005e8fd52cc8f696bf48e
Size (xorm.io_core_@v_v0.7.3.zip) = 31222 bytes
SHA1 (patch-conf_sample.ini) = 8861cec5f653cad38a53093846dfb2626982a3aa
+SHA1 (patch-go.mod) = 858733f6c4a971b9c89f2aece150788e170cee1d
+SHA1 (patch-go.sum) = f6f2abc349b097e748940ec2229ed81dcd02cb9f
SHA1 (patch-pkg_build_cmd.go) = 6d550f8413fb3752c558d46f691f8f7d862cd7fa
SHA1 (patch-pkg_cmd_grafana-server_commands_flags.go) = f10afd19305f50f1f6199c56d35f2c122cdb8689
Index: pkgsrc/www/grafana/go-modules.mk
diff -u pkgsrc/www/grafana/go-modules.mk:1.29 pkgsrc/www/grafana/go-modules.mk:1.30
--- pkgsrc/www/grafana/go-modules.mk:1.29 Thu Feb 15 13:24:06 2024
+++ pkgsrc/www/grafana/go-modules.mk Tue Feb 20 12:43:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: go-modules.mk,v 1.29 2024/02/15 13:24:06 wiz Exp $
+# $NetBSD: go-modules.mk,v 1.30 2024/02/20 12:43:19 jperkin Exp $
GO_MODULE_FILES+= bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod
GO_MODULE_FILES+= buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go/@v/v1.28.1-20221127060915-a1ecdc58eccd.4.mod
@@ -801,13 +801,12 @@ GO_MODULE_FILES+= github.com/blevesearch
GO_MODULE_FILES+= github.com/blevesearch/vellum/@v/v1.0.5.mod
GO_MODULE_FILES+= github.com/blevesearch/vellum/@v/v1.0.7.mod
GO_MODULE_FILES+= github.com/blevesearch/vellum/@v/v1.0.7.zip
-GO_MODULE_FILES+= github.com/blugelabs/bluge/@v/v0.1.9.mod
-GO_MODULE_FILES+= github.com/blugelabs/bluge/@v/v0.1.9.zip
GO_MODULE_FILES+= github.com/blugelabs/bluge_segment_api/@v/v0.2.0.mod
GO_MODULE_FILES+= github.com/blugelabs/bluge_segment_api/@v/v0.2.0.zip
-GO_MODULE_FILES+= github.com/blugelabs/ice/@v/v0.2.0.mod
GO_MODULE_FILES+= github.com/blugelabs/ice/@v/v1.0.0.mod
GO_MODULE_FILES+= github.com/blugelabs/ice/@v/v1.0.0.zip
+GO_MODULE_FILES+= github.com/blugelabs/ice/v2/@v/v2.0.1.mod
+GO_MODULE_FILES+= github.com/blugelabs/ice/v2/@v/v2.0.1.zip
GO_MODULE_FILES+= github.com/bmatcuk/doublestar/@v/v1.1.1.mod
GO_MODULE_FILES+= github.com/bmatcuk/doublestar/@v/v1.1.1.zip
GO_MODULE_FILES+= github.com/bmatcuk/doublestar/v2/@v/v2.0.3.mod
@@ -2018,6 +2017,10 @@ GO_MODULE_FILES+= github.com/jonboulle/c
GO_MODULE_FILES+= github.com/jonboulle/clockwork/@v/v0.4.0.zip
GO_MODULE_FILES+= github.com/josharian/intern/@v/v1.0.0.mod
GO_MODULE_FILES+= github.com/josharian/intern/@v/v1.0.0.zip
+GO_MODULE_FILES+= github.com/jperkin/apiserver/@v/v0.0.0-20240219180422-2d63424797e0.mod
+GO_MODULE_FILES+= github.com/jperkin/apiserver/@v/v0.0.0-20240219180422-2d63424797e0.zip
+GO_MODULE_FILES+= github.com/jperkin/bluge/@v/v0.0.0-20221115155924-ffd91b43c395.mod
+GO_MODULE_FILES+= github.com/jperkin/bluge/@v/v0.0.0-20221115155924-ffd91b43c395.zip
GO_MODULE_FILES+= github.com/jpillora/backoff/@v/v1.0.0.mod
GO_MODULE_FILES+= github.com/jpillora/backoff/@v/v1.0.0.zip
GO_MODULE_FILES+= github.com/json-iterator/go/@v/v1.1.10.mod
@@ -2066,6 +2069,7 @@ GO_MODULE_FILES+= github.com/klauspost/c
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.13.4.mod
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.13.6.mod
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.15.1.mod
+GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.15.2.mod
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.15.9.mod
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.17.3.mod
GO_MODULE_FILES+= github.com/klauspost/compress/@v/v1.17.3.zip
@@ -4032,8 +4036,6 @@ GO_MODULE_FILES+= k8s.io/api/@v/v0.29.0.
GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.26.2.mod
GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.29.0.mod
GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.29.0.zip
-GO_MODULE_FILES+= k8s.io/apiserver/@v/v0.29.0.mod
-GO_MODULE_FILES+= k8s.io/apiserver/@v/v0.29.0.zip
GO_MODULE_FILES+= k8s.io/client-go/@v/v0.26.2.mod
GO_MODULE_FILES+= k8s.io/client-go/@v/v0.29.0.mod
GO_MODULE_FILES+= k8s.io/client-go/@v/v0.29.0.zip
Added files:
Index: pkgsrc/www/grafana/patches/patch-go.mod
diff -u /dev/null pkgsrc/www/grafana/patches/patch-go.mod:1.8
--- /dev/null Tue Feb 20 12:43:19 2024
+++ pkgsrc/www/grafana/patches/patch-go.mod Tue Feb 20 12:43:19 2024
@@ -0,0 +1,51 @@
+$NetBSD: patch-go.mod,v 1.8 2024/02/20 12:43:19 jperkin Exp $
+
+Bluge upstream is dead, and k8s refuse to support non-Linux platforms, so we're
+stuck carrying these changes. Previous pull requests:
+
+ https://github.com/blugelabs/bluge/pull/139
+ https://github.com/kubernetes/kubernetes/pull/120498
+
+go get github.com/jperkin/bluge@master
+go mod edit --replace=github.com/blugelabs/bluge=github.com/jperkin/bluge@<version output>
+go get github.com/jperkin/apiserver@master
+go mod edit --replace=k8s.io/apiserver=github.com/jperkin/apiserver@<version output>
+go mod tidy
+
+--- go.mod.orig 2024-02-02 15:14:58.000000000 +0000
++++ go.mod
+@@ -121,7 +121,7 @@ require (
+ gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend
+- xorm.io/builder v0.3.6 // @grafana/backend-platform
++ xorm.io/builder v0.3.6 // indirect; @grafana/backend-platform
+ xorm.io/core v0.7.3 // @grafana/backend-platform
+ xorm.io/xorm v0.8.2 // @grafana/alerting-squad-backend
+ )
+@@ -173,7 +173,7 @@ require (
+ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
+ github.com/hashicorp/errwrap v1.1.0 // indirect
+ github.com/hashicorp/go-msgpack v0.5.5 // indirect
+- github.com/hashicorp/go-multierror v1.1.1 // @grafana/alerting-squad
++ github.com/hashicorp/go-multierror v1.1.1 // indirect; @grafana/alerting-squad
+ github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+ github.com/hashicorp/golang-lru v0.6.0 // indirect
+ github.com/hashicorp/yamux v0.1.1 // indirect
+@@ -477,6 +477,8 @@ require (
+ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+ )
+
++require github.com/blugelabs/ice/v2 v2.0.1 // indirect
++
+ // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream
+ replace github.com/crewjam/saml => github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c
+
+@@ -497,3 +499,7 @@ replace xorm.io/xorm => ./pkg/util/xorm
+ replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20231027171310-70c52bf65758
+
+ exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
++
++replace github.com/blugelabs/bluge v0.1.9 => github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395
++
++replace k8s.io/apiserver v0.29.0 => github.com/jperkin/apiserver v0.0.0-20240219180422-2d63424797e0
Index: pkgsrc/www/grafana/patches/patch-go.sum
diff -u /dev/null pkgsrc/www/grafana/patches/patch-go.sum:1.8
--- /dev/null Tue Feb 20 12:43:19 2024
+++ pkgsrc/www/grafana/patches/patch-go.sum Tue Feb 20 12:43:19 2024
@@ -0,0 +1,50 @@
+$NetBSD: patch-go.sum,v 1.8 2024/02/20 12:43:19 jperkin Exp $
+
+See go.mod for details.
+
+--- go.sum.orig 2024-02-02 15:14:58.000000000 +0000
++++ go.sum
+@@ -819,13 +819,12 @@ github.com/blevesearch/snowballstem v0.9
+ github.com/blevesearch/vellum v1.0.5/go.mod h1:atE0EH3fvk43zzS7t1YNdNC7DbmcC3uz+eMD5xZ2OyQ=
+ github.com/blevesearch/vellum v1.0.7 h1:+vn8rfyCRHxKVRgDLeR0FAXej2+6mEb5Q15aQE/XESQ=
+ github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
+-github.com/blugelabs/bluge v0.1.9 h1:bPgXlcsWugrXNjzeoLdOnvfJpHsyODKpYaAndayl/SM=
+-github.com/blugelabs/bluge v0.1.9/go.mod h1:5d7LktUkQgvbh5Bmi6tPWtvo4+6uRTm6gAwP+5z6FqQ=
+ github.com/blugelabs/bluge_segment_api v0.2.0 h1:cCX1Y2y8v0LZ7+EEJ6gH7dW6TtVTW4RhG0vp3R+N2Lo=
+ github.com/blugelabs/bluge_segment_api v0.2.0/go.mod h1:95XA+ZXfRj/IXADm7gZ+iTcWOJPg5jQTY1EReIzl3LA=
+-github.com/blugelabs/ice v0.2.0/go.mod h1:7foiDf4V83FIYYnGh2LOoRWsbNoCqAAMNgKn879Iyu0=
+ github.com/blugelabs/ice v1.0.0 h1:um7wf9e6jbkTVCrOyQq3tKK43fBMOvLUYxbj3Qtc4eo=
+ github.com/blugelabs/ice v1.0.0/go.mod h1:gNfFPk5zM+yxJROhthxhVQYjpBO9amuxWXJQ2Lo+IbQ=
++github.com/blugelabs/ice/v2 v2.0.1 h1:mzHbntLjk2v7eDRgoXCgzOsPKN1Tenu9Svo6l9cTLS4=
++github.com/blugelabs/ice/v2 v2.0.1/go.mod h1:QxAWSPNwZwsIqS25c3lbIPFQrVvT1sphf5x5DfMLH5M=
+ github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ=
+ github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+ github.com/bmatcuk/doublestar/v2 v2.0.3/go.mod h1:QMmcs3H2AUQICWhfzLXz+IYln8lRQmTZRptLie8RgRw=
+@@ -2081,6 +2080,10 @@ github.com/jonboulle/clockwork v0.4.0 h1
+ github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
+ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
++github.com/jperkin/apiserver v0.0.0-20240219180422-2d63424797e0 h1:tuMCUnUa0TX29jdn+1UE3FP0dqeBFzBu1nnxIx0dPXQ=
++github.com/jperkin/apiserver v0.0.0-20240219180422-2d63424797e0/go.mod h1:Nw1r+ZHMUmWstbrzblIad+PHdJZS0NZZJpAPLkwVobE=
++github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395 h1:bBZHN8Kq3LKqKVWnmNRHN2CM15EJx8EisEMqHAeqTqc=
++github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395/go.mod h1:am1LU9jS8dZgWkRzkGLQN3757EgMs3upWrU2fdN9foE=
+ github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+@@ -2133,6 +2136,7 @@ github.com/klauspost/compress v1.10.3/go
+ github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+ github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+ github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
++github.com/klauspost/compress v1.15.2/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+ github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+ github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
+ github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+@@ -4146,8 +4150,6 @@ k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/
+ k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
+ k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
+ k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
+-k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o=
+-k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM=
+ k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
+ k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
+ k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
Home |
Main Index |
Thread Index |
Old Index