Date: Monday, September 5, 2022 @ 02:03:43
Author: daurnimator
Revision: 1292949
upgpkg: loki 2.6.1-1
Added:
loki/trunk/go-1.19.patch
Modified:
loki/trunk/PKGBUILD
---------------+
PKGBUILD | 12 ++++++----
go-1.19.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-05 01:16:03 UTC (rev 1292948)
+++ PKGBUILD 2022-09-05 02:03:43 UTC (rev 1292949)
@@ -2,7 +2,7 @@
# Maintainer: Jelle van der Waa <je...@archlinux.org>
pkgname=('loki' 'loki-canary' 'promtail' 'logcli')
-pkgver=2.6.0
+pkgver=2.6.1
pkgrel=1
pkgdesc='like Prometheus, but for logs'
url='https://github.com/grafana/loki'
@@ -13,18 +13,22 @@
options=('!lto')
source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz
promtail.sysusers promtail.service promtail.tmpfiles
- loki.sysusers loki.service loki.tmpfiles)
-sha512sums=('d727ebbe2be30b9446c5369ccecfddfb05641a6f4d8231f41c2aad48979b9db1b97bda338d0e922e34d440d4e343de83be5c3250ad35de5c3d5fcbdb9a77e6f4'
+ loki.sysusers loki.service loki.tmpfiles
+ go-1.19.patch)
+sha512sums=('9a95b0dfde2c814c0d180929e9099a02ff8dcd9c7ca88b8fd3632c031dd5b26c8229ed2d9bb5af76ef3eead906e0e5e2062ccf4edcb5ab2dabc631228930b3b1'
'2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
'18011b135c7817f2542f7a93b607ee46e5d61625921c7dc6e46e1b29e31c67147653b215d8677fde21cdce3b577c479cebd2d85f47e4b8cbe4c30f8be5f910cd'
'598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
'03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74'
-
'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
+
'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040'
+
'a4ac82beeea71ff0125480246cd64573be29b19f192334a5d9a3b5663e59fedd9bc29a78e083542d760376cc039342888de573608b1f91986efdcd09adf31f13')
prepare() {
cd "$pkgname-$pkgver"
+ patch -Np1 -i ../go-1.19.patch
+
go mod download
}
Added: go-1.19.patch
===================================================================
--- go-1.19.patch (rev 0)
+++ go-1.19.patch 2022-09-05 02:03:43 UTC (rev 1292949)
@@ -0,0 +1,65 @@
+diff --git a/go.mod b/go.mod
+index f6b5af8bb..667ed4517 100644
+--- a/go.mod
++++ b/go.mod
+@@ -327,3 +327,5 @@ exclude k8s.io/client-go v8.0.0+incompatible
+ // Replace memberlist with our fork which includes some fixes that haven't
been
+ // merged upstream yet.
+ replace github.com/hashicorp/memberlist => github.com/grafana/memberlist
v0.3.1-0.20220708130638-bd88e10a3d91
++
++replace go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37
=> go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760
+diff --git a/go.sum b/go.sum
+index bf4a83f17..f3db4362c 100644
+--- a/go.sum
++++ b/go.sum
+@@ -2028,8 +2028,8 @@ go.uber.org/zap v1.19.1
h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
+ go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+ go4.org/intern v0.0.0-20211027215823-ae77deb06f29
h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE=
+ 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=
+@@ -2345,11 +2345,9 @@ golang.org/x/sys
v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+index 01377f77e..da4d943f6 100644
+--- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
++++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go
+@@ -2,8 +2,8 @@
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
+
+-//go:build go1.19
+-// +build go1.19
++//go:build go1.20
++// +build go1.20
+
+ package assume_no_moving_gc
+
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index 7bef3766d..2cdfa9baa 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -1178,7 +1178,7 @@ go.uber.org/zap/zapgrpc
+ # 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-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
