Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D1BB784E87 for ; Thu, 7 Sep 2023 14:58:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id V2XXPOTH07Dy for ; Thu, 7 Sep 2023 14:58:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E5E1184CFE for ; Thu, 7 Sep 2023 14:58:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DF51CFBDB; Thu, 7 Sep 2023 14:58:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169409869635450" MIME-Version: 1.0 Date: Thu, 7 Sep 2023 14:58:16 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/www/grafana To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20230907145816.DF51CFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169409869635450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Sep 7 14:58:16 UTC 2023 Modified Files: pkgsrc/www/grafana: distinfo go-modules.mk pkgsrc/www/grafana/patches: patch-go.mod patch-go.sum Log Message: grafana: Fix build on illumos. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/grafana/distinfo cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/grafana/go-modules.mk cvs rdiff -u -r1.5 -r1.6 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. --_----------=_169409869635450 Content-Disposition: inline Content-Length: 7422 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/grafana/distinfo diff -u pkgsrc/www/grafana/distinfo:1.41 pkgsrc/www/grafana/distinfo:1.42 --- pkgsrc/www/grafana/distinfo:1.41 Sun Aug 27 12:09:56 2023 +++ pkgsrc/www/grafana/distinfo Thu Sep 7 14:58:16 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2023/08/27 12:09:56 tnn Exp $ +$NetBSD: distinfo,v 1.42 2023/09/07 14:58:16 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 @@ -12033,7 +12033,7 @@ Size (xorm.io_core_@v_v0.7.3.mod) = 193 BLAKE2s (xorm.io_core_@v_v0.7.3.zip) = 5c41003b538f900e8fe8e018035ea37178453012f64c422a91dcfe20f71683ba SHA512 (xorm.io_core_@v_v0.7.3.zip) = 55a07d5a03f8eff5b6dc735c31516070fcea93039d541907a7254e89c57b68f43196afc64df924b7ec26bd74de7983b145f6466b8b5005e8fd52cc8f696bf48e Size (xorm.io_core_@v_v0.7.3.zip) = 31222 bytes -SHA1 (patch-go.mod) = aa59d39ba619a1997b3a84ffd103f76c876636d7 -SHA1 (patch-go.sum) = 2a5e94c5e41cbe321e21091231f32bbe57ed3906 +SHA1 (patch-go.mod) = 8f94b85e8f846b517a2eea3fc32cde3e8bcbcf66 +SHA1 (patch-go.sum) = bef3ccec2f3e3a78cc4d31023c7dc252af342605 SHA1 (patch-pkg_build_cmd.go) = 6d550f8413fb3752c558d46f691f8f7d862cd7fa SHA1 (patch-pkg_cmd_grafana-server_commands_cli.go) = 0dce3a76ad509aade343c6f5bae9b3590198f2c3 Index: pkgsrc/www/grafana/go-modules.mk diff -u pkgsrc/www/grafana/go-modules.mk:1.27 pkgsrc/www/grafana/go-modules.mk:1.28 --- pkgsrc/www/grafana/go-modules.mk:1.27 Sun Aug 27 12:09:56 2023 +++ pkgsrc/www/grafana/go-modules.mk Thu Sep 7 14:58:16 2023 @@ -1,4 +1,4 @@ -# $NetBSD: go-modules.mk,v 1.27 2023/08/27 12:09:56 tnn Exp $ +# $NetBSD: go-modules.mk,v 1.28 2023/09/07 14:58:16 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 @@ -790,11 +790,8 @@ 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 @@ -1979,6 +1976,8 @@ 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-20230907131324-edf907a81faa.mod +GO_MODULE_FILES+= github.com/jperkin/apiserver/@v/v0.0.0-20230907131324-edf907a81faa.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 @@ -3921,8 +3920,6 @@ GO_MODULE_FILES+= k8s.io/api/@v/v0.27.1. GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.26.2.mod GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.27.1.mod GO_MODULE_FILES+= k8s.io/apimachinery/@v/v0.27.1.zip -GO_MODULE_FILES+= k8s.io/apiserver/@v/v0.27.1.mod -GO_MODULE_FILES+= k8s.io/apiserver/@v/v0.27.1.zip GO_MODULE_FILES+= k8s.io/client-go/@v/v0.26.2.mod GO_MODULE_FILES+= k8s.io/client-go/@v/v0.27.1.mod GO_MODULE_FILES+= k8s.io/client-go/@v/v0.27.1.zip Index: pkgsrc/www/grafana/patches/patch-go.mod diff -u pkgsrc/www/grafana/patches/patch-go.mod:1.5 pkgsrc/www/grafana/patches/patch-go.mod:1.6 --- pkgsrc/www/grafana/patches/patch-go.mod:1.5 Sun Aug 27 12:09:56 2023 +++ pkgsrc/www/grafana/patches/patch-go.mod Thu Sep 7 14:58:16 2023 @@ -1,8 +1,11 @@ -$NetBSD: patch-go.mod,v 1.5 2023/08/27 12:09:56 tnn Exp $ +$NetBSD: patch-go.mod,v 1.6 2023/09/07 14:58:16 jperkin Exp $ Use bluge fork to support illumos. https://github.com/blugelabs/bluge/pull/139 +Use apiserver fork to support illumos. +https://github.com/kubernetes/kubernetes/pull/120498 + --- go.mod.orig 2023-08-23 17:05:28.000000000 +0000 +++ go.mod @@ -298,6 +298,7 @@ require ( @@ -13,9 +16,11 @@ https://github.com/blugelabs/bluge/pull/ github.com/bmatcuk/doublestar v1.1.1 // indirect github.com/buildkite/yaml v2.1.0+incompatible // indirect github.com/bwmarrin/snowflake v0.3.0 // indirect -@@ -491,3 +492,5 @@ replace google.golang.org/grpc => google +@@ -491,3 +492,7 @@ replace google.golang.org/grpc => google replace github.com/lib/pq => github.com/lib/pq v1.10.6 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible + +replace github.com/blugelabs/bluge => github.com/jperkin/bluge v0.0.0-20221115155924-ffd91b43c395 ++ ++replace k8s.io/apiserver v0.27.1 => github.com/jperkin/apiserver v0.0.0-20230907131324-edf907a81faa Index: pkgsrc/www/grafana/patches/patch-go.sum diff -u pkgsrc/www/grafana/patches/patch-go.sum:1.5 pkgsrc/www/grafana/patches/patch-go.sum:1.6 --- pkgsrc/www/grafana/patches/patch-go.sum:1.5 Sun Aug 27 12:09:56 2023 +++ pkgsrc/www/grafana/patches/patch-go.sum Thu Sep 7 14:58:16 2023 @@ -1,8 +1,11 @@ -$NetBSD: patch-go.sum,v 1.5 2023/08/27 12:09:56 tnn Exp $ +$NetBSD: patch-go.sum,v 1.6 2023/09/07 14:58:16 jperkin Exp $ Use bluge fork to support illumos. https://github.com/blugelabs/bluge/pull/139 +Use apiserver fork to support illumos. +https://github.com/kubernetes/kubernetes/pull/120498 + --- go.sum.orig 2023-08-23 17:05:28.000000000 +0000 +++ go.sum @@ -810,13 +810,12 @@ github.com/blevesearch/snowballstem v0.9 @@ -21,10 +24,12 @@ https://github.com/blugelabs/bluge/pull/ 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= -@@ -2043,6 +2042,8 @@ github.com/jonboulle/clockwork v0.4.0 h1 +@@ -2043,6 +2042,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-20230907131324-edf907a81faa h1:r53ivI3vJj5FQfi6lZtJSX0fiJLJRXEMvfhlY0xkpV8= ++github.com/jperkin/apiserver v0.0.0-20230907131324-edf907a81faa/go.mod h1:UGrOjLY2KsieA9Fw6lLiTObxTb8Z1xEba4uqSuMY0WU= +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= --_----------=_169409869635450--