From 4dddb92a4d3a7d8d0323fc4f9511f190017db64d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 9 Aug 2023 06:01:08 +0000
Subject: [PATCH] extra/go to 1.21.0-1

---
 extra/go/.SRCINFO | 8 ++++----
 extra/go/PKGBUILD | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/extra/go/.SRCINFO b/extra/go/.SRCINFO
index 41a9b280a..6d6a19d62 100644
--- a/extra/go/.SRCINFO
+++ b/extra/go/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = go
 	pkgdesc = Core compiler tools for the Go programming language
-	pkgver = 1.20.7
+	pkgver = 1.21.0
 	pkgrel = 1
 	epoch = 2
 	url = https://golang.org/
@@ -12,10 +12,10 @@ pkgbase = go
 	replaces = go-pie
 	options = !strip
 	options = staticlibs
-	source = https://go.dev/dl/go1.20.7.src.tar.gz
-	source = https://go.dev/dl/go1.20.7.src.tar.gz.asc
+	source = https://go.dev/dl/go1.21.0.src.tar.gz
+	source = https://go.dev/dl/go1.21.0.src.tar.gz.asc
 	validpgpkeys = EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796
-	sha256sums = 2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+	sha256sums = 818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 	sha256sums = SKIP
 
 pkgname = go
diff --git a/extra/go/PKGBUILD b/extra/go/PKGBUILD
index 524090c61..b95c839c1 100644
--- a/extra/go/PKGBUILD
+++ b/extra/go/PKGBUILD
@@ -17,7 +17,7 @@
 
 pkgname=go
 epoch=2
-pkgver=1.20.7
+pkgver=1.21.0
 pkgrel=1
 pkgdesc='Core compiler tools for the Go programming language'
 arch=(x86_64)
@@ -29,7 +29,7 @@ provides=(go-pie)
 options=(!strip staticlibs)
 source=(https://go.dev/dl/go${pkgver}.src.tar.gz{,.asc})
 validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796')
-sha256sums=('2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597'
+sha256sums=('818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a'
             'SKIP')
 
 case "$CARCH" in
@@ -78,6 +78,9 @@ package() {
   # TODO: Figure out if really needed
   rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build
 
+  # https://github.com/golang/go/issues/57179
+  install -Dm644 go.env "$pkgdir/usr/lib/go/go.env"
+
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }