From 57e8c87d9bf9a2300d55063267c20af270d9f39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Sat, 5 Aug 2023 15:15:29 +0200
Subject: [PATCH] upgpkg: gvisor-git 20230801.0-1

upstream release
Better support debug packages
Remove unnecessary GO111MODULE=on
Fix version not being written correctly
---
 gvisor-git/.SRCINFO | 2 +-
 gvisor-git/PKGBUILD | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gvisor-git/.SRCINFO b/gvisor-git/.SRCINFO
index 9f6558d..938437e 100644
--- a/gvisor-git/.SRCINFO
+++ b/gvisor-git/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gvisor-git
 	pkgdesc = OCI container sandbox runtime focused on security, efficiency, and ease of use
-	pkgver = 20230710.0
+	pkgver = 20230801.0
 	pkgrel = 1
 	url = https://gvisor.dev
 	arch = x86_64
diff --git a/gvisor-git/PKGBUILD b/gvisor-git/PKGBUILD
index e04f8e3..876a32c 100644
--- a/gvisor-git/PKGBUILD
+++ b/gvisor-git/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname='gvisor-git'
 _pkgbin='runsc'
 _pkgshim='containerd-shim-runsc-v1'
-pkgver=20230710.0
+pkgver=20230801.0
 pkgrel=1
 pkgdesc='OCI container sandbox runtime focused on security, efficiency, and ease of use'
 arch=('x86_64' 'aarch64')
@@ -32,10 +32,10 @@ build() {
 	export CGO_CFLAGS="${CFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
-	export GO111MODULE=on
+	export GOPATH="${srcdir}"
 	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-	CGO_ENABLED=0 go build -v -o "bin/$_pkgbin" -ldflags "-X main.version=${pkgver}" gvisor.dev/gvisor/runsc
-	go build -v -o "bin/$_pkgshim" gvisor.dev/gvisor/shim
+	CGO_ENABLED=0 go build -v -o "bin/$_pkgbin" -ldflags "-linkmode=external -compressdwarf=false -X gvisor.dev/gvisor/runsc/version.version=${pkgver}" gvisor.dev/gvisor/runsc
+	go build -v -o "bin/$_pkgshim" -ldflags "-linkmode=external -compressdwarf=false" gvisor.dev/gvisor/shim
 }
 
 package() {