[arch-commits] Commit in loki/trunk (2 files)

Evangelos Foutras foutrelis at gemini.archlinux.org
Wed May 18 07:16:57 UTC 2022 

    Date: Wednesday, May 18, 2022 @ 07:16:56
  Author: foutrelis
Revision: 1207770

Use upstream patch for Go 1.18

Modified:
  loki/trunk/PKGBUILD
Deleted:
  loki/trunk/bump-inet.af-netaddr-for-Go-1.18-compatibility.patch

------------------------------------------------------+
 PKGBUILD                                             |   13 +--
 bump-inet.af-netaddr-for-Go-1.18-compatibility.patch |   68 -----------------
 2 files changed, 5 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-18 07:09:41 UTC (rev 1207769)
+++ PKGBUILD	2022-05-18 07:16:56 UTC (rev 1207770)
@@ -12,25 +12,22 @@
 makedepends=('go' 'systemd')
 options=('!lto')
 source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz
+        $pkgname-go1.18.patch::https://github.com/grafana/loki/commit/d0160cb09c1e.patch
         promtail.sysusers promtail.service promtail.tmpfiles
-        loki.sysusers loki.service loki.tmpfiles
-        bump-inet.af-netaddr-for-Go-1.18-compatibility.patch)
+        loki.sysusers loki.service loki.tmpfiles)
 sha512sums=('1a37cc3f5685d822e4ddc9d733505905ee4ef8f664e78954a69d34b5cab90b2dd82133bd309da2d98e7235ead1d952815f76dbd6ec655ebd26027506238fa7a3'
+            '5f06db86127d5601b37bea65decd469b6d1b126bddfcaf1dd85b0c074b6c1ed30e0d96d2b331399154bb2e7a72ed0edb3d9ea1bc62e8986d40148ba4caa2dacf'
             '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
             '18011b135c7817f2542f7a93b607ee46e5d61625921c7dc6e46e1b29e31c67147653b215d8677fde21cdce3b577c479cebd2d85f47e4b8cbe4c30f8be5f910cd'
             '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788'
             'f00b3cb64b71d3ca5a422a2bdff1f81a3e2707c4f73bcb27e24338eabff039b96125c847aaae43c9b22ccc47f89585118c1d0e0b29c4eb7b6f9260c68f8a8324'
             '03904b67617e4064a1eb39b6edfaec5d55bc85f142e867d115d3d0e12494a052fddf13bb6f5c541aaca29a18582df2332bb0cc6b8f29928cf6a0d5d2710ead74'
-            'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040'
-            'c71ac26f34ab3f4fe17335b827129cbace961e29ba0642b165af5697d30aaf6b9d8c02530e59391c410189afafbb959a6a82131415d4566495390e46fd3ba8f6')
+            'de40d1e6752edbf8c21317ce1ee10f98dfc869e569c07092c613f7144e261e9438683a145a2e0e37e2a9fc758c5c2f02e1d0ac1c60347e98b147e4a550ec6040')
 
 prepare() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i ../$pkgname-go1.18.patch
 
-  # https://github.com/grafana/loki/pull/5872
-  patch -Np1 -i ../bump-inet.af-netaddr-for-Go-1.18-compatibility.patch
-  go mod vendor
-
   go mod download
 }
 

Deleted: bump-inet.af-netaddr-for-Go-1.18-compatibility.patch
===================================================================
--- bump-inet.af-netaddr-for-Go-1.18-compatibility.patch	2022-05-18 07:09:41 UTC (rev 1207769)
+++ bump-inet.af-netaddr-for-Go-1.18-compatibility.patch	2022-05-18 07:16:56 UTC (rev 1207770)
@@ -1,68 +0,0 @@
-From 6961a2dbb2f6c3229073f7c288f3fdc87b010175 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Mon, 11 Apr 2022 23:24:12 +0300
-Subject: [PATCH] Bump inet.af/netaddr for Go 1.18 compatibility
-
-Fixes panic caused by outdated go4.org/unsafe/assume-no-moving-gc. [1]
-
-[1] assume-no-moving-gc commit 538ce61f45ea5c2c48d7133d44b3e52c3db5c31e
----
- go.mod |  6 +++---
- go.sum | 13 ++++++-------
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/go.mod b/go.mod
-index 6844ad480..8c1366006 100644
---- a/go.mod
-+++ b/go.mod
-@@ -106,7 +106,7 @@ require (
- 	gopkg.in/fsnotify.v1 v1.4.7
- 	gopkg.in/yaml.v2 v2.4.0
- 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
--	inet.af/netaddr v0.0.0-20210707202901-70468d781e6c
-+	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
- 	k8s.io/klog v1.0.0
- )
- 
-@@ -256,8 +256,8 @@ require (
- 	go.opentelemetry.io/otel/trace v1.4.1 // indirect
- 	go.uber.org/multierr v1.7.0 // indirect
- 	go.uber.org/zap v1.19.1 // indirect
--	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
--	go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect
-+	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
-+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // 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/go.sum b/go.sum
-index 8b6b52f2b..b415ba2ee 100644
---- a/go.sum
-+++ b/go.sum
-@@ -2023,11 +2023,10 @@ go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
- go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
- 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-20210108033219-3eb7198706b2 h1:VFTf+jjIgsldaz/Mr00VaCSswHJrI2hIjQygE/W4IMg=
--go4.org/intern v0.0.0-20210108033219-3eb7198706b2/go.mod h1:vLqJ+12kCw61iCWsPto0EOHhBS+o4rO5VIucbc9g2Cc=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222175341-b30ae309168e/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 h1:1tk03FUNpulq2cuWpXZWj649rwJpk0d20rxWiopKRmc=
--go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
-+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=
- 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=
-@@ -2769,8 +2768,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
- honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
- honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
- howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
--inet.af/netaddr v0.0.0-20210707202901-70468d781e6c h1:ZNUX2CiFwNbN1VFaD4MQFmC8o5Rxc7BQW1P1K8kMpbE=
--inet.af/netaddr v0.0.0-20210707202901-70468d781e6c/go.mod h1:z0nx+Dh+7N7CC8V5ayHtHGpZpxLQZZxkIaaz6HN65Ls=
-+inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw=
-+inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8=
- k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
- k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
- k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=

More information about the arch-commits mailing list