From nobody Mon Sep 05 20:19:45 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MM0HP60v7z4bbmj; Mon, 5 Sep 2022 20:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MM0HP5SHZz3W4Z; Mon, 5 Sep 2022 20:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662409185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odpKVOyM29TWDN6Y05p3MW+p0Kmq91YXV8YR4U4rMbk=; b=bOdfzh0pTRw6vLR/p8cgw8vJ/Ff1ffjk/YFIPlbjV69ESDV0fyXskRGe+g38RTq21eMxe+ HnIj09c1xeRA1LXI83AhIHT3nHCw8ivjVpBI512/B0p2jSgwxGtIklgG1IkwGTUUAdFCvv aGgqMgzQuA9EPL0LF1qUfY0GrvveTQ98KmtZaUlso1LoqH5ZDkjpc3SMWa7n4kFfnlR/cJ pTLCacax+UdVRi/HsliEcDjoNY+sehVQCVLpR3OMGHes3JKdeHVbugHrP/VRxuWFjyHAZ9 e+9BU7W3o079C8Dcjssp5Ggf3xWSqxyF9deuNQxOlalQOGOGrBqSFNq+JzozDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MM0HP4Tnzzwmk; Mon, 5 Sep 2022 20:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 285KJjlo009050; Mon, 5 Sep 2022 20:19:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285KJjJw009049; Mon, 5 Sep 2022 20:19:45 GMT (envelope-from git) Date: Mon, 5 Sep 2022 20:19:45 GMT Message-Id: <202209052019.285KJjJw009049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: c5b27101bd44 - main - sysutils/loki: Fix runtime error with after runtime bump to go119 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5b27101bd44148e7ddab559d96438e77c05acd3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662409185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odpKVOyM29TWDN6Y05p3MW+p0Kmq91YXV8YR4U4rMbk=; b=i21zM/p67WOvhQmtqD3GtPMD/QuopmWB+9FkMqxiR28dvNnP8Jyr5NJveTXbU5wGlC82wk 7rk6Upkn6W6W8HYaZkMwsip0QdsBN4+IzzKQIbVJgn+kroOCMAUbwawTiRjhUKS2ZqQZ58 m6jNsJUgl387ZBhomGR9j7nXXSUi8NjM3L+a67llwLO9iq7xTpoafaPRTqd25EXhqq3X2d UrYVztpNfcxKC1LWq4/qrYHva+AkTMpZY5miraaGd5RbfwbGDFRfKOg8sq5vy4HvMAmc+X GPc6u/OmDgnLb/LoNRRpdrL7oQdANoFGE8wTUqOmvMyCKDGmAkXdaq5xidh8Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662409185; a=rsa-sha256; cv=none; b=Pu4gDI5PyJAUWINP+pfrt9eYrcL4w4ZWr9MoFMOTCx45p1K4d51NiXurhdn90N1ORQJ+va 0kXenzx8MMh8bdHR6ybXkL6QmIfNK2aCna6oStmE1xxi9DU/519ij4XZEuVG7gLPTJb30F GGBrwM3sR/3mYgL2gn1nkJ9EXhvG8nRjXX1qZjrejYbvxHZ9ElBE7X4d7yfTqj5o80yck1 S1sVjTCRJDVHnujVkk7mI+0oCd73hgFSrLiwII6ubF0ZGA9s93cZ48U/HdNbvIU6HYf/1A 1DYO/ul84Lm7eH0MVudMmjcwXU6M9VSPf5SI4PIViTnw7LwjJr6IviF5TyRE8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5b27101bd44148e7ddab559d96438e77c05acd3 commit c5b27101bd44148e7ddab559d96438e77c05acd3 Author: Christopher Beppler AuthorDate: 2022-09-05 20:18:25 +0000 Commit: Kurt Jaeger CommitDate: 2022-09-05 20:19:27 +0000 sysutils/loki: Fix runtime error with after runtime bump to go119 PR: 266041 Approved by: maintainer --- sysutils/loki/Makefile | 6 +++--- sysutils/loki/distinfo | 4 +++- sysutils/loki/files/patch-go.mod | 11 +++++++++++ sysutils/loki/files/patch-go.sum | 11 +++++++++++ sysutils/loki/files/patch-vendor_modules.txt | 11 +++++++++++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile index 39986f0b7576..1e379619c91b 100644 --- a/sysutils/loki/Makefile +++ b/sysutils/loki/Makefile @@ -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 diff --git a/sysutils/loki/distinfo b/sysutils/loki/distinfo index 52b60cffe8e6..c04be5f0e278 100644 --- a/sysutils/loki/distinfo +++ b/sysutils/loki/distinfo @@ -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 diff --git a/sysutils/loki/files/patch-go.mod b/sysutils/loki/files/patch-go.mod new file mode 100644 index 000000000000..820c28c83f5a --- /dev/null +++ b/sysutils/loki/files/patch-go.mod @@ -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 diff --git a/sysutils/loki/files/patch-go.sum b/sysutils/loki/files/patch-go.sum new file mode 100644 index 000000000000..c6b744ca49b9 --- /dev/null +++ b/sysutils/loki/files/patch-go.sum @@ -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= diff --git a/sysutils/loki/files/patch-vendor_modules.txt b/sysutils/loki/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..c8a40e729988 --- /dev/null +++ b/sysutils/loki/files/patch-vendor_modules.txt @@ -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