cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/loki: Fix runtime error with after runtime bump to go119

Browse Source 
PR:		266041
Approved by:	maintainer
This commit is contained in:
Christopher Beppler 2022-09-05 22:18:25 +02:00 committed by Kurt Jaeger
parent 00b787288f
commit c5b27101bd
5 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/loki/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= loki
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
PKGNAMEPREFIX= grafana-
@ -11,7 +11,6 @@ COMMENT= Scalable, highly-available, multi-tenant log aggregation system
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= aarch64 armv7 armv6 amd64 i386
USES= go:modules cpe
CPE_VENDOR= grafana
USE_GITHUB= yes
@ -120,7 +119,7 @@ GH_TUPLE= \
go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
go-zookeeper:zk:v1.0.2:go_zookeeper_zk/vendor/github.com/go-zookeeper/zk \
go4org:go4:d4a079459e60:go4org_go4/vendor/go4.org/intern \
go4org:go4:d4a079459e60:go4org_go4_1/vendor/go4.org/unsafe/assume-no-moving-gc \
go4org:unsafe-assume-no-moving-gc:928513b29760:go4org_go4_1/vendor/go4.org/unsafe/assume-no-moving-gc \
gofrs:flock:v0.7.1:gofrs_flock/vendor/github.com/gofrs/flock \
gogo:googleapis:v1.4.0:gogo_googleapis/vendor/github.com/gogo/googleapis \
gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
@ -348,6 +347,7 @@ post-extract:
@${RLN} ${WRKSRC_coreos_etcd} ${WRKSRC}/vendor/go.etcd.io/etcd
@${MKDIR} ${WRKSRC}/vendor/gopkg.in/fsnotify
@${RLN} ${WRKSRC_fsnotify_fsnotify_1} ${WRKSRC}/vendor/gopkg.in/fsnotify/fsnotify.v1
@${MV} ${WRKSRC}/vendor/go4.org/unsafe/assume-no-moving-gc/unsafe-assume-no-moving-gc-928513b29760/untested.go ${WRKSRC}/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
post-install:
@${CP} ${WRKSRC}/cmd/loki/loki-local-config.yaml ${STAGEDIR}${PREFIX}/etc/loki.yaml.sample

4
sysutils/loki/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1658302472
TIMESTAMP = 1661467500
SHA256 (grafana-loki-v2.6.1_GH0.tar.gz) = 4b41175e552dd198bb9cae213df3c0d9ca8cacd0b673f79d26419cea7cfb2df7
SIZE (grafana-loki-v2.6.1_GH0.tar.gz) = 29347388
SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
@ -197,6 +197,8 @@ SHA256 (go-zookeeper-zk-v1.0.2_GH0.tar.gz) = b752c97a44f5dbfc01a156c7a8c3de76d46
SIZE (go-zookeeper-zk-v1.0.2_GH0.tar.gz) = 43406
SHA256 (go4org-go4-d4a079459e60_GH0.tar.gz) = d00030ca56b072e908fec5e16bddf7d8379c48d659335ae0ce6a63379e9886b0
SIZE (go4org-go4-d4a079459e60_GH0.tar.gz) = 150608
SHA256 (go4org-unsafe-assume-no-moving-gc-928513b29760_GH0.tar.gz) = 4736ab4acb7a1aa0fcc4e75917bac2b89d80f4929824650d25d93097e1c1da2e
SIZE (go4org-unsafe-assume-no-moving-gc-928513b29760_GH0.tar.gz) = 2289
SHA256 (gofrs-flock-v0.7.1_GH0.tar.gz) = d4e33c3923e671fe6288a6dcb6618b7c46834c1a387653f482f5247c5a132dea
SIZE (gofrs-flock-v0.7.1_GH0.tar.gz) = 7294
SHA256 (gogo-googleapis-v1.4.0_GH0.tar.gz) = 0f1be0cc87e1f7942091f529dd2669d66fc249d57c6ed6906666d42b6d384497

11
sysutils/loki/files/patch-go.mod Normal file
View File

@ -0,0 +1,11 @@
--- go.mod.orig 2022-08-25 22:27:18.635139000 +0000
+++ go.mod 2022-08-25 22:27:22.489247000 +0000
@@ -265,7 +265,7 @@
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1 // indirect
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
- go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect

11
sysutils/loki/files/patch-go.sum Normal file
View File

@ -0,0 +1,11 @@
--- go.sum.orig 2022-08-25 22:27:27.011319000 +0000
+++ go.sum 2022-08-25 22:27:30.486485000 +0000
@@ -2030,6 +2030,8 @@
go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA=
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA=
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

11
sysutils/loki/files/patch-vendor_modules.txt Normal file
View File

@ -0,0 +1,11 @@
--- vendor/modules.txt.orig 2022-08-25 22:53:37.657430000 +0000
+++ vendor/modules.txt 2022-08-25 22:54:21.632244000 +0000
@@ -1178,7 +1178,7 @@
# go4.org/intern v0.0.0-20211027215823-ae77deb06f29
## explicit; go 1.13
go4.org/intern
-# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
+# go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
## explicit; go 1.11
go4.org/unsafe/assume-no-moving-gc
# golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3