Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] go: update to 1.21.0.
@ 2023-08-10 18:10 g4s8
  2023-08-10 18:24 ` g4s8
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: g4s8 @ 2023-08-10 18:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]

There is a new pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 7418 bytes --]

From 4b40de172b850bf4db6f0158c3ddebb74167c8e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
@ 2023-08-10 18:24 ` g4s8
  2023-08-11 11:54 ` mhmdanas
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-10 18:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New comment by g4s8 on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1673698228

Comment:
@the-maldridge @paper42 please take a look. And pay attention to this ticket https://github.com/golang/go/issues/61921

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
  2023-08-10 18:24 ` g4s8
@ 2023-08-11 11:54 ` mhmdanas
  2023-08-12 15:42 ` [PR PATCH] [Updated] " g4s8
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: mhmdanas @ 2023-08-11 11:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1674623478

Comment:
It's best that you do a world rebuild of `build_style=go` packages (for multiple archs), to check if they can still build successfully.

Also see https://github.com/void-linux/void-packages/issues/44578.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
  2023-08-10 18:24 ` g4s8
  2023-08-11 11:54 ` mhmdanas
@ 2023-08-12 15:42 ` g4s8
  2023-08-12 15:47 ` g4s8
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-12 15:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 174325 bytes --]

From 4b40de172b850bf4db6f0158c3ddebb74167c8e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 1/2] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 4dd33301912f84f652382b83226c692b26018ada Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 14:04:55 +0400
Subject: [PATCH 2/2] Bump revision for go packages

---
 common/build-style/go.sh                      | 2 +-
 common/environment/build-style/go.sh          | 4 ++++
 srcpkgs/3mux/template                         | 2 +-
 srcpkgs/Amass/template                        | 2 +-
 srcpkgs/Gokapi/template                       | 5 +++--
 srcpkgs/NetAuth-ldap/template                 | 2 +-
 srcpkgs/NetAuth-localizer/template            | 2 +-
 srcpkgs/NetAuth-nsscache/template             | 2 +-
 srcpkgs/NetAuth-pam-helper/template           | 2 +-
 srcpkgs/NetAuth-sftpgo-hook/template          | 2 +-
 srcpkgs/NetAuth/template                      | 2 +-
 srcpkgs/NetKeys/template                      | 2 +-
 srcpkgs/NoiseTorch/template                   | 2 +-
 srcpkgs/PopCorn/template                      | 2 +-
 srcpkgs/TMSU/template                         | 2 +-
 srcpkgs/TerraState/template                   | 2 +-
 srcpkgs/abireport/template                    | 2 +-
 srcpkgs/acbuild/template                      | 2 +-
 srcpkgs/ace-util/template                     | 2 +-
 srcpkgs/acmetool/template                     | 2 +-
 srcpkgs/act/template                          | 2 +-
 srcpkgs/aerc/template                         | 2 +-
 srcpkgs/age/template                          | 2 +-
 srcpkgs/alertmanager/template                 | 2 +-
 srcpkgs/amfora/template                       | 2 +-
 srcpkgs/antibody/template                     | 2 +-
 srcpkgs/app-builder/template                  | 2 +-
 srcpkgs/aptly/template                        | 2 +-
 srcpkgs/aquatone/template                     | 2 +-
 srcpkgs/archiver/template                     | 2 +-
 srcpkgs/arduino-cli/template                  | 2 +-
 srcpkgs/arpfox/template                       | 2 +-
 srcpkgs/atlantis/template                     | 2 +-
 srcpkgs/autorestic/template                   | 2 +-
 srcpkgs/aws-vault/template                    | 2 +-
 srcpkgs/babelfish/template                    | 2 +-
 srcpkgs/bettercap/template                    | 2 +-
 srcpkgs/bird_exporter/template                | 2 +-
 srcpkgs/blackbox_exporter/template            | 2 +-
 srcpkgs/blush/template                        | 2 +-
 srcpkgs/bombadillo/template                   | 2 +-
 srcpkgs/bombardier/template                   | 2 +-
 srcpkgs/booster/template                      | 2 +-
 srcpkgs/brig/template                         | 2 +-
 srcpkgs/browserpass/template                  | 2 +-
 srcpkgs/browsh/template                       | 4 ++--
 srcpkgs/buildah/template                      | 2 +-
 srcpkgs/caddy/template                        | 6 +++++-
 srcpkgs/carapace/template                     | 2 +-
 srcpkgs/cdetect/template                      | 2 +-
 srcpkgs/cfssl/template                        | 2 +-
 srcpkgs/cgrps/template                        | 2 +-
 srcpkgs/chathistorysync/template              | 2 +-
 srcpkgs/cheat/template                        | 5 +++--
 srcpkgs/chezmoi/template                      | 2 +-
 srcpkgs/chroma/template                       | 2 +-
 srcpkgs/chronograf/template                   | 2 +-
 srcpkgs/circleci-cli/template                 | 2 +-
 srcpkgs/cliphist/template                     | 2 +-
 srcpkgs/clipman/template                      | 2 +-
 srcpkgs/cloudflared/template                  | 3 ++-
 srcpkgs/cni-plugin-dnsname/template           | 2 +-
 srcpkgs/cni-plugins/template                  | 2 +-
 srcpkgs/cni/template                          | 2 +-
 srcpkgs/cod/template                          | 2 +-
 srcpkgs/codesearch/template                   | 2 +-
 srcpkgs/consul-template/template              | 2 +-
 srcpkgs/consul/template                       | 2 +-
 srcpkgs/containerd/template                   | 2 +-
 srcpkgs/coredns/template                      | 2 +-
 srcpkgs/cowyo/template                        | 2 +-
 srcpkgs/coyim/template                        | 2 +-
 srcpkgs/crane/template                        | 2 +-
 srcpkgs/cri-o/template                        | 2 +-
 srcpkgs/cri-tools/template                    | 2 +-
 srcpkgs/croc/template                         | 2 +-
 srcpkgs/d2/template                           | 2 +-
 srcpkgs/darch/template                        | 2 +-
 srcpkgs/darkman/template                      | 2 +-
 srcpkgs/darktile/template                     | 2 +-
 srcpkgs/dasel/template                        | 2 +-
 srcpkgs/delve/template                        | 2 +-
 srcpkgs/dendrite/template                     | 2 +-
 srcpkgs/dep/template                          | 2 +-
 srcpkgs/direnv/template                       | 2 +-
 srcpkgs/dirstalk/template                     | 2 +-
 srcpkgs/distrobuilder/template                | 2 +-
 srcpkgs/dive/template                         | 2 +-
 srcpkgs/dlayer/template                       | 2 +-
 srcpkgs/dnscrypt-proxy/template               | 6 +++++-
 srcpkgs/docker-buildx/template                | 5 +++--
 srcpkgs/docker-cli/template                   | 2 +-
 srcpkgs/docker-compose/template               | 2 +-
 srcpkgs/docker-credential-pass/template       | 2 +-
 srcpkgs/docker-gen/template                   | 2 +-
 srcpkgs/docker-machine-driver-kvm/template    | 2 +-
 srcpkgs/docker-machine/template               | 2 +-
 srcpkgs/doctl/template                        | 2 +-
 srcpkgs/domain_exporter/template              | 2 +-
 srcpkgs/dotool/template                       | 2 +-
 srcpkgs/drive/template                        | 2 +-
 srcpkgs/drone-cli/template                    | 2 +-
 srcpkgs/duf/template                          | 2 +-
 srcpkgs/elfinfo/template                      | 2 +-
 srcpkgs/elvish/template                       | 5 +++--
 srcpkgs/emptty/template                       | 2 +-
 srcpkgs/ensure-access/template                | 2 +-
 srcpkgs/etcd/template                         | 2 +-
 srcpkgs/exercism/template                     | 2 +-
 srcpkgs/ffuf/template                         | 4 ++--
 srcpkgs/figurine/template                     | 2 +-
 srcpkgs/flannel/template                      | 2 +-
 srcpkgs/flint/template                        | 2 +-
 srcpkgs/forego/template                       | 2 +-
 srcpkgs/frp/template                          | 2 +-
 srcpkgs/fs-repo-migrations/template           | 2 +-
 srcpkgs/fscrypt/template                      | 2 +-
 srcpkgs/fzf/template                          | 2 +-
 srcpkgs/gdu/template                          | 5 +++--
 srcpkgs/gemget/template                       | 2 +-
 srcpkgs/gendesk/template                      | 2 +-
 srcpkgs/gfuzz/template                        | 2 +-
 srcpkgs/ghq/template                          | 2 +-
 srcpkgs/gister/template                       | 2 +-
 srcpkgs/git-lfs/template                      | 2 +-
 srcpkgs/git-sizer/template                    | 2 +-
 srcpkgs/git-team/template                     | 2 +-
 srcpkgs/gitbatch/template                     | 2 +-
 srcpkgs/gitea/template                        | 2 +-
 srcpkgs/github-cli/template                   | 2 +-
 srcpkgs/github-opml/template                  | 2 +-
 srcpkgs/gitlab-runner/template                | 2 +-
 srcpkgs/gkill/template                        | 2 +-
 srcpkgs/glab/template                         | 2 +-
 srcpkgs/glide/template                        | 2 +-
 srcpkgs/glider/template                       | 2 +-
 srcpkgs/glock/template                        | 2 +-
 srcpkgs/glow/template                         | 2 +-
 srcpkgs/go-bindata/template                   | 2 +-
 srcpkgs/go-capnproto2/template                | 2 +-
 srcpkgs/go-ipfs/template                      | 3 ++-
 srcpkgs/go-jira/template                      | 2 +-
 srcpkgs/go-md2man/template                    | 2 +-
 srcpkgs/go-mtpfs/template                     | 2 +-
 srcpkgs/go-review/template                    | 2 +-
 srcpkgs/goatcounter/template                  | 2 +-
 srcpkgs/gobuster/template                     | 2 +-
 srcpkgs/gocloc/template                       | 2 +-
 srcpkgs/gocryptfs/template                    | 2 +-
 srcpkgs/godef/template                        | 2 +-
 srcpkgs/gogs/template                         | 2 +-
 srcpkgs/goimapnotify/template                 | 2 +-
 srcpkgs/golangci-lint/template                | 5 +++--
 srcpkgs/gomatrix/template                     | 2 +-
 srcpkgs/gopass-jsonapi/template               | 2 +-
 srcpkgs/gopass/template                       | 2 +-
 srcpkgs/gopls/template                        | 2 +-
 srcpkgs/gopm/template                         | 2 +-
 srcpkgs/gops/template                         | 2 +-
 srcpkgs/goreleaser/template                   | 2 +-
 srcpkgs/gotify-cli/template                   | 2 +-
 srcpkgs/gotify-server/template                | 2 +-
 srcpkgs/gotop/template                        | 2 +-
 srcpkgs/gotty/template                        | 2 +-
 srcpkgs/goversion/template                    | 2 +-
 srcpkgs/grafana/template                      | 2 +-
 srcpkgs/gron/template                         | 2 +-
 srcpkgs/grype/template                        | 2 +-
 srcpkgs/gucci/template                        | 2 +-
 srcpkgs/gum/template                          | 2 +-
 srcpkgs/hcloud/template                       | 2 +-
 srcpkgs/hey/template                          | 2 +-
 srcpkgs/hivemind/template                     | 2 +-
 srcpkgs/hooktftp/template                     | 2 +-
 srcpkgs/httpstat/template                     | 2 +-
 srcpkgs/hub/template                          | 2 +-
 srcpkgs/hugo/template                         | 2 +-
 srcpkgs/hut/template                          | 2 +-
 srcpkgs/hydroxide/template                    | 2 +-
 srcpkgs/i3cat/template                        | 2 +-
 srcpkgs/ibus-bamboo/template                  | 2 +-
 srcpkgs/img/template                          | 2 +-
 srcpkgs/immortal/template                     | 2 +-
 srcpkgs/influxdb/template                     | 2 +-
 srcpkgs/ipfs-cluster/template                 | 2 +-
 srcpkgs/ipp-usb/template                      | 2 +-
 srcpkgs/ircdog/template                       | 2 +-
 srcpkgs/jd/template                           | 2 +-
 srcpkgs/jid/template                          | 2 +-
 srcpkgs/jj/template                           | 2 +-
 srcpkgs/joker/template                        | 2 +-
 srcpkgs/jp/template                           | 2 +-
 srcpkgs/jsonnet-language-server/template      | 2 +-
 srcpkgs/jump/template                         | 2 +-
 srcpkgs/k3d/template                          | 6 +++++-
 srcpkgs/k9s/template                          | 2 +-
 srcpkgs/kapacitor/template                    | 2 +-
 srcpkgs/keybase/template                      | 2 +-
 srcpkgs/knit/template                         | 5 +++--
 srcpkgs/kopia/template                        | 2 +-
 srcpkgs/kops/template                         | 5 +++--
 srcpkgs/kubecfg/template                      | 2 +-
 srcpkgs/kubefwd/template                      | 9 +++------
 srcpkgs/kubernetes-kind/template              | 2 +-
 srcpkgs/kubernetes/template                   | 2 +-
 srcpkgs/kurly/template                        | 2 +-
 srcpkgs/lazydocker/template                   | 2 +-
 srcpkgs/lazygit/template                      | 2 +-
 srcpkgs/lego/template                         | 2 +-
 srcpkgs/lets/template                         | 2 +-
 srcpkgs/lf/template                           | 2 +-
 srcpkgs/licensechecker/template               | 2 +-
 srcpkgs/loki/template                         | 2 +-
 srcpkgs/lsp/template                          | 2 +-
 srcpkgs/lux/template                          | 2 +-
 srcpkgs/maddy/template                        | 2 +-
 srcpkgs/madonctl/template                     | 2 +-
 srcpkgs/massren/template                      | 2 +-
 srcpkgs/mdr/template                          | 2 +-
 srcpkgs/micro/template                        | 2 +-
 srcpkgs/microhookd/template                   | 2 +-
 srcpkgs/miller/template                       | 2 +-
 srcpkgs/miniflux/template                     | 2 +-
 srcpkgs/minify/template                       | 2 +-
 srcpkgs/minikube/template                     | 5 +++--
 srcpkgs/minio/template                        | 2 +-
 srcpkgs/misspell/template                     | 2 +-
 srcpkgs/mmark/template                        | 2 +-
 srcpkgs/mmv-go/template                       | 5 +++--
 srcpkgs/moar/template                         | 2 +-
 srcpkgs/moby/template                         | 2 +-
 srcpkgs/mountain-backup/template              | 2 +-
 srcpkgs/mpdviz/template                       | 2 +-
 srcpkgs/nebula/template                       | 2 +-
 srcpkgs/nerdctl/template                      | 2 +-
 srcpkgs/netdata-plugins-go/template           | 5 +++--
 srcpkgs/netns/template                        | 2 +-
 srcpkgs/netris/template                       | 5 +++--
 srcpkgs/nextdns/template                      | 2 +-
 srcpkgs/nncp/template                         | 2 +-
 srcpkgs/node_exporter/template                | 2 +-
 srcpkgs/nomad/template                        | 2 +-
 srcpkgs/ntfy/template                         | 2 +-
 srcpkgs/nvidia-container-toolkit/template     | 2 +-
 srcpkgs/nwg-look/template                     | 2 +-
 srcpkgs/obfs4proxy/template                   | 2 +-
 srcpkgs/oh/template                           | 2 +-
 srcpkgs/opensmtpd-filter-rspamd/template      | 2 +-
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 srcpkgs/operator-sdk/template                 | 2 +-
 srcpkgs/oragono/template                      | 4 ++--
 srcpkgs/oras/template                         | 2 +-
 srcpkgs/osv-scanner/template                  | 2 +-
 srcpkgs/packer/template                       | 2 +-
 srcpkgs/packr2/template                       | 4 ++++
 srcpkgs/pam_netauth/template                  | 2 +-
 srcpkgs/passphrase2pgp/template               | 2 +-
 srcpkgs/peco/template                         | 2 +-
 srcpkgs/pgmetrics/template                    | 5 +++--
 srcpkgs/pgweb/template                        | 2 +-
 srcpkgs/pkgtop/template                       | 2 +-
 srcpkgs/podman-tui/template                   | 2 +-
 srcpkgs/podman/template                       | 2 +-
 srcpkgs/pong-command/template                 | 2 +-
 srcpkgs/prometheus/template                   | 2 +-
 srcpkgs/pst/template                          | 2 +-
 srcpkgs/pup/template                          | 2 +-
 srcpkgs/pwget/template                        | 2 +-
 srcpkgs/qrcp/template                         | 2 +-
 srcpkgs/rancher-compose/template              | 2 +-
 srcpkgs/rclone/template                       | 2 +-
 srcpkgs/rest-server/template                  | 2 +-
 srcpkgs/restic/template                       | 2 +-
 srcpkgs/revive/template                       | 2 +-
 srcpkgs/rmapi/template                        | 2 +-
 srcpkgs/rocker/template                       | 2 +-
 srcpkgs/rootlesskit/template                  | 2 +-
 srcpkgs/runc/template                         | 2 +-
 srcpkgs/ryzen-stabilizator/template           | 2 +-
 srcpkgs/s/template                            | 2 +-
 srcpkgs/saml2aws/template                     | 2 +-
 srcpkgs/sampler/template                      | 2 +-
 srcpkgs/sbctl/template                        | 2 +-
 srcpkgs/scaleway-cli/template                 | 2 +-
 srcpkgs/scc/template                          | 2 +-
 srcpkgs/seaweedfs/template                    | 2 +-
 srcpkgs/senpai/template                       | 2 +-
 srcpkgs/sftpgo/template                       | 2 +-
 srcpkgs/shadowfox-updater/template            | 2 +-
 srcpkgs/sharenix/template                     | 2 +-
 srcpkgs/shfmt/template                        | 2 +-
 srcpkgs/shiori/template                       | 2 +-
 srcpkgs/sift/template                         | 2 +-
 srcpkgs/skaffold/template                     | 2 +-
 srcpkgs/skate/template                        | 2 +-
 srcpkgs/skopeo/template                       | 2 +-
 srcpkgs/slack-term/template                   | 2 +-
 srcpkgs/slit/template                         | 2 +-
 srcpkgs/soju/template                         | 2 +-
 srcpkgs/sops/template                         | 2 +-
 srcpkgs/spreed-webrtc/template                | 4 +++-
 srcpkgs/ssl_exporter/template                 | 2 +-
 srcpkgs/stc/template                          | 2 +-
 srcpkgs/step-certificates/template            | 2 +-
 srcpkgs/step-cli/template                     | 2 +-
 srcpkgs/stern/template                        | 2 +-
 srcpkgs/subfinder/template                    | 2 +-
 srcpkgs/subjack/template                      | 2 +-
 srcpkgs/superd/template                       | 2 +-
 srcpkgs/svctl/template                        | 2 +-
 srcpkgs/syft/template                         | 2 +-
 srcpkgs/syncthing/template                    | 3 ++-
 srcpkgs/tag/template                          | 2 +-
 srcpkgs/tailscale/template                    | 2 +-
 srcpkgs/tea/template                          | 4 ++--
 srcpkgs/telegraf/template                     | 2 +-
 srcpkgs/termshark/template                    | 2 +-
 srcpkgs/terraform-docs/template               | 2 +-
 srcpkgs/terraform-ls/template                 | 2 +-
 srcpkgs/terraform/template                    | 2 +-
 srcpkgs/terragrunt/template                   | 2 +-
 srcpkgs/tflint/template                       | 2 +-
 srcpkgs/tinycron/template                     | 2 +-
 srcpkgs/tldr/template                         | 2 +-
 srcpkgs/tml/template                          | 2 +-
 srcpkgs/todoist/template                      | 2 +-
 srcpkgs/transifex-cli/template                | 2 +-
 srcpkgs/twitch-cli/template                   | 2 +-
 srcpkgs/typioca/template                      | 2 +-
 srcpkgs/umoci/template                        | 2 +-
 srcpkgs/unflac/template                       | 2 +-
 srcpkgs/uni/template                          | 2 +-
 srcpkgs/up/template                           | 2 +-
 srcpkgs/up_rewrite/template                   | 2 +-
 srcpkgs/upterm/template                       | 2 +-
 srcpkgs/usql/template                         | 2 +-
 srcpkgs/v2ray/template                        | 6 +++++-
 srcpkgs/vale/template                         | 2 +-
 srcpkgs/vault-acme/template                   | 2 +-
 srcpkgs/vault/template                        | 2 +-
 srcpkgs/vegeta/template                       | 2 +-
 srcpkgs/vhs/template                          | 2 +-
 srcpkgs/vmdfmt/template                       | 2 +-
 srcpkgs/vndr/template                         | 2 +-
 srcpkgs/vultr-cli/template                    | 2 +-
 srcpkgs/vultr/template                        | 2 +-
 srcpkgs/wally-cli/template                    | 2 +-
 srcpkgs/wander/template                       | 2 +-
 srcpkgs/webcat/template                       | 2 +-
 srcpkgs/webhook/template                      | 2 +-
 srcpkgs/websocketd/template                   | 2 +-
 srcpkgs/wego/template                         | 2 +-
 srcpkgs/wireproxy/template                    | 6 +++++-
 srcpkgs/woke/template                         | 2 +-
 srcpkgs/wtfutil/template                      | 2 +-
 srcpkgs/wuzz/template                         | 2 +-
 srcpkgs/xmandump/template                     | 2 +-
 srcpkgs/xq-api/template                       | 2 +-
 srcpkgs/xurls/template                        | 2 +-
 srcpkgs/yggdrasil/template                    | 2 +-
 srcpkgs/yj/template                           | 2 +-
 srcpkgs/ymuse/template                        | 2 +-
 srcpkgs/yq-go/template                        | 2 +-
 srcpkgs/zrepl/template                        | 2 +-
 364 files changed, 427 insertions(+), 384 deletions(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index f1808b3311a4a..2b9538d9e4b0f 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -33,7 +33,7 @@ do_build() {
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;
diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"
diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"
diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"
diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"
diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"
diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"
diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"
diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"
diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild
diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"
diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"
diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch
diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."
diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"
diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"
diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"
diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"
diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"
diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"
diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"
diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli
diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"
diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"
diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"
diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"
diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"
diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"
diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"
diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"
diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"
diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 
diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"
diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"
diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index c281d47f9bb8c..9b2ec1d6682ed 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."
diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"
diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"
diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bf1f6ee617a1c..021d135b8d7d4 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.36.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"
diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}
diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"
diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }
diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"
diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"
diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"
diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"
diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd
diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"
diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"
diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"
diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"
diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch
diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"
diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"
diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config
diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"
diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"
diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"
diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE
diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"
diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"
diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"
diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"
diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"
diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"
diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"
diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"
diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"
diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"
diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"
diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"
diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"
diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"
diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"
diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="
diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"
diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"
diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"
diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"
diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 44a62707ee4c5..7f8f7bfb60f8c 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"
diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"
diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"
diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"
diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"
diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"
diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"
diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"
diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"
diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {
diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"
diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"
diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"
diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"
diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"
diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"
diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"
diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"
diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"
diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls
diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"
diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"
diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser
diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}
diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"
diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"
diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"
diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 4f1340bcca407..8fed0d66672cc 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=8.5.24
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server"
diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"
diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 423f0bdb7a8d6..8843e963b1fcb 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.64.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"
diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli
diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"
diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"
diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"
diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide
diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"
diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"
diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx
diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"
diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"
diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"
diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid
diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"
diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index 6bb756466ad93..cabf5f1422d75 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"
diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"
diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"
diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index ee8f06416f1c0..3923ac95d38b5 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=e01e274a5a9ea547bcdd885504bd44ef37b67a5a3f597bcb69b84d54eb8bfef0
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"
diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor
diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase
diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1
diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia
diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"
diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"
diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}
diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"
diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"
diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index fdb306e298338..c19af0a1970d1 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"
diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"
diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"
diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"
diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki
diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"
diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"
diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy
diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"
diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"
diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"
diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"
diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"
diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"
diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"
diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"
diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"
diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes
diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"
diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"
diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula
diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl
diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"
diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"
diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 5d2712cd67170..9ac8e20b52769 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.8.3
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"
diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}
diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit
diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git
diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"
diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"
diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"
diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"
diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"
diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"
diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"
diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..e4db0561a13c5 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -12,6 +12,10 @@ homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vlicense v2/LICENSE.txt
 }
diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel
diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"
diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"
diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"
diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"
diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"
diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"
diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"
diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"
diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}
diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone
diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 9868880d17320..6a8ced2bc4cc2 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"
diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"
diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"
diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"
diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 1c1b96897f1bc..3c0ac8667f744 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"
diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"
diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"
diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw
diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"
diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"
diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"
diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"
diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"
diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"
diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"
diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"
diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."
diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets
diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"
diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"
diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca
diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step
diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"
diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"
diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"
diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"
diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"
diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index a67c986b6678d..8ab8d197c9afa 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.85.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 9a5f43c414899..5e7bbf824e682 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=8b4d127c6893375165bbbc31865735b7cccc99e1bb019f6dab7a6020ba6b621b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto
diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"
diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash
diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"
diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"
diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"
diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"
diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 256db9390a32f..e553d98972c00 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.46.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"
diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"
diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"
diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"
diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"
diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"
diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index ccb0af3051a63..6ea5c1e3d8dfc 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"
diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"
diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"
diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"
diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"
diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"
diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"
diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"
diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"
diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"
diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"
diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE
diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"
diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"
diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"
diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"
diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"
diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"
diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (2 preceding siblings ...)
  2023-08-12 15:42 ` [PR PATCH] [Updated] " g4s8
@ 2023-08-12 15:47 ` g4s8
  2023-08-12 16:33 ` g4s8
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-12 15:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 174359 bytes --]

From 4e96fbe6a27a8f1594fa0850b96fe6f77da2c5c7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 1/2] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 73ae74487d4b7f138d405fdc6034417faf311cc6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 14:04:55 +0400
Subject: [PATCH 2/2] Bump revision for go packages

---
 common/build-style/go.sh                      | 2 +-
 common/environment/build-style/go.sh          | 4 ++++
 srcpkgs/3mux/template                         | 2 +-
 srcpkgs/Amass/template                        | 2 +-
 srcpkgs/Gokapi/template                       | 5 +++--
 srcpkgs/NetAuth-ldap/template                 | 2 +-
 srcpkgs/NetAuth-localizer/template            | 2 +-
 srcpkgs/NetAuth-nsscache/template             | 2 +-
 srcpkgs/NetAuth-pam-helper/template           | 2 +-
 srcpkgs/NetAuth-sftpgo-hook/template          | 2 +-
 srcpkgs/NetAuth/template                      | 2 +-
 srcpkgs/NetKeys/template                      | 2 +-
 srcpkgs/NoiseTorch/template                   | 2 +-
 srcpkgs/PopCorn/template                      | 2 +-
 srcpkgs/TMSU/template                         | 2 +-
 srcpkgs/TerraState/template                   | 2 +-
 srcpkgs/abireport/template                    | 2 +-
 srcpkgs/acbuild/template                      | 2 +-
 srcpkgs/ace-util/template                     | 2 +-
 srcpkgs/acmetool/template                     | 2 +-
 srcpkgs/act/template                          | 2 +-
 srcpkgs/aerc/template                         | 2 +-
 srcpkgs/age/template                          | 2 +-
 srcpkgs/alertmanager/template                 | 2 +-
 srcpkgs/amfora/template                       | 2 +-
 srcpkgs/antibody/template                     | 2 +-
 srcpkgs/app-builder/template                  | 2 +-
 srcpkgs/aptly/template                        | 2 +-
 srcpkgs/aquatone/template                     | 2 +-
 srcpkgs/archiver/template                     | 2 +-
 srcpkgs/arduino-cli/template                  | 2 +-
 srcpkgs/arpfox/template                       | 2 +-
 srcpkgs/atlantis/template                     | 2 +-
 srcpkgs/autorestic/template                   | 2 +-
 srcpkgs/aws-vault/template                    | 2 +-
 srcpkgs/babelfish/template                    | 2 +-
 srcpkgs/bettercap/template                    | 2 +-
 srcpkgs/bird_exporter/template                | 2 +-
 srcpkgs/blackbox_exporter/template            | 2 +-
 srcpkgs/blush/template                        | 2 +-
 srcpkgs/bombadillo/template                   | 2 +-
 srcpkgs/bombardier/template                   | 2 +-
 srcpkgs/booster/template                      | 2 +-
 srcpkgs/brig/template                         | 2 +-
 srcpkgs/browserpass/template                  | 2 +-
 srcpkgs/browsh/template                       | 4 ++--
 srcpkgs/buildah/template                      | 2 +-
 srcpkgs/caddy/template                        | 6 +++++-
 srcpkgs/carapace/template                     | 2 +-
 srcpkgs/cdetect/template                      | 2 +-
 srcpkgs/cfssl/template                        | 2 +-
 srcpkgs/cgrps/template                        | 2 +-
 srcpkgs/chathistorysync/template              | 2 +-
 srcpkgs/cheat/template                        | 5 +++--
 srcpkgs/chezmoi/template                      | 2 +-
 srcpkgs/chroma/template                       | 2 +-
 srcpkgs/chronograf/template                   | 2 +-
 srcpkgs/circleci-cli/template                 | 2 +-
 srcpkgs/cliphist/template                     | 2 +-
 srcpkgs/clipman/template                      | 2 +-
 srcpkgs/cloudflared/template                  | 3 ++-
 srcpkgs/cni-plugin-dnsname/template           | 2 +-
 srcpkgs/cni-plugins/template                  | 2 +-
 srcpkgs/cni/template                          | 2 +-
 srcpkgs/cod/template                          | 2 +-
 srcpkgs/codesearch/template                   | 2 +-
 srcpkgs/consul-template/template              | 2 +-
 srcpkgs/consul/template                       | 2 +-
 srcpkgs/containerd/template                   | 2 +-
 srcpkgs/coredns/template                      | 2 +-
 srcpkgs/cowyo/template                        | 2 +-
 srcpkgs/coyim/template                        | 2 +-
 srcpkgs/crane/template                        | 2 +-
 srcpkgs/cri-o/template                        | 2 +-
 srcpkgs/cri-tools/template                    | 2 +-
 srcpkgs/croc/template                         | 2 +-
 srcpkgs/d2/template                           | 2 +-
 srcpkgs/darch/template                        | 2 +-
 srcpkgs/darkman/template                      | 2 +-
 srcpkgs/darktile/template                     | 2 +-
 srcpkgs/dasel/template                        | 2 +-
 srcpkgs/delve/template                        | 2 +-
 srcpkgs/dendrite/template                     | 2 +-
 srcpkgs/dep/template                          | 2 +-
 srcpkgs/direnv/template                       | 2 +-
 srcpkgs/dirstalk/template                     | 2 +-
 srcpkgs/distrobuilder/template                | 2 +-
 srcpkgs/dive/template                         | 2 +-
 srcpkgs/dlayer/template                       | 2 +-
 srcpkgs/dnscrypt-proxy/template               | 6 +++++-
 srcpkgs/docker-buildx/template                | 5 +++--
 srcpkgs/docker-cli/template                   | 2 +-
 srcpkgs/docker-compose/template               | 2 +-
 srcpkgs/docker-credential-pass/template       | 2 +-
 srcpkgs/docker-gen/template                   | 2 +-
 srcpkgs/docker-machine-driver-kvm/template    | 2 +-
 srcpkgs/docker-machine/template               | 2 +-
 srcpkgs/doctl/template                        | 2 +-
 srcpkgs/domain_exporter/template              | 2 +-
 srcpkgs/dotool/template                       | 2 +-
 srcpkgs/drive/template                        | 2 +-
 srcpkgs/drone-cli/template                    | 2 +-
 srcpkgs/duf/template                          | 2 +-
 srcpkgs/elfinfo/template                      | 2 +-
 srcpkgs/elvish/template                       | 5 +++--
 srcpkgs/emptty/template                       | 2 +-
 srcpkgs/ensure-access/template                | 2 +-
 srcpkgs/etcd/template                         | 2 +-
 srcpkgs/exercism/template                     | 2 +-
 srcpkgs/ffuf/template                         | 4 ++--
 srcpkgs/figurine/template                     | 2 +-
 srcpkgs/flannel/template                      | 2 +-
 srcpkgs/flint/template                        | 2 +-
 srcpkgs/forego/template                       | 2 +-
 srcpkgs/frp/template                          | 2 +-
 srcpkgs/fs-repo-migrations/template           | 2 +-
 srcpkgs/fscrypt/template                      | 2 +-
 srcpkgs/fzf/template                          | 2 +-
 srcpkgs/gdu/template                          | 5 +++--
 srcpkgs/gemget/template                       | 2 +-
 srcpkgs/gendesk/template                      | 2 +-
 srcpkgs/gfuzz/template                        | 2 +-
 srcpkgs/ghq/template                          | 2 +-
 srcpkgs/gister/template                       | 2 +-
 srcpkgs/git-lfs/template                      | 2 +-
 srcpkgs/git-sizer/template                    | 2 +-
 srcpkgs/git-team/template                     | 2 +-
 srcpkgs/gitbatch/template                     | 2 +-
 srcpkgs/gitea/template                        | 2 +-
 srcpkgs/github-cli/template                   | 2 +-
 srcpkgs/github-opml/template                  | 2 +-
 srcpkgs/gitlab-runner/template                | 2 +-
 srcpkgs/gkill/template                        | 2 +-
 srcpkgs/glab/template                         | 2 +-
 srcpkgs/glide/template                        | 2 +-
 srcpkgs/glider/template                       | 2 +-
 srcpkgs/glock/template                        | 2 +-
 srcpkgs/glow/template                         | 2 +-
 srcpkgs/go-bindata/template                   | 2 +-
 srcpkgs/go-capnproto2/template                | 2 +-
 srcpkgs/go-ipfs/template                      | 3 ++-
 srcpkgs/go-jira/template                      | 2 +-
 srcpkgs/go-md2man/template                    | 2 +-
 srcpkgs/go-mtpfs/template                     | 2 +-
 srcpkgs/go-review/template                    | 2 +-
 srcpkgs/goatcounter/template                  | 2 +-
 srcpkgs/gobuster/template                     | 2 +-
 srcpkgs/gocloc/template                       | 2 +-
 srcpkgs/gocryptfs/template                    | 2 +-
 srcpkgs/godef/template                        | 2 +-
 srcpkgs/gogs/template                         | 2 +-
 srcpkgs/goimapnotify/template                 | 2 +-
 srcpkgs/golangci-lint/template                | 5 +++--
 srcpkgs/gomatrix/template                     | 2 +-
 srcpkgs/gopass-jsonapi/template               | 2 +-
 srcpkgs/gopass/template                       | 2 +-
 srcpkgs/gopls/template                        | 2 +-
 srcpkgs/gopm/template                         | 2 +-
 srcpkgs/gops/template                         | 2 +-
 srcpkgs/goreleaser/template                   | 2 +-
 srcpkgs/gotify-cli/template                   | 2 +-
 srcpkgs/gotify-server/template                | 2 +-
 srcpkgs/gotop/template                        | 2 +-
 srcpkgs/gotty/template                        | 2 +-
 srcpkgs/goversion/template                    | 2 +-
 srcpkgs/grafana/template                      | 2 +-
 srcpkgs/gron/template                         | 2 +-
 srcpkgs/grype/template                        | 2 +-
 srcpkgs/gucci/template                        | 2 +-
 srcpkgs/gum/template                          | 2 +-
 srcpkgs/hcloud/template                       | 2 +-
 srcpkgs/hey/template                          | 2 +-
 srcpkgs/hivemind/template                     | 2 +-
 srcpkgs/hooktftp/template                     | 2 +-
 srcpkgs/httpstat/template                     | 2 +-
 srcpkgs/hub/template                          | 2 +-
 srcpkgs/hugo/template                         | 2 +-
 srcpkgs/hut/template                          | 2 +-
 srcpkgs/hydroxide/template                    | 2 +-
 srcpkgs/i3cat/template                        | 2 +-
 srcpkgs/ibus-bamboo/template                  | 2 +-
 srcpkgs/img/template                          | 2 +-
 srcpkgs/immortal/template                     | 2 +-
 srcpkgs/influxdb/template                     | 2 +-
 srcpkgs/ipfs-cluster/template                 | 2 +-
 srcpkgs/ipp-usb/template                      | 2 +-
 srcpkgs/ircdog/template                       | 2 +-
 srcpkgs/jd/template                           | 2 +-
 srcpkgs/jid/template                          | 2 +-
 srcpkgs/jj/template                           | 2 +-
 srcpkgs/joker/template                        | 2 +-
 srcpkgs/jp/template                           | 2 +-
 srcpkgs/jsonnet-language-server/template      | 2 +-
 srcpkgs/jump/template                         | 2 +-
 srcpkgs/k3d/template                          | 6 +++++-
 srcpkgs/k9s/template                          | 2 +-
 srcpkgs/kapacitor/template                    | 2 +-
 srcpkgs/keybase/template                      | 2 +-
 srcpkgs/knit/template                         | 5 +++--
 srcpkgs/kopia/template                        | 2 +-
 srcpkgs/kops/template                         | 5 +++--
 srcpkgs/kubecfg/template                      | 2 +-
 srcpkgs/kubefwd/template                      | 9 +++------
 srcpkgs/kubernetes-kind/template              | 2 +-
 srcpkgs/kubernetes/template                   | 2 +-
 srcpkgs/kurly/template                        | 2 +-
 srcpkgs/lazydocker/template                   | 2 +-
 srcpkgs/lazygit/template                      | 2 +-
 srcpkgs/lego/template                         | 2 +-
 srcpkgs/lets/template                         | 2 +-
 srcpkgs/lf/template                           | 2 +-
 srcpkgs/licensechecker/template               | 2 +-
 srcpkgs/loki/template                         | 2 +-
 srcpkgs/lsp/template                          | 2 +-
 srcpkgs/lux/template                          | 2 +-
 srcpkgs/maddy/template                        | 2 +-
 srcpkgs/madonctl/template                     | 2 +-
 srcpkgs/massren/template                      | 2 +-
 srcpkgs/mdr/template                          | 2 +-
 srcpkgs/micro/template                        | 2 +-
 srcpkgs/microhookd/template                   | 2 +-
 srcpkgs/miller/template                       | 2 +-
 srcpkgs/miniflux/template                     | 2 +-
 srcpkgs/minify/template                       | 2 +-
 srcpkgs/minikube/template                     | 5 +++--
 srcpkgs/minio/template                        | 2 +-
 srcpkgs/misspell/template                     | 2 +-
 srcpkgs/mmark/template                        | 2 +-
 srcpkgs/mmv-go/template                       | 5 +++--
 srcpkgs/moar/template                         | 2 +-
 srcpkgs/moby/template                         | 2 +-
 srcpkgs/mountain-backup/template              | 2 +-
 srcpkgs/mpdviz/template                       | 2 +-
 srcpkgs/nebula/template                       | 2 +-
 srcpkgs/nerdctl/template                      | 2 +-
 srcpkgs/netdata-plugins-go/template           | 5 +++--
 srcpkgs/netns/template                        | 2 +-
 srcpkgs/netris/template                       | 5 +++--
 srcpkgs/nextdns/template                      | 2 +-
 srcpkgs/nncp/template                         | 2 +-
 srcpkgs/node_exporter/template                | 2 +-
 srcpkgs/nomad/template                        | 2 +-
 srcpkgs/ntfy/template                         | 2 +-
 srcpkgs/nvidia-container-toolkit/template     | 2 +-
 srcpkgs/nwg-look/template                     | 2 +-
 srcpkgs/obfs4proxy/template                   | 2 +-
 srcpkgs/oh/template                           | 2 +-
 srcpkgs/opensmtpd-filter-rspamd/template      | 2 +-
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 srcpkgs/operator-sdk/template                 | 2 +-
 srcpkgs/oragono/template                      | 4 ++--
 srcpkgs/oras/template                         | 2 +-
 srcpkgs/osv-scanner/template                  | 2 +-
 srcpkgs/packer/template                       | 2 +-
 srcpkgs/packr2/template                       | 4 ++++
 srcpkgs/pam_netauth/template                  | 2 +-
 srcpkgs/passphrase2pgp/template               | 2 +-
 srcpkgs/peco/template                         | 2 +-
 srcpkgs/pgmetrics/template                    | 5 +++--
 srcpkgs/pgweb/template                        | 2 +-
 srcpkgs/pkgtop/template                       | 2 +-
 srcpkgs/podman-tui/template                   | 2 +-
 srcpkgs/podman/template                       | 2 +-
 srcpkgs/pong-command/template                 | 2 +-
 srcpkgs/prometheus/template                   | 2 +-
 srcpkgs/pst/template                          | 2 +-
 srcpkgs/pup/template                          | 2 +-
 srcpkgs/pwget/template                        | 2 +-
 srcpkgs/qrcp/template                         | 2 +-
 srcpkgs/rancher-compose/template              | 2 +-
 srcpkgs/rclone/template                       | 2 +-
 srcpkgs/rest-server/template                  | 2 +-
 srcpkgs/restic/template                       | 2 +-
 srcpkgs/revive/template                       | 2 +-
 srcpkgs/rmapi/template                        | 2 +-
 srcpkgs/rocker/template                       | 2 +-
 srcpkgs/rootlesskit/template                  | 2 +-
 srcpkgs/runc/template                         | 2 +-
 srcpkgs/ryzen-stabilizator/template           | 2 +-
 srcpkgs/s/template                            | 2 +-
 srcpkgs/saml2aws/template                     | 2 +-
 srcpkgs/sampler/template                      | 2 +-
 srcpkgs/sbctl/template                        | 2 +-
 srcpkgs/scaleway-cli/template                 | 2 +-
 srcpkgs/scc/template                          | 2 +-
 srcpkgs/seaweedfs/template                    | 2 +-
 srcpkgs/senpai/template                       | 2 +-
 srcpkgs/sftpgo/template                       | 2 +-
 srcpkgs/shadowfox-updater/template            | 2 +-
 srcpkgs/sharenix/template                     | 2 +-
 srcpkgs/shfmt/template                        | 2 +-
 srcpkgs/shiori/template                       | 2 +-
 srcpkgs/sift/template                         | 2 +-
 srcpkgs/skaffold/template                     | 2 +-
 srcpkgs/skate/template                        | 2 +-
 srcpkgs/skopeo/template                       | 2 +-
 srcpkgs/slack-term/template                   | 2 +-
 srcpkgs/slit/template                         | 2 +-
 srcpkgs/soju/template                         | 2 +-
 srcpkgs/sops/template                         | 2 +-
 srcpkgs/spreed-webrtc/template                | 4 +++-
 srcpkgs/ssl_exporter/template                 | 2 +-
 srcpkgs/stc/template                          | 2 +-
 srcpkgs/step-certificates/template            | 2 +-
 srcpkgs/step-cli/template                     | 2 +-
 srcpkgs/stern/template                        | 2 +-
 srcpkgs/subfinder/template                    | 2 +-
 srcpkgs/subjack/template                      | 2 +-
 srcpkgs/superd/template                       | 2 +-
 srcpkgs/svctl/template                        | 2 +-
 srcpkgs/syft/template                         | 2 +-
 srcpkgs/syncthing/template                    | 3 ++-
 srcpkgs/tag/template                          | 2 +-
 srcpkgs/tailscale/template                    | 2 +-
 srcpkgs/tea/template                          | 4 ++--
 srcpkgs/telegraf/template                     | 2 +-
 srcpkgs/termshark/template                    | 2 +-
 srcpkgs/terraform-docs/template               | 2 +-
 srcpkgs/terraform-ls/template                 | 2 +-
 srcpkgs/terraform/template                    | 2 +-
 srcpkgs/terragrunt/template                   | 2 +-
 srcpkgs/tflint/template                       | 2 +-
 srcpkgs/tinycron/template                     | 2 +-
 srcpkgs/tldr/template                         | 2 +-
 srcpkgs/tml/template                          | 2 +-
 srcpkgs/todoist/template                      | 2 +-
 srcpkgs/transifex-cli/template                | 2 +-
 srcpkgs/twitch-cli/template                   | 2 +-
 srcpkgs/typioca/template                      | 2 +-
 srcpkgs/umoci/template                        | 2 +-
 srcpkgs/unflac/template                       | 2 +-
 srcpkgs/uni/template                          | 2 +-
 srcpkgs/up/template                           | 2 +-
 srcpkgs/up_rewrite/template                   | 2 +-
 srcpkgs/upterm/template                       | 2 +-
 srcpkgs/usql/template                         | 2 +-
 srcpkgs/v2ray/template                        | 6 +++++-
 srcpkgs/vale/template                         | 2 +-
 srcpkgs/vault-acme/template                   | 2 +-
 srcpkgs/vault/template                        | 2 +-
 srcpkgs/vegeta/template                       | 2 +-
 srcpkgs/vhs/template                          | 2 +-
 srcpkgs/vmdfmt/template                       | 2 +-
 srcpkgs/vndr/template                         | 2 +-
 srcpkgs/vultr-cli/template                    | 2 +-
 srcpkgs/vultr/template                        | 2 +-
 srcpkgs/wally-cli/template                    | 2 +-
 srcpkgs/wander/template                       | 2 +-
 srcpkgs/webcat/template                       | 2 +-
 srcpkgs/webhook/template                      | 2 +-
 srcpkgs/websocketd/template                   | 2 +-
 srcpkgs/wego/template                         | 2 +-
 srcpkgs/wireproxy/template                    | 6 +++++-
 srcpkgs/woke/template                         | 2 +-
 srcpkgs/wtfutil/template                      | 2 +-
 srcpkgs/wuzz/template                         | 2 +-
 srcpkgs/xmandump/template                     | 2 +-
 srcpkgs/xq-api/template                       | 2 +-
 srcpkgs/xurls/template                        | 2 +-
 srcpkgs/yggdrasil/template                    | 2 +-
 srcpkgs/yj/template                           | 2 +-
 srcpkgs/ymuse/template                        | 2 +-
 srcpkgs/yq-go/template                        | 2 +-
 srcpkgs/zrepl/template                        | 2 +-
 364 files changed, 427 insertions(+), 384 deletions(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..038e989aceafc 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -33,7 +33,7 @@ do_build() {
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;
diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"
diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"
diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"
diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"
diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"
diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"
diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"
diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"
diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"
diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"
diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild
diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"
diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"
diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch
diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."
diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"
diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"
diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"
diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"
diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"
diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"
diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"
diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli
diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"
diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"
diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"
diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"
diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"
diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"
diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"
diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"
diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"
diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"
diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"
diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"
diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 
diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"
diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"
diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."
diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"
diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"
diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"
diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"
diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}
diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"
diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }
diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"
diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"
diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"
diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"
diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd
diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"
diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"
diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"
diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"
diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"
diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"
diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"
diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch
diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"
diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"
diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2
diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config
diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"
diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"
diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"
diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"
diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE
diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"
diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"
diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"
diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"
diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"
diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"
diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"
diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"
diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"
diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"
diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"
diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"
diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"
diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"
diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"
diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="
diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"
diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"
diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"
diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"
diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"
diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"
diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"
diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"
diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"
diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"
diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"
diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"
diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"
diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"
diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {
diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"
diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"
diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"
diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"
diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"
diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"
diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"
diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"
diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"
diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"
diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass
diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls
diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"
diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"
diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser
diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}
diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}
diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"
diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"
diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"
diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"
diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"
diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"
diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"
diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli
diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"
diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"
diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"
diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"
diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide
diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"
diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"
diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"
diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx
diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"
diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"
diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"
diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid
diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"
diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"
diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"
diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"
diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"
diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor
diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase
diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1
diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia
diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"
diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"
diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}
diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"
diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"
diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"
diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"
diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"
diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"
diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki
diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"
diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"
diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy
diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"
diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"
diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"
diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"
diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"
diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"
diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"
diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"
diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"
diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"
diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes
diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"
diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"
diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula
diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl
diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"
diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"
diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 5d2712cd67170..9ac8e20b52769 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.8.3
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"
diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}
diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit
diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git
diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"
diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"
diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"
diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"
diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"
diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"
diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"
diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..e4db0561a13c5 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -12,6 +12,10 @@ homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vlicense v2/LICENSE.txt
 }
diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel
diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"
diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"
diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"
diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"
diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"
diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"
diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"
diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"
diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"
diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"
diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}
diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone
diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"
diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"
diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"
diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"
diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl
diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5495e4a720bb1..008a94e502e19 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.8
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"
diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go
diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"
diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"
diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw
diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"
diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"
diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"
diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"
diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"
diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"
diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"
diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"
diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"
diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"
diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"
diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"
diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"
diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."
diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets
diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"
diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"
diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca
diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step
diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"
diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"
diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"
diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"
diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"
diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto
diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"
diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"
diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash
diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"
diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"
diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"
diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"
diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"
diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"
diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"
diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"
diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"
diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"
diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"
diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"
diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"
diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"
diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"
diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"
diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }
diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"
diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"
diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"
diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"
diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"
diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"
diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"
diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"
diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"
diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"
diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"
diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE
diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"
diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"
diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"
diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"
diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"
diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"
diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"
diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (3 preceding siblings ...)
  2023-08-12 15:47 ` g4s8
@ 2023-08-12 16:33 ` g4s8
  2023-08-12 21:15 ` g4s8
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-12 16:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 264453 bytes --]

From 4e96fbe6a27a8f1594fa0850b96fe6f77da2c5c7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/364] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 0923db677aad0abec23bf2cd77518337558f4260 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/364] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 2 +-
 common/environment/build-style/go.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..038e989aceafc 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -33,7 +33,7 @@ do_build() {
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From f97a9a62b6bc8ce0871a2e9474e48b1505d2d807 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:13 +0400
Subject: [PATCH 003/364] 3mux: update go build style to go1.21.0

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From d56c93cf48e24316d726b0204fb5167ef0ad9d7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:14 +0400
Subject: [PATCH 004/364] Amass: update go build style to go1.21.0

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From 49235666bfa8bd131f6865fba05198285f446365 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:14 +0400
Subject: [PATCH 005/364] Gokapi: update go build style to go1.21.0

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From 5c39c20b5c2e72135dbb62f66a85a09233078422 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:15 +0400
Subject: [PATCH 006/364] NetAuth-ldap: update go build style to go1.21.0

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From b8a4b4c11b2703fc0172a7efab5f0526e80697ac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:15 +0400
Subject: [PATCH 007/364] NetAuth-localizer: update go build style to go1.21.0

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From e5d9ec19f6afc121c406f05dc92c9117503bf183 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:16 +0400
Subject: [PATCH 008/364] NetAuth-nsscache: update go build style to go1.21.0

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From a33d01acbf5abca21a66a1eb439a6844fff70192 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:16 +0400
Subject: [PATCH 009/364] NetAuth-pam-helper: update go build style to go1.21.0

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From 5853a310ca6cf0961d33bd72263def9b5a9ed1d2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:17 +0400
Subject: [PATCH 010/364] NetAuth-sftpgo-hook: update go build style to
 go1.21.0

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 943748716f018007067abe54a0cca0cc50fa1354 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:17 +0400
Subject: [PATCH 011/364] NetAuth: update go build style to go1.21.0

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From 02375023d24f3c2062ee766d74eba36df20cc6f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:18 +0400
Subject: [PATCH 012/364] NetKeys: update go build style to go1.21.0

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From 4cef150e9ba991b51529fd0b1edf0f2269b8303e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:18 +0400
Subject: [PATCH 013/364] NoiseTorch: update go build style to go1.21.0

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From b5157eb06ee3a13c9f2ba1aa6c6d7a5fe35fc85f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:19 +0400
Subject: [PATCH 014/364] PopCorn: update go build style to go1.21.0

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 71350f485e56179e4204fea923df76027343d4eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:19 +0400
Subject: [PATCH 015/364] TMSU: update go build style to go1.21.0

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From b6292972f50be9e644bd3471c48f9ac313d3d5f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:20 +0400
Subject: [PATCH 016/364] TerraState: update go build style to go1.21.0

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From 60caea967ef62b097640010cbaaafc0d0e993759 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:20 +0400
Subject: [PATCH 017/364] abireport: update go build style to go1.21.0

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From 9964f78b064628d1974b8f8a7d85424b2f96b0a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:21 +0400
Subject: [PATCH 018/364] acbuild: update go build style to go1.21.0

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From 6ae64a8651b28d5d711865a1ddb9b959819fc766 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:21 +0400
Subject: [PATCH 019/364] ace-util: update go build style to go1.21.0

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From 81cbdc26b5ce6b6de7f548f95fd63b02863306cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:22 +0400
Subject: [PATCH 020/364] acmetool: update go build style to go1.21.0

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 50d236641051af12e2fb0400be4b5d923bd24820 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:22 +0400
Subject: [PATCH 021/364] act: update go build style to go1.21.0

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 1963df1949fc04e8dc1b428710f89c377ba4592e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:23 +0400
Subject: [PATCH 022/364] aerc: update go build style to go1.21.0

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From a195dafc01cf6458686bd5e708ac715f16d4cd66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:23 +0400
Subject: [PATCH 023/364] age: update go build style to go1.21.0

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From cc0a97ef27a8b610d3110fdf345482bebe80cd44 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:24 +0400
Subject: [PATCH 024/364] alertmanager: update go build style to go1.21.0

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From c1b575dd0cde605df44aa38bb102718c1105a02d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:24 +0400
Subject: [PATCH 025/364] amfora: update go build style to go1.21.0

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 1731acb94bafb330d283725478c598ff1e3fbe00 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:25 +0400
Subject: [PATCH 026/364] antibody: update go build style to go1.21.0

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From a879e93fbdf5dedb4d93e27a0a029d7eb3ed0de4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:25 +0400
Subject: [PATCH 027/364] app-builder: update go build style to go1.21.0

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From daa68b1783d95616d6915d9f064b0e591bd9f0dd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:26 +0400
Subject: [PATCH 028/364] aptly: update go build style to go1.21.0

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From b946fe648f2ddab72686ecc1f50865d81f1cc20f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:26 +0400
Subject: [PATCH 029/364] aquatone: update go build style to go1.21.0

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From e60c665bd788c9aa7ced754c8ccf5855c9f50232 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:27 +0400
Subject: [PATCH 030/364] archiver: update go build style to go1.21.0

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 1bed976789469131668c690ea57d76f51e8cb015 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:27 +0400
Subject: [PATCH 031/364] arduino-cli: update go build style to go1.21.0

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From 6330b6a558dbb20b924af7f48359333560db541f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:28 +0400
Subject: [PATCH 032/364] arpfox: update go build style to go1.21.0

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From af97f821da1ac1bf097736e8db5bdef5cbda58e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:28 +0400
Subject: [PATCH 033/364] atlantis: update go build style to go1.21.0

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From 831a883a735d840a5d46fd6a28fe9d2fa61eb6ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:29 +0400
Subject: [PATCH 034/364] autorestic: update go build style to go1.21.0

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From b035daba68b4b6649fc306441fd492fa081563ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:29 +0400
Subject: [PATCH 035/364] aws-vault: update go build style to go1.21.0

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 968ca24521c96e0bf516aef991dfb4fa78c7c7e7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:30 +0400
Subject: [PATCH 036/364] babelfish: update go build style to go1.21.0

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From 40bd5e0bcc1f9f796170dcbaf99d0f6437b60bad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:30 +0400
Subject: [PATCH 037/364] bettercap: update go build style to go1.21.0

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From a31ea6709b0607fabd183784971eb576b3f47fc1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:31 +0400
Subject: [PATCH 038/364] bird_exporter: update go build style to go1.21.0

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From 1703f8a6c1e98319e8b78b7bcda86179f6f76ecf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:31 +0400
Subject: [PATCH 039/364] blackbox_exporter: update go build style to go1.21.0

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From b2629e0a53102a831d944cb6b9fba47dc92210df Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:32 +0400
Subject: [PATCH 040/364] blush: update go build style to go1.21.0

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From bb1b7110056f472498a31da620611cc306b68222 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:32 +0400
Subject: [PATCH 041/364] bombadillo: update go build style to go1.21.0

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From 3fd6f8744d7539bfc0034fa3a5d2a7fefc2e4efb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:33 +0400
Subject: [PATCH 042/364] bombardier: update go build style to go1.21.0

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 8254814ecd0180b0c79fba5bad85ef946303ca1a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:33 +0400
Subject: [PATCH 043/364] booster: update go build style to go1.21.0

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From c661fa23411bf80b60f069e3302fa4a9432c9fae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:34 +0400
Subject: [PATCH 044/364] brig: update go build style to go1.21.0

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From de120f398167c8b57a635bd68ff786e4a4a6ab30 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:34 +0400
Subject: [PATCH 045/364] browserpass: update go build style to go1.21.0

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From 137d711ccff9ea648166c1fc2767cd3e0ef08042 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:35 +0400
Subject: [PATCH 046/364] browsh: update go build style to go1.21.0

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From f2f37951dab8a62041883e224329b657f238e057 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:35 +0400
Subject: [PATCH 047/364] buildah: update go build style to go1.21.0

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From 4b76c2e149d5a2fda9932657d44ae0e0943697b5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:36 +0400
Subject: [PATCH 048/364] caddy: update go build style to go1.21.0

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From f1239b9c482156235534b2c0489a637aa0beee86 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:36 +0400
Subject: [PATCH 049/364] carapace: update go build style to go1.21.0

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From 5fc88c56cf9e79611d31cd2db472b783925ec310 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:37 +0400
Subject: [PATCH 050/364] cdetect: update go build style to go1.21.0

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From ae66d507b13b6dca31a88c158e55173a59b631ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:37 +0400
Subject: [PATCH 051/364] cfssl: update go build style to go1.21.0

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From 2e3a16a3a4ce8c682d7513950ed44cd7b0b3c36d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:38 +0400
Subject: [PATCH 052/364] cgrps: update go build style to go1.21.0

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From fdb42347f1d013186f36b6411e1b60adc01547c1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:38 +0400
Subject: [PATCH 053/364] chathistorysync: update go build style to go1.21.0

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From 55e0360c63eea9f28d42fa1e0dc548e00e671649 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:39 +0400
Subject: [PATCH 054/364] cheat: update go build style to go1.21.0

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From aed2cde4c75a54c27ad1af81f23535856c89e07b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 055/364] chezmoi: update go build style to go1.21.0

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From e44b40ee5043247910d952e9c412210c98d24c2c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 056/364] chroma: update go build style to go1.21.0

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From 928dccb61fea1ef48193a14892028b8a4a6fb516 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 057/364] chronograf: update go build style to go1.21.0

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From 6ae455b8573299735e0fab77ac2f9c1380caac89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:41 +0400
Subject: [PATCH 058/364] circleci-cli: update go build style to go1.21.0

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 41adeb86022022b768c3131cb73ed9779c76c5c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:41 +0400
Subject: [PATCH 059/364] cliphist: update go build style to go1.21.0

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From 1cd38b2216d3d4a75e051370adcbeebe4b4b61b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:42 +0400
Subject: [PATCH 060/364] clipman: update go build style to go1.21.0

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 513d0513702bf640d004ad08e260f1b16e7af165 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:43 +0400
Subject: [PATCH 061/364] cloudflared: update go build style to go1.21.0

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From 45347a61d7a8c35e98233f439eb8c6d4ab13dcf6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:43 +0400
Subject: [PATCH 062/364] cni-plugin-dnsname: update go build style to go1.21.0

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From 17bcb2f32ce3dc5f42bf5409cac0b335f2c3f97d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:44 +0400
Subject: [PATCH 063/364] cni-plugins: update go build style to go1.21.0

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From eb07d5f1975f1faba49c401f8519ca14db14f37f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:44 +0400
Subject: [PATCH 064/364] cni: update go build style to go1.21.0

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From b37f50322042f29f400038a94076a41886b2466e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:45 +0400
Subject: [PATCH 065/364] cod: update go build style to go1.21.0

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From b83f12c49e2640821cf7ee00b6c4dabbbeffd8a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:45 +0400
Subject: [PATCH 066/364] codesearch: update go build style to go1.21.0

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From 9d2876c5efcd95f2292d7835b5400e156da14951 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:46 +0400
Subject: [PATCH 067/364] consul-template: update go build style to go1.21.0

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From b23b71422a61f1d2a68995b10651c1df02880194 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:46 +0400
Subject: [PATCH 068/364] consul: update go build style to go1.21.0

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From b9aba84f42da00775609cd0775b9059e2fa39f91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:47 +0400
Subject: [PATCH 069/364] containerd: update go build style to go1.21.0

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From e972c28d334131b6dee9b54cdf2bddd7041bfab5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:47 +0400
Subject: [PATCH 070/364] coredns: update go build style to go1.21.0

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From e1671e72d7dbef953fa1a4c64df5f831179c9bf2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:48 +0400
Subject: [PATCH 071/364] cowyo: update go build style to go1.21.0

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 82f48c2949b9c4a1ba5e93b7d7b600dc6517e6a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:48 +0400
Subject: [PATCH 072/364] coyim: update go build style to go1.21.0

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 8146d530c127e3c2cbda15a8abb5719c1da37b3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:49 +0400
Subject: [PATCH 073/364] crane: update go build style to go1.21.0

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From 911049a88da1f075b8fbfcea7098e4c5dfde4ec1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:49 +0400
Subject: [PATCH 074/364] cri-o: update go build style to go1.21.0

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From 399ac883e480e06d0a5b3173226b5375b40b56a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:50 +0400
Subject: [PATCH 075/364] cri-tools: update go build style to go1.21.0

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From d7f6d491cf8667be51764a7d9165fc5f095adb31 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:50 +0400
Subject: [PATCH 076/364] croc: update go build style to go1.21.0

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From af0a02d25d9b039a8b228b5cdd6f86ee3c6a5140 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:51 +0400
Subject: [PATCH 077/364] d2: update go build style to go1.21.0

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 8e241470b73e0d92b09893eb4b50c53a3564b8f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:51 +0400
Subject: [PATCH 078/364] darch: update go build style to go1.21.0

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 94a60e80929c3e6390c3ab74f47648ba4d2994dd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:52 +0400
Subject: [PATCH 079/364] darkman: update go build style to go1.21.0

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 43ec2ea6cbcdb27c94d6132d1a7d5a905e99a4a7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:52 +0400
Subject: [PATCH 080/364] darktile: update go build style to go1.21.0

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From 530f5ff941cc9d1d37636ef1cbc3f548a93d877f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:53 +0400
Subject: [PATCH 081/364] dasel: update go build style to go1.21.0

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 4934c0c68f2206cbb4340779908ea6c17c98aa24 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:53 +0400
Subject: [PATCH 082/364] delve: update go build style to go1.21.0

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From 72b5304bfced6b3c88898aa9fd05f5196c80e859 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:54 +0400
Subject: [PATCH 083/364] dendrite: update go build style to go1.21.0

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From f42decdd74d2742133a28e8f253c22b5118d30d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:54 +0400
Subject: [PATCH 084/364] dep: update go build style to go1.21.0

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 9514412abcb4217a891922722859a69f55126fb0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:55 +0400
Subject: [PATCH 085/364] direnv: update go build style to go1.21.0

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 548953bf1538bbb57819d882b4fb8af5164c0330 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:55 +0400
Subject: [PATCH 086/364] dirstalk: update go build style to go1.21.0

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From 88adffdfafcaaf537ef32b705d90c96364790bfd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:56 +0400
Subject: [PATCH 087/364] distrobuilder: update go build style to go1.21.0

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 540e99474d412ba2e232588cd10cb34aabc0c538 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:56 +0400
Subject: [PATCH 088/364] dive: update go build style to go1.21.0

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From 7723ec75b22f2ff59e2e494d7a4aa6a5a2d9370e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:57 +0400
Subject: [PATCH 089/364] dlayer: update go build style to go1.21.0

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From a3a3e4ee8c183022567d4f43fa4e29b5d3d04386 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:57 +0400
Subject: [PATCH 090/364] dnscrypt-proxy: update go build style to go1.21.0

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From b3785e512337bf9175c27b096456d366419fd239 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:58 +0400
Subject: [PATCH 091/364] docker-buildx: update go build style to go1.21.0

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From fe6430de919febc1a0161d8f3723b171b931c3b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:58 +0400
Subject: [PATCH 092/364] docker-cli: update go build style to go1.21.0

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From 4d947c37d49315434dbb94070cb179f4a6b84615 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:59 +0400
Subject: [PATCH 093/364] docker-compose: update go build style to go1.21.0

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From 382bf402742d32a788419eb7fb56ed40369cb410 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:59 +0400
Subject: [PATCH 094/364] docker-credential-pass: update go build style to
 go1.21.0

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From ef9f2ef9da2e86913f79eb5711d3ffad1031e8d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:00 +0400
Subject: [PATCH 095/364] docker-gen: update go build style to go1.21.0

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From a6545b76c31241f5a03d25ade2fc99317558bfe4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:00 +0400
Subject: [PATCH 096/364] docker-machine-driver-kvm: update go build style to
 go1.21.0

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From dd6a663ad1301d56a625b97ec5db0524af034655 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:01 +0400
Subject: [PATCH 097/364] docker-machine: update go build style to go1.21.0

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From 053aa77d29f6e41fec3597d18cace87de03ddf84 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:01 +0400
Subject: [PATCH 098/364] doctl: update go build style to go1.21.0

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 6e20d6ff87572597b5a6ff588199eb5a71db2e21 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:02 +0400
Subject: [PATCH 099/364] domain_exporter: update go build style to go1.21.0

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 87d22732b4de61bb99844be33b0846914f82f7eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:02 +0400
Subject: [PATCH 100/364] dotool: update go build style to go1.21.0

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From 4e27bf70171705699564bbf351fc1f6d87fceb5d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:03 +0400
Subject: [PATCH 101/364] drive: update go build style to go1.21.0

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 875f2ed17b8a63826558d7e9948a7b68a07dc25b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:03 +0400
Subject: [PATCH 102/364] drone-cli: update go build style to go1.21.0

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 970d7949a9b0a99413d1237dda939fb2cf4630eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:04 +0400
Subject: [PATCH 103/364] duf: update go build style to go1.21.0

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From 5be679d83ca79baf6cfaf26f9fceb3e797c56ad0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:04 +0400
Subject: [PATCH 104/364] elfinfo: update go build style to go1.21.0

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From 2836056e5166d0b90ee3ca683fdc199e437082a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:05 +0400
Subject: [PATCH 105/364] elvish: update go build style to go1.21.0

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 5655b510f17645e4ddd237c73219fa30d517cf3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:05 +0400
Subject: [PATCH 106/364] emptty: update go build style to go1.21.0

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 3b4db8781661d95348538000a7e538e239ccba14 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:06 +0400
Subject: [PATCH 107/364] ensure-access: update go build style to go1.21.0

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From 2dddf5d5469e569e45b5844b25d87014f0512935 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:06 +0400
Subject: [PATCH 108/364] etcd: update go build style to go1.21.0

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 6ee4937492a6d215346e3494646bf9004de28d5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:07 +0400
Subject: [PATCH 109/364] exercism: update go build style to go1.21.0

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From b23a372ce89929c38f26d1002d42e33cc16a267c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:07 +0400
Subject: [PATCH 110/364] ffuf: update go build style to go1.21.0

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 681120aa94feaed2cb03c693385dd70db017b9d9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:08 +0400
Subject: [PATCH 111/364] figurine: update go build style to go1.21.0

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From 4b5c94df4cef6f77108fea3d9b1efb03332d6208 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:08 +0400
Subject: [PATCH 112/364] flannel: update go build style to go1.21.0

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 3f1a2e1414b24dd4fa72c000daedab2085ff2ac5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:09 +0400
Subject: [PATCH 113/364] flint: update go build style to go1.21.0

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From 59443ead6b5c89e1cfb6aa130e013ef06cb78399 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:09 +0400
Subject: [PATCH 114/364] forego: update go build style to go1.21.0

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From b993dcee0291cba9b6eb9ea66334dc3e2405c679 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:10 +0400
Subject: [PATCH 115/364] frp: update go build style to go1.21.0

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 579282c6c5f3c293799174239724b414a61e1a06 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:10 +0400
Subject: [PATCH 116/364] fs-repo-migrations: update go build style to go1.21.0

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 09008f5fcd3834a3c46ea694987301d50da8b76f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:11 +0400
Subject: [PATCH 117/364] fscrypt: update go build style to go1.21.0

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From 18797f14f6fdcef166591c513192c921a5b130b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:11 +0400
Subject: [PATCH 118/364] fzf: update go build style to go1.21.0

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 64a049f6fb03d6530449a9b20b9ee92260dd5f2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:12 +0400
Subject: [PATCH 119/364] gdu: update go build style to go1.21.0

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 742facd17b14bf2e9209e687ee3e436d90dd4af8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:12 +0400
Subject: [PATCH 120/364] gemget: update go build style to go1.21.0

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From 0b8eaab7622b09abc0fc2cdbf0645c040cd4bdf7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:13 +0400
Subject: [PATCH 121/364] gendesk: update go build style to go1.21.0

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 87a545f2c73cbf4be5ba98d1e46f4741ee355c22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:14 +0400
Subject: [PATCH 122/364] gfuzz: update go build style to go1.21.0

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 51cb05ec86722c573af27e9c153bfcf3d9e48aad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:14 +0400
Subject: [PATCH 123/364] ghq: update go build style to go1.21.0

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From 481d32681e3b894c303ef3ea3904b41d529675cb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:15 +0400
Subject: [PATCH 124/364] gister: update go build style to go1.21.0

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From 300a33aa08eeb7af36b685ff13e391536e7f72f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:15 +0400
Subject: [PATCH 125/364] git-lfs: update go build style to go1.21.0

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From 17fc2674ef7859929f60343b4f40019e4e688b6e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:16 +0400
Subject: [PATCH 126/364] git-sizer: update go build style to go1.21.0

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From f7fbe054cd5c0a26e56b77535ea86e5b5d029a01 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:16 +0400
Subject: [PATCH 127/364] git-team: update go build style to go1.21.0

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From ae761b2772118db4ded8265f14ada035cad3d5c1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:17 +0400
Subject: [PATCH 128/364] gitbatch: update go build style to go1.21.0

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From f359a5a5a1af35addc4775d0f8ac4b91e55aa3d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:17 +0400
Subject: [PATCH 129/364] gitea: update go build style to go1.21.0

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 4084b3d28775eda7aad57a691dc1a083a7603a4b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:18 +0400
Subject: [PATCH 130/364] github-cli: update go build style to go1.21.0

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 073e2cf0d021d668021bba05002d60ae1dcd2b12 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:18 +0400
Subject: [PATCH 131/364] github-opml: update go build style to go1.21.0

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From fd500b87d6afdf95232373cfebb766bc23c77bec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:19 +0400
Subject: [PATCH 132/364] gitlab-runner: update go build style to go1.21.0

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From 89e5279fe0b3c325fb347b921395a79d72b83f4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:19 +0400
Subject: [PATCH 133/364] gkill: update go build style to go1.21.0

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From 3d486443f7a647f4906bc4da46e4134ff2955bb9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:20 +0400
Subject: [PATCH 134/364] glab: update go build style to go1.21.0

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From f4c2747ace4161b68babcb9a9b8e3eb6de3f7f34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:21 +0400
Subject: [PATCH 135/364] glide: update go build style to go1.21.0

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 21b41f02386472e0fbdb0fd25ac9e52a2a017dbf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:21 +0400
Subject: [PATCH 136/364] glider: update go build style to go1.21.0

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From 7d4a07e129b205cf9c73859c1832eae425d00789 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:22 +0400
Subject: [PATCH 137/364] glock: update go build style to go1.21.0

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From e9f123bde64c79799a94bfb47b9a75b711703ee6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:22 +0400
Subject: [PATCH 138/364] glow: update go build style to go1.21.0

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 53340712fb98136cc11dce1eeef1a2beb4614015 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:23 +0400
Subject: [PATCH 139/364] go-bindata: update go build style to go1.21.0

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From d376df4855cee5b137c92218cd3c0620ae6729c8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:23 +0400
Subject: [PATCH 140/364] go-capnproto2: update go build style to go1.21.0

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 75f0106b088b3374cbe2439c97d00936949ad1f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:24 +0400
Subject: [PATCH 141/364] go-ipfs: update go build style to go1.21.0

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 84dbb22ff87c3715d424f6b1e774e4321d84d155 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:24 +0400
Subject: [PATCH 142/364] go-jira: update go build style to go1.21.0

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From 05cb11a6497bc043320816d3a846ebe7ea40c441 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:25 +0400
Subject: [PATCH 143/364] go-md2man: update go build style to go1.21.0

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From c0c634956d1239fca84ec2f0e68f61e4a40b9421 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:25 +0400
Subject: [PATCH 144/364] go-mtpfs: update go build style to go1.21.0

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 648324e074546d73fbb745ab3b9e8f6afb37734d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:26 +0400
Subject: [PATCH 145/364] go-review: update go build style to go1.21.0

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From 43ff9d40570a4e4371b00854deb24fcdcffac466 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:26 +0400
Subject: [PATCH 146/364] goatcounter: update go build style to go1.21.0

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From 6c630320999dc0567a8b2b5981187232dfd34cb8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:27 +0400
Subject: [PATCH 147/364] gobuster: update go build style to go1.21.0

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 91c787fabbbef1325ed82ba693b932df4f5cf090 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:28 +0400
Subject: [PATCH 148/364] gocloc: update go build style to go1.21.0

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From ed6748ef0d239b07f32fc95379c0a1b70f084199 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:28 +0400
Subject: [PATCH 149/364] gocryptfs: update go build style to go1.21.0

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From 7169da72e3726cd2aa13a062b21cf194a127023f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:29 +0400
Subject: [PATCH 150/364] godef: update go build style to go1.21.0

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From fa6828d88b56e74f05982b4127f2d37369c3e31b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:29 +0400
Subject: [PATCH 151/364] gogs: update go build style to go1.21.0

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From f45f4ee5a322b9fcc01e0e1c5c3cc1150d28cf2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:30 +0400
Subject: [PATCH 152/364] goimapnotify: update go build style to go1.21.0

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From dbe3824d8d3b301ca702879c2dc53ed1c20ab846 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:30 +0400
Subject: [PATCH 153/364] golangci-lint: update go build style to go1.21.0

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 0f02553e4e322397260b6f9c3e11254f1c891bd8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:31 +0400
Subject: [PATCH 154/364] gomatrix: update go build style to go1.21.0

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 1f175b86f3a32fe74100e654d18b3ff9a37b84cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:31 +0400
Subject: [PATCH 155/364] gopass-jsonapi: update go build style to go1.21.0

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From fd1200ad6429f20204d7320586031d382b190e00 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:32 +0400
Subject: [PATCH 156/364] gopass: update go build style to go1.21.0

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From f3529fe59698c57f8ac767cc81163f329c38be9a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:32 +0400
Subject: [PATCH 157/364] gopls: update go build style to go1.21.0

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From af6232eab65dddbe591f1e325afd23974413727d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:33 +0400
Subject: [PATCH 158/364] gopm: update go build style to go1.21.0

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From 618dc0a0ca88a08d931a92ad08c7f1ab29af60e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:33 +0400
Subject: [PATCH 159/364] gops: update go build style to go1.21.0

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From 3acb2fece7addb65cb72bd6dd9a7ed2b1bb94984 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:34 +0400
Subject: [PATCH 160/364] goreleaser: update go build style to go1.21.0

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From b7e7929ada2449e637200b7a8ef0f8c286f9483c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:34 +0400
Subject: [PATCH 161/364] gotify-cli: update go build style to go1.21.0

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From 579a6dda8ae0dbe8f9fab7754d0c5feb1981e4f3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:35 +0400
Subject: [PATCH 162/364] gotify-server: update go build style to go1.21.0

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From 5f54eb59a36e7dcd002af702459ab89039069df9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:36 +0400
Subject: [PATCH 163/364] gotop: update go build style to go1.21.0

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From e5f10aa6694d0305567395e5d3fa60570b597523 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:36 +0400
Subject: [PATCH 164/364] gotty: update go build style to go1.21.0

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From bae4d32eff1be833c6ede0c62ecf815878ef991f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:37 +0400
Subject: [PATCH 165/364] goversion: update go build style to go1.21.0

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From a2961c8843fe3a58268758b22a9090d97e26405f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:37 +0400
Subject: [PATCH 166/364] grafana: update go build style to go1.21.0

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From 963dd2a3f62e5d7c282014f4f92c95e122469974 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:38 +0400
Subject: [PATCH 167/364] gron: update go build style to go1.21.0

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From fa1b315da6d3d242a3423c8610a8f25ddff8c77f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:38 +0400
Subject: [PATCH 168/364] grype: update go build style to go1.21.0

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From 9a80cf84c3f64a595d9ef6aaea72e47b65668b06 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:39 +0400
Subject: [PATCH 169/364] gucci: update go build style to go1.21.0

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From 9dd9c0a7da75a9f6bb438bf9108a9db885f04fb7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:39 +0400
Subject: [PATCH 170/364] gum: update go build style to go1.21.0

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From 3e971e2de06b2c47f48e4b3ddf30d81edb8fe448 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:40 +0400
Subject: [PATCH 171/364] hcloud: update go build style to go1.21.0

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From 4f2d28b1a0f10cb6dba712fcc004b71944828945 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:40 +0400
Subject: [PATCH 172/364] hey: update go build style to go1.21.0

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From 47ba07063a38513fdc4c52de695d1425b4bd6999 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:41 +0400
Subject: [PATCH 173/364] hivemind: update go build style to go1.21.0

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 6db147338dc72627a20d20f640fcedae534945e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:41 +0400
Subject: [PATCH 174/364] hooktftp: update go build style to go1.21.0

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From dd99a2bad62e2d457b2b0535c98341040b965953 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:42 +0400
Subject: [PATCH 175/364] httpstat: update go build style to go1.21.0

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 1490870deb8bf9a4c547b7ac0f841d06fab10cd9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:42 +0400
Subject: [PATCH 176/364] hub: update go build style to go1.21.0

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From 0ab4baeb84473210d863b11b1f300cf837cf48ed Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:43 +0400
Subject: [PATCH 177/364] hugo: update go build style to go1.21.0

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From a0f2a409c2104f0cdd6800e811bfb58e084201f3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:43 +0400
Subject: [PATCH 178/364] hut: update go build style to go1.21.0

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From acacf1b38f042332d2d94cd3974975b8f239c3de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:44 +0400
Subject: [PATCH 179/364] hydroxide: update go build style to go1.21.0

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From 8799b83af0458f533ed7bb2d7659512de01864f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:45 +0400
Subject: [PATCH 180/364] i3cat: update go build style to go1.21.0

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From db2e2c333afa136d6e97e851b50f07b34021e47c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:45 +0400
Subject: [PATCH 181/364] ibus-bamboo: update go build style to go1.21.0

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From 0cde072b51aa78fb6b957f4c226ef6b0e92ff38d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:46 +0400
Subject: [PATCH 182/364] img: update go build style to go1.21.0

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From ce80f8dc7c246434bdf6bef131bcc816e70075ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:46 +0400
Subject: [PATCH 183/364] immortal: update go build style to go1.21.0

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From 0a7f142cdf17dc7536baeab2c9ed9a722787b136 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:47 +0400
Subject: [PATCH 184/364] influxdb: update go build style to go1.21.0

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From 87bd33b2c6cadcb001482d638058a621e51e9f63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:47 +0400
Subject: [PATCH 185/364] ipfs-cluster: update go build style to go1.21.0

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From dde2e0e1faaddbdb05cf5e30c6fbf6baed114e9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:48 +0400
Subject: [PATCH 186/364] ipp-usb: update go build style to go1.21.0

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From 0db238ea946909960a70a1893efcada00bccea3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:48 +0400
Subject: [PATCH 187/364] ircdog: update go build style to go1.21.0

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From 865dd1e39c9e75e6d0fee9885f347387d7f9fff7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:49 +0400
Subject: [PATCH 188/364] jd: update go build style to go1.21.0

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From dfc839735c2f4d022530fd9e0bf0466b97c9b101 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:49 +0400
Subject: [PATCH 189/364] jid: update go build style to go1.21.0

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 76cfbdbdb540ccd8813d62b6074ebc2eca83ef8e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:50 +0400
Subject: [PATCH 190/364] jj: update go build style to go1.21.0

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From 5a116277bf99acf5b0276116b4c958452b55ff42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:50 +0400
Subject: [PATCH 191/364] joker: update go build style to go1.21.0

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From cfc0e03066c68af0c7266f3f798c609de1b8710b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:51 +0400
Subject: [PATCH 192/364] jp: update go build style to go1.21.0

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From fa240d2262c45a7af443aa473c818da1dbd5bca7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:52 +0400
Subject: [PATCH 193/364] jsonnet-language-server: update go build style to
 go1.21.0

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From d9d0c6815ccbc1a7083b1cf7ddf4d78e4e8867e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:52 +0400
Subject: [PATCH 194/364] jump: update go build style to go1.21.0

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From f5b614f2f3f6169d2dcc3318393aa14adfeb4a0a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:53 +0400
Subject: [PATCH 195/364] k3d: update go build style to go1.21.0

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From 422225a2175a0087cee496abb5f63ddf1b70a617 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:53 +0400
Subject: [PATCH 196/364] k9s: update go build style to go1.21.0

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From d609066208f3b2d994083bdd6a6294dfa8d1c326 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:54 +0400
Subject: [PATCH 197/364] kapacitor: update go build style to go1.21.0

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From 3177c9cb7127771483403b447fd8075b9c9825a0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:54 +0400
Subject: [PATCH 198/364] keybase: update go build style to go1.21.0

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From be6d56d31afdfc0afb9bdc03104f6ba1554fe24a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:55 +0400
Subject: [PATCH 199/364] knit: update go build style to go1.21.0

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From 3ed6c608a276526683af2543d944a06dba536abc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:55 +0400
Subject: [PATCH 200/364] kopia: update go build style to go1.21.0

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From e862d3879e22ebd2edb225d2f1b404663cbb5f98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:56 +0400
Subject: [PATCH 201/364] kops: update go build style to go1.21.0

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 561b0d6bef671bba7e835ef6cb98ba6adcddec78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:56 +0400
Subject: [PATCH 202/364] kubecfg: update go build style to go1.21.0

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From 82e098f7c9537e0a11a580cd543faced4869c06c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:57 +0400
Subject: [PATCH 203/364] kubefwd: update go build style to go1.21.0

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From a26e15e59e1dceda42ba2628c41b2be3c80dad16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:57 +0400
Subject: [PATCH 204/364] kubernetes-kind: update go build style to go1.21.0

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From 9e6448dae0e1ae9374276f517d2a1e620bc96853 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:58 +0400
Subject: [PATCH 205/364] kubernetes: update go build style to go1.21.0

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 489eb2a5a216d1ea1ba71b6d033a4f4713662aaa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:58 +0400
Subject: [PATCH 206/364] kurly: update go build style to go1.21.0

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From eaac319c609760fcac430d250b1dc88e1de4bc15 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:59 +0400
Subject: [PATCH 207/364] lazydocker: update go build style to go1.21.0

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From 456ee25444dfdbe665b8f1fa7bc0a85a8b8d2815 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:00 +0400
Subject: [PATCH 208/364] lazygit: update go build style to go1.21.0

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From 42fc02e5822119471510397507f60d940962f29c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:00 +0400
Subject: [PATCH 209/364] lego: update go build style to go1.21.0

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From bdea7f84bb92e2f832af5fe72d008d6212789e74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:01 +0400
Subject: [PATCH 210/364] lets: update go build style to go1.21.0

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From 55720ed308cbd2a0a584b476fb76eac235af63ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:01 +0400
Subject: [PATCH 211/364] lf: update go build style to go1.21.0

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 2afbb9ed9f155b73610e635f974c02e2f7ea5aa3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:02 +0400
Subject: [PATCH 212/364] licensechecker: update go build style to go1.21.0

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From 981179d5acfbddca5be11d299748514ff7697a47 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:02 +0400
Subject: [PATCH 213/364] loki: update go build style to go1.21.0

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From 233037fb4a853da0671b553efff24a2995d7c406 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:03 +0400
Subject: [PATCH 214/364] lsp: update go build style to go1.21.0

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From e2e2a14a3c8a8a592ed6a01ce0fe229214f30172 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:03 +0400
Subject: [PATCH 215/364] lux: update go build style to go1.21.0

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 0ce92cc3697d6d1a31803e6389ff487417a1429b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:04 +0400
Subject: [PATCH 216/364] maddy: update go build style to go1.21.0

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From 3b37bd4a0b22131aa50ea7921b0689658f91e978 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:04 +0400
Subject: [PATCH 217/364] madonctl: update go build style to go1.21.0

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From fdd3f8e6bbf27d64dee9be6a5b70ee63386fb831 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:05 +0400
Subject: [PATCH 218/364] massren: update go build style to go1.21.0

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From dc4766682595280bc8ef1039698011cd4f9e655d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:05 +0400
Subject: [PATCH 219/364] mdr: update go build style to go1.21.0

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 75d4130cf19c40588ca8c71c059c7742de5fc06b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:06 +0400
Subject: [PATCH 220/364] micro: update go build style to go1.21.0

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From aa3d0a147c9db5cf9e63fb018051c5906eef2290 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:06 +0400
Subject: [PATCH 221/364] microhookd: update go build style to go1.21.0

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From 3d364428f7f54a4dd09ce6ba215d5ee1420ccee6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:07 +0400
Subject: [PATCH 222/364] miller: update go build style to go1.21.0

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 12daaae7f4920c8e37ada9e5ec272737d0729e91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:08 +0400
Subject: [PATCH 223/364] miniflux: update go build style to go1.21.0

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From d068622a7448276b024b50f691293ab4ab3efdcb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:08 +0400
Subject: [PATCH 224/364] minify: update go build style to go1.21.0

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From b7040e46fbd0aaf4316281ece40687bf32691061 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:09 +0400
Subject: [PATCH 225/364] minikube: update go build style to go1.21.0

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From 3901fb7cdb6448cf4bb72e77c203b719ec4824a5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:09 +0400
Subject: [PATCH 226/364] minio: update go build style to go1.21.0

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 67ddeb4b67ff9e73ecb67958af2e1b9a4fb087a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:10 +0400
Subject: [PATCH 227/364] misspell: update go build style to go1.21.0

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From 3200077259b7c099de0323441c14396989a126bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:10 +0400
Subject: [PATCH 228/364] mmark: update go build style to go1.21.0

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From d8028e1d342882a7b780fdb29f5f74ece01a86ac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:11 +0400
Subject: [PATCH 229/364] mmv-go: update go build style to go1.21.0

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From 8c69b26bd95398c9aab9553048efcc56ecce0a34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:11 +0400
Subject: [PATCH 230/364] moar: update go build style to go1.21.0

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From 91172b6a1585149d78e3de2d08d773a029fe9ad5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:12 +0400
Subject: [PATCH 231/364] moby: update go build style to go1.21.0

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From c92465e6c4150038b15087e54c662ae000e89ea7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:12 +0400
Subject: [PATCH 232/364] mountain-backup: update go build style to go1.21.0

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From 73691232131bc28d04ab6c6eac28a76de8ebea0e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:13 +0400
Subject: [PATCH 233/364] mpdviz: update go build style to go1.21.0

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From 22828fa36e463f1fd15dd27f6e6a626dc1f5497a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:13 +0400
Subject: [PATCH 234/364] nebula: update go build style to go1.21.0

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From 21a09390f72855abfed5202e5061bbaed7351406 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:14 +0400
Subject: [PATCH 235/364] nerdctl: update go build style to go1.21.0

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From c51734e529b5658229ec2f814fdaff9fd3e5c381 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:15 +0400
Subject: [PATCH 236/364] netdata-plugins-go: update go build style to go1.21.0

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From e4416ae537b7e79e97c41c27dd7a7bb706f81031 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:15 +0400
Subject: [PATCH 237/364] netns: update go build style to go1.21.0

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From 6244da14b3f1860e02f27118db1f939dee484c33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:16 +0400
Subject: [PATCH 238/364] netris: update go build style to go1.21.0

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 9765e3260db3822436506495e0d4c6777ca6a2c4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:16 +0400
Subject: [PATCH 239/364] nextdns: update go build style to go1.21.0

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From eeaf670846b012854e388adc9b570b348e111186 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:17 +0400
Subject: [PATCH 240/364] nncp: update go build style to go1.21.0

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 5d2712cd67170..9ac8e20b52769 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.8.3
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From b99bee8af6a50a16def101129bcc2b9b0770916e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:17 +0400
Subject: [PATCH 241/364] node_exporter: update go build style to go1.21.0

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From a6a065b245f762450a62788177243daa9e344558 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:18 +0400
Subject: [PATCH 242/364] nomad: update go build style to go1.21.0

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 9720cf56e93ee0098b6bd6085931179127b0cd71 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:18 +0400
Subject: [PATCH 243/364] ntfy: update go build style to go1.21.0

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 52d763df5e2cd95c8733e1fe52d5e3c984ee4234 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:19 +0400
Subject: [PATCH 244/364] nvidia-container-toolkit: update go build style to
 go1.21.0

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From a89595ba7604a097ee6e718e34927609005a24ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:19 +0400
Subject: [PATCH 245/364] nwg-look: update go build style to go1.21.0

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From f033d7182d05f009e11c3d0d801c48f9bd6ce954 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:20 +0400
Subject: [PATCH 246/364] obfs4proxy: update go build style to go1.21.0

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 5207aeff51c88c25deb8f4e47766732fb301f71a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:20 +0400
Subject: [PATCH 247/364] oh: update go build style to go1.21.0

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From 597af2b2efaff63be8ef7cd7a02978ad9716a577 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:21 +0400
Subject: [PATCH 248/364] opensmtpd-filter-rspamd: update go build style to
 go1.21.0

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 877b6df81145fa94789b5d8a5d9586cb82111bd1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:21 +0400
Subject: [PATCH 249/364] opensmtpd-filter-senderscore: update go build style
 to go1.21.0

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From cd88f530355e161491c5cdcf71201386cfc8f8b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:22 +0400
Subject: [PATCH 250/364] operator-sdk: update go build style to go1.21.0

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From 112c496212585c7eefa0e355ad93a4655229e60e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:23 +0400
Subject: [PATCH 251/364] oragono: update go build style to go1.21.0

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 78c1c24731ac4872d6e2f8d26b29df3197453e72 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:23 +0400
Subject: [PATCH 252/364] oras: update go build style to go1.21.0

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From 7844c8906012acaee43ab12ee4b59a8a7a0e915d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:24 +0400
Subject: [PATCH 253/364] osv-scanner: update go build style to go1.21.0

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 5f9fabfdb5ff57562324b114113035bd9ecf8ce3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:24 +0400
Subject: [PATCH 254/364] packer: update go build style to go1.21.0

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From 2ac87c693d9064150f798efcfc7090c1e30a59d4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:25 +0400
Subject: [PATCH 255/364] packr2: update go build style to go1.21.0

---
 srcpkgs/packr2/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..de0e9b90c73fc 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,7 +2,7 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
 short_desc="Static files embedder for Go binaries"
@@ -12,6 +12,10 @@ homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vlicense v2/LICENSE.txt
 }

From 5f7afd44d91d9e2ddb97f24b7eed5ecdfd31b7d1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:25 +0400
Subject: [PATCH 256/364] pam_netauth: update go build style to go1.21.0

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From 292dfba8165ce577d1ac83778bfc6fe9bffae214 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:26 +0400
Subject: [PATCH 257/364] passphrase2pgp: update go build style to go1.21.0

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From 775454f444325d71767b80338f725814e6161c2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:26 +0400
Subject: [PATCH 258/364] peco: update go build style to go1.21.0

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From ad380daf5f291a8f807f3159523d84c035eefe09 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:27 +0400
Subject: [PATCH 259/364] pgmetrics: update go build style to go1.21.0

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 6a1aae3f4a9c716eb4a463aa2ae83788273015bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:27 +0400
Subject: [PATCH 260/364] pgweb: update go build style to go1.21.0

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From cde8b8cd8246811a230a23254b48e328aa5aa054 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:28 +0400
Subject: [PATCH 261/364] pkgtop: update go build style to go1.21.0

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From cd1ceb1809a04c70dd1a930b0786fb5d280cc347 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:28 +0400
Subject: [PATCH 262/364] podman-tui: update go build style to go1.21.0

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From 4b095bbdcc5e2d70a3596adf1d65630951d4095d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:29 +0400
Subject: [PATCH 263/364] podman: update go build style to go1.21.0

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From abe809f7d3ee26c3b6dc3088a383a9781b345253 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:30 +0400
Subject: [PATCH 264/364] pong-command: update go build style to go1.21.0

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 66f5423f9f054eaf278249c8cfb591331f84bbeb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:30 +0400
Subject: [PATCH 265/364] prometheus: update go build style to go1.21.0

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From d38e406b9968fc7407c1dd63347d6fb7a3040efc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:31 +0400
Subject: [PATCH 266/364] pst: update go build style to go1.21.0

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 364dc85b87a92a4b6dddce42c05cacc3b44f69ed Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:31 +0400
Subject: [PATCH 267/364] pup: update go build style to go1.21.0

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From cc1ae49e8bca5aaa84bb9a0df066c4fcc127e68e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:32 +0400
Subject: [PATCH 268/364] pwget: update go build style to go1.21.0

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From 759d95ba2e9f1a887e251bc369ea0e649e943fd0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:32 +0400
Subject: [PATCH 269/364] qrcp: update go build style to go1.21.0

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 9c1644415e99e59ce6e462c123dcd52f8d026ac0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:33 +0400
Subject: [PATCH 270/364] rancher-compose: update go build style to go1.21.0

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From bf68b09e1ad6dff8eee3c8226508e04c622188a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:33 +0400
Subject: [PATCH 271/364] rclone: update go build style to go1.21.0

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From 4cfa029479a027a06908c3b70ef5e9ff9f8ab41e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:34 +0400
Subject: [PATCH 272/364] rest-server: update go build style to go1.21.0

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 5f350f7fdbbaf1fc4a6e3348c4d22d0d1f839270 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:34 +0400
Subject: [PATCH 273/364] restic: update go build style to go1.21.0

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 374e8d85b7893150e3fd0ee65375c97b0b7c1bb5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:35 +0400
Subject: [PATCH 274/364] revive: update go build style to go1.21.0

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From 491df5f706aaf8b40f86a49c623cc696ef9e0ca4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:35 +0400
Subject: [PATCH 275/364] rmapi: update go build style to go1.21.0

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From c649454d27180e35568ac92a7ac7dc93312017ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:36 +0400
Subject: [PATCH 276/364] rocker: update go build style to go1.21.0

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From ca71050346a8602c0bfe0ca95be3019410aa09c3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:37 +0400
Subject: [PATCH 277/364] rootlesskit: update go build style to go1.21.0

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From 0ee0efa0863454ccabf52c43e27ef4be278984c5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:37 +0400
Subject: [PATCH 278/364] runc: update go build style to go1.21.0

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5495e4a720bb1..008a94e502e19 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.8
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From a4bf65cbc7817fdc1ad4e98511f21e9992204d89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:38 +0400
Subject: [PATCH 279/364] ryzen-stabilizator: update go build style to go1.21.0

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From a2830cee436d342dfadd083dd7772b8607678279 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:38 +0400
Subject: [PATCH 280/364] s: update go build style to go1.21.0

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From fda5d5677a2fd0bd382acdda6453104915b068bc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:39 +0400
Subject: [PATCH 281/364] saml2aws: update go build style to go1.21.0

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From b19c72435a78bf381333099e0bd30531bd099a86 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:39 +0400
Subject: [PATCH 282/364] sampler: update go build style to go1.21.0

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From ec8c1f1c43a49e7f2021bc4f0d3cec3bff49a6fb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:40 +0400
Subject: [PATCH 283/364] sbctl: update go build style to go1.21.0

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From c689a253a69541f04fe785c6f048cb4d5dbd72fd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:40 +0400
Subject: [PATCH 284/364] scaleway-cli: update go build style to go1.21.0

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From dcafdaa06cfb7082bfb69c17509cb35133d84f6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:41 +0400
Subject: [PATCH 285/364] scc: update go build style to go1.21.0

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 087fca7c5f9ef80e53dd4befce6d6727633d833b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:41 +0400
Subject: [PATCH 286/364] seaweedfs: update go build style to go1.21.0

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 07655301b21da67724bf41c7299f4386a4f28f5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:42 +0400
Subject: [PATCH 287/364] senpai: update go build style to go1.21.0

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From 8de8386214a0f032155870efccd7250229276f11 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:43 +0400
Subject: [PATCH 288/364] sftpgo: update go build style to go1.21.0

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 289123c2a80185e6eb0aa3310146c27cb1b5765a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:43 +0400
Subject: [PATCH 289/364] shadowfox-updater: update go build style to go1.21.0

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From c1019c345dfbfd126638de262518d8f2f70cbd73 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:44 +0400
Subject: [PATCH 290/364] sharenix: update go build style to go1.21.0

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From c2d0a0a640afc2d5556447931ed2d3e98e9a879c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:44 +0400
Subject: [PATCH 291/364] shfmt: update go build style to go1.21.0

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From 8efe1c48ce5e087d525f8a40019192ae063a6515 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:45 +0400
Subject: [PATCH 292/364] shiori: update go build style to go1.21.0

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From 8d37f05cc9eebb9e5822c79c21a128ef232f61ea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:45 +0400
Subject: [PATCH 293/364] sift: update go build style to go1.21.0

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From 5482a51b9dd525d26f5bc7f9bf7a1e6274655d3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:46 +0400
Subject: [PATCH 294/364] skaffold: update go build style to go1.21.0

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From 912f685eb6d7f23d4cfccf5d1451a86cd87e90c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:46 +0400
Subject: [PATCH 295/364] skate: update go build style to go1.21.0

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From f6ae1385a1c8e0d7613b2aa94098d382c2c67a02 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:47 +0400
Subject: [PATCH 296/364] skopeo: update go build style to go1.21.0

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 30ec169a85a40744e7b2b46c8131d24c1051f0e9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:47 +0400
Subject: [PATCH 297/364] slack-term: update go build style to go1.21.0

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 736e92fd47ce859c793902564f5c17e241063722 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:48 +0400
Subject: [PATCH 298/364] slit: update go build style to go1.21.0

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From afcf557693149b565a5fccb6dad273d51f1cbb4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:48 +0400
Subject: [PATCH 299/364] soju: update go build style to go1.21.0

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From 471ae21b90cfe48c7fda3b4206fef360c5c75263 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:49 +0400
Subject: [PATCH 300/364] sops: update go build style to go1.21.0

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 0d805a2b002f5fa1a3e1eda9e5ba9a64419b0428 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:50 +0400
Subject: [PATCH 301/364] spreed-webrtc: update go build style to go1.21.0

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From d7584d3d2fc28b995f34478e32b5096752724185 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:50 +0400
Subject: [PATCH 302/364] ssl_exporter: update go build style to go1.21.0

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From be165646d9439897995405e162b439bd89b24cff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:51 +0400
Subject: [PATCH 303/364] stc: update go build style to go1.21.0

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From 1b4c3206dac2b26424c06daaaafd6638d3842234 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:51 +0400
Subject: [PATCH 304/364] step-certificates: update go build style to go1.21.0

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From e2f6df9cef9b7fbf945ee9da8f7688445798976e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:52 +0400
Subject: [PATCH 305/364] step-cli: update go build style to go1.21.0

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From 29b4bf7230561cd31a4fbdf163677c76f7af47ba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:52 +0400
Subject: [PATCH 306/364] stern: update go build style to go1.21.0

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From ff7d6f962f59351b4dde6a0a0580fefc6b66b978 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:53 +0400
Subject: [PATCH 307/364] subfinder: update go build style to go1.21.0

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From 0825356247e7421e8888514b5ed71dd699218dd3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:53 +0400
Subject: [PATCH 308/364] subjack: update go build style to go1.21.0

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From 0fd6b9600ac3010a783ed59d14b832a6ec7e0509 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:54 +0400
Subject: [PATCH 309/364] superd: update go build style to go1.21.0

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From ccbae02c24595fdc44570150c67da74e59cdcf69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:54 +0400
Subject: [PATCH 310/364] svctl: update go build style to go1.21.0

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From 1ea16a4829651dc2ba0686db7b2db366e07a73e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:55 +0400
Subject: [PATCH 311/364] syft: update go build style to go1.21.0

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 768435c0611c2febb5c7c52f032184dd4a7b76ff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:56 +0400
Subject: [PATCH 312/364] syncthing: update go build style to go1.21.0

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From 0ef9c59a9504d478aaa51435b9288779b9b28cb8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:56 +0400
Subject: [PATCH 313/364] tag: update go build style to go1.21.0

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From bb19dda1d10cc81696b46e24ab3d9c2d53c6b89e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:57 +0400
Subject: [PATCH 314/364] tailscale: update go build style to go1.21.0

---
 srcpkgs/tailscale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"

From 7ce95965929108dc455bbb07cda0fc4415a96c68 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:57 +0400
Subject: [PATCH 315/364] tea: update go build style to go1.21.0

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From b72ebdf008128b72ea30e9e27b13a8fe1e26bcb9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:58 +0400
Subject: [PATCH 316/364] telegraf: update go build style to go1.21.0

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From 24d181974f007c90ae6a3e359c4936255cb62def Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:58 +0400
Subject: [PATCH 317/364] termshark: update go build style to go1.21.0

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From 0a584cb8956932cf51f3b53bbbbe0b8959aabfb5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:59 +0400
Subject: [PATCH 318/364] terraform-docs: update go build style to go1.21.0

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From d6c912d1eedcb09502071bff1f97669b09754322 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:59 +0400
Subject: [PATCH 319/364] terraform-ls: update go build style to go1.21.0

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From 9476491ba7b19a3ca1dcb9adf0ee2144c1eb0288 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:00 +0400
Subject: [PATCH 320/364] terraform: update go build style to go1.21.0

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 103b41da7a3764bc893997435bcacd47aea850e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:00 +0400
Subject: [PATCH 321/364] terragrunt: update go build style to go1.21.0

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From 91bf5934dd5ecd49c3cc59b82d810a5a87b10895 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:01 +0400
Subject: [PATCH 322/364] tflint: update go build style to go1.21.0

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From bee4eca4f10412a483e6ad74bfbe6406052eafa0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:01 +0400
Subject: [PATCH 323/364] tinycron: update go build style to go1.21.0

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From a10b4ee370ef3922c60219e4dfd3899fd6b133d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:02 +0400
Subject: [PATCH 324/364] tldr: update go build style to go1.21.0

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From 6370cd04f0e0ca6590eb59dc11956b9d18be261e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:03 +0400
Subject: [PATCH 325/364] tml: update go build style to go1.21.0

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From d7cee018cc071a9ba22d4f10f9e95fddf977560c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:03 +0400
Subject: [PATCH 326/364] todoist: update go build style to go1.21.0

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From d39dac6e5958f68a203129ea3654328430add4b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:04 +0400
Subject: [PATCH 327/364] transifex-cli: update go build style to go1.21.0

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From 7c2c69bd2040e52cbde47b7430a2aadb15b83386 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:04 +0400
Subject: [PATCH 328/364] twitch-cli: update go build style to go1.21.0

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From a4843413a38f3ae40e9e04d3ce97d01828d9d4f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:05 +0400
Subject: [PATCH 329/364] typioca: update go build style to go1.21.0

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From 240cbda3c29920348391a803ff09c38a3f1a69d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:05 +0400
Subject: [PATCH 330/364] umoci: update go build style to go1.21.0

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From 2aefa12fc0243d9ee99c45253ac9b86ea1e0fee8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:06 +0400
Subject: [PATCH 331/364] unflac: update go build style to go1.21.0

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From ed51035974f67d210190f756c6dbc42402d42e52 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:06 +0400
Subject: [PATCH 332/364] uni: update go build style to go1.21.0

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From 6c0bb90801395e859321257e769f586e2998e4aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:07 +0400
Subject: [PATCH 333/364] up: update go build style to go1.21.0

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 20f7a1447d040009949f474739418fa6660c720e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:07 +0400
Subject: [PATCH 334/364] up_rewrite: update go build style to go1.21.0

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 92831ec8e9a3f230b941f882b2db0a63afb36f57 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:08 +0400
Subject: [PATCH 335/364] upterm: update go build style to go1.21.0

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From 6ccea8ef54cf33f9f7fc8d7647c39b1eb19c3352 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:09 +0400
Subject: [PATCH 336/364] usql: update go build style to go1.21.0

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From c7b40290a12b3da29134acadb5820e0c60aeb194 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:09 +0400
Subject: [PATCH 337/364] v2ray: update go build style to go1.21.0

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From dc417ab0d996f57278010b9d247dfd56368fc566 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:10 +0400
Subject: [PATCH 338/364] vale: update go build style to go1.21.0

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From c6d55d4a1d081985427fb2d0f8770aac2568ba35 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:10 +0400
Subject: [PATCH 339/364] vault-acme: update go build style to go1.21.0

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From e421c9145e0dba31b8ce9abeae88982801e4b299 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:11 +0400
Subject: [PATCH 340/364] vault: update go build style to go1.21.0

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From edc476aaff7b24d5d1f3a8498bbe0a7a1e79698e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:11 +0400
Subject: [PATCH 341/364] vegeta: update go build style to go1.21.0

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From 6f0fa98a488091f07ab89df88343a868c90082a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:12 +0400
Subject: [PATCH 342/364] vhs: update go build style to go1.21.0

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 594867ec42597a8d605c2e28229ae9b644e040a5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:12 +0400
Subject: [PATCH 343/364] vmdfmt: update go build style to go1.21.0

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From b5b5ea761b08a2fe2480eec4a1f234a40b86380f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:13 +0400
Subject: [PATCH 344/364] vndr: update go build style to go1.21.0

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From 6a93f393bacb415bcc6612d6e94ce7fce283cd2f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:13 +0400
Subject: [PATCH 345/364] vultr-cli: update go build style to go1.21.0

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From cae7e13bb099081fc32e318fc0cb39c8f821ced7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:14 +0400
Subject: [PATCH 346/364] vultr: update go build style to go1.21.0

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From 0d46b4d2de7a934cddbb1a5d682323d40884da53 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:14 +0400
Subject: [PATCH 347/364] wally-cli: update go build style to go1.21.0

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From ea6d1cd0023856caaa2752e2eeaddd9c033d8a28 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:15 +0400
Subject: [PATCH 348/364] wander: update go build style to go1.21.0

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 2fa6dd6799960446c8a60ea3718b832f0d28cc74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:16 +0400
Subject: [PATCH 349/364] webcat: update go build style to go1.21.0

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From 8a6ae81f061ecaf6f2a55ec12fabf5dea415317c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:16 +0400
Subject: [PATCH 350/364] webhook: update go build style to go1.21.0

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From c86e289501d4060680e19d6402df0e3590cbaf73 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:17 +0400
Subject: [PATCH 351/364] websocketd: update go build style to go1.21.0

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From f740c7c32db81f7fc6befea239b3b61afcbcafbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:17 +0400
Subject: [PATCH 352/364] wego: update go build style to go1.21.0

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From f711fa05ac63c0855c991c6d97a092b5f8f0c4aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:18 +0400
Subject: [PATCH 353/364] wireproxy: update go build style to go1.21.0

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From 64e647776ab08c25272505c9eb056fa8b4b74cf1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:18 +0400
Subject: [PATCH 354/364] woke: update go build style to go1.21.0

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From f1e3d43cc4b23f652abe79b1ab25530e3e183b56 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:19 +0400
Subject: [PATCH 355/364] wtfutil: update go build style to go1.21.0

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From 3a58a4ea37d1e331da523c61ff20922dbfb7d4d2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:19 +0400
Subject: [PATCH 356/364] wuzz: update go build style to go1.21.0

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 49c2ebba2ad91c85782c0f52135fa09a86975ecb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:20 +0400
Subject: [PATCH 357/364] xmandump: update go build style to go1.21.0

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From 32f381e0cfdaf00fa6c290b384dd38044634b861 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:20 +0400
Subject: [PATCH 358/364] xq-api: update go build style to go1.21.0

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 2bc5d767c78558ce0ec4c1d1ca25032028379ba4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:21 +0400
Subject: [PATCH 359/364] xurls: update go build style to go1.21.0

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From 7451eb5066dd08bee711b2f39465bb1182e9f845 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:22 +0400
Subject: [PATCH 360/364] yggdrasil: update go build style to go1.21.0

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From 71c237c97da570f34e00c0d7f7c0fa4ed9a1c474 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:22 +0400
Subject: [PATCH 361/364] yj: update go build style to go1.21.0

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From f96460b624a05322c6561cf11414039c4e83d09a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:23 +0400
Subject: [PATCH 362/364] ymuse: update go build style to go1.21.0

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From 8ad47904f18004f5aefec019a479751e4e7f4791 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:23 +0400
Subject: [PATCH 363/364] yq-go: update go build style to go1.21.0

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 62cb8f7ae5c36217bb19a2c81446c0ba63721da0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:24 +0400
Subject: [PATCH 364/364] zrepl: update go build style to go1.21.0

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (4 preceding siblings ...)
  2023-08-12 16:33 ` g4s8
@ 2023-08-12 21:15 ` g4s8
  2023-08-12 21:27 ` Bnyro
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-12 21:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 264453 bytes --]

From 1c0863c3ad5f0dbd730f2eccf8fb5d5bf1de83f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/364] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 14407253f6924135a43cdce870a5ba05a527f80f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/364] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 2 +-
 common/environment/build-style/go.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..038e989aceafc 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -33,7 +33,7 @@ do_build() {
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 4ecfb0501813a321995d62c6054bbc17202e0bf7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:13 +0400
Subject: [PATCH 003/364] 3mux: update go build style to go1.21.0

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From ba7239f2aeecd3cbd8e373e4ef1df12582bd35d9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:14 +0400
Subject: [PATCH 004/364] Amass: update go build style to go1.21.0

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From 9a86e28278457feaa6af4c5b34305ad316d39e63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:14 +0400
Subject: [PATCH 005/364] Gokapi: update go build style to go1.21.0

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From bc93e819bb8d63960f7829dafb3fefab6364bde5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:15 +0400
Subject: [PATCH 006/364] NetAuth-ldap: update go build style to go1.21.0

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From 0f6f09f45b4c8c5bc67b3301747ed745ade9066d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:15 +0400
Subject: [PATCH 007/364] NetAuth-localizer: update go build style to go1.21.0

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From 201871d063ae27d75251865cfda813c6b86a5990 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:16 +0400
Subject: [PATCH 008/364] NetAuth-nsscache: update go build style to go1.21.0

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From c5b021e23daf31102a68eaad80501564e5f0451b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:16 +0400
Subject: [PATCH 009/364] NetAuth-pam-helper: update go build style to go1.21.0

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From efffb3fc4280959f2de92e8975589c312d3ef010 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:17 +0400
Subject: [PATCH 010/364] NetAuth-sftpgo-hook: update go build style to
 go1.21.0

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 2968cc263ec4c44e39e67dc587c724ca68d33601 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:17 +0400
Subject: [PATCH 011/364] NetAuth: update go build style to go1.21.0

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From 385e42803e327e1d81c11129783f817879f697b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:18 +0400
Subject: [PATCH 012/364] NetKeys: update go build style to go1.21.0

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From 49839b09be12ab3b07c735d9c004b283fcccde53 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:18 +0400
Subject: [PATCH 013/364] NoiseTorch: update go build style to go1.21.0

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 3a67800eab1b17f4c897f93e4b86a559a3941aeb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:19 +0400
Subject: [PATCH 014/364] PopCorn: update go build style to go1.21.0

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 640f76c5dc31a4a196b596d0182bdaae8cff0511 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:19 +0400
Subject: [PATCH 015/364] TMSU: update go build style to go1.21.0

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From 8a79f8374cc788d9ea2ea1047c85bddb6932e346 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:20 +0400
Subject: [PATCH 016/364] TerraState: update go build style to go1.21.0

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From e900e90c33ba98c95a9449d3c5b8a7eeaa0fc6f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:20 +0400
Subject: [PATCH 017/364] abireport: update go build style to go1.21.0

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From 4d4e7a241b16d4bf690dd56c12cec05046bb4297 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:21 +0400
Subject: [PATCH 018/364] acbuild: update go build style to go1.21.0

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From a5e1fc10cb1c7348cf9739e9e7cd5845f9a94fb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:21 +0400
Subject: [PATCH 019/364] ace-util: update go build style to go1.21.0

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From 01e0f9202212f6af7f4222b954d61ab801eddedb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:22 +0400
Subject: [PATCH 020/364] acmetool: update go build style to go1.21.0

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 737c8456190fe31e0ffc29373f5749048e4f45bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:22 +0400
Subject: [PATCH 021/364] act: update go build style to go1.21.0

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 2cfaa1efef7a1db4db8e0ef8259270396e05915a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:23 +0400
Subject: [PATCH 022/364] aerc: update go build style to go1.21.0

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From f30cb254c11ea5052e04f8f21a7a6cb6646d370c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:23 +0400
Subject: [PATCH 023/364] age: update go build style to go1.21.0

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From d7d824ca5280cbb76d85aa7a3347782418c21d63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:24 +0400
Subject: [PATCH 024/364] alertmanager: update go build style to go1.21.0

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From 0466576f2431ae7d852a3b91c37b26f821848e0b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:24 +0400
Subject: [PATCH 025/364] amfora: update go build style to go1.21.0

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 6e62bbc17f00b633b5466dfa054ad1067da9d4c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:25 +0400
Subject: [PATCH 026/364] antibody: update go build style to go1.21.0

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From a1b5a0fcef923571e4f905af18202c0e7edebd93 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:25 +0400
Subject: [PATCH 027/364] app-builder: update go build style to go1.21.0

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From 7b70918ce6cbbe2043547cd4daac239a64e98f7e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:26 +0400
Subject: [PATCH 028/364] aptly: update go build style to go1.21.0

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From 59ae1a16cb1523efc0d157572fde4318daf779c4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:26 +0400
Subject: [PATCH 029/364] aquatone: update go build style to go1.21.0

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From 6dde417f63a652db57404acb2273588717059f7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:27 +0400
Subject: [PATCH 030/364] archiver: update go build style to go1.21.0

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 9453ac1738d7421a6871210ef7467468fadc4281 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:27 +0400
Subject: [PATCH 031/364] arduino-cli: update go build style to go1.21.0

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From c9c5ffe74b14d5ae75d55723412b3e5d26bceb42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:28 +0400
Subject: [PATCH 032/364] arpfox: update go build style to go1.21.0

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From 81404867f2b9391c84a6966821b6a9a6fec99ee8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:28 +0400
Subject: [PATCH 033/364] atlantis: update go build style to go1.21.0

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From 68299a82191a3ed238c792b2cc98b89ccfd4ee3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:29 +0400
Subject: [PATCH 034/364] autorestic: update go build style to go1.21.0

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From 7829c2aebfe552eb992e08c36c2ea724537c8a36 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:29 +0400
Subject: [PATCH 035/364] aws-vault: update go build style to go1.21.0

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From f48acc81f92c697d526ef2a95f67d76dc7218d34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:30 +0400
Subject: [PATCH 036/364] babelfish: update go build style to go1.21.0

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From 7e8c028e1d093daaafb6499a3e00e3d3e4c68f55 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:30 +0400
Subject: [PATCH 037/364] bettercap: update go build style to go1.21.0

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From 0079dfad1690d59908413f630713160311f1ae78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:31 +0400
Subject: [PATCH 038/364] bird_exporter: update go build style to go1.21.0

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From d27531132cd992023dc1b551351e818f7a4f36c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:31 +0400
Subject: [PATCH 039/364] blackbox_exporter: update go build style to go1.21.0

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From a4d4824552c1e0b5bb8a7c50f0ac6b3af14df53a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:32 +0400
Subject: [PATCH 040/364] blush: update go build style to go1.21.0

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From 378470d149ed0a62379a62593538fd23d81ad445 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:32 +0400
Subject: [PATCH 041/364] bombadillo: update go build style to go1.21.0

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From 98cf21f3a1eee91f806611f97a39cef7809c2800 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:33 +0400
Subject: [PATCH 042/364] bombardier: update go build style to go1.21.0

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 0a7d29acf3d901f51a5c1f2d819e6e7b8887a212 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:33 +0400
Subject: [PATCH 043/364] booster: update go build style to go1.21.0

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From 46f015e1a2940fd6ab448b313ae76c5581ccff74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:34 +0400
Subject: [PATCH 044/364] brig: update go build style to go1.21.0

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 74c85fcef73da2de8aad5e9ff13fe4d827275a15 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:34 +0400
Subject: [PATCH 045/364] browserpass: update go build style to go1.21.0

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From 2a8f22da4896ec4beb42e60872eac75f7096a9f4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:35 +0400
Subject: [PATCH 046/364] browsh: update go build style to go1.21.0

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From 815dbad81bb15421702a2a085aa2eed264ad54f4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:35 +0400
Subject: [PATCH 047/364] buildah: update go build style to go1.21.0

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From b072aa7aa90b1b4b01a37bdd796498345799a639 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:36 +0400
Subject: [PATCH 048/364] caddy: update go build style to go1.21.0

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From 2d139d76699b778f0134b3ae508882a4ed227c92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:36 +0400
Subject: [PATCH 049/364] carapace: update go build style to go1.21.0

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From 00c51fef206e6c9cd7467972efd2e800b561a330 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:37 +0400
Subject: [PATCH 050/364] cdetect: update go build style to go1.21.0

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From c03d8a25b48a3a57bfe825f3433d8803a51207b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:37 +0400
Subject: [PATCH 051/364] cfssl: update go build style to go1.21.0

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From 6dd85ba38798a338013b4a320c9f8d3dade9bcac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:38 +0400
Subject: [PATCH 052/364] cgrps: update go build style to go1.21.0

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From 200835254bb27d269dd576a2e6c5759fe56a167b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:38 +0400
Subject: [PATCH 053/364] chathistorysync: update go build style to go1.21.0

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From 5fddb7d611f1d010abb452167956127672df142e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:39 +0400
Subject: [PATCH 054/364] cheat: update go build style to go1.21.0

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 20377d6cb54095d8eb33471b8fa131d245379b5b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 055/364] chezmoi: update go build style to go1.21.0

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 445d413fa13720f833110f48a0a1f31ee60b9229 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 056/364] chroma: update go build style to go1.21.0

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From 9676b08a50292f8834038d3134df764f94e473fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:40 +0400
Subject: [PATCH 057/364] chronograf: update go build style to go1.21.0

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From 2b9b80b73678959242b6092f4982137bc0b86169 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:41 +0400
Subject: [PATCH 058/364] circleci-cli: update go build style to go1.21.0

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 007694783123c03c575cfb11e6c6d6494e4df691 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:41 +0400
Subject: [PATCH 059/364] cliphist: update go build style to go1.21.0

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From 75beab34a9fee7cbfcd8e6ae76ec5b28c63ea74c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:42 +0400
Subject: [PATCH 060/364] clipman: update go build style to go1.21.0

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 716621195d505f8b4a4aeaf5835d65cbc1213ad0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:43 +0400
Subject: [PATCH 061/364] cloudflared: update go build style to go1.21.0

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From 960c1d37899eaba4d5485578364b91628865923d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:43 +0400
Subject: [PATCH 062/364] cni-plugin-dnsname: update go build style to go1.21.0

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From 0fc9aaa36a1894c4ab71c867942b4c994250c2ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:44 +0400
Subject: [PATCH 063/364] cni-plugins: update go build style to go1.21.0

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From a9c5411b454ee67abe97d8236d551c42ba7803d2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:44 +0400
Subject: [PATCH 064/364] cni: update go build style to go1.21.0

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From ce36d4647fcf6cce98075f09e1911458478a9fe0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:45 +0400
Subject: [PATCH 065/364] cod: update go build style to go1.21.0

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From 596af8721e1eb11f3b170ab9e35a97e007b73750 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:45 +0400
Subject: [PATCH 066/364] codesearch: update go build style to go1.21.0

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From 0f84b2b54d5efde3d10b69569d8b71b870abd060 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:46 +0400
Subject: [PATCH 067/364] consul-template: update go build style to go1.21.0

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From a5141c1ed0e4e1720bf6cf46ae938bb72d8ec33c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:46 +0400
Subject: [PATCH 068/364] consul: update go build style to go1.21.0

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From 41a91b3561e74ec3d623bd10e051f767259fc792 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:47 +0400
Subject: [PATCH 069/364] containerd: update go build style to go1.21.0

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 3d8e1f4cd3f26f8f79e0027098b3ea70bcf64f1b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:47 +0400
Subject: [PATCH 070/364] coredns: update go build style to go1.21.0

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From d4034a034882fa83b3aaea969c9b65469b12c21c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:48 +0400
Subject: [PATCH 071/364] cowyo: update go build style to go1.21.0

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 7aae0c0b9e29284eea49a38c5bf589c8c2db1d82 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:48 +0400
Subject: [PATCH 072/364] coyim: update go build style to go1.21.0

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 0140c1333aff2be9d1ada54703d8e8987d9b73e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:49 +0400
Subject: [PATCH 073/364] crane: update go build style to go1.21.0

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From a87142982c2258e21d7101fc8f2561e8a6d65709 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:49 +0400
Subject: [PATCH 074/364] cri-o: update go build style to go1.21.0

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From a467cf145e6fac7f37055e7f84a88abe1b1e04ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:50 +0400
Subject: [PATCH 075/364] cri-tools: update go build style to go1.21.0

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From 7e1ef4a68af8a4fb68a3e323307f47ec762d0a0f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:50 +0400
Subject: [PATCH 076/364] croc: update go build style to go1.21.0

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From e1c1636e746de02a42bfa773990dfc941ed16345 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:51 +0400
Subject: [PATCH 077/364] d2: update go build style to go1.21.0

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 34787ad02efc75b2a089bbdb25a819c7fffb8c37 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:51 +0400
Subject: [PATCH 078/364] darch: update go build style to go1.21.0

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From c73ed37b303421645e4d407d4573f6e093bdd8a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:52 +0400
Subject: [PATCH 079/364] darkman: update go build style to go1.21.0

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 5cb03960698d893bca9dd0afe6a90564df074ed6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:52 +0400
Subject: [PATCH 080/364] darktile: update go build style to go1.21.0

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From 6353f9dba6886dd59ba253d5ed6d6359a0b4584c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:53 +0400
Subject: [PATCH 081/364] dasel: update go build style to go1.21.0

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 71d25b2a7c937dc2cf01ac8d6b365e203761044a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:53 +0400
Subject: [PATCH 082/364] delve: update go build style to go1.21.0

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From 93ff869b2c3007dc92415a7c8d40acca7c44dc40 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:54 +0400
Subject: [PATCH 083/364] dendrite: update go build style to go1.21.0

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From 32e7f2002e91c42c5741ab8a7ae7ed8bdd643ec1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:54 +0400
Subject: [PATCH 084/364] dep: update go build style to go1.21.0

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 8e60cad104040c4a757f4a8afcf40d210be9041f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:55 +0400
Subject: [PATCH 085/364] direnv: update go build style to go1.21.0

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 92ec0fc349bdc55e261f55a31b347a47f1bce6be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:55 +0400
Subject: [PATCH 086/364] dirstalk: update go build style to go1.21.0

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From aece46102023396d825bba256146aba03d611643 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:56 +0400
Subject: [PATCH 087/364] distrobuilder: update go build style to go1.21.0

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 0ed7e9ee543be56a5e09a006342a69e854005489 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:56 +0400
Subject: [PATCH 088/364] dive: update go build style to go1.21.0

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From 41bb271107a61f7f207e1df4d670210ecfadf140 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:57 +0400
Subject: [PATCH 089/364] dlayer: update go build style to go1.21.0

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From 2b4a670fcfc03abaa1b95653a147d1b4d3585f08 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:57 +0400
Subject: [PATCH 090/364] dnscrypt-proxy: update go build style to go1.21.0

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From 637102bfc1ff957d798a27b59cdd68ad38f39cae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:58 +0400
Subject: [PATCH 091/364] docker-buildx: update go build style to go1.21.0

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 773abd5d7f64fa0e6a346462b92d6f1e960ca050 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:58 +0400
Subject: [PATCH 092/364] docker-cli: update go build style to go1.21.0

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From c58e3f27c09fa46d30ed59a661a9d7b5279eb7f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:59 +0400
Subject: [PATCH 093/364] docker-compose: update go build style to go1.21.0

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From ec6732e4f2e689a6253270eff717c7c4a3df7ead Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:22:59 +0400
Subject: [PATCH 094/364] docker-credential-pass: update go build style to
 go1.21.0

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From b79c391fdd2093e5a548dd7d8ae68dac496fabc0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:00 +0400
Subject: [PATCH 095/364] docker-gen: update go build style to go1.21.0

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From e95dd8794743a7571c69fd1d88e2942073f1941b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:00 +0400
Subject: [PATCH 096/364] docker-machine-driver-kvm: update go build style to
 go1.21.0

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From 8e91758a2785cdb0c65e72ebe0ddd76bd200c8e0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:01 +0400
Subject: [PATCH 097/364] docker-machine: update go build style to go1.21.0

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From c0a9ba8d4b0048b889e2f83aa4e9f2ca169d085a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:01 +0400
Subject: [PATCH 098/364] doctl: update go build style to go1.21.0

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 641a90c491c7bd4df2092f91e315b0541d7aae79 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:02 +0400
Subject: [PATCH 099/364] domain_exporter: update go build style to go1.21.0

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 7a7d8b04aa98140c45da09d5f58f5fd24c51e406 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:02 +0400
Subject: [PATCH 100/364] dotool: update go build style to go1.21.0

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From dcdcb67b8244f62469a07e7eabafcb7de79d2673 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:03 +0400
Subject: [PATCH 101/364] drive: update go build style to go1.21.0

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 8f8f6180311c77688b3380411008219eb21e5f55 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:03 +0400
Subject: [PATCH 102/364] drone-cli: update go build style to go1.21.0

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 76162c5323c9b4ef2990ae68ea227cee9c283879 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:04 +0400
Subject: [PATCH 103/364] duf: update go build style to go1.21.0

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From 848636b958854b5036bdda22d8161254feec86a2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:04 +0400
Subject: [PATCH 104/364] elfinfo: update go build style to go1.21.0

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From af8bf0774d4d59eb464d619d46d449cce5e44f42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:05 +0400
Subject: [PATCH 105/364] elvish: update go build style to go1.21.0

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 51e28fb0f8c2db1ad2b186350a58068cf539aab9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:05 +0400
Subject: [PATCH 106/364] emptty: update go build style to go1.21.0

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 7a434b4a994620042ce7081053935e530be395cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:06 +0400
Subject: [PATCH 107/364] ensure-access: update go build style to go1.21.0

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From 547a0cd431a626ef8a16664c5086e6d006c022c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:06 +0400
Subject: [PATCH 108/364] etcd: update go build style to go1.21.0

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 135c16d4abac1b9430ea2cf4547911721f079b76 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:07 +0400
Subject: [PATCH 109/364] exercism: update go build style to go1.21.0

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From 398a331e2945f0e798b18cbd86f921d577d51355 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:07 +0400
Subject: [PATCH 110/364] ffuf: update go build style to go1.21.0

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From f749ef29c80627c953203fe2351a9508848cbaca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:08 +0400
Subject: [PATCH 111/364] figurine: update go build style to go1.21.0

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From 885a54477da4736cf0032bcd82ecd91def3b9367 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:08 +0400
Subject: [PATCH 112/364] flannel: update go build style to go1.21.0

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 391170fb28611e7b2f6334ca35a6c61efcd720c2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:09 +0400
Subject: [PATCH 113/364] flint: update go build style to go1.21.0

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From 3bb43185b73271c3b7ac0e28e4e5afc183fc7d58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:09 +0400
Subject: [PATCH 114/364] forego: update go build style to go1.21.0

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From 3c823785cd7f8510a654fe68398e74f4b2568e96 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:10 +0400
Subject: [PATCH 115/364] frp: update go build style to go1.21.0

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 3abe4569e1ee64f9c59897de3e50e278a9d58c5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:10 +0400
Subject: [PATCH 116/364] fs-repo-migrations: update go build style to go1.21.0

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 5b4fe0e06123e626b86a77222ec46537dbda4e82 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:11 +0400
Subject: [PATCH 117/364] fscrypt: update go build style to go1.21.0

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From dfada84821d3e3a5c5d26d1dc7f1397095b40128 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:11 +0400
Subject: [PATCH 118/364] fzf: update go build style to go1.21.0

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 81023d0f4634512f28904b46b7dd38a5a812cfc8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:12 +0400
Subject: [PATCH 119/364] gdu: update go build style to go1.21.0

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From e59ac0ea2dfe8ab8a55f752e97d04be2b2e4abca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:12 +0400
Subject: [PATCH 120/364] gemget: update go build style to go1.21.0

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From 34835f09aec35483d0c9e19b873b057fac15f59d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:13 +0400
Subject: [PATCH 121/364] gendesk: update go build style to go1.21.0

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 10a0a6b05f037fab77e60940a4d7ca4dc5bca48d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:14 +0400
Subject: [PATCH 122/364] gfuzz: update go build style to go1.21.0

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 4a24e1330696e36371a9eb3399b4ecf7519ed301 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:14 +0400
Subject: [PATCH 123/364] ghq: update go build style to go1.21.0

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From 141508f3dfd4c33837008dd163edb0928e146eed Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:15 +0400
Subject: [PATCH 124/364] gister: update go build style to go1.21.0

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From 59df0e9806e0ae69c843f0036ddf8616ead34b27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:15 +0400
Subject: [PATCH 125/364] git-lfs: update go build style to go1.21.0

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From 073a671fbc6a7edc53e07130651ff1f743c87e15 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:16 +0400
Subject: [PATCH 126/364] git-sizer: update go build style to go1.21.0

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From 4a3c9ec4af751afd5beaf5225493ff475457e18b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:16 +0400
Subject: [PATCH 127/364] git-team: update go build style to go1.21.0

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From 8c2862845991f9e68d99e8263623a7c2119aa0e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:17 +0400
Subject: [PATCH 128/364] gitbatch: update go build style to go1.21.0

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From ece0d60bdfc9ef3bf20c96d8bcdf032ebb8d5356 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:17 +0400
Subject: [PATCH 129/364] gitea: update go build style to go1.21.0

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 161bfb1b3c216ac2141813798f44401b4244f916 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:18 +0400
Subject: [PATCH 130/364] github-cli: update go build style to go1.21.0

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From ee6e4d634bc8dfac1a2f59418b7d0db3262f1c67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:18 +0400
Subject: [PATCH 131/364] github-opml: update go build style to go1.21.0

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From 78866140d709b674062f0d3c7c806fb9ed739cac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:19 +0400
Subject: [PATCH 132/364] gitlab-runner: update go build style to go1.21.0

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From 5e290c14673aa92efe8f4ccb88929142c8bff86e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:19 +0400
Subject: [PATCH 133/364] gkill: update go build style to go1.21.0

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From ea3f693b7d507d68bac48eefe57fa7bc89ac5fee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:20 +0400
Subject: [PATCH 134/364] glab: update go build style to go1.21.0

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From 8e88a9433f507e053eb9cd5b19b2a78b1bd5328c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:21 +0400
Subject: [PATCH 135/364] glide: update go build style to go1.21.0

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 856871aaf4fb38985c71cd2926c2c96eab3b49e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:21 +0400
Subject: [PATCH 136/364] glider: update go build style to go1.21.0

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From 26b270e2e454a61c2944624362f7847e0da416c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:22 +0400
Subject: [PATCH 137/364] glock: update go build style to go1.21.0

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 2be68de01a6fcfd79635e7d9c8601a8402422a27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:22 +0400
Subject: [PATCH 138/364] glow: update go build style to go1.21.0

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 4536b12947c23c9cb7e0bd25e3869dc9b191df18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:23 +0400
Subject: [PATCH 139/364] go-bindata: update go build style to go1.21.0

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From 5e870399696e7ed97f0b16079c9bff9136e4f41e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:23 +0400
Subject: [PATCH 140/364] go-capnproto2: update go build style to go1.21.0

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 79b6506741936c84ea4c26e9878db2ca7acdc1aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:24 +0400
Subject: [PATCH 141/364] go-ipfs: update go build style to go1.21.0

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 4cb2967d7d1a77db7b074dabaeaf39b547ea2358 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:24 +0400
Subject: [PATCH 142/364] go-jira: update go build style to go1.21.0

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From 0c9d629d376deb84f82e63af090265e0eaac7160 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:25 +0400
Subject: [PATCH 143/364] go-md2man: update go build style to go1.21.0

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From 4bff96de093c585c6020228ab97e482de523dcbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:25 +0400
Subject: [PATCH 144/364] go-mtpfs: update go build style to go1.21.0

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 20fd0f64bee3c43f56023e45b322aa9bf1e12b2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:26 +0400
Subject: [PATCH 145/364] go-review: update go build style to go1.21.0

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From d60d26ca67fd4588f02f0a80f67772da388262e4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:26 +0400
Subject: [PATCH 146/364] goatcounter: update go build style to go1.21.0

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From 7ce7ecd051398b66c91599826720f14cc05ae5ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:27 +0400
Subject: [PATCH 147/364] gobuster: update go build style to go1.21.0

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 62485fcf6fc005401e40e017b6781fbb1e49de3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:28 +0400
Subject: [PATCH 148/364] gocloc: update go build style to go1.21.0

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From 9292ab95430a2cb25b64bf83bb85cbc6da3d4a08 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:28 +0400
Subject: [PATCH 149/364] gocryptfs: update go build style to go1.21.0

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From 4d50268ff97adb6c5869103454f35cabcdd82bb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:29 +0400
Subject: [PATCH 150/364] godef: update go build style to go1.21.0

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From 8afbf4ddb1595785a872da67551e7b7305203cd5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:29 +0400
Subject: [PATCH 151/364] gogs: update go build style to go1.21.0

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From f0d20b6abd855f500c0b3567c2dbce0aa3c1c815 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:30 +0400
Subject: [PATCH 152/364] goimapnotify: update go build style to go1.21.0

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From 556ab2f2d75036e26e3dd8910ba26e10462a9688 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:30 +0400
Subject: [PATCH 153/364] golangci-lint: update go build style to go1.21.0

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From bc9d704703a7af2551db20044da6a17f8d55344d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:31 +0400
Subject: [PATCH 154/364] gomatrix: update go build style to go1.21.0

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 249e398375965e4f44e88dbf6352986a104b8f65 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:31 +0400
Subject: [PATCH 155/364] gopass-jsonapi: update go build style to go1.21.0

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From 5e78bc4478cdebde65446964dfdcb891ac686608 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:32 +0400
Subject: [PATCH 156/364] gopass: update go build style to go1.21.0

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From 00cdf151bac5ee88afd62290489dc7ff221b8ba7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:32 +0400
Subject: [PATCH 157/364] gopls: update go build style to go1.21.0

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From b7d89e440f9422f45f12b445c7803570f07de6e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:33 +0400
Subject: [PATCH 158/364] gopm: update go build style to go1.21.0

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From b6f956c69d42da80dff85385512ad625c8f03fa7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:33 +0400
Subject: [PATCH 159/364] gops: update go build style to go1.21.0

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From 31c50fb829d31cfa5490ac76ba04dc85758d800e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:34 +0400
Subject: [PATCH 160/364] goreleaser: update go build style to go1.21.0

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From c39ca5816670d38f7382904f212700a0abc7514a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:34 +0400
Subject: [PATCH 161/364] gotify-cli: update go build style to go1.21.0

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From 830074117ee81eb600a5aa367d448b6580443d3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:35 +0400
Subject: [PATCH 162/364] gotify-server: update go build style to go1.21.0

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From fe8423bd7d7c880ab7092243cf44ba645c5b08ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:36 +0400
Subject: [PATCH 163/364] gotop: update go build style to go1.21.0

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From 1ba97b6646710ba7bd3ced83f1f21096987bb95b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:36 +0400
Subject: [PATCH 164/364] gotty: update go build style to go1.21.0

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From d2191b125144ece9bb72e278f8bfbf1af4f0a23a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:37 +0400
Subject: [PATCH 165/364] goversion: update go build style to go1.21.0

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From 6330315f950e293dd53fe6a59e439d5d9101c1c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:37 +0400
Subject: [PATCH 166/364] grafana: update go build style to go1.21.0

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From 3b5d5c6dbae4477fce41f8d3a497fa991772e1ac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:38 +0400
Subject: [PATCH 167/364] gron: update go build style to go1.21.0

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From 3f60cc97a20be817c4e7411ebfec49209288aa46 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:38 +0400
Subject: [PATCH 168/364] grype: update go build style to go1.21.0

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From 066c81782a78ae671a5aa2471d22fd8e1e818d5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:39 +0400
Subject: [PATCH 169/364] gucci: update go build style to go1.21.0

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From 8d59a4d0ce0e3bd3bf8cd578b095f1b09b5ccc64 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:39 +0400
Subject: [PATCH 170/364] gum: update go build style to go1.21.0

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From ee703d532b392c5942cd58ed7af0fdabac5ddecf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:40 +0400
Subject: [PATCH 171/364] hcloud: update go build style to go1.21.0

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From 716fc6af1b411741b3e389fe15769d0683e5f4cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:40 +0400
Subject: [PATCH 172/364] hey: update go build style to go1.21.0

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From 859b3905f8d10e72e0130541454056a6779312c2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:41 +0400
Subject: [PATCH 173/364] hivemind: update go build style to go1.21.0

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 33ed7a1a92de774a5ca8f94c06b6e9999ecaaecc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:41 +0400
Subject: [PATCH 174/364] hooktftp: update go build style to go1.21.0

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From 45b5073dd16fdaec9b9ba6331ab5b3ee4b1bd82d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:42 +0400
Subject: [PATCH 175/364] httpstat: update go build style to go1.21.0

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 780c076d659b835acb51246bdd9b856711dcaeaa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:42 +0400
Subject: [PATCH 176/364] hub: update go build style to go1.21.0

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From d4285045a986cd693889411a17ce359c041c9cc1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:43 +0400
Subject: [PATCH 177/364] hugo: update go build style to go1.21.0

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From 619018885e7bf3b4dd4a657d8c7c5c859e0e0381 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:43 +0400
Subject: [PATCH 178/364] hut: update go build style to go1.21.0

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From fc292df35c1f5488c0b7d482b7ac3f66f3ccb401 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:44 +0400
Subject: [PATCH 179/364] hydroxide: update go build style to go1.21.0

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From a05cddc9cd020ae3c37e67582f1d6a34bdfb39bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:45 +0400
Subject: [PATCH 180/364] i3cat: update go build style to go1.21.0

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From a418416633d8a52e5bc1921a4b017ac85b79e912 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:45 +0400
Subject: [PATCH 181/364] ibus-bamboo: update go build style to go1.21.0

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From 300bb31cb1d9cad008ccf477f39fa7fa23b8692d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:46 +0400
Subject: [PATCH 182/364] img: update go build style to go1.21.0

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From ab486315782dca9869be3ef14b2b95306656e146 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:46 +0400
Subject: [PATCH 183/364] immortal: update go build style to go1.21.0

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From f3d1ab3a31434a3f4f674de1988d6478b2ce255e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:47 +0400
Subject: [PATCH 184/364] influxdb: update go build style to go1.21.0

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From b2ed2ed338846a273f41b80d013205c074eb95bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:47 +0400
Subject: [PATCH 185/364] ipfs-cluster: update go build style to go1.21.0

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From e3cc1c95304093beb7ba86d6dfb983b9d5147cbf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:48 +0400
Subject: [PATCH 186/364] ipp-usb: update go build style to go1.21.0

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From 6968ebd101e2fbfd674207ee5a9b4e773a15281e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:48 +0400
Subject: [PATCH 187/364] ircdog: update go build style to go1.21.0

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From 4a1179f62f272ee02d4d22805fa582f535423a9d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:49 +0400
Subject: [PATCH 188/364] jd: update go build style to go1.21.0

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From d582ec4e92054d2b481e830a168024d4539bdbc8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:49 +0400
Subject: [PATCH 189/364] jid: update go build style to go1.21.0

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 8c631fc6b07f5d93439eae64b2621bcc34384cf2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:50 +0400
Subject: [PATCH 190/364] jj: update go build style to go1.21.0

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From 3f848b7b310040082c83d36206417e74fa55a0a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:50 +0400
Subject: [PATCH 191/364] joker: update go build style to go1.21.0

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From d932bdfe3479d7afae47d564fe653797c5b3ad89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:51 +0400
Subject: [PATCH 192/364] jp: update go build style to go1.21.0

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From eb51c90e3dd75d18e0e15c70fc382335cbf43509 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:52 +0400
Subject: [PATCH 193/364] jsonnet-language-server: update go build style to
 go1.21.0

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From beaf6b7fb72f1fb86d79603adba2bf02b52cf9f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:52 +0400
Subject: [PATCH 194/364] jump: update go build style to go1.21.0

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From 8407de2108876ae6ddee369fa29e19ca104bac9c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:53 +0400
Subject: [PATCH 195/364] k3d: update go build style to go1.21.0

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From 5c8fe9516091b4b9f33f177345ca1e322e506b57 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:53 +0400
Subject: [PATCH 196/364] k9s: update go build style to go1.21.0

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From e831446abec8143359dd485989fc8fc213c43adb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:54 +0400
Subject: [PATCH 197/364] kapacitor: update go build style to go1.21.0

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From cff5b3cd6ceb7b6898a909824224dd87dc1e1f9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:54 +0400
Subject: [PATCH 198/364] keybase: update go build style to go1.21.0

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From e984a396a1beb2dd2df49394df28c4542c4d19c3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:55 +0400
Subject: [PATCH 199/364] knit: update go build style to go1.21.0

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From 6d2976696a3f0c4555eeb846f82775d6eff1bbf1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:55 +0400
Subject: [PATCH 200/364] kopia: update go build style to go1.21.0

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 437a5e74671f78b42b75e0e086f007d8bbf1feda Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:56 +0400
Subject: [PATCH 201/364] kops: update go build style to go1.21.0

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From b8f88cd1e5fe995730606133d2d145b5fd0c01fd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:56 +0400
Subject: [PATCH 202/364] kubecfg: update go build style to go1.21.0

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From 870069f8e5320b7b865b6dad53e3af7de8ec9a8a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:57 +0400
Subject: [PATCH 203/364] kubefwd: update go build style to go1.21.0

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From e7cd9e0a3d55c263c72272ee2b0eec3f12aed106 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:57 +0400
Subject: [PATCH 204/364] kubernetes-kind: update go build style to go1.21.0

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From f6179cd07754210c8a3635bae9945850191c44a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:58 +0400
Subject: [PATCH 205/364] kubernetes: update go build style to go1.21.0

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From da222827f59083183afe57f7cc54d3dee07a2124 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:58 +0400
Subject: [PATCH 206/364] kurly: update go build style to go1.21.0

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From 4e9ac64dace212f5ea93e708e9b432175b581d8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:23:59 +0400
Subject: [PATCH 207/364] lazydocker: update go build style to go1.21.0

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From 67489a4bf978f1b7fe16dce1a4a25d245e334260 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:00 +0400
Subject: [PATCH 208/364] lazygit: update go build style to go1.21.0

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From feba0a090111e70af80dcffdb00bce6c5a14b3f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:00 +0400
Subject: [PATCH 209/364] lego: update go build style to go1.21.0

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From 7705644e1d610bef446f624bd0d846d8f1ddb99f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:01 +0400
Subject: [PATCH 210/364] lets: update go build style to go1.21.0

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From cf23b31411bf402d454d826e2556653dd880df91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:01 +0400
Subject: [PATCH 211/364] lf: update go build style to go1.21.0

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 60d1f765b2b88b05cffac8c6d872e100059eed6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:02 +0400
Subject: [PATCH 212/364] licensechecker: update go build style to go1.21.0

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From 92daf4408584763d8e413d0236c5c737cad4079d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:02 +0400
Subject: [PATCH 213/364] loki: update go build style to go1.21.0

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From 37922e176c38e0ee0ab7983854881f351238a52c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:03 +0400
Subject: [PATCH 214/364] lsp: update go build style to go1.21.0

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From ff9c89253326f5c1fa810fd4cc62ebeced7a16d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:03 +0400
Subject: [PATCH 215/364] lux: update go build style to go1.21.0

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 8cfe223612ac7537eede6f7d2cb43e6c4433bd38 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:04 +0400
Subject: [PATCH 216/364] maddy: update go build style to go1.21.0

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From b3f7c24660860bb53e02da8d95009b50f0a24051 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:04 +0400
Subject: [PATCH 217/364] madonctl: update go build style to go1.21.0

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From 5a235edda77033707639f0ad43c765e61b656ad5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:05 +0400
Subject: [PATCH 218/364] massren: update go build style to go1.21.0

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From e14526e46d2da4acd608e8dae5257832489f9dae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:05 +0400
Subject: [PATCH 219/364] mdr: update go build style to go1.21.0

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 8fc9d07cb023486af782bd51ca4c344f31ab7f53 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:06 +0400
Subject: [PATCH 220/364] micro: update go build style to go1.21.0

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From efb923a79dd52ac027e5d80bc32527693ac8ff3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:06 +0400
Subject: [PATCH 221/364] microhookd: update go build style to go1.21.0

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From 726d859b0b50ef084640a31837b8694a5fb17e82 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:07 +0400
Subject: [PATCH 222/364] miller: update go build style to go1.21.0

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 2dc3797f446234afd7c8fcd0d997419b0210f8d4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:08 +0400
Subject: [PATCH 223/364] miniflux: update go build style to go1.21.0

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From 9482f8c8a434f0549fcc770c21efbf657c4b2405 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:08 +0400
Subject: [PATCH 224/364] minify: update go build style to go1.21.0

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From bfb743b95d9b409e9a748fbca4a0fa7250728259 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:09 +0400
Subject: [PATCH 225/364] minikube: update go build style to go1.21.0

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From db973deef6536f6f14cff5707c12a6683ebb7dbe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:09 +0400
Subject: [PATCH 226/364] minio: update go build style to go1.21.0

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From e01b8fe745d949ecc6f592fd5ab310f66f39f33c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:10 +0400
Subject: [PATCH 227/364] misspell: update go build style to go1.21.0

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From 5511e0e999dd524d863594b2d112dd6912b3908c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:10 +0400
Subject: [PATCH 228/364] mmark: update go build style to go1.21.0

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From 0bee47f83fbd0d831d1c56decd003b1ff198cf4d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:11 +0400
Subject: [PATCH 229/364] mmv-go: update go build style to go1.21.0

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From 59a0025d31b39dc4134fe73282f53934578573be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:11 +0400
Subject: [PATCH 230/364] moar: update go build style to go1.21.0

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From 98db67e68329315e0e7b1dbb8ad0cad424a45484 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:12 +0400
Subject: [PATCH 231/364] moby: update go build style to go1.21.0

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From 240c7d90034816de36759008e358d370a137ba42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:12 +0400
Subject: [PATCH 232/364] mountain-backup: update go build style to go1.21.0

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From 4d11b4e786951dcb99a0813802f83320d9c621a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:13 +0400
Subject: [PATCH 233/364] mpdviz: update go build style to go1.21.0

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From b38ac2d4801de486108c84911e27eab0c0cb93ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:13 +0400
Subject: [PATCH 234/364] nebula: update go build style to go1.21.0

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From b1b36e570a335336d7b645ae6b469a24f6460884 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:14 +0400
Subject: [PATCH 235/364] nerdctl: update go build style to go1.21.0

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From 805f48445b28fbc8693fc2676be1ccf4e8f8d25c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:15 +0400
Subject: [PATCH 236/364] netdata-plugins-go: update go build style to go1.21.0

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From 54938fdd54a17ef17070b13d311438e857f7169a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:15 +0400
Subject: [PATCH 237/364] netns: update go build style to go1.21.0

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From 4fc5550eac67c3299c0902af8c4ba06776840c24 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:16 +0400
Subject: [PATCH 238/364] netris: update go build style to go1.21.0

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 9caa06511947bb22b600954b43ec3a5b6b23c8ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:16 +0400
Subject: [PATCH 239/364] nextdns: update go build style to go1.21.0

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From ce38d68cc181e22770d51ba4ea2230fbfac5ea09 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:17 +0400
Subject: [PATCH 240/364] nncp: update go build style to go1.21.0

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 5d2712cd67170..9ac8e20b52769 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.8.3
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From afbb3df2c36d2f60c2cf32bd26e4fa320372f3b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:17 +0400
Subject: [PATCH 241/364] node_exporter: update go build style to go1.21.0

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 8bf24672e47ccaf4ade425840c073c6bb1d5edbf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:18 +0400
Subject: [PATCH 242/364] nomad: update go build style to go1.21.0

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 5a5cb41b2f643a0320a52c18606bc0015bb30c76 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:18 +0400
Subject: [PATCH 243/364] ntfy: update go build style to go1.21.0

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 1e4b43338b71222c6d19436d9b04447a02a2563e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:19 +0400
Subject: [PATCH 244/364] nvidia-container-toolkit: update go build style to
 go1.21.0

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From 537d8ac5abb4127875db9bda0fd7e391bfabfd2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:19 +0400
Subject: [PATCH 245/364] nwg-look: update go build style to go1.21.0

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From 012a41105ea26a2af71dfc1bc8a54a25a4e67fad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:20 +0400
Subject: [PATCH 246/364] obfs4proxy: update go build style to go1.21.0

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 3605cd5933c64fb8016c95b8fa3f544388eb2518 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:20 +0400
Subject: [PATCH 247/364] oh: update go build style to go1.21.0

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From f1734daed9b901dba019171b2243ce885ec5e503 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:21 +0400
Subject: [PATCH 248/364] opensmtpd-filter-rspamd: update go build style to
 go1.21.0

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 934509767154f6b30dac3856aea1d94c2ec3b9b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:21 +0400
Subject: [PATCH 249/364] opensmtpd-filter-senderscore: update go build style
 to go1.21.0

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 2f426c58ba296bb7e6ae043ec3a63b8ac7ca8db2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:22 +0400
Subject: [PATCH 250/364] operator-sdk: update go build style to go1.21.0

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From 2f9566b77c7e0ec9fc2f249c82c17f3150a1af81 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:23 +0400
Subject: [PATCH 251/364] oragono: update go build style to go1.21.0

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From add043978b5b91df585971db79efcb0fec3ebf22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:23 +0400
Subject: [PATCH 252/364] oras: update go build style to go1.21.0

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From 462bb3699aeb0946a9b58fe4d03416dfedd10e70 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:24 +0400
Subject: [PATCH 253/364] osv-scanner: update go build style to go1.21.0

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From c970f2ff16e562752f97bd4a880e86174963d609 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:24 +0400
Subject: [PATCH 254/364] packer: update go build style to go1.21.0

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From 6033115d603cab325f706a71316b79a773469264 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:25 +0400
Subject: [PATCH 255/364] packr2: update go build style to go1.21.0

---
 srcpkgs/packr2/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..de0e9b90c73fc 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,7 +2,7 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
 short_desc="Static files embedder for Go binaries"
@@ -12,6 +12,10 @@ homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vlicense v2/LICENSE.txt
 }

From 344c7a7dc30504d6714dc923769ea2499429117f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:25 +0400
Subject: [PATCH 256/364] pam_netauth: update go build style to go1.21.0

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From c901568b13cc6e81bf1a959217222b13851d44ff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:26 +0400
Subject: [PATCH 257/364] passphrase2pgp: update go build style to go1.21.0

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From 3cc355ffe29e6087d8e0fdb90b30efe6a43716b9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:26 +0400
Subject: [PATCH 258/364] peco: update go build style to go1.21.0

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From e0af19a77f9101e2b61b069e836bec0d144ed66f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:27 +0400
Subject: [PATCH 259/364] pgmetrics: update go build style to go1.21.0

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 0c8aea77755cacdb96ebe827b861e9d0f439daa1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:27 +0400
Subject: [PATCH 260/364] pgweb: update go build style to go1.21.0

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From 795c868ec8d5d47a7ec83298b9f1878d0998c905 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:28 +0400
Subject: [PATCH 261/364] pkgtop: update go build style to go1.21.0

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From 5ff801da39ac83ecd8ea55662892f8244d755e4b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:28 +0400
Subject: [PATCH 262/364] podman-tui: update go build style to go1.21.0

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From 75509dd17942d672abb7694a91839150cf85e2dd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:29 +0400
Subject: [PATCH 263/364] podman: update go build style to go1.21.0

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From d25e311f2ebe9f681bd990bd0fee7acdd5a36d75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:30 +0400
Subject: [PATCH 264/364] pong-command: update go build style to go1.21.0

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 776eac9525ac97f33472d64e0f64331b341822fd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:30 +0400
Subject: [PATCH 265/364] prometheus: update go build style to go1.21.0

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From ce0495c6d1c11f1ffb7d35161d0167b1b6f238f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:31 +0400
Subject: [PATCH 266/364] pst: update go build style to go1.21.0

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 97dd6b09386941cd6c10e9986b8c5ea33e732add Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:31 +0400
Subject: [PATCH 267/364] pup: update go build style to go1.21.0

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 8256cc9caae3af479b6c9aad0a061b5569b7b3ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:32 +0400
Subject: [PATCH 268/364] pwget: update go build style to go1.21.0

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From 927817fa26f4999d0893c44838ac0113a472b33c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:32 +0400
Subject: [PATCH 269/364] qrcp: update go build style to go1.21.0

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 6f55ef3f817576d4b61bfe336ae3776afccfc5ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:33 +0400
Subject: [PATCH 270/364] rancher-compose: update go build style to go1.21.0

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From 48fc18d6dc0eff68b432fdf6d17c9db904d087cb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:33 +0400
Subject: [PATCH 271/364] rclone: update go build style to go1.21.0

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From 82c1268e08d3e7e5138c08058dbb4d9b35e45e36 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:34 +0400
Subject: [PATCH 272/364] rest-server: update go build style to go1.21.0

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 1c6d89ce3b30ccaaca5cd1bb6ac84483c9711d9c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:34 +0400
Subject: [PATCH 273/364] restic: update go build style to go1.21.0

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 13acbb826a62c9de000ac88647fe9768c0131156 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:35 +0400
Subject: [PATCH 274/364] revive: update go build style to go1.21.0

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From 87f133d481d7be05febd7274939f9bc070a8fbe4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:35 +0400
Subject: [PATCH 275/364] rmapi: update go build style to go1.21.0

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From 9284f213157d2009676e4f2158c43a3a52524ae3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:36 +0400
Subject: [PATCH 276/364] rocker: update go build style to go1.21.0

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From f6ebbf6f538f8f5f8a2efa282e5245c0277cc1b6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:37 +0400
Subject: [PATCH 277/364] rootlesskit: update go build style to go1.21.0

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From 3a56e7bf532e8b09649d0b7b8250a6a4062068e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:37 +0400
Subject: [PATCH 278/364] runc: update go build style to go1.21.0

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5495e4a720bb1..008a94e502e19 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.8
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From 21034520a1c6227ac24b2471a09c28e6de36e30d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:38 +0400
Subject: [PATCH 279/364] ryzen-stabilizator: update go build style to go1.21.0

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From 3f9dcf7d2d66793de588a143ae624b588353ad66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:38 +0400
Subject: [PATCH 280/364] s: update go build style to go1.21.0

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From 2b074cf9c26f0118da752e791069a30da4d221f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:39 +0400
Subject: [PATCH 281/364] saml2aws: update go build style to go1.21.0

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From c629be39d2b3c89130382f3759121db6f0e38494 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:39 +0400
Subject: [PATCH 282/364] sampler: update go build style to go1.21.0

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From f4deb5ebd8d47b73fc5cb7b53ffe741aacc81eb4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:40 +0400
Subject: [PATCH 283/364] sbctl: update go build style to go1.21.0

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From 044b8698b812e16f3642849074a55a4ed47ff61d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:40 +0400
Subject: [PATCH 284/364] scaleway-cli: update go build style to go1.21.0

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From a7f3a99b6e9009a6ea252134d79bb56b818614af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:41 +0400
Subject: [PATCH 285/364] scc: update go build style to go1.21.0

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 366950021ab0814aa711c7622f1d081221adb9c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:41 +0400
Subject: [PATCH 286/364] seaweedfs: update go build style to go1.21.0

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From a9f7d06360c287581ebe375e4dd6a1caadabdbfd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:42 +0400
Subject: [PATCH 287/364] senpai: update go build style to go1.21.0

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From bcdca03dd3ddef82e64b207b6f6cd093483a6bb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:43 +0400
Subject: [PATCH 288/364] sftpgo: update go build style to go1.21.0

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 63f65aff628c74604debcffac14c956efcc1866c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:43 +0400
Subject: [PATCH 289/364] shadowfox-updater: update go build style to go1.21.0

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From e20ab48792d1bf4bb3ad52171f41c1e3758231f1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:44 +0400
Subject: [PATCH 290/364] sharenix: update go build style to go1.21.0

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From 93c3b4867d2c7256a8411efa1499b4d1647062fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:44 +0400
Subject: [PATCH 291/364] shfmt: update go build style to go1.21.0

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From 2c497251990164729ed32f2420341568239d6bec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:45 +0400
Subject: [PATCH 292/364] shiori: update go build style to go1.21.0

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From 1ae5b72df9d4ba6e680ca4f5e499c5ff23d63d1a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:45 +0400
Subject: [PATCH 293/364] sift: update go build style to go1.21.0

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From 6f8902b6204fc59d661afade23da75c72de0560b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:46 +0400
Subject: [PATCH 294/364] skaffold: update go build style to go1.21.0

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From c20cd4df0475e6c59e9beeedfeb3fb6f43a206eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:46 +0400
Subject: [PATCH 295/364] skate: update go build style to go1.21.0

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From 21910ee61e688df6b22778f32a40ef875b6ac0b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:47 +0400
Subject: [PATCH 296/364] skopeo: update go build style to go1.21.0

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 8a0ca2cb91781097e06a253f839949e1e40b2629 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:47 +0400
Subject: [PATCH 297/364] slack-term: update go build style to go1.21.0

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From f81323b66ccb6aee5d2ca7b273a1959e9e5b5640 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:48 +0400
Subject: [PATCH 298/364] slit: update go build style to go1.21.0

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From fcb56723fcfd89dd8a398ff2896759423f4f803e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:48 +0400
Subject: [PATCH 299/364] soju: update go build style to go1.21.0

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From e2ed332bd61b28bda2268ff28ee49fe9747b1aae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:49 +0400
Subject: [PATCH 300/364] sops: update go build style to go1.21.0

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 5491253a458b0ab9d701a49712d3304585f463a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:50 +0400
Subject: [PATCH 301/364] spreed-webrtc: update go build style to go1.21.0

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From 8120f0b3a8119de87dbf3b0d99d072a9606dacca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:50 +0400
Subject: [PATCH 302/364] ssl_exporter: update go build style to go1.21.0

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From 7721dee3c61b66859971b9cc15b2dc5c7afa3407 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:51 +0400
Subject: [PATCH 303/364] stc: update go build style to go1.21.0

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From b6b45b1f78f41548b1935ff889cce356cebee083 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:51 +0400
Subject: [PATCH 304/364] step-certificates: update go build style to go1.21.0

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From 6bad4e4ad409536f1e2380ef350217d404f34262 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:52 +0400
Subject: [PATCH 305/364] step-cli: update go build style to go1.21.0

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From 4d869f32568922e11856c6789002241f2b5a2d9a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:52 +0400
Subject: [PATCH 306/364] stern: update go build style to go1.21.0

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From e350f4df821a1686c30a76d137b36b3387f7d75a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:53 +0400
Subject: [PATCH 307/364] subfinder: update go build style to go1.21.0

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From 04f75d1845dfbf5a3eb56d57fb5ef0084c09f963 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:53 +0400
Subject: [PATCH 308/364] subjack: update go build style to go1.21.0

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From 681d1d462a981206a8905f591657c3638e6a8118 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:54 +0400
Subject: [PATCH 309/364] superd: update go build style to go1.21.0

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From f48ee1c4d3d02ec5932e1c631d23ef12000f2769 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:54 +0400
Subject: [PATCH 310/364] svctl: update go build style to go1.21.0

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From 217e44fb29613d1fae35c0f29ec19a2406bb053b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:55 +0400
Subject: [PATCH 311/364] syft: update go build style to go1.21.0

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 902935e6446fc09c7605b097820dd92ff7ac7bd2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:56 +0400
Subject: [PATCH 312/364] syncthing: update go build style to go1.21.0

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From f8bbe7316fda394b8bf91e5fd4d3cdf13b6e55d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:56 +0400
Subject: [PATCH 313/364] tag: update go build style to go1.21.0

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From c020c1daec84a84edb2392d0ef0d3c96a675b8bc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:57 +0400
Subject: [PATCH 314/364] tailscale: update go build style to go1.21.0

---
 srcpkgs/tailscale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"

From cbac81a580696cd9b7ca7c70e11acae79c520dff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:57 +0400
Subject: [PATCH 315/364] tea: update go build style to go1.21.0

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From 3d4bcb04ed1f7822a6184ea7fae8d3c4693fb4fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:58 +0400
Subject: [PATCH 316/364] telegraf: update go build style to go1.21.0

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From f778fc3ea2f0ae64190e3d4995c52e4dbeeddc5d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:58 +0400
Subject: [PATCH 317/364] termshark: update go build style to go1.21.0

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From c21700ec68f9a13672d1a06f991e45398ee23efc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:59 +0400
Subject: [PATCH 318/364] terraform-docs: update go build style to go1.21.0

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From fec520281ba35420eec85b5de1ab2c83af20e1fe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:24:59 +0400
Subject: [PATCH 319/364] terraform-ls: update go build style to go1.21.0

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From f1a2dec4b77e88b8aebed39bf73ca7f29d119019 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:00 +0400
Subject: [PATCH 320/364] terraform: update go build style to go1.21.0

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From a3e446fd0f171bb86540b313eee3c0029e1cadd0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:00 +0400
Subject: [PATCH 321/364] terragrunt: update go build style to go1.21.0

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From 48c9089ca4da25416bcfd1ff48b24416347bace0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:01 +0400
Subject: [PATCH 322/364] tflint: update go build style to go1.21.0

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From 4284c83afac7709e170868375440b546d3d9ed5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:01 +0400
Subject: [PATCH 323/364] tinycron: update go build style to go1.21.0

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 90ed3adf75b1bdf303b2917918df68dd96a4bf2f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:02 +0400
Subject: [PATCH 324/364] tldr: update go build style to go1.21.0

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From cd254b4bfc3d99d1cad504a344368395808fd4ab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:03 +0400
Subject: [PATCH 325/364] tml: update go build style to go1.21.0

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From 513c257e97d936cb60b1468ffd1ef12822deed94 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:03 +0400
Subject: [PATCH 326/364] todoist: update go build style to go1.21.0

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 8f5060850a06915c83b5085e9e6a482faee98747 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:04 +0400
Subject: [PATCH 327/364] transifex-cli: update go build style to go1.21.0

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From 3ec32ac76d67b7fc27988b44a16ce7ffd7d4f4f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:04 +0400
Subject: [PATCH 328/364] twitch-cli: update go build style to go1.21.0

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From 1dac97b6423d7c127e0cd678d5bd0d79d9ad0a9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:05 +0400
Subject: [PATCH 329/364] typioca: update go build style to go1.21.0

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From b0829a000065b56dd4ffff85ed4a3bca823fed92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:05 +0400
Subject: [PATCH 330/364] umoci: update go build style to go1.21.0

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From 97c895dc954adb70c62dcbad182ff6380234a4ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:06 +0400
Subject: [PATCH 331/364] unflac: update go build style to go1.21.0

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From 9dc5a0b33231ed38747fa5ced3483ef2273d50ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:06 +0400
Subject: [PATCH 332/364] uni: update go build style to go1.21.0

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From deaf0990cfb72833bb627d73c32f086da0b190cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:07 +0400
Subject: [PATCH 333/364] up: update go build style to go1.21.0

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 78a34b52c481809751eab115b26f969db8ee46e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:07 +0400
Subject: [PATCH 334/364] up_rewrite: update go build style to go1.21.0

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From b623bd83b3efe6e04982954ae13d31be10d0f264 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:08 +0400
Subject: [PATCH 335/364] upterm: update go build style to go1.21.0

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From fbee2df9a8a478bed2b1d92e0d6091bf47180dcc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:09 +0400
Subject: [PATCH 336/364] usql: update go build style to go1.21.0

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From 680efe59cdccca11b388d28324fc02c76fa112bc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:09 +0400
Subject: [PATCH 337/364] v2ray: update go build style to go1.21.0

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From c57178e05b5705d9da55a9b4d01b5d7bc5c8065e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:10 +0400
Subject: [PATCH 338/364] vale: update go build style to go1.21.0

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From ec91a50fc0cb19e6c40e64ab98e54ed581de9ae9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:10 +0400
Subject: [PATCH 339/364] vault-acme: update go build style to go1.21.0

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From 3a470426aa9304163b35c8a074547cff521371cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:11 +0400
Subject: [PATCH 340/364] vault: update go build style to go1.21.0

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From be53d6f1d770102e0d0f727ffbe2b59c91b70a68 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:11 +0400
Subject: [PATCH 341/364] vegeta: update go build style to go1.21.0

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From e5f48cb32e14fa18a3e07e1620d2356798d283c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:12 +0400
Subject: [PATCH 342/364] vhs: update go build style to go1.21.0

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 60a6eb2dccdcdbb0f6b07b3fd30f4dc06ef80750 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:12 +0400
Subject: [PATCH 343/364] vmdfmt: update go build style to go1.21.0

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 6dc3d49bb5dbf4c29bf776c6e11c91ca759b1384 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:13 +0400
Subject: [PATCH 344/364] vndr: update go build style to go1.21.0

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From 3c367d0fc2c4f54f7e7a81531411df5debb4c3ed Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:13 +0400
Subject: [PATCH 345/364] vultr-cli: update go build style to go1.21.0

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From 7d6eae05d56903b6a7660f315048c1e0d3afd451 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:14 +0400
Subject: [PATCH 346/364] vultr: update go build style to go1.21.0

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From f8fdbe654747037f32d2640c878640abc9086568 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:14 +0400
Subject: [PATCH 347/364] wally-cli: update go build style to go1.21.0

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From 44fe77704739b164c7b0ff4149e3ad32898cdc4b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:15 +0400
Subject: [PATCH 348/364] wander: update go build style to go1.21.0

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From fa0dfde0f5f62050d3fa3e7175d9fe91e68ce49d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:16 +0400
Subject: [PATCH 349/364] webcat: update go build style to go1.21.0

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From f85b34783172fa100f3fdbe8341528cfea9236f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:16 +0400
Subject: [PATCH 350/364] webhook: update go build style to go1.21.0

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From f806647144c8d5b89d3854ac6c9a8514989971a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:17 +0400
Subject: [PATCH 351/364] websocketd: update go build style to go1.21.0

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From d9da875ffa2aca6093cda615322f78a732e30d01 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:17 +0400
Subject: [PATCH 352/364] wego: update go build style to go1.21.0

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 6452ceab09ec6cf7cd55072dc65eb6b2952d588a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:18 +0400
Subject: [PATCH 353/364] wireproxy: update go build style to go1.21.0

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From e1877e7162b8f2301632d87e54d482266cbdcd48 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:18 +0400
Subject: [PATCH 354/364] woke: update go build style to go1.21.0

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From 0d1388cbfa078f5e861d3bb86e47d961941d5c4f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:19 +0400
Subject: [PATCH 355/364] wtfutil: update go build style to go1.21.0

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From b22dbdd972fb2a1cb3e2b23e558a121028f0fa40 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:19 +0400
Subject: [PATCH 356/364] wuzz: update go build style to go1.21.0

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 9839a1054f33998b970d3b8c9d503b417ce30534 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:20 +0400
Subject: [PATCH 357/364] xmandump: update go build style to go1.21.0

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From c2a772bdb63c22a40897de810fb557a9509b4303 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:20 +0400
Subject: [PATCH 358/364] xq-api: update go build style to go1.21.0

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 912ec30b45143ebc1ed36a810c8ef83b250e0771 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:21 +0400
Subject: [PATCH 359/364] xurls: update go build style to go1.21.0

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From 473c880d084568c6a511036c6f8c34841a08ca74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:22 +0400
Subject: [PATCH 360/364] yggdrasil: update go build style to go1.21.0

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From 27234726c2ece4c23bf58cc5fde407446e234037 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:22 +0400
Subject: [PATCH 361/364] yj: update go build style to go1.21.0

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From a965a6b4509e072d2f42c42334b9bee03ed34242 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:23 +0400
Subject: [PATCH 362/364] ymuse: update go build style to go1.21.0

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From 33ef2a941c311cd3539c65f388b10c5001c1030e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:23 +0400
Subject: [PATCH 363/364] yq-go: update go build style to go1.21.0

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 58ff2a165597500ccf5b552cd9e6ba5d136f7b49 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:25:24 +0400
Subject: [PATCH 364/364] zrepl: update go build style to go1.21.0

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (5 preceding siblings ...)
  2023-08-12 21:15 ` g4s8
@ 2023-08-12 21:27 ` Bnyro
  2023-08-13  8:03 ` paper42
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Bnyro @ 2023-08-12 21:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1676106049

Comment:
I don't think all the packages should be rev-bumped, since that would block all builders for multiple days. @mhmdanas rather proposed that you compile all the packages on your local machine in the background or over night to see if all of them still build fine.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (6 preceding siblings ...)
  2023-08-12 21:27 ` Bnyro
@ 2023-08-13  8:03 ` paper42
  2023-08-14 15:39 ` [PR PATCH] [Updated] " g4s8
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: paper42 @ 2023-08-13  8:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1676273055

Comment:
yes, they should be revbumped, but also this should be tested locally to make sure everything builds fine before we send it to the builders.

also, the commit messages should be something like `revbump for go 1.21`

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (7 preceding siblings ...)
  2023-08-13  8:03 ` paper42
@ 2023-08-14 15:39 ` g4s8
  2023-08-14 15:42 ` g4s8
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-14 15:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.



A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 260000 bytes --]

From 592e544b769c97856a639c5763218b73fc09e762 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/364] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 7da4dc48aa3ca1abb5be01d4caada5e72fd76915 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/364] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 10 +++++++++-
 common/environment/build-style/go.sh |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..50524b07f768c 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,8 +32,13 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+
+		if [[ -n "${_go_mod_path}" ]]; then
+			pushd $(dirname ${_go_mod_path})
+		fi
+
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
@@ -46,6 +51,9 @@ do_build() {
 			go_mod_mode=
 		fi
 		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		if [[ -n "${_go_mod_path}" ]]; then
+			popd
+		fi
 	else
 		# Otherwise, build using GOPATH
 		go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 5ca89585d59a18cfef5c6e3fe535acd461bb829f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 003/364] 3mux: revbump for go 1.21

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From 61c99bf330a3576b09f88bdae716287ae0cbe7e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 004/364] Amass: revbump for go 1.21

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From f9b76b27bef84d8eb82d6f13c1aea0ee40229425 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 005/364] Gokapi: revbump for go 1.21

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From 5abfa3da2e422c0b07651b7b36a72b3b52f83552 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 006/364] NetAuth-ldap: revbump for go 1.21

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From ca26ab716ca470c171da08d1dd1e6851db7d2d19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 007/364] NetAuth-localizer: revbump for go 1.21

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From 08af50b5275fd7291cce4feb593ca103bc236465 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 008/364] NetAuth-nsscache: revbump for go 1.21

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From 8a65601c9dba8aa7205ad7dbe484e195fee9270d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 009/364] NetAuth-pam-helper: revbump for go 1.21

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From 1b8950a44c0bdcc3c0fe35f12d6aebb785ae7a7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 010/364] NetAuth-sftpgo-hook: revbump for go 1.21

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 358bc7d19bffab0c210894f3bf86ed7cee3a0367 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 011/364] NetAuth: revbump for go 1.21

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From aa7d0314913e3c46556f29ede87b79c6b6b99e2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 012/364] NetKeys: revbump for go 1.21

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From b258f10938ae881ccff657da50ab180ad9ebd47d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 013/364] NoiseTorch: revbump for go 1.21

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 152f7ef7ae38e61f857590494d19db48208b2fdc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 014/364] PopCorn: revbump for go 1.21

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 4f6ee3a4236e39fa6dc6e33116d91e58419f05aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 015/364] TMSU: revbump for go 1.21

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From 6f0c1287e800502a0593c3a61c7b9d4b77405c67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 016/364] TerraState: revbump for go 1.21

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From 2a2a73a802e491d0d38717192fbf857a101fd315 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 017/364] abireport: revbump for go 1.21

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From f628456d1baec6123bdf7490d377d31a247558c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 018/364] acbuild: revbump for go 1.21

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From 0b1702256d19261322a6dd8f46be0b66b6ff5a1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 019/364] ace-util: revbump for go 1.21

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From 6e23e1fd5893cba8b8e08b4c4af07f6ade319a46 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 020/364] acmetool: revbump for go 1.21

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 9f06c9d90c770bfc4afaeb7a26f899bef55c5cd7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 021/364] act: revbump for go 1.21

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 0cf2edcd8237d30d182bbe4ae6aed4d471aed410 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 022/364] aerc: revbump for go 1.21

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From 08e49bfd26df7036439304921cd6ff2028357d89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 023/364] age: revbump for go 1.21

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From 93a77669b3e21d32d090d7c2fdb123c4cc153c76 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 024/364] alertmanager: revbump for go 1.21

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From 8d8cdfe1bf982653805d0bbc6861bb7dcb167e25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 025/364] amfora: revbump for go 1.21

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 32a15a54e5c7a0d4a29a3c18a4bb979b6213f3a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 026/364] antibody: revbump for go 1.21

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From 2d2b25470982ee980b3e6d8fb6cb1ab6aa0bee3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 027/364] app-builder: revbump for go 1.21

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From 7f0cffaf5e0e26b5b8189eb0c9c66f22ba7f5a98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 028/364] aptly: revbump for go 1.21

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From 0d261ab1c363eb43589f31f98a3fd524f116c1ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 029/364] aquatone: revbump for go 1.21

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From 81975f761ecb9cea2355cfdaccea14dfb8d248d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 030/364] archiver: revbump for go 1.21

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 4b2b67217556372324eee56d965e0ffe962c60f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 031/364] arduino-cli: revbump for go 1.21

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From 8207636c7c8a7ba9ecc5a026a1d495e6b336f62c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 032/364] arpfox: revbump for go 1.21

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From 941267a552640ade90609f8f20c3b9d979d24bb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 033/364] atlantis: revbump for go 1.21

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From d69bb311c773f3b960b06b5935a4bacef70efe61 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 034/364] autorestic: revbump for go 1.21

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From 9831ceeb956dbde987761e7c34bd0c5978e8ca58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 035/364] aws-vault: revbump for go 1.21

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 76e0f702b9b68c4211c57fb3b0588dbc7181c129 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 036/364] babelfish: revbump for go 1.21

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From 8b71f698518e6db452b2d8d10a163d555b24a2f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 037/364] bettercap: revbump for go 1.21

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From e297acd562de956c595dbfca174ae8d9f78b044a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 038/364] bird_exporter: revbump for go 1.21

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From e044e24bd59e277c9b3e08e289635c3ff7bfa8dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 039/364] blackbox_exporter: revbump for go 1.21

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 7772ab777deaad650b5b4decf0a81f4d0bde0598 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 040/364] blush: revbump for go 1.21

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From 33440a2383c9d24c40ac8626d433fd32c62422a5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 041/364] bombadillo: revbump for go 1.21

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From 5fa8cac888249d3f361022206bb2bc5f26341f8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 042/364] bombardier: revbump for go 1.21

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 1b92d790543df3456b5e41cb01dfb098b0d8ab78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 043/364] booster: revbump for go 1.21

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From b734badae1b1b3db0f57c8c00cd899b84f378281 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 044/364] brig: revbump for go 1.21

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 21ab15b932d8d26eaab743e2ea5501356e422454 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 045/364] browserpass: revbump for go 1.21

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From 185a79b5a0e599f253bf4f5e3c406df046d348bb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 046/364] browsh: revbump for go 1.21

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From 4e65cca1c99af269e7e37888d0abf97bcd31a294 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 047/364] buildah: revbump for go 1.21

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From 6c9d1237ed628bd6221816085cacc96c55571357 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 048/364] caddy: revbump for go 1.21

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From 66ffbc7cf4faa381d01fc2a9ab47333fb5b09213 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 049/364] carapace: revbump for go 1.21

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From f0756942f65b3b21c4b2adf15cae1456dd31babe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 050/364] cdetect: revbump for go 1.21

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From b9e595bfc284dd70c87182f31c51c81155414cca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 051/364] cfssl: revbump for go 1.21

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From e22b93dc6c7d71a414632ad78c90332152702cc5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 052/364] cgrps: revbump for go 1.21

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From c05229df88f7619390c987bc2cf70028d55d0459 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 053/364] chathistorysync: revbump for go 1.21

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From c851f24f143698fe27c00208c3f6a7b93e9f9b41 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 054/364] cheat: revbump for go 1.21

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 7304a323944fbbb9326b8a9e1811dc78d2014bae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 055/364] chezmoi: revbump for go 1.21

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 4561a67302099b20911b6b097a262774326f41cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 056/364] chroma: revbump for go 1.21

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From 2b3fabcf116ed53a7d88d5aca34da459c8c4546e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 057/364] chronograf: revbump for go 1.21

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From 04ff051263a0a4082f24655b50f17bde83404b4f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 058/364] circleci-cli: revbump for go 1.21

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 0d0bc3fb241e6082889c73ab0883453a8ba868ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 059/364] cliphist: revbump for go 1.21

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From c2f069bf73b88aafaeef3b49bbb7f653a24b8a3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 060/364] clipman: revbump for go 1.21

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 9ef2bbb3294bad2f16c0585f193ecd2fd828f6e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 061/364] cloudflared: revbump for go 1.21

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From b01ec7beeeecf11d8fe67d82c7150837741aae9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 062/364] cni-plugin-dnsname: revbump for go 1.21

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From 63a112a1453d69860d703acea3ff579e71bdba99 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 063/364] cni-plugins: revbump for go 1.21

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From 4c777a18e6cdde3aa49f3e4bf0b07c1ddeb0692f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 064/364] cni: revbump for go 1.21

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From 18db395f9008376fdd67b11010c9cf0b800583bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 065/364] cod: revbump for go 1.21

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From ef799f3ac0aa3db46b62d51ed795fbc3acefa7da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 066/364] codesearch: revbump for go 1.21

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From 3e1bc3bdeeb2b9840f28f4402f8252bb587d6b1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 067/364] consul-template: revbump for go 1.21

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From 9b0495e883d639514521a29f66e976682adb7436 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 068/364] consul: revbump for go 1.21

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From bf188028d241f561653e3057473406b29ab14f32 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 069/364] containerd: revbump for go 1.21

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 867e5f721ffff9ba3c48a158f97dcab861255d67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 070/364] coredns: revbump for go 1.21

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From 3910b52e5a06d0d815aec76f75488c7c62fc84b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 071/364] cowyo: revbump for go 1.21

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 0d3d6f35dfdc4dc48974ffd58e68955e58d8f7e4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 072/364] coyim: revbump for go 1.21

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 267a04dd8d9f99045c84b19e28bb78e5840ad9d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 073/364] crane: revbump for go 1.21

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From b401633139fe98ef1648f9c0f9076e444c71101f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 074/364] cri-o: revbump for go 1.21

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From e2eed4552f22761c5c8c9581bab71d98541ae365 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 075/364] cri-tools: revbump for go 1.21

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From 4d4cea30a031567b660ca29a4577a3839145281b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 076/364] croc: revbump for go 1.21

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From e355ac4725dcb614fab904aaa451a0011b37b6f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 077/364] d2: revbump for go 1.21

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 91e153f4c6ba004dd3bb884024842d67e07a70d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 078/364] darch: revbump for go 1.21

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 38d5056eba4f56785b126278187d122e010a1daf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 079/364] darkman: revbump for go 1.21

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 24191a64a20c37326d89caa334749d4d3493f447 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 080/364] darktile: revbump for go 1.21

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From cdc8d5f814ac6fcef0a0a9a0ee06015b15ee0d16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 081/364] dasel: revbump for go 1.21

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 87ec1d588c7aee045a2347e5317ed12ac35755a0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 082/364] delve: revbump for go 1.21

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From cb7e5460ebf7e793b03e9bb3a7ef40ee85165dd5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 083/364] dendrite: revbump for go 1.21

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From 3d0d751ebf49dd3dfa86ec5711abc545ee43066c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 084/364] dep: revbump for go 1.21

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 7d4aabf71655e981e3691d126058be8b83b43d1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 085/364] direnv: revbump for go 1.21

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 8b97cd2fb3aa07ab8921cc6190af27d707a4897a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 086/364] dirstalk: revbump for go 1.21

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From 0c8f30512954163a41a7dc3642d56fe4d2192a4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 087/364] distrobuilder: revbump for go 1.21

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 9bfc83cad4cf2bba14fe522ae647e07fd4ebe01d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 088/364] dive: revbump for go 1.21

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From 57a216b594728cc1e65035204d8cf313ab18f9be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 089/364] dlayer: revbump for go 1.21

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From 586a2f6fc48c14d888af8bd55be2d9387ee31f58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 090/364] dnscrypt-proxy: revbump for go 1.21

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From 58cd80a61dcaad7af6eadb12f0d27207b223a024 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 091/364] docker-buildx: revbump for go 1.21

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 565afae28b2d1d8cd75b3aa730a4b8dab3847e18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 092/364] docker-cli: revbump for go 1.21

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From 33558920d32462b8cb96eadcdbed9959319dc9e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 093/364] docker-compose: revbump for go 1.21

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From cb8533d26bb70f341bb67959ceabd14a39c3818f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 094/364] docker-credential-pass: revbump for go 1.21

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From dcd2485d1440885d84d74b3f9f2f19c98a36d25a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 095/364] docker-gen: revbump for go 1.21

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From 86f0bc76ea8c4bb394efedaa2b3a01778cd4f64e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 096/364] docker-machine-driver-kvm: revbump for go 1.21

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From cf4584cca5d27741073307993aca2e8681d93569 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 097/364] docker-machine: revbump for go 1.21

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From 3deb5f6831e99808bd88f1880a61e0f881e5ccef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 098/364] doctl: revbump for go 1.21

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 90feb3419adac754560f9984a14165fb2c28d511 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 099/364] domain_exporter: revbump for go 1.21

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 70a996892fbd07d6068f897ea46472e6245f757a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 100/364] dotool: revbump for go 1.21

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From f118a171a3470ee9d74a1906015c1df2e61d38b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 101/364] drive: revbump for go 1.21

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 0d1ce78dd74164540989f2374aac5df5eb14ece4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 102/364] drone-cli: revbump for go 1.21

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 40d30949b5920e19b3701ae76dcf19b982a6483e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 103/364] duf: revbump for go 1.21

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From ee52ee164ff89adcf6b78df1c48525221df1ebb8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 104/364] elfinfo: revbump for go 1.21

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From 412f5b29aee8decec22faf550accb231102d8f19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 105/364] elvish: revbump for go 1.21

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From f0f539202c5feb43b885a3817aaac209434e222c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 106/364] emptty: revbump for go 1.21

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 7a3b585182709122afdf034a5a0115e90862744c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 107/364] ensure-access: revbump for go 1.21

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From fbc020d9c57a778f07e0387269da1a2afbf4ef05 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 108/364] etcd: revbump for go 1.21

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 34075e4d34ce3a6bc62b698278d6af754aa32b16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 109/364] exercism: revbump for go 1.21

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From 20bcbee4391db6b73b41ab4e8dc1ed12f63117d8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 110/364] ffuf: revbump for go 1.21

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From addd6c09fd96d40185d9114e06429ad58dde617f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 111/364] figurine: revbump for go 1.21

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From fdb5f98d970df571fe6667ca0498939e1158a7b4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 112/364] flannel: revbump for go 1.21

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 271e65af0f8819c1e588d6da4d2f7eb5c895524b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 113/364] flint: revbump for go 1.21

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From 182d843a13f2a1e7f72e3ce904f46bfad7de1742 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 114/364] forego: revbump for go 1.21

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From 10de92f4c5550ac6a0dd71ab5e84d1c8b83ec22d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 115/364] frp: revbump for go 1.21

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 19d42c97d124afaf5b45205dc4c5f1e9c3fe9108 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 116/364] fs-repo-migrations: revbump for go 1.21

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 5a620b37d22aeceb20b09fe5f67e66bc5563db6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 117/364] fscrypt: revbump for go 1.21

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From d050755b674b46eea8f599a85180644e5171e428 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 118/364] fzf: revbump for go 1.21

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 7fc16698f6d2af70291ad19da8a8fc8553c8ee22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 119/364] gdu: revbump for go 1.21

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From a667dab5f52e696b65ae82f02ffe4843e665b753 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 120/364] gemget: revbump for go 1.21

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From d130e4040e6b13bc4453d7c499f7d5f42c22f094 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 121/364] gendesk: revbump for go 1.21

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 392db3b66182d1d58688427d0681607a02194aa7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 122/364] gfuzz: revbump for go 1.21

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 09bcc8bf1a3d2fed0160583ab93b6b1bb501e636 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 123/364] ghq: revbump for go 1.21

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From dbe5b410588003b44fe8790d173bf147b59c75b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 124/364] gister: revbump for go 1.21

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From bbfacbfe5c3aff31eb3ad56cd663558b39499e27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 125/364] git-lfs: revbump for go 1.21

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From e6e8e69f0b37604499c8d85f475ac8528f93682e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 126/364] git-sizer: revbump for go 1.21

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From c53e97dea3ca18005aea8de2457e08cec2d46b34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 127/364] git-team: revbump for go 1.21

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From 75d7cb711a9ac95932ae381d26477ed19205fb8d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 128/364] gitbatch: revbump for go 1.21

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From 62a2001b60fe5ea8394c982559899142bad9e0d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 129/364] gitea: revbump for go 1.21

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 80703a357e0450f8c01b8865d1ff4f3cd0260b77 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 130/364] github-cli: revbump for go 1.21

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 9a973d0d5e779b7620645f0c821b6758727e4b3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 131/364] github-opml: revbump for go 1.21

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From cdfcffd693ae6e479535d6ad0d8babca11524ad3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 132/364] gitlab-runner: revbump for go 1.21

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From e8f17195f98bd0c9f15d6aa788960b7dae8c835d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 133/364] gkill: revbump for go 1.21

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From 8f0193df2afbcfc4c5c1178c2e344ee079d3f8ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 134/364] glab: revbump for go 1.21

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From 09b021dfdd200c4a5288c3e7addda5b18f6498e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 135/364] glide: revbump for go 1.21

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 98858a50970e4392b3e63013c63a549423ad7e6e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 136/364] glider: revbump for go 1.21

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From 7abdbf819ba8a30df37994a09a526bce843da3af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 137/364] glock: revbump for go 1.21

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 40c94ae766c8151bf4a95afeb1a8a5398b0e28eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 138/364] glow: revbump for go 1.21

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 487d14aee6b9f73a38617d1d4ed4a61f29d97cba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 139/364] go-bindata: revbump for go 1.21

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From f9cc25bdecec161abe3a5bb4ca9aeb958f16b8eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 140/364] go-capnproto2: revbump for go 1.21

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 307f4336ac88469241d0a5a157fbcbb88974e926 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 141/364] go-ipfs: revbump for go 1.21

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 813dd5d6e3d03323b5b04a6e4d1c4c43c8f04179 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 142/364] go-jira: revbump for go 1.21

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From e50697dd2d1ef7529758481adad267109fa403f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 143/364] go-md2man: revbump for go 1.21

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From a9287923f0c28277033062e9add61d8412af646b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 144/364] go-mtpfs: revbump for go 1.21

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 7520f2deb36c692316044b14b9756818ca7db93a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 145/364] go-review: revbump for go 1.21

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From 6e0b629a57900890707fd7035ab07dd798023c91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 146/364] goatcounter: revbump for go 1.21

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From d0a0ea63436099eef1077f7c3d0bcff20d286ac6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 147/364] gobuster: revbump for go 1.21

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 1dea444ec2f64f09c5b0eb59ccf53b4c9f1fe5a8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 148/364] gocloc: revbump for go 1.21

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From d589941476a5f4d318b4b76ece801aa4fea07901 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 149/364] gocryptfs: revbump for go 1.21

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From a95cd727c89564063af5af48910ae6b868299326 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 150/364] godef: revbump for go 1.21

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From b4792b78aaec0cae5bb78052cd585e989116fc0e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 151/364] gogs: revbump for go 1.21

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From bd264973778715acad64279a56a71315e1ffabcc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 152/364] goimapnotify: revbump for go 1.21

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From 3db3f4dfd07e73d03172f340dd2a93138e96b3ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 153/364] golangci-lint: revbump for go 1.21

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 59300aebdfdfb06bf6a7afaa8ba6c104e93734af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 154/364] gomatrix: revbump for go 1.21

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 8eb26427897df7b83adf2db4fbacace817242187 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 155/364] gopass-jsonapi: revbump for go 1.21

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From 667969eedbcb3dffcc2eb73664bb9cf76d8dc212 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 156/364] gopass: revbump for go 1.21

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From 6bdc5e1ea4c14673985da1746111176de1aeba98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 157/364] gopls: revbump for go 1.21

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From fff8684e7ebbdec60d4b317a9233e2bc4cfc4322 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 158/364] gopm: revbump for go 1.21

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From d5efec3333181a01a3814dc8840fe925d1d8fd27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 159/364] gops: revbump for go 1.21

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From e027d7a1649f079f344b9f6cb755b932bbc34e94 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 160/364] goreleaser: revbump for go 1.21

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From 66759297fc28a72e8ec414f2d9d52e252692e820 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 161/364] gotify-cli: revbump for go 1.21

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From e87e5b925b0cf85cc8336cd210b6383f3e7e553c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 162/364] gotify-server: revbump for go 1.21

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From 3004b67d651ef3484d7276ff71bf7b576e1c84d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 163/364] gotop: revbump for go 1.21

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From 5c5efae1a39113b76e25c980dfda684201b3ee6c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 164/364] gotty: revbump for go 1.21

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From 512bc13d119387c326f0f2c685bcf81ec61b20a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 165/364] goversion: revbump for go 1.21

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From 19269ff6fc00017592bf07b530180caa105ecd75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 166/364] grafana: revbump for go 1.21

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From 42328623f483e5cb600ea96b4e8e7c5b931f875c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 167/364] gron: revbump for go 1.21

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From 98ab3e272fe3eac0b25a4b56b423e7bb5a21853d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 168/364] grype: revbump for go 1.21

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From d4d95f66e96201226a0d753a454dc91ef03788e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 169/364] gucci: revbump for go 1.21

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From a6be65fb084a71d8b731a620555d5557b573d53d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 170/364] gum: revbump for go 1.21

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From a7ab8889feed6d32bf784fea51b86984f5510ee7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 171/364] hcloud: revbump for go 1.21

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From 5c83c3cda2a4a89e9e8377e86c4ef3e8afd3bd1b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 172/364] hey: revbump for go 1.21

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From cac96460f9790de3ab172997f354a92b5c462471 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 173/364] hivemind: revbump for go 1.21

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 3e977befee3345ed89823963b90fe5bc59ea8624 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 174/364] hooktftp: revbump for go 1.21

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From 69476089e650d395d8064edd7b150edfd15c8d1c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 175/364] httpstat: revbump for go 1.21

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 79fbbfe93485962fff12e5f0254a8c97eec8be43 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 176/364] hub: revbump for go 1.21

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From edbd8c4023c0af43baa8c79c2bc44d3f0810cf4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 177/364] hugo: revbump for go 1.21

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From d8536e4ac4035bb565020c6579d9f685e76c0443 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 178/364] hut: revbump for go 1.21

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From e3e9ab12507c33d92ef7f5092acba654538936e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 179/364] hydroxide: revbump for go 1.21

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From 7817809a2e04a857fa598e9a614ff2723857bf66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 180/364] i3cat: revbump for go 1.21

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From 888f7f93fecf1b168f479da3ca1e3d300c8f5a0b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 181/364] ibus-bamboo: revbump for go 1.21

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From e2b48f1561aa385f9211de247c9a720326dd48d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 182/364] img: revbump for go 1.21

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From 2fa2f53a6d708405af7fcf16556deeb62122a6bb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 183/364] immortal: revbump for go 1.21

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From 4f188b5f04d5cf15de7d6bc6205965d76daf5c58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 184/364] influxdb: revbump for go 1.21

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From 65a104c3d336b6affffbd5069d6e6da0fa704287 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 185/364] ipfs-cluster: revbump for go 1.21

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From a1c61aa09d5881c7f5ab3125cb0e78f47d92cc66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 186/364] ipp-usb: revbump for go 1.21

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From af2773ab59e0f2322321fd51ee58f7513e56887f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 187/364] ircdog: revbump for go 1.21

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From 1eeff7c3bf51843a106bf11b7c7f2a0687222b01 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 188/364] jd: revbump for go 1.21

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From 9b3cbfeffcc0f742766197e9e4bc4ecadfa01668 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 189/364] jid: revbump for go 1.21

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 1ea8200d7c175ffb27060395f734d8d05d544c3b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 190/364] jj: revbump for go 1.21

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From 3316aa49a4137f8a51be955ff3f52dbf83510790 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 191/364] joker: revbump for go 1.21

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From a5d264567324a1174906c848024362b5d06a7889 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 192/364] jp: revbump for go 1.21

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From 051bb1f5cd1bc9c4694a084d93bf0270b69d2ce6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 193/364] jsonnet-language-server: revbump for go 1.21

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From c8acbfa4d7999c4919d0d82076f5227ae0b3066b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 194/364] jump: revbump for go 1.21

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From 39decf37d7bcea3bf0f7c520afe78afc2b43871c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 195/364] k3d: revbump for go 1.21

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From d86612d8d3c772af6dd7a8052e9b84ca28ba2623 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 196/364] k9s: revbump for go 1.21

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From f0e080500b1f44d8fca4eb82bfc200d8424cd36b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 197/364] kapacitor: revbump for go 1.21

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From 80ce3232b2c0b71ceb873c5e63e07227ecf61464 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 198/364] keybase: revbump for go 1.21

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From e8479010f1eef2f5ab29038b4b00471492bf5bbf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 199/364] knit: revbump for go 1.21

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From b8202a2bbc13de8544552ac727fed8fc79f2af07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 200/364] kopia: revbump for go 1.21

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 63511bcd4fc148b1ad9028f2e6a56136604f1440 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 201/364] kops: revbump for go 1.21

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 3d62665101d7f6aeff3e2b41fb15d81615c4f47b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 202/364] kubecfg: revbump for go 1.21

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From ec6f42bf6e2c72bdecb162134d6555996e99113e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 203/364] kubefwd: revbump for go 1.21

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From dd048e351f14d7d9f9aa5cfce7f4dea93191b34e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 204/364] kubernetes-kind: revbump for go 1.21

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From a7bf1c570ee11884f0048b61de9eb238cda75c8b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 205/364] kubernetes: revbump for go 1.21

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 19415cd2f97af934c50e57aa06ac63eca32588e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 206/364] kurly: revbump for go 1.21

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From 0f3cddc3ed4205536a98f66e87a1b86dc1df4a95 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 207/364] lazydocker: revbump for go 1.21

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From aacc85efdfe208b78ed3de355c62d3c29af3e273 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 208/364] lazygit: revbump for go 1.21

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From aa573316aae57fb2758c35dc16ea3e6a92420cbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 209/364] lego: revbump for go 1.21

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From c89564f71e52e5cf90968aee9e6e949e5fc51086 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 210/364] lets: revbump for go 1.21

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From b11c25a166c6ce877592bc680bae9c644bed39db Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 211/364] lf: revbump for go 1.21

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 6497e412f990e90a524da79c3fd5b1578ad7d699 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 212/364] licensechecker: revbump for go 1.21

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From cbc183a0537afad2a0eb9c90305a958e60037a91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 213/364] loki: revbump for go 1.21

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From 43307b73daaeaeacc7b8709156d33a841fc1d4f4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 214/364] lsp: revbump for go 1.21

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From 224f08176eb204e619b1cd4386b9a8a97f954a60 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 215/364] lux: revbump for go 1.21

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 136552d528708fec30a9a684862338fc577d3ca9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 216/364] maddy: revbump for go 1.21

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From 28d3bffc05ed521b51a4a11f5ae23ecc4dbed953 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 217/364] madonctl: revbump for go 1.21

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From aecd57bba8d40a534162a6b0a48b424aee50327f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 218/364] massren: revbump for go 1.21

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From ff0566506e9d6e5acec5c8d52f41e007f29181c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 219/364] mdr: revbump for go 1.21

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 369c25a19cc4e8ff44c5266b3e950e5fe742c5a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 220/364] micro: revbump for go 1.21

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From 721866088281c70f6eda3782ba938fc553627d45 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 221/364] microhookd: revbump for go 1.21

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From 1e059b198eff95b6970db6cad111211463205c5d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 222/364] miller: revbump for go 1.21

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 3143aa73ce7b09f652f5d531ec19bfa3004d2094 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 223/364] miniflux: revbump for go 1.21

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From badcd413251bc8ee825edeec16b2750c604ab5f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 224/364] minify: revbump for go 1.21

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From d0f710e2b3f16c8318e31bfe4281ca1bdc9f8f9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 225/364] minikube: revbump for go 1.21

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From d0feefc1da0f2a87ff07b0bdc562120f4c75919d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 226/364] minio: revbump for go 1.21

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 4e6b35b3a67887cbe5bfa02b0c24f9b8daadca8f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 227/364] misspell: revbump for go 1.21

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From ac2de541df411fd1c853722c4ce09f7a746bc532 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 228/364] mmark: revbump for go 1.21

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From 74d879eab8a796226081ac48e2e01d39545d7ead Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 229/364] mmv-go: revbump for go 1.21

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From b67e2b76f912c282ce1e6ddb305db7e48066f1f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 230/364] moar: revbump for go 1.21

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From 336c3398b124acc41e634c10fb510d43f5561217 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 231/364] moby: revbump for go 1.21

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From b3a223abcb6f4a584a000355efdebe8afe04901d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 232/364] mountain-backup: revbump for go 1.21

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From 0fa9de92ed74eab588a33073398b62209837e811 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 233/364] mpdviz: revbump for go 1.21

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From 9a0a1fd49eb8342f475bc693289418503c587d19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 234/364] nebula: revbump for go 1.21

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From 44098c9c5df764b51c1b68b840324a1caa488a25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 235/364] nerdctl: revbump for go 1.21

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From fe54195b00e8595132b753d504fc575b475bfcc9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 236/364] netdata-plugins-go: revbump for go 1.21

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From 5abbada7a43cb21e95e35f4c40ee3ae9cc21f0dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 237/364] netns: revbump for go 1.21

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From 9e8fdc6babd3fbc4b7dfc0b97b8629ef76ab1156 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 238/364] netris: revbump for go 1.21

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 111d3f97b904f3ac002e084b835391130af6c821 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 239/364] nextdns: revbump for go 1.21

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From 28aa639a69eba82913002e543713c7bba0473b66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 240/364] nncp: revbump for go 1.21

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 27ab96ea84c88..57ab5a771f851 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.9.0
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From a44a9ef0045661583eb83194c5a9965c7c51f4c1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 241/364] node_exporter: revbump for go 1.21

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From a92b9cf530d86dda8c9657dc4dab8143afcfcf07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 242/364] nomad: revbump for go 1.21

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 3939a84c506dcb679922fd2f4009d1145e53d17a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 243/364] ntfy: revbump for go 1.21

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 38cd5834819aec0383307cb509b0f5ed7310a26a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 244/364] nvidia-container-toolkit: revbump for go 1.21

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From 6474c2cb28bb79b2d5b8ba501f8c87048265a576 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 245/364] nwg-look: revbump for go 1.21

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From 055a4f45b29ee62e2ab5109db1d521d84d57be45 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 246/364] obfs4proxy: revbump for go 1.21

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 86e66f2fabbcd7dff0d5b18fa48f560009e63bff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 247/364] oh: revbump for go 1.21

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From 73cf41da9bd9d46c6e18f6bd15ccea22d0e15d3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 248/364] opensmtpd-filter-rspamd: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 41eb69cb9ccb65680543097822e0bcebedd6fb3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 249/364] opensmtpd-filter-senderscore: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 631b969c9181bc5faedff32d68bddd0314d6df7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 250/364] operator-sdk: revbump for go 1.21

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From 4a4994a38a4f63ab53626deee6ab5791701ec266 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 251/364] oragono: revbump for go 1.21

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 862934bcee87bbeff516000508eff437412737c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 252/364] oras: revbump for go 1.21

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From ec756823c9f44b78b6a6744a8011d139cd25ee33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 253/364] osv-scanner: revbump for go 1.21

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 41c7f8378e46448bef66b78656f15cb73842f027 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 254/364] packer: revbump for go 1.21

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From dadc1554a4421b2a2f3c766063f3a301b9df516a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 255/364] packr2: revbump for go 1.21

---
 srcpkgs/packr2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..1df39c1dfc3fb 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,15 +2,17 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
-go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+go_import_path="github.com/gobuffalo/${_pkgname}/v2"
+go_package="./packr2"
 short_desc="Static files embedder for Go binaries"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
+_go_mod_path="./v2/go.mod"
 
 post_install() {
 	vlicense v2/LICENSE.txt

From 1dd3cb084102a6a9aae676398e739479358eeee0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 256/364] pam_netauth: revbump for go 1.21

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From d550eec19f8b7b6f41abf3b64f9ac699f1913002 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 257/364] passphrase2pgp: revbump for go 1.21

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From b3b050ff84a6981d0b395d317e3e4969603c3331 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 258/364] peco: revbump for go 1.21

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From 5dfc5d0d97db54b98f8a650ef68889563e60d73c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 259/364] pgmetrics: revbump for go 1.21

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 1acac52fe9efd91fd796a421f69c2c01c426637e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 260/364] pgweb: revbump for go 1.21

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From 10c32ed98ff04c8c4c8b632e56fdcc32a2570f79 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 261/364] pkgtop: revbump for go 1.21

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From bc8a387e923c33eb1aa3a3d22affc5cc8df81831 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 262/364] podman-tui: revbump for go 1.21

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From b99d067c0f626240cc7fe22efb91e827afb51702 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 263/364] podman: revbump for go 1.21

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From 8dce18663f3a3ccc277bca1a76cd0a8b2930302c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 264/364] pong-command: revbump for go 1.21

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 48237e8d6bb69ec7ef665c004c61c5a025e8177c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 265/364] prometheus: revbump for go 1.21

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From 69703b67fa73559cc8ceaf6ef6742ca4ee96283c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 266/364] pst: revbump for go 1.21

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 39ccdb566045c6f157f49fdcecb7b618e94efe0f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 267/364] pup: revbump for go 1.21

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 7303a747c70943c5196e5e307adbc255167fbcb0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 268/364] pwget: revbump for go 1.21

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From cf664198ad3e3ff56d7fe758826ab50552bc5de1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 269/364] qrcp: revbump for go 1.21

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 5e8cecd433391c9f0328adf4606f4a262c3eac32 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 270/364] rancher-compose: revbump for go 1.21

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From 9c7752370a25a49eb985c31a7626fb5909548eec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 271/364] rclone: revbump for go 1.21

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From bb167249a3504702929195a8cce4f72b38952f9b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 272/364] rest-server: revbump for go 1.21

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 52445e4671ce645da271a25330df13b8cabed370 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 273/364] restic: revbump for go 1.21

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 23f13a75f7a2bb64605fc8010a191a90882246f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 274/364] revive: revbump for go 1.21

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From c8b63373d7d252e7edc5bc19346aeac55613a373 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 275/364] rmapi: revbump for go 1.21

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From 85f2aa8f75739330b36eb5b89abf17d52bb39865 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 276/364] rocker: revbump for go 1.21

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From 6a515700223c63f98a45207fa76b7d14bd900286 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 277/364] rootlesskit: revbump for go 1.21

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From 144326bd326507506c1380d9dfa3402c9a8e26f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 278/364] runc: revbump for go 1.21

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5495e4a720bb1..008a94e502e19 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.8
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From aa8f5082956a69a12ce10e3d5c0f134de53b5ed8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 279/364] ryzen-stabilizator: revbump for go 1.21

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From b0b5c2049fa089d268faf1653c6d9b158d5eaede Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 280/364] s: revbump for go 1.21

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From bd0f243b03e8c9668fcd754260a7855880454063 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 281/364] saml2aws: revbump for go 1.21

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From 933446b8f730505f172f09b833eed1b77f2b0650 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 282/364] sampler: revbump for go 1.21

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From fa648538d3f34ca2b00859dabf2ec6524938ba80 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 283/364] sbctl: revbump for go 1.21

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From f5c257b4b60820970986113ce00ab6afbc4659d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 284/364] scaleway-cli: revbump for go 1.21

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From a496c228bf25580c1b0d16550f57c204799226ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 285/364] scc: revbump for go 1.21

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 6ceb6fa9f0eafa8cbdb8041e36dd4ce3fc1838e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 286/364] seaweedfs: revbump for go 1.21

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 92c05d4826a4125798c691ffd655b9fec3ee796d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 287/364] senpai: revbump for go 1.21

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From 28d4d9903d728ee5785e681efa531949bf64ee0a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 288/364] sftpgo: revbump for go 1.21

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 88dad03c833261b225f104107ec1f72754a2a226 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 289/364] shadowfox-updater: revbump for go 1.21

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From d990f925636f7c45ed3637b92f9bf13c06ef15e7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 290/364] sharenix: revbump for go 1.21

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From fbeee114c35b2baf3a384045a389f47224cb74f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 291/364] shfmt: revbump for go 1.21

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From fea3204f3bb0572a39d32299273aa75f33cb0f5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 292/364] shiori: revbump for go 1.21

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From b6696c7bfbb4e8cf242be875be6dfb729e95fcaf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 293/364] sift: revbump for go 1.21

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From ba91eb0f0c4337e8edef189b5ea67fd4ee85d345 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 294/364] skaffold: revbump for go 1.21

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From a0855f50657866e7f0faba7ce1a5222eb03dccfe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 295/364] skate: revbump for go 1.21

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From 513f64d8bac3c7835541be0924e573398738e768 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 296/364] skopeo: revbump for go 1.21

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 6fa48810091afa3638e51c53969d1537bd405346 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 297/364] slack-term: revbump for go 1.21

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 3741153507569d06abd4388d8af4848a6a0ae522 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 298/364] slit: revbump for go 1.21

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From 606a9b5b8c973cd1935370b023006433c0dbed9f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 299/364] soju: revbump for go 1.21

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From 212e5d75ac8c19452504e83ea8b1fbb848c8d07c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 300/364] sops: revbump for go 1.21

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 1dd4b06c28b2c8d3b28e220cb01b6e57508ceed5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 301/364] spreed-webrtc: revbump for go 1.21

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From 2d7a3fb82b71d298167531f0d14aa5011afcb316 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 302/364] ssl_exporter: revbump for go 1.21

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From 98ed96a9f41befa42d2d615d01cc5c92ce76ab36 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 303/364] stc: revbump for go 1.21

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From c05d5548885d516288798c0b92b20b3d1f925638 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 304/364] step-certificates: revbump for go 1.21

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From 0a5a3bb1f86b3adac5d6e448a31093657ec4d0b9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 305/364] step-cli: revbump for go 1.21

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From 6c6ab0d74c359519a6ef181f6f55f2b7cdb7e637 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 306/364] stern: revbump for go 1.21

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From f34121d946c702e09874741acae680ed89d25cfa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 307/364] subfinder: revbump for go 1.21

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From c4ac70ca2e43221250e7bd3a8a98fa4803aa5a2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 308/364] subjack: revbump for go 1.21

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From bf233ad877958ac322308b7100ee29cceffbc7b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 309/364] superd: revbump for go 1.21

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From e2133955b034cf4485590b6e0918f7ef7cc5a6ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 310/364] svctl: revbump for go 1.21

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From f3bc37c161fed59263f1729ee41a4d52cba99dde Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 311/364] syft: revbump for go 1.21

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 03e71563859f4246d246dfab4fa51bf25502b059 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 312/364] syncthing: revbump for go 1.21

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From f13c4f1ffed824c3c5ea673cfffc1a32c0eca26f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 313/364] tag: revbump for go 1.21

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From 84db22c48644d414e6aa7ad20f22c9530c91f835 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 314/364] tailscale: revbump for go 1.21

---
 srcpkgs/tailscale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"

From 1cec15f301ece3c3937a8c5cc8e3ee6081faaea0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 315/364] tea: revbump for go 1.21

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From 3239581a55377b69ca615356460b3aac79ed3bb2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 316/364] telegraf: revbump for go 1.21

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From 26501a863bc310eb8df4669b2625540892ba7561 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 317/364] termshark: revbump for go 1.21

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From ccb2ff4d0ed2e46c0ebd76a8db35c173809e7540 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 318/364] terraform-docs: revbump for go 1.21

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From 44565638ff44160bc73940c4dc4655f1b0cdc6f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 319/364] terraform-ls: revbump for go 1.21

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From 541509b68979182b8609d309345129c75b061a3f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 320/364] terraform: revbump for go 1.21

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 1f00cda5329e606bac162815ee56eeed742366f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 321/364] terragrunt: revbump for go 1.21

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From fdde0566e4d5fd54c58c18d521a178a9b36ef32a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 322/364] tflint: revbump for go 1.21

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From 809fabb4506a7dcfbbd1feb100467fcd786f2ac2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 323/364] tinycron: revbump for go 1.21

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 0a8d448313fdf666b211bd99f227d5d535673c5a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 324/364] tldr: revbump for go 1.21

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From 6d8b4704a081fd32cc5d259e6f0778cf5b92a464 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 325/364] tml: revbump for go 1.21

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From 27df691982ce003d2e02a39dbf841650b733dd8b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 326/364] todoist: revbump for go 1.21

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 23f5fb73933818874f865d98a3db3887bf0742a7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 327/364] transifex-cli: revbump for go 1.21

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From 1c7ab6096b732679f6652df2bbff329e74ffb54c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 328/364] twitch-cli: revbump for go 1.21

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From d850668f77820943451aacb86e6bd247a6e9fa9f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 329/364] typioca: revbump for go 1.21

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From a1fb981c74d6d7b104e910a6d8a8d9d7d3e5c823 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 330/364] umoci: revbump for go 1.21

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From bc44226be246408fd6b4e2999beb9d1914f2d6d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 331/364] unflac: revbump for go 1.21

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From 7dfab319a6ae81b2cb81c454e30b1111e602eb8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 332/364] uni: revbump for go 1.21

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From d7779e3ddf9af4083ef07d897a51521de814adaa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 333/364] up: revbump for go 1.21

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 88ce2fe85e3a122f8750be91a07e249a7d475c61 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 334/364] up_rewrite: revbump for go 1.21

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 14040536d6779a6b11f22a54826b09c964668646 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 335/364] upterm: revbump for go 1.21

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From 1d5b9aca32d82bf1bba0bb9b6e552ebc6c3dc1df Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 336/364] usql: revbump for go 1.21

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From 048e6e6e9cf42ac59ec78eada0c3e3b59926fa5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 337/364] v2ray: revbump for go 1.21

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From 0348e3156e83ec5fa6693acf9c7a2ae243b086ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 338/364] vale: revbump for go 1.21

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From e11a431da49fb4986a9aabe4370963123dcfc612 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 339/364] vault-acme: revbump for go 1.21

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From 03947faff1350648b3c1a630b5eb1e12aba8f63b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 340/364] vault: revbump for go 1.21

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From db1f0d911ff11a7ed135f91b14ce1b57cceb7eb7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 341/364] vegeta: revbump for go 1.21

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From 207480b459ddfaf01e57520451597b5c9f2eb456 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 342/364] vhs: revbump for go 1.21

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 74bf5a09cc5ff85d580a034d952ff93b32ccf18c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 343/364] vmdfmt: revbump for go 1.21

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 240d67b69e931cbaea2cfcf2dc694c1d10326615 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 344/364] vndr: revbump for go 1.21

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From 5ed84ba52afe4b67857759738680c7525da206de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 345/364] vultr-cli: revbump for go 1.21

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From e29730360466b1eac5db44106925bc92bd81788b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 346/364] vultr: revbump for go 1.21

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From d061e777a26b3477c8e851c1f058e89893af113f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 347/364] wally-cli: revbump for go 1.21

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From 4587a704c14ed61532479eca4ea7355b170e684c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 348/364] wander: revbump for go 1.21

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 251632c470447a1b30906fda2eb07dc9cae20da6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 349/364] webcat: revbump for go 1.21

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From 75f94347a5bd7ec1f4d8c53866f324c56ff82c42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 350/364] webhook: revbump for go 1.21

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From c76b67bc6ca41b946d6b502c4a21a2a4c62f593d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 351/364] websocketd: revbump for go 1.21

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From 1b09502b9a6331fb34e6ec3b0245d9ea7939a4ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 352/364] wego: revbump for go 1.21

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 8c741a1b5e67ad174ca37abc5796b1cad8d5afad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 353/364] wireproxy: revbump for go 1.21

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From 85cef5c3fdfa078908eb3a2e739782eee1e3f7c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 354/364] woke: revbump for go 1.21

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From c014c11558c358a9e4cef112c756058aef9c61aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 355/364] wtfutil: revbump for go 1.21

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From 860b3f117983dacd193b6a739d23646c9d852cbe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 356/364] wuzz: revbump for go 1.21

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 102e8009d60b00942447028b7e1064751182efdf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 357/364] xmandump: revbump for go 1.21

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From 4a2c17ebc0e9205508685f46fd2b255821e1f243 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 358/364] xq-api: revbump for go 1.21

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 59e11fc892647510679ae91db956f193dfa880b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 359/364] xurls: revbump for go 1.21

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From 7a2665977d6c7c5f0fb221c112a7160cc96b5817 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 360/364] yggdrasil: revbump for go 1.21

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From d7a426ea4762d8c2a85028af8567da5392cfb6aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 361/364] yj: revbump for go 1.21

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From d8ca121142adb583dbf1ef448cdee68999011576 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 362/364] ymuse: revbump for go 1.21

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From a38bc82a8f490b2f2d7c62e0c5023380c96fd196 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 363/364] yq-go: revbump for go 1.21

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 437b38deef0f11050bbb44e5154d788e377d1452 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 364/364] zrepl: revbump for go 1.21

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (8 preceding siblings ...)
  2023-08-14 15:39 ` [PR PATCH] [Updated] " g4s8
@ 2023-08-14 15:42 ` g4s8
  2023-08-14 16:01 ` mhmdanas
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-14 15:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

New comment by g4s8 on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1677580533

Comment:
I tested all packages for different archs, all builds are OK for x86_64, some packages are failing for aarch64, armv7l and i686, but the same packages are failing on current `master` branch, so it looks it was not caused by go update. Also, changed commit messages.

And CI can't run because of amount of commits.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (9 preceding siblings ...)
  2023-08-14 15:42 ` g4s8
@ 2023-08-14 16:01 ` mhmdanas
  2023-08-14 21:11 ` [PR PATCH] [Updated] " g4s8
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: mhmdanas @ 2023-08-14 16:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1677616412

Comment:
> And CI can't run because of amount of commits.

You should mark this PR as [ci skip] anyway.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (10 preceding siblings ...)
  2023-08-14 16:01 ` mhmdanas
@ 2023-08-14 21:11 ` g4s8
  2023-08-21  6:18 ` g4s8
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-14 21:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 260000 bytes --]

From 592e544b769c97856a639c5763218b73fc09e762 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/364] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 7da4dc48aa3ca1abb5be01d4caada5e72fd76915 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/364] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 10 +++++++++-
 common/environment/build-style/go.sh |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..50524b07f768c 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,8 +32,13 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+
+		if [[ -n "${_go_mod_path}" ]]; then
+			pushd $(dirname ${_go_mod_path})
+		fi
+
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
@@ -46,6 +51,9 @@ do_build() {
 			go_mod_mode=
 		fi
 		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		if [[ -n "${_go_mod_path}" ]]; then
+			popd
+		fi
 	else
 		# Otherwise, build using GOPATH
 		go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 5ca89585d59a18cfef5c6e3fe535acd461bb829f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 003/364] 3mux: revbump for go 1.21

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From 61c99bf330a3576b09f88bdae716287ae0cbe7e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 004/364] Amass: revbump for go 1.21

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From f9b76b27bef84d8eb82d6f13c1aea0ee40229425 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 005/364] Gokapi: revbump for go 1.21

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From 5abfa3da2e422c0b07651b7b36a72b3b52f83552 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 006/364] NetAuth-ldap: revbump for go 1.21

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From ca26ab716ca470c171da08d1dd1e6851db7d2d19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 007/364] NetAuth-localizer: revbump for go 1.21

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From 08af50b5275fd7291cce4feb593ca103bc236465 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 008/364] NetAuth-nsscache: revbump for go 1.21

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From 8a65601c9dba8aa7205ad7dbe484e195fee9270d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 009/364] NetAuth-pam-helper: revbump for go 1.21

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From 1b8950a44c0bdcc3c0fe35f12d6aebb785ae7a7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 010/364] NetAuth-sftpgo-hook: revbump for go 1.21

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 358bc7d19bffab0c210894f3bf86ed7cee3a0367 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 011/364] NetAuth: revbump for go 1.21

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From aa7d0314913e3c46556f29ede87b79c6b6b99e2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 012/364] NetKeys: revbump for go 1.21

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From b258f10938ae881ccff657da50ab180ad9ebd47d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 013/364] NoiseTorch: revbump for go 1.21

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 152f7ef7ae38e61f857590494d19db48208b2fdc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 014/364] PopCorn: revbump for go 1.21

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 4f6ee3a4236e39fa6dc6e33116d91e58419f05aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 015/364] TMSU: revbump for go 1.21

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From 6f0c1287e800502a0593c3a61c7b9d4b77405c67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 016/364] TerraState: revbump for go 1.21

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From 2a2a73a802e491d0d38717192fbf857a101fd315 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 017/364] abireport: revbump for go 1.21

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From f628456d1baec6123bdf7490d377d31a247558c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 018/364] acbuild: revbump for go 1.21

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From 0b1702256d19261322a6dd8f46be0b66b6ff5a1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 019/364] ace-util: revbump for go 1.21

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From 6e23e1fd5893cba8b8e08b4c4af07f6ade319a46 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 020/364] acmetool: revbump for go 1.21

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 9f06c9d90c770bfc4afaeb7a26f899bef55c5cd7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 021/364] act: revbump for go 1.21

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 0cf2edcd8237d30d182bbe4ae6aed4d471aed410 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 022/364] aerc: revbump for go 1.21

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From 08e49bfd26df7036439304921cd6ff2028357d89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 023/364] age: revbump for go 1.21

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From 93a77669b3e21d32d090d7c2fdb123c4cc153c76 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 024/364] alertmanager: revbump for go 1.21

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From 8d8cdfe1bf982653805d0bbc6861bb7dcb167e25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 025/364] amfora: revbump for go 1.21

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 32a15a54e5c7a0d4a29a3c18a4bb979b6213f3a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 026/364] antibody: revbump for go 1.21

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From 2d2b25470982ee980b3e6d8fb6cb1ab6aa0bee3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 027/364] app-builder: revbump for go 1.21

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From 7f0cffaf5e0e26b5b8189eb0c9c66f22ba7f5a98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 028/364] aptly: revbump for go 1.21

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From 0d261ab1c363eb43589f31f98a3fd524f116c1ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 029/364] aquatone: revbump for go 1.21

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From 81975f761ecb9cea2355cfdaccea14dfb8d248d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 030/364] archiver: revbump for go 1.21

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 4b2b67217556372324eee56d965e0ffe962c60f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 031/364] arduino-cli: revbump for go 1.21

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From 8207636c7c8a7ba9ecc5a026a1d495e6b336f62c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 032/364] arpfox: revbump for go 1.21

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From 941267a552640ade90609f8f20c3b9d979d24bb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 033/364] atlantis: revbump for go 1.21

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From d69bb311c773f3b960b06b5935a4bacef70efe61 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 034/364] autorestic: revbump for go 1.21

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From 9831ceeb956dbde987761e7c34bd0c5978e8ca58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 035/364] aws-vault: revbump for go 1.21

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 76e0f702b9b68c4211c57fb3b0588dbc7181c129 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 036/364] babelfish: revbump for go 1.21

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From 8b71f698518e6db452b2d8d10a163d555b24a2f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 037/364] bettercap: revbump for go 1.21

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From e297acd562de956c595dbfca174ae8d9f78b044a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 038/364] bird_exporter: revbump for go 1.21

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From e044e24bd59e277c9b3e08e289635c3ff7bfa8dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 039/364] blackbox_exporter: revbump for go 1.21

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 7772ab777deaad650b5b4decf0a81f4d0bde0598 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 040/364] blush: revbump for go 1.21

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From 33440a2383c9d24c40ac8626d433fd32c62422a5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 041/364] bombadillo: revbump for go 1.21

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From 5fa8cac888249d3f361022206bb2bc5f26341f8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 042/364] bombardier: revbump for go 1.21

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 1b92d790543df3456b5e41cb01dfb098b0d8ab78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 043/364] booster: revbump for go 1.21

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From b734badae1b1b3db0f57c8c00cd899b84f378281 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 044/364] brig: revbump for go 1.21

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 21ab15b932d8d26eaab743e2ea5501356e422454 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 045/364] browserpass: revbump for go 1.21

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From 185a79b5a0e599f253bf4f5e3c406df046d348bb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 046/364] browsh: revbump for go 1.21

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From 4e65cca1c99af269e7e37888d0abf97bcd31a294 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 047/364] buildah: revbump for go 1.21

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From 6c9d1237ed628bd6221816085cacc96c55571357 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 048/364] caddy: revbump for go 1.21

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From 66ffbc7cf4faa381d01fc2a9ab47333fb5b09213 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 049/364] carapace: revbump for go 1.21

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From f0756942f65b3b21c4b2adf15cae1456dd31babe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 050/364] cdetect: revbump for go 1.21

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From b9e595bfc284dd70c87182f31c51c81155414cca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 051/364] cfssl: revbump for go 1.21

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From e22b93dc6c7d71a414632ad78c90332152702cc5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 052/364] cgrps: revbump for go 1.21

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From c05229df88f7619390c987bc2cf70028d55d0459 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 053/364] chathistorysync: revbump for go 1.21

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From c851f24f143698fe27c00208c3f6a7b93e9f9b41 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 054/364] cheat: revbump for go 1.21

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 7304a323944fbbb9326b8a9e1811dc78d2014bae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 055/364] chezmoi: revbump for go 1.21

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 4561a67302099b20911b6b097a262774326f41cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 056/364] chroma: revbump for go 1.21

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From 2b3fabcf116ed53a7d88d5aca34da459c8c4546e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 057/364] chronograf: revbump for go 1.21

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From 04ff051263a0a4082f24655b50f17bde83404b4f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 058/364] circleci-cli: revbump for go 1.21

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 0d0bc3fb241e6082889c73ab0883453a8ba868ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 059/364] cliphist: revbump for go 1.21

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From c2f069bf73b88aafaeef3b49bbb7f653a24b8a3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 060/364] clipman: revbump for go 1.21

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 9ef2bbb3294bad2f16c0585f193ecd2fd828f6e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 061/364] cloudflared: revbump for go 1.21

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From b01ec7beeeecf11d8fe67d82c7150837741aae9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 062/364] cni-plugin-dnsname: revbump for go 1.21

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From 63a112a1453d69860d703acea3ff579e71bdba99 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 063/364] cni-plugins: revbump for go 1.21

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From 4c777a18e6cdde3aa49f3e4bf0b07c1ddeb0692f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 064/364] cni: revbump for go 1.21

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From 18db395f9008376fdd67b11010c9cf0b800583bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 065/364] cod: revbump for go 1.21

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From ef799f3ac0aa3db46b62d51ed795fbc3acefa7da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 066/364] codesearch: revbump for go 1.21

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From 3e1bc3bdeeb2b9840f28f4402f8252bb587d6b1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 067/364] consul-template: revbump for go 1.21

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From 9b0495e883d639514521a29f66e976682adb7436 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 068/364] consul: revbump for go 1.21

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From bf188028d241f561653e3057473406b29ab14f32 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 069/364] containerd: revbump for go 1.21

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 867e5f721ffff9ba3c48a158f97dcab861255d67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 070/364] coredns: revbump for go 1.21

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From 3910b52e5a06d0d815aec76f75488c7c62fc84b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 071/364] cowyo: revbump for go 1.21

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 0d3d6f35dfdc4dc48974ffd58e68955e58d8f7e4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 072/364] coyim: revbump for go 1.21

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 267a04dd8d9f99045c84b19e28bb78e5840ad9d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 073/364] crane: revbump for go 1.21

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From b401633139fe98ef1648f9c0f9076e444c71101f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 074/364] cri-o: revbump for go 1.21

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From e2eed4552f22761c5c8c9581bab71d98541ae365 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 075/364] cri-tools: revbump for go 1.21

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From 4d4cea30a031567b660ca29a4577a3839145281b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 076/364] croc: revbump for go 1.21

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From e355ac4725dcb614fab904aaa451a0011b37b6f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 077/364] d2: revbump for go 1.21

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 91e153f4c6ba004dd3bb884024842d67e07a70d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 078/364] darch: revbump for go 1.21

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 38d5056eba4f56785b126278187d122e010a1daf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 079/364] darkman: revbump for go 1.21

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 24191a64a20c37326d89caa334749d4d3493f447 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 080/364] darktile: revbump for go 1.21

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From cdc8d5f814ac6fcef0a0a9a0ee06015b15ee0d16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 081/364] dasel: revbump for go 1.21

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 87ec1d588c7aee045a2347e5317ed12ac35755a0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 082/364] delve: revbump for go 1.21

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From cb7e5460ebf7e793b03e9bb3a7ef40ee85165dd5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 083/364] dendrite: revbump for go 1.21

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From 3d0d751ebf49dd3dfa86ec5711abc545ee43066c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 084/364] dep: revbump for go 1.21

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 7d4aabf71655e981e3691d126058be8b83b43d1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 085/364] direnv: revbump for go 1.21

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 8b97cd2fb3aa07ab8921cc6190af27d707a4897a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 086/364] dirstalk: revbump for go 1.21

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From 0c8f30512954163a41a7dc3642d56fe4d2192a4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 087/364] distrobuilder: revbump for go 1.21

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 9bfc83cad4cf2bba14fe522ae647e07fd4ebe01d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 088/364] dive: revbump for go 1.21

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From 57a216b594728cc1e65035204d8cf313ab18f9be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 089/364] dlayer: revbump for go 1.21

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From 586a2f6fc48c14d888af8bd55be2d9387ee31f58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 090/364] dnscrypt-proxy: revbump for go 1.21

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From 58cd80a61dcaad7af6eadb12f0d27207b223a024 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 091/364] docker-buildx: revbump for go 1.21

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 565afae28b2d1d8cd75b3aa730a4b8dab3847e18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 092/364] docker-cli: revbump for go 1.21

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From 33558920d32462b8cb96eadcdbed9959319dc9e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 093/364] docker-compose: revbump for go 1.21

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index bf58701865515..6a5b5059117e6 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From cb8533d26bb70f341bb67959ceabd14a39c3818f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 094/364] docker-credential-pass: revbump for go 1.21

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From dcd2485d1440885d84d74b3f9f2f19c98a36d25a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 095/364] docker-gen: revbump for go 1.21

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From 86f0bc76ea8c4bb394efedaa2b3a01778cd4f64e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 096/364] docker-machine-driver-kvm: revbump for go 1.21

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From cf4584cca5d27741073307993aca2e8681d93569 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 097/364] docker-machine: revbump for go 1.21

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From 3deb5f6831e99808bd88f1880a61e0f881e5ccef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 098/364] doctl: revbump for go 1.21

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a07908238dc60..cd80b53588919 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.97.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 90feb3419adac754560f9984a14165fb2c28d511 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 099/364] domain_exporter: revbump for go 1.21

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 70a996892fbd07d6068f897ea46472e6245f757a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 100/364] dotool: revbump for go 1.21

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From f118a171a3470ee9d74a1906015c1df2e61d38b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 101/364] drive: revbump for go 1.21

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 0d1ce78dd74164540989f2374aac5df5eb14ece4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 102/364] drone-cli: revbump for go 1.21

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 40d30949b5920e19b3701ae76dcf19b982a6483e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 103/364] duf: revbump for go 1.21

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From ee52ee164ff89adcf6b78df1c48525221df1ebb8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 104/364] elfinfo: revbump for go 1.21

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From 412f5b29aee8decec22faf550accb231102d8f19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 105/364] elvish: revbump for go 1.21

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From f0f539202c5feb43b885a3817aaac209434e222c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 106/364] emptty: revbump for go 1.21

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 7a3b585182709122afdf034a5a0115e90862744c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 107/364] ensure-access: revbump for go 1.21

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From fbc020d9c57a778f07e0387269da1a2afbf4ef05 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 108/364] etcd: revbump for go 1.21

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 34075e4d34ce3a6bc62b698278d6af754aa32b16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 109/364] exercism: revbump for go 1.21

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From 20bcbee4391db6b73b41ab4e8dc1ed12f63117d8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 110/364] ffuf: revbump for go 1.21

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From addd6c09fd96d40185d9114e06429ad58dde617f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 111/364] figurine: revbump for go 1.21

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From fdb5f98d970df571fe6667ca0498939e1158a7b4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 112/364] flannel: revbump for go 1.21

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 271e65af0f8819c1e588d6da4d2f7eb5c895524b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 113/364] flint: revbump for go 1.21

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From 182d843a13f2a1e7f72e3ce904f46bfad7de1742 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 114/364] forego: revbump for go 1.21

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From 10de92f4c5550ac6a0dd71ab5e84d1c8b83ec22d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 115/364] frp: revbump for go 1.21

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 19d42c97d124afaf5b45205dc4c5f1e9c3fe9108 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 116/364] fs-repo-migrations: revbump for go 1.21

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 5a620b37d22aeceb20b09fe5f67e66bc5563db6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 117/364] fscrypt: revbump for go 1.21

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From d050755b674b46eea8f599a85180644e5171e428 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 118/364] fzf: revbump for go 1.21

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 7fc16698f6d2af70291ad19da8a8fc8553c8ee22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 119/364] gdu: revbump for go 1.21

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From a667dab5f52e696b65ae82f02ffe4843e665b753 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 120/364] gemget: revbump for go 1.21

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From d130e4040e6b13bc4453d7c499f7d5f42c22f094 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 121/364] gendesk: revbump for go 1.21

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 392db3b66182d1d58688427d0681607a02194aa7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 122/364] gfuzz: revbump for go 1.21

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 09bcc8bf1a3d2fed0160583ab93b6b1bb501e636 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 123/364] ghq: revbump for go 1.21

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From dbe5b410588003b44fe8790d173bf147b59c75b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 124/364] gister: revbump for go 1.21

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From bbfacbfe5c3aff31eb3ad56cd663558b39499e27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 125/364] git-lfs: revbump for go 1.21

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From e6e8e69f0b37604499c8d85f475ac8528f93682e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 126/364] git-sizer: revbump for go 1.21

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From c53e97dea3ca18005aea8de2457e08cec2d46b34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 127/364] git-team: revbump for go 1.21

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From 75d7cb711a9ac95932ae381d26477ed19205fb8d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 128/364] gitbatch: revbump for go 1.21

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From 62a2001b60fe5ea8394c982559899142bad9e0d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 129/364] gitea: revbump for go 1.21

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 80703a357e0450f8c01b8865d1ff4f3cd0260b77 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 130/364] github-cli: revbump for go 1.21

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 9a973d0d5e779b7620645f0c821b6758727e4b3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 131/364] github-opml: revbump for go 1.21

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From cdfcffd693ae6e479535d6ad0d8babca11524ad3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 132/364] gitlab-runner: revbump for go 1.21

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From e8f17195f98bd0c9f15d6aa788960b7dae8c835d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 133/364] gkill: revbump for go 1.21

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From 8f0193df2afbcfc4c5c1178c2e344ee079d3f8ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 134/364] glab: revbump for go 1.21

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From 09b021dfdd200c4a5288c3e7addda5b18f6498e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 135/364] glide: revbump for go 1.21

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 98858a50970e4392b3e63013c63a549423ad7e6e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 136/364] glider: revbump for go 1.21

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From 7abdbf819ba8a30df37994a09a526bce843da3af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 137/364] glock: revbump for go 1.21

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 40c94ae766c8151bf4a95afeb1a8a5398b0e28eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 138/364] glow: revbump for go 1.21

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 487d14aee6b9f73a38617d1d4ed4a61f29d97cba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 139/364] go-bindata: revbump for go 1.21

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From f9cc25bdecec161abe3a5bb4ca9aeb958f16b8eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 140/364] go-capnproto2: revbump for go 1.21

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 307f4336ac88469241d0a5a157fbcbb88974e926 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 141/364] go-ipfs: revbump for go 1.21

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 813dd5d6e3d03323b5b04a6e4d1c4c43c8f04179 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 142/364] go-jira: revbump for go 1.21

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From e50697dd2d1ef7529758481adad267109fa403f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 143/364] go-md2man: revbump for go 1.21

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From a9287923f0c28277033062e9add61d8412af646b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 144/364] go-mtpfs: revbump for go 1.21

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 7520f2deb36c692316044b14b9756818ca7db93a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 145/364] go-review: revbump for go 1.21

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From 6e0b629a57900890707fd7035ab07dd798023c91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 146/364] goatcounter: revbump for go 1.21

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From d0a0ea63436099eef1077f7c3d0bcff20d286ac6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 147/364] gobuster: revbump for go 1.21

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index 226419ea3a3d7..2a5ce9ec37b0b 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 1dea444ec2f64f09c5b0eb59ccf53b4c9f1fe5a8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 148/364] gocloc: revbump for go 1.21

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From d589941476a5f4d318b4b76ece801aa4fea07901 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 149/364] gocryptfs: revbump for go 1.21

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From a95cd727c89564063af5af48910ae6b868299326 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 150/364] godef: revbump for go 1.21

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From b4792b78aaec0cae5bb78052cd585e989116fc0e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 151/364] gogs: revbump for go 1.21

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From bd264973778715acad64279a56a71315e1ffabcc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 152/364] goimapnotify: revbump for go 1.21

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From 3db3f4dfd07e73d03172f340dd2a93138e96b3ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 153/364] golangci-lint: revbump for go 1.21

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 59300aebdfdfb06bf6a7afaa8ba6c104e93734af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 154/364] gomatrix: revbump for go 1.21

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 8eb26427897df7b83adf2db4fbacace817242187 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 155/364] gopass-jsonapi: revbump for go 1.21

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From 667969eedbcb3dffcc2eb73664bb9cf76d8dc212 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 156/364] gopass: revbump for go 1.21

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From 6bdc5e1ea4c14673985da1746111176de1aeba98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 157/364] gopls: revbump for go 1.21

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 47ba337328349..d0fd784d45df4 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.1
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From fff8684e7ebbdec60d4b317a9233e2bc4cfc4322 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 158/364] gopm: revbump for go 1.21

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From d5efec3333181a01a3814dc8840fe925d1d8fd27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 159/364] gops: revbump for go 1.21

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index f63b18514e36f..e2dff2821a6b2 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.27
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From e027d7a1649f079f344b9f6cb755b932bbc34e94 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 160/364] goreleaser: revbump for go 1.21

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From 66759297fc28a72e8ec414f2d9d52e252692e820 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 161/364] gotify-cli: revbump for go 1.21

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From e87e5b925b0cf85cc8336cd210b6383f3e7e553c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 162/364] gotify-server: revbump for go 1.21

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From 3004b67d651ef3484d7276ff71bf7b576e1c84d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 163/364] gotop: revbump for go 1.21

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From 5c5efae1a39113b76e25c980dfda684201b3ee6c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 164/364] gotty: revbump for go 1.21

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From 512bc13d119387c326f0f2c685bcf81ec61b20a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 165/364] goversion: revbump for go 1.21

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From 19269ff6fc00017592bf07b530180caa105ecd75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 166/364] grafana: revbump for go 1.21

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From 42328623f483e5cb600ea96b4e8e7c5b931f875c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 167/364] gron: revbump for go 1.21

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From 98ab3e272fe3eac0b25a4b56b423e7bb5a21853d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 168/364] grype: revbump for go 1.21

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From d4d95f66e96201226a0d753a454dc91ef03788e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 169/364] gucci: revbump for go 1.21

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From a6be65fb084a71d8b731a620555d5557b573d53d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 170/364] gum: revbump for go 1.21

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From a7ab8889feed6d32bf784fea51b86984f5510ee7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 171/364] hcloud: revbump for go 1.21

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From 5c83c3cda2a4a89e9e8377e86c4ef3e8afd3bd1b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 172/364] hey: revbump for go 1.21

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From cac96460f9790de3ab172997f354a92b5c462471 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 173/364] hivemind: revbump for go 1.21

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 3e977befee3345ed89823963b90fe5bc59ea8624 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 174/364] hooktftp: revbump for go 1.21

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From 69476089e650d395d8064edd7b150edfd15c8d1c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 175/364] httpstat: revbump for go 1.21

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 79fbbfe93485962fff12e5f0254a8c97eec8be43 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 176/364] hub: revbump for go 1.21

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From edbd8c4023c0af43baa8c79c2bc44d3f0810cf4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 177/364] hugo: revbump for go 1.21

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From d8536e4ac4035bb565020c6579d9f685e76c0443 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 178/364] hut: revbump for go 1.21

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From e3e9ab12507c33d92ef7f5092acba654538936e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 179/364] hydroxide: revbump for go 1.21

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From 7817809a2e04a857fa598e9a614ff2723857bf66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 180/364] i3cat: revbump for go 1.21

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From 888f7f93fecf1b168f479da3ca1e3d300c8f5a0b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 181/364] ibus-bamboo: revbump for go 1.21

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From e2b48f1561aa385f9211de247c9a720326dd48d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 182/364] img: revbump for go 1.21

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From 2fa2f53a6d708405af7fcf16556deeb62122a6bb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 183/364] immortal: revbump for go 1.21

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From 4f188b5f04d5cf15de7d6bc6205965d76daf5c58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 184/364] influxdb: revbump for go 1.21

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From 65a104c3d336b6affffbd5069d6e6da0fa704287 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 185/364] ipfs-cluster: revbump for go 1.21

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From a1c61aa09d5881c7f5ab3125cb0e78f47d92cc66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 186/364] ipp-usb: revbump for go 1.21

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From af2773ab59e0f2322321fd51ee58f7513e56887f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 187/364] ircdog: revbump for go 1.21

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From 1eeff7c3bf51843a106bf11b7c7f2a0687222b01 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 188/364] jd: revbump for go 1.21

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From 9b3cbfeffcc0f742766197e9e4bc4ecadfa01668 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 189/364] jid: revbump for go 1.21

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 1ea8200d7c175ffb27060395f734d8d05d544c3b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 190/364] jj: revbump for go 1.21

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From 3316aa49a4137f8a51be955ff3f52dbf83510790 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 191/364] joker: revbump for go 1.21

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From a5d264567324a1174906c848024362b5d06a7889 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 192/364] jp: revbump for go 1.21

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From 051bb1f5cd1bc9c4694a084d93bf0270b69d2ce6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 193/364] jsonnet-language-server: revbump for go 1.21

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From c8acbfa4d7999c4919d0d82076f5227ae0b3066b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 194/364] jump: revbump for go 1.21

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From 39decf37d7bcea3bf0f7c520afe78afc2b43871c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 195/364] k3d: revbump for go 1.21

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From d86612d8d3c772af6dd7a8052e9b84ca28ba2623 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 196/364] k9s: revbump for go 1.21

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From f0e080500b1f44d8fca4eb82bfc200d8424cd36b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 197/364] kapacitor: revbump for go 1.21

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From 80ce3232b2c0b71ceb873c5e63e07227ecf61464 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 198/364] keybase: revbump for go 1.21

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From e8479010f1eef2f5ab29038b4b00471492bf5bbf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 199/364] knit: revbump for go 1.21

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From b8202a2bbc13de8544552ac727fed8fc79f2af07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 200/364] kopia: revbump for go 1.21

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 63511bcd4fc148b1ad9028f2e6a56136604f1440 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 201/364] kops: revbump for go 1.21

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 3d62665101d7f6aeff3e2b41fb15d81615c4f47b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 202/364] kubecfg: revbump for go 1.21

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From ec6f42bf6e2c72bdecb162134d6555996e99113e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 203/364] kubefwd: revbump for go 1.21

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From dd048e351f14d7d9f9aa5cfce7f4dea93191b34e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 204/364] kubernetes-kind: revbump for go 1.21

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From a7bf1c570ee11884f0048b61de9eb238cda75c8b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 205/364] kubernetes: revbump for go 1.21

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 19415cd2f97af934c50e57aa06ac63eca32588e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 206/364] kurly: revbump for go 1.21

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From 0f3cddc3ed4205536a98f66e87a1b86dc1df4a95 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 207/364] lazydocker: revbump for go 1.21

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From aacc85efdfe208b78ed3de355c62d3c29af3e273 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 208/364] lazygit: revbump for go 1.21

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From aa573316aae57fb2758c35dc16ea3e6a92420cbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 209/364] lego: revbump for go 1.21

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From c89564f71e52e5cf90968aee9e6e949e5fc51086 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 210/364] lets: revbump for go 1.21

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 0be733e685f32..ab6095922afbb 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.52
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From b11c25a166c6ce877592bc680bae9c644bed39db Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 211/364] lf: revbump for go 1.21

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 6497e412f990e90a524da79c3fd5b1578ad7d699 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 212/364] licensechecker: revbump for go 1.21

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From cbc183a0537afad2a0eb9c90305a958e60037a91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 213/364] loki: revbump for go 1.21

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From 43307b73daaeaeacc7b8709156d33a841fc1d4f4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 214/364] lsp: revbump for go 1.21

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From 224f08176eb204e619b1cd4386b9a8a97f954a60 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 215/364] lux: revbump for go 1.21

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 136552d528708fec30a9a684862338fc577d3ca9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 216/364] maddy: revbump for go 1.21

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From 28d3bffc05ed521b51a4a11f5ae23ecc4dbed953 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 217/364] madonctl: revbump for go 1.21

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From aecd57bba8d40a534162a6b0a48b424aee50327f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 218/364] massren: revbump for go 1.21

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From ff0566506e9d6e5acec5c8d52f41e007f29181c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 219/364] mdr: revbump for go 1.21

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 369c25a19cc4e8ff44c5266b3e950e5fe742c5a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 220/364] micro: revbump for go 1.21

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From 721866088281c70f6eda3782ba938fc553627d45 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 221/364] microhookd: revbump for go 1.21

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From 1e059b198eff95b6970db6cad111211463205c5d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 222/364] miller: revbump for go 1.21

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 3143aa73ce7b09f652f5d531ec19bfa3004d2094 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 223/364] miniflux: revbump for go 1.21

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From badcd413251bc8ee825edeec16b2750c604ab5f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 224/364] minify: revbump for go 1.21

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From d0f710e2b3f16c8318e31bfe4281ca1bdc9f8f9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 225/364] minikube: revbump for go 1.21

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From d0feefc1da0f2a87ff07b0bdc562120f4c75919d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 226/364] minio: revbump for go 1.21

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 4e6b35b3a67887cbe5bfa02b0c24f9b8daadca8f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 227/364] misspell: revbump for go 1.21

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From ac2de541df411fd1c853722c4ce09f7a746bc532 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 228/364] mmark: revbump for go 1.21

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From 74d879eab8a796226081ac48e2e01d39545d7ead Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 229/364] mmv-go: revbump for go 1.21

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From b67e2b76f912c282ce1e6ddb305db7e48066f1f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 230/364] moar: revbump for go 1.21

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From 336c3398b124acc41e634c10fb510d43f5561217 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 231/364] moby: revbump for go 1.21

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From b3a223abcb6f4a584a000355efdebe8afe04901d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 232/364] mountain-backup: revbump for go 1.21

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From 0fa9de92ed74eab588a33073398b62209837e811 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 233/364] mpdviz: revbump for go 1.21

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From 9a0a1fd49eb8342f475bc693289418503c587d19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 234/364] nebula: revbump for go 1.21

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From 44098c9c5df764b51c1b68b840324a1caa488a25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 235/364] nerdctl: revbump for go 1.21

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From fe54195b00e8595132b753d504fc575b475bfcc9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 236/364] netdata-plugins-go: revbump for go 1.21

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From 5abbada7a43cb21e95e35f4c40ee3ae9cc21f0dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 237/364] netns: revbump for go 1.21

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From 9e8fdc6babd3fbc4b7dfc0b97b8629ef76ab1156 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 238/364] netris: revbump for go 1.21

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 111d3f97b904f3ac002e084b835391130af6c821 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 239/364] nextdns: revbump for go 1.21

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From 28aa639a69eba82913002e543713c7bba0473b66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 240/364] nncp: revbump for go 1.21

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 27ab96ea84c88..57ab5a771f851 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.9.0
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From a44a9ef0045661583eb83194c5a9965c7c51f4c1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 241/364] node_exporter: revbump for go 1.21

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From a92b9cf530d86dda8c9657dc4dab8143afcfcf07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 242/364] nomad: revbump for go 1.21

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 3939a84c506dcb679922fd2f4009d1145e53d17a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 243/364] ntfy: revbump for go 1.21

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index f3a134ac1ecdc..779ed8e5d63c3 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 38cd5834819aec0383307cb509b0f5ed7310a26a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 244/364] nvidia-container-toolkit: revbump for go 1.21

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From 6474c2cb28bb79b2d5b8ba501f8c87048265a576 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 245/364] nwg-look: revbump for go 1.21

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From 055a4f45b29ee62e2ab5109db1d521d84d57be45 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 246/364] obfs4proxy: revbump for go 1.21

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 86e66f2fabbcd7dff0d5b18fa48f560009e63bff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 247/364] oh: revbump for go 1.21

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From 73cf41da9bd9d46c6e18f6bd15ccea22d0e15d3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 248/364] opensmtpd-filter-rspamd: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 41eb69cb9ccb65680543097822e0bcebedd6fb3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 249/364] opensmtpd-filter-senderscore: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 631b969c9181bc5faedff32d68bddd0314d6df7d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 250/364] operator-sdk: revbump for go 1.21

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From 4a4994a38a4f63ab53626deee6ab5791701ec266 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 251/364] oragono: revbump for go 1.21

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 862934bcee87bbeff516000508eff437412737c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 252/364] oras: revbump for go 1.21

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From ec756823c9f44b78b6a6744a8011d139cd25ee33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 253/364] osv-scanner: revbump for go 1.21

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 41c7f8378e46448bef66b78656f15cb73842f027 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 254/364] packer: revbump for go 1.21

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From dadc1554a4421b2a2f3c766063f3a301b9df516a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 255/364] packr2: revbump for go 1.21

---
 srcpkgs/packr2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..1df39c1dfc3fb 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,15 +2,17 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
-go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+go_import_path="github.com/gobuffalo/${_pkgname}/v2"
+go_package="./packr2"
 short_desc="Static files embedder for Go binaries"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
+_go_mod_path="./v2/go.mod"
 
 post_install() {
 	vlicense v2/LICENSE.txt

From 1dd3cb084102a6a9aae676398e739479358eeee0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 256/364] pam_netauth: revbump for go 1.21

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From d550eec19f8b7b6f41abf3b64f9ac699f1913002 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 257/364] passphrase2pgp: revbump for go 1.21

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From b3b050ff84a6981d0b395d317e3e4969603c3331 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 258/364] peco: revbump for go 1.21

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From 5dfc5d0d97db54b98f8a650ef68889563e60d73c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 259/364] pgmetrics: revbump for go 1.21

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 1acac52fe9efd91fd796a421f69c2c01c426637e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 260/364] pgweb: revbump for go 1.21

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From 10c32ed98ff04c8c4c8b632e56fdcc32a2570f79 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 261/364] pkgtop: revbump for go 1.21

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From bc8a387e923c33eb1aa3a3d22affc5cc8df81831 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 262/364] podman-tui: revbump for go 1.21

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From b99d067c0f626240cc7fe22efb91e827afb51702 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 263/364] podman: revbump for go 1.21

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From 8dce18663f3a3ccc277bca1a76cd0a8b2930302c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 264/364] pong-command: revbump for go 1.21

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 48237e8d6bb69ec7ef665c004c61c5a025e8177c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 265/364] prometheus: revbump for go 1.21

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From 69703b67fa73559cc8ceaf6ef6742ca4ee96283c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 266/364] pst: revbump for go 1.21

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 39ccdb566045c6f157f49fdcecb7b618e94efe0f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 267/364] pup: revbump for go 1.21

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 7303a747c70943c5196e5e307adbc255167fbcb0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 268/364] pwget: revbump for go 1.21

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From cf664198ad3e3ff56d7fe758826ab50552bc5de1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 269/364] qrcp: revbump for go 1.21

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 5e8cecd433391c9f0328adf4606f4a262c3eac32 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 270/364] rancher-compose: revbump for go 1.21

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From 9c7752370a25a49eb985c31a7626fb5909548eec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 271/364] rclone: revbump for go 1.21

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From bb167249a3504702929195a8cce4f72b38952f9b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 272/364] rest-server: revbump for go 1.21

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 52445e4671ce645da271a25330df13b8cabed370 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 273/364] restic: revbump for go 1.21

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 23f13a75f7a2bb64605fc8010a191a90882246f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 274/364] revive: revbump for go 1.21

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From c8b63373d7d252e7edc5bc19346aeac55613a373 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 275/364] rmapi: revbump for go 1.21

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From 85f2aa8f75739330b36eb5b89abf17d52bb39865 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 276/364] rocker: revbump for go 1.21

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From 6a515700223c63f98a45207fa76b7d14bd900286 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 277/364] rootlesskit: revbump for go 1.21

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From 144326bd326507506c1380d9dfa3402c9a8e26f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 278/364] runc: revbump for go 1.21

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5495e4a720bb1..008a94e502e19 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.8
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From aa8f5082956a69a12ce10e3d5c0f134de53b5ed8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 279/364] ryzen-stabilizator: revbump for go 1.21

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From b0b5c2049fa089d268faf1653c6d9b158d5eaede Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 280/364] s: revbump for go 1.21

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From bd0f243b03e8c9668fcd754260a7855880454063 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 281/364] saml2aws: revbump for go 1.21

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From 933446b8f730505f172f09b833eed1b77f2b0650 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 282/364] sampler: revbump for go 1.21

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From fa648538d3f34ca2b00859dabf2ec6524938ba80 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 283/364] sbctl: revbump for go 1.21

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From f5c257b4b60820970986113ce00ab6afbc4659d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 284/364] scaleway-cli: revbump for go 1.21

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From a496c228bf25580c1b0d16550f57c204799226ad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 285/364] scc: revbump for go 1.21

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 6ceb6fa9f0eafa8cbdb8041e36dd4ce3fc1838e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 286/364] seaweedfs: revbump for go 1.21

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 92c05d4826a4125798c691ffd655b9fec3ee796d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 287/364] senpai: revbump for go 1.21

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From 28d4d9903d728ee5785e681efa531949bf64ee0a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 288/364] sftpgo: revbump for go 1.21

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 88dad03c833261b225f104107ec1f72754a2a226 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 289/364] shadowfox-updater: revbump for go 1.21

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From d990f925636f7c45ed3637b92f9bf13c06ef15e7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 290/364] sharenix: revbump for go 1.21

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From fbeee114c35b2baf3a384045a389f47224cb74f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 291/364] shfmt: revbump for go 1.21

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From fea3204f3bb0572a39d32299273aa75f33cb0f5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 292/364] shiori: revbump for go 1.21

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From b6696c7bfbb4e8cf242be875be6dfb729e95fcaf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 293/364] sift: revbump for go 1.21

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From ba91eb0f0c4337e8edef189b5ea67fd4ee85d345 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 294/364] skaffold: revbump for go 1.21

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From a0855f50657866e7f0faba7ce1a5222eb03dccfe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 295/364] skate: revbump for go 1.21

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From 513f64d8bac3c7835541be0924e573398738e768 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 296/364] skopeo: revbump for go 1.21

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 6fa48810091afa3638e51c53969d1537bd405346 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 297/364] slack-term: revbump for go 1.21

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 3741153507569d06abd4388d8af4848a6a0ae522 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 298/364] slit: revbump for go 1.21

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From 606a9b5b8c973cd1935370b023006433c0dbed9f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 299/364] soju: revbump for go 1.21

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From 212e5d75ac8c19452504e83ea8b1fbb848c8d07c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 300/364] sops: revbump for go 1.21

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 1dd4b06c28b2c8d3b28e220cb01b6e57508ceed5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 301/364] spreed-webrtc: revbump for go 1.21

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From 2d7a3fb82b71d298167531f0d14aa5011afcb316 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 302/364] ssl_exporter: revbump for go 1.21

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From 98ed96a9f41befa42d2d615d01cc5c92ce76ab36 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 303/364] stc: revbump for go 1.21

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From c05d5548885d516288798c0b92b20b3d1f925638 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 304/364] step-certificates: revbump for go 1.21

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From 0a5a3bb1f86b3adac5d6e448a31093657ec4d0b9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 305/364] step-cli: revbump for go 1.21

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From 6c6ab0d74c359519a6ef181f6f55f2b7cdb7e637 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 306/364] stern: revbump for go 1.21

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From f34121d946c702e09874741acae680ed89d25cfa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 307/364] subfinder: revbump for go 1.21

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index eccbab4317572..7416b68760b77 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.1
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From c4ac70ca2e43221250e7bd3a8a98fa4803aa5a2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 308/364] subjack: revbump for go 1.21

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From bf233ad877958ac322308b7100ee29cceffbc7b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 309/364] superd: revbump for go 1.21

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From e2133955b034cf4485590b6e0918f7ef7cc5a6ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 310/364] svctl: revbump for go 1.21

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From f3bc37c161fed59263f1729ee41a4d52cba99dde Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 311/364] syft: revbump for go 1.21

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 03e71563859f4246d246dfab4fa51bf25502b059 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 312/364] syncthing: revbump for go 1.21

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From f13c4f1ffed824c3c5ea673cfffc1a32c0eca26f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 313/364] tag: revbump for go 1.21

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From 84db22c48644d414e6aa7ad20f22c9530c91f835 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 314/364] tailscale: revbump for go 1.21

---
 srcpkgs/tailscale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"

From 1cec15f301ece3c3937a8c5cc8e3ee6081faaea0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 315/364] tea: revbump for go 1.21

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From 3239581a55377b69ca615356460b3aac79ed3bb2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 316/364] telegraf: revbump for go 1.21

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From 26501a863bc310eb8df4669b2625540892ba7561 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 317/364] termshark: revbump for go 1.21

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From ccb2ff4d0ed2e46c0ebd76a8db35c173809e7540 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 318/364] terraform-docs: revbump for go 1.21

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From 44565638ff44160bc73940c4dc4655f1b0cdc6f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 319/364] terraform-ls: revbump for go 1.21

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From 541509b68979182b8609d309345129c75b061a3f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 320/364] terraform: revbump for go 1.21

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 1f00cda5329e606bac162815ee56eeed742366f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 321/364] terragrunt: revbump for go 1.21

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From fdde0566e4d5fd54c58c18d521a178a9b36ef32a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 322/364] tflint: revbump for go 1.21

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From 809fabb4506a7dcfbbd1feb100467fcd786f2ac2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 323/364] tinycron: revbump for go 1.21

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 0a8d448313fdf666b211bd99f227d5d535673c5a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 324/364] tldr: revbump for go 1.21

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From 6d8b4704a081fd32cc5d259e6f0778cf5b92a464 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 325/364] tml: revbump for go 1.21

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From 27df691982ce003d2e02a39dbf841650b733dd8b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 326/364] todoist: revbump for go 1.21

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 23f5fb73933818874f865d98a3db3887bf0742a7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 327/364] transifex-cli: revbump for go 1.21

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From 1c7ab6096b732679f6652df2bbff329e74ffb54c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 328/364] twitch-cli: revbump for go 1.21

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From d850668f77820943451aacb86e6bd247a6e9fa9f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 329/364] typioca: revbump for go 1.21

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From a1fb981c74d6d7b104e910a6d8a8d9d7d3e5c823 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 330/364] umoci: revbump for go 1.21

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From bc44226be246408fd6b4e2999beb9d1914f2d6d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 331/364] unflac: revbump for go 1.21

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From 7dfab319a6ae81b2cb81c454e30b1111e602eb8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 332/364] uni: revbump for go 1.21

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From d7779e3ddf9af4083ef07d897a51521de814adaa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 333/364] up: revbump for go 1.21

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 88ce2fe85e3a122f8750be91a07e249a7d475c61 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 334/364] up_rewrite: revbump for go 1.21

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 14040536d6779a6b11f22a54826b09c964668646 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 335/364] upterm: revbump for go 1.21

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From 1d5b9aca32d82bf1bba0bb9b6e552ebc6c3dc1df Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 336/364] usql: revbump for go 1.21

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From 048e6e6e9cf42ac59ec78eada0c3e3b59926fa5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 337/364] v2ray: revbump for go 1.21

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From 0348e3156e83ec5fa6693acf9c7a2ae243b086ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 338/364] vale: revbump for go 1.21

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 57da0673e2fa7..68f6ed04ee338 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From e11a431da49fb4986a9aabe4370963123dcfc612 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 339/364] vault-acme: revbump for go 1.21

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From 03947faff1350648b3c1a630b5eb1e12aba8f63b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 340/364] vault: revbump for go 1.21

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From db1f0d911ff11a7ed135f91b14ce1b57cceb7eb7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 341/364] vegeta: revbump for go 1.21

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From 207480b459ddfaf01e57520451597b5c9f2eb456 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 342/364] vhs: revbump for go 1.21

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 74bf5a09cc5ff85d580a034d952ff93b32ccf18c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 343/364] vmdfmt: revbump for go 1.21

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 240d67b69e931cbaea2cfcf2dc694c1d10326615 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 344/364] vndr: revbump for go 1.21

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From 5ed84ba52afe4b67857759738680c7525da206de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 345/364] vultr-cli: revbump for go 1.21

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From e29730360466b1eac5db44106925bc92bd81788b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 346/364] vultr: revbump for go 1.21

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From d061e777a26b3477c8e851c1f058e89893af113f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 347/364] wally-cli: revbump for go 1.21

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From 4587a704c14ed61532479eca4ea7355b170e684c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 348/364] wander: revbump for go 1.21

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 251632c470447a1b30906fda2eb07dc9cae20da6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 349/364] webcat: revbump for go 1.21

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From 75f94347a5bd7ec1f4d8c53866f324c56ff82c42 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 350/364] webhook: revbump for go 1.21

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From c76b67bc6ca41b946d6b502c4a21a2a4c62f593d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 351/364] websocketd: revbump for go 1.21

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From 1b09502b9a6331fb34e6ec3b0245d9ea7939a4ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 352/364] wego: revbump for go 1.21

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 8c741a1b5e67ad174ca37abc5796b1cad8d5afad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 353/364] wireproxy: revbump for go 1.21

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From 85cef5c3fdfa078908eb3a2e739782eee1e3f7c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 354/364] woke: revbump for go 1.21

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From c014c11558c358a9e4cef112c756058aef9c61aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 355/364] wtfutil: revbump for go 1.21

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From 860b3f117983dacd193b6a739d23646c9d852cbe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 356/364] wuzz: revbump for go 1.21

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 102e8009d60b00942447028b7e1064751182efdf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 357/364] xmandump: revbump for go 1.21

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From 4a2c17ebc0e9205508685f46fd2b255821e1f243 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 358/364] xq-api: revbump for go 1.21

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 59e11fc892647510679ae91db956f193dfa880b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 359/364] xurls: revbump for go 1.21

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From 7a2665977d6c7c5f0fb221c112a7160cc96b5817 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 360/364] yggdrasil: revbump for go 1.21

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From d7a426ea4762d8c2a85028af8567da5392cfb6aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 361/364] yj: revbump for go 1.21

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From d8ca121142adb583dbf1ef448cdee68999011576 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 362/364] ymuse: revbump for go 1.21

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From a38bc82a8f490b2f2d7c62e0c5023380c96fd196 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 363/364] yq-go: revbump for go 1.21

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 83e3719b1dc61..1eabb60bec808 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.34.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From a68444c66d26101d7fae55dfe719e52cc708b0f1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 364/364] zrepl: revbump for go 1.21

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (11 preceding siblings ...)
  2023-08-14 21:11 ` [PR PATCH] [Updated] " g4s8
@ 2023-08-21  6:18 ` g4s8
  2023-08-22  7:28 ` g4s8
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-21  6:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 260000 bytes --]

From d82a785e4667c4721a4e41c2c4fb1d16f98103ba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/364] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From dd4a4309fc213c7ea4fae32535fcb00c386060db Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/364] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 10 +++++++++-
 common/environment/build-style/go.sh |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..50524b07f768c 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,8 +32,13 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+
+		if [[ -n "${_go_mod_path}" ]]; then
+			pushd $(dirname ${_go_mod_path})
+		fi
+
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
@@ -46,6 +51,9 @@ do_build() {
 			go_mod_mode=
 		fi
 		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		if [[ -n "${_go_mod_path}" ]]; then
+			popd
+		fi
 	else
 		# Otherwise, build using GOPATH
 		go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 4cc26633bf2857020071f07b8ae78dfce49dbfec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 003/364] 3mux: revbump for go 1.21

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From 0dcbd8a59ab6cfe6ce443ca475d2dbb154daedb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 004/364] Amass: revbump for go 1.21

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From 8568ddcf675c02d6a72fad6300780cd1cc304fd9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 005/364] Gokapi: revbump for go 1.21

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From fe490ab21e8e460a26c9c34556766a8404abb04d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 006/364] NetAuth-ldap: revbump for go 1.21

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From f1dc36eac8c704b6b72ef2620c8ca17198fbd295 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 007/364] NetAuth-localizer: revbump for go 1.21

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From 722370d7864328ae2a63c755d0cf128cfb25ac7e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 008/364] NetAuth-nsscache: revbump for go 1.21

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From ee3aafc026e62c3da2067ae17a7d49035e576fa4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 009/364] NetAuth-pam-helper: revbump for go 1.21

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From e9485cd3afabe23caae467ec4990e28cc4550982 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 010/364] NetAuth-sftpgo-hook: revbump for go 1.21

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 8904d304260b079bcba50c8a236b2640546f4c11 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 011/364] NetAuth: revbump for go 1.21

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From 906c707b2efaea247ee30b55ba9fb3abd7c083c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 012/364] NetKeys: revbump for go 1.21

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From 2e79cd69cf031e834b9c33c31c2d0543de8c5dd6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 013/364] NoiseTorch: revbump for go 1.21

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 487f3fe347d44d2f65fdcf3de14580df73d8fe4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 014/364] PopCorn: revbump for go 1.21

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 896cda2764158e241b80ab40e16d34b61d2d8f22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 015/364] TMSU: revbump for go 1.21

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From 717bcd9b7247bff33e83d9a77ef1bfbbba5f0f07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 016/364] TerraState: revbump for go 1.21

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From 85254137be2f08f675d92f002d925712c1001394 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 017/364] abireport: revbump for go 1.21

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From 82f878057264ef7f3195fef65466e4268ad734ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 018/364] acbuild: revbump for go 1.21

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From a96ff0573e95b731f059ac5f02bb9cf624212cbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 019/364] ace-util: revbump for go 1.21

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From 226a63bad877e2310f583d7eadd37fd67c8374ff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 020/364] acmetool: revbump for go 1.21

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From c99ee975b13516ee4324baf3fb54099bbb5baec1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 021/364] act: revbump for go 1.21

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From cd8d0d9e72048f6aaac5e4798e1d73b48d216fca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 022/364] aerc: revbump for go 1.21

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From 228f6dd8d43867496afbe115a39fe7df545b57ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 023/364] age: revbump for go 1.21

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From a1c221f915c8c45fd2e17f8d351b427e46bffb55 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 024/364] alertmanager: revbump for go 1.21

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From 0f41cc85d847efbb94d025c9da99e1f38832c34a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 025/364] amfora: revbump for go 1.21

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 31b1bd49ba94bb584a6f200df999cfa7645f575a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 026/364] antibody: revbump for go 1.21

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From d9a3f717432966cefbc31465334e9fd4d365a237 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 027/364] app-builder: revbump for go 1.21

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From 22bedef6ab5c1310559e8fe319f9f51a9f25230e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 028/364] aptly: revbump for go 1.21

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From 7e26f91f1ecbcc1da55e9c5f965864d6891ed033 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 029/364] aquatone: revbump for go 1.21

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From deb97d83dd55e14926ef8a4296ac3aadac5f5c1f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 030/364] archiver: revbump for go 1.21

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 0a3f623a43fefb880d9e50a030ed4964b6869d32 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 031/364] arduino-cli: revbump for go 1.21

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From 3105a315b0f1b83628ef1e2faff73221e8f5dc7c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 032/364] arpfox: revbump for go 1.21

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From 5114b1b6ab6c46c20cdd9f1ca10a48d9bb864921 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 033/364] atlantis: revbump for go 1.21

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From 6d3a5852da13399ce362afa24beea07d6f19a6ea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 034/364] autorestic: revbump for go 1.21

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From a76b3ad47da0d1468acc7bf55ed8dfbb4e5258d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 035/364] aws-vault: revbump for go 1.21

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 08163106fac36647b13b3d0a8bd085b1493d759d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 036/364] babelfish: revbump for go 1.21

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From f7a2cf65410dc6ffcf212b21a479d3cc91f5cdd3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 037/364] bettercap: revbump for go 1.21

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From f41a5ca04aeca80cfc03fa01dcbe1fa974c402eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 038/364] bird_exporter: revbump for go 1.21

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From 21cae6d7555f07336b6bb31c5699e41f7f60aeb9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 039/364] blackbox_exporter: revbump for go 1.21

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From e401f857c73f9bea59c1ff1e8454d2be33239af8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 040/364] blush: revbump for go 1.21

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From d6c2122890221d7385508101ca177e254d04de51 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 041/364] bombadillo: revbump for go 1.21

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From e17cc02431ceadfdf4f8e26fd50663923ef4e524 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 042/364] bombardier: revbump for go 1.21

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 72737d0cef486f49d116acf05032ca9ed9217588 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 043/364] booster: revbump for go 1.21

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From f65855ba30e57a39b69b23c79e56bd9622ab332c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 044/364] brig: revbump for go 1.21

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 1f42c485a62674fa0306c22d56d1c9078862cc69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 045/364] browserpass: revbump for go 1.21

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From 52a690e66401b82084f7d9b75e724a86b79cf6fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 046/364] browsh: revbump for go 1.21

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From f46ab20a65c3691ee4c4ca773ac93d9a68098625 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 047/364] buildah: revbump for go 1.21

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From 12dd9c0dd8c7de2dcbd3968e6f80b5d44aaaef1e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 048/364] caddy: revbump for go 1.21

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From 209b164449fcfef2a571e9fd225cabdd62eb9f7c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 049/364] carapace: revbump for go 1.21

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From b8c0ad53958543e5356545040dd0dcbe97df878c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 050/364] cdetect: revbump for go 1.21

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From 9348403f76da118c1d3465f38c16047d83054aac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 051/364] cfssl: revbump for go 1.21

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From d6e57d6d6254c8e785709df7785fe8c2868ad871 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 052/364] cgrps: revbump for go 1.21

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From 7f2b6cff8aa5c3e3c45567b145412e6deac1556d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 053/364] chathistorysync: revbump for go 1.21

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From dce2b19df1c720c175d193b191b74d89f1cbb6de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 054/364] cheat: revbump for go 1.21

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From e3c84f633da30aba7df11fc062eaae8c243a04d3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 055/364] chezmoi: revbump for go 1.21

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 7f1a6b8be694a0fe8b6f3d7ccd500c2108cfe1dd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 056/364] chroma: revbump for go 1.21

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From 2b87f3cf3e10b2d2549d998b5a24f2b8bbdcf94a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 057/364] chronograf: revbump for go 1.21

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From d8c7bb2b9e3ef300617111b338c16a513e3f29dd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 058/364] circleci-cli: revbump for go 1.21

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From d85019c36bbefda396ece9a3d47ade8d11bd5640 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 059/364] cliphist: revbump for go 1.21

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From 0518d64cb58848c636c6f56a34a119baf969a9f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 060/364] clipman: revbump for go 1.21

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 439997a8a4591e0081236caa1eafafc53af399fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 061/364] cloudflared: revbump for go 1.21

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From 0cae0c5ab0256aed0af695d13bd1ec584af9bba9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 062/364] cni-plugin-dnsname: revbump for go 1.21

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From d642b7cde3ac69b85ae435670be8e4d45b3d71a7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 063/364] cni-plugins: revbump for go 1.21

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From 23ff0f2348bfbc89e2754b5d792f9c53665d3a7a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 064/364] cni: revbump for go 1.21

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From 16f78ae657ca677304d724f30a95312fa4a1d558 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 065/364] cod: revbump for go 1.21

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From ec3dba9a31971e4f383b4f526a24c34b04c41992 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 066/364] codesearch: revbump for go 1.21

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From 35315916f7863fefc6ea9b60a7cfe2edddad556c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 067/364] consul-template: revbump for go 1.21

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From bb743aa5e7b5b96d1c71607b2d2c9a9d170c9e84 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 068/364] consul: revbump for go 1.21

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From 2bdaaeec6712f7ca8cb305a981867d619db013f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 069/364] containerd: revbump for go 1.21

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 3db5a42233fba862f7bbcc9437e3d2505ccdfec6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 070/364] coredns: revbump for go 1.21

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From 60660834924104706d94307db87f1a68894599a8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 071/364] cowyo: revbump for go 1.21

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 7ecf26b71a78517f0b208cd9d8620838ef84c5ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 072/364] coyim: revbump for go 1.21

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 5838b03041e63f6ae18e239d568b0befe9cb6d20 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 073/364] crane: revbump for go 1.21

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From eb267766d2632067c3c838f205d54006cc92ce6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 074/364] cri-o: revbump for go 1.21

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From 8dca7fab258bb7c547e0e7a5add2858f905e56ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 075/364] cri-tools: revbump for go 1.21

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From 6dbf1c0cdd85a875796fe5421fdca4d1a584b21f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 076/364] croc: revbump for go 1.21

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From 23b7336eb1f90960eb7a75440389190242ef4f4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 077/364] d2: revbump for go 1.21

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 8eb6a8b1f0c4cdbcde31c61bfa96818c3de2d23e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 078/364] darch: revbump for go 1.21

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 37bf736a34df491e9807a2c1b3d5c83c7477863f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 079/364] darkman: revbump for go 1.21

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 425d65bd69b7890594c324ed82f16e11969b379b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 080/364] darktile: revbump for go 1.21

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From 61ea9fe9fe53896084972c26682ab2eacdf14880 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 081/364] dasel: revbump for go 1.21

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 950f533834c2b4f6225bb027af6ef914bb877191 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 082/364] delve: revbump for go 1.21

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From e7b095647c5cb41d0b5dc4d16d15cbe3cd752a34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 083/364] dendrite: revbump for go 1.21

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From 57c149e17456003d672b428fe65867d6c291dd22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 084/364] dep: revbump for go 1.21

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 7c88a5756eac124f7ae2f943c3d843d5885148c5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 085/364] direnv: revbump for go 1.21

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From bac3ab586a43d364236d5bdf9902f9fdd60b91e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 086/364] dirstalk: revbump for go 1.21

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From 5924aefa0a62300d21a4fb7fc777d2824774f1bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 087/364] distrobuilder: revbump for go 1.21

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From c9cdd5d26d481959fa91155d2448d6d1824ec2d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 088/364] dive: revbump for go 1.21

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From 075b7887a56ed996d506a610f50977b7269b8419 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 089/364] dlayer: revbump for go 1.21

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From ff8f3c73881308ad60857fe1e6dfea75061ea101 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 090/364] dnscrypt-proxy: revbump for go 1.21

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From 28feb73af5d588b78be4a46c46e2fb1afa128771 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 091/364] docker-buildx: revbump for go 1.21

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 1aea2251d8a992dad12ee0607a4f129d6eb246ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 092/364] docker-cli: revbump for go 1.21

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From 4ac08a48d79e722649a94dd992f2646610ffd10a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 093/364] docker-compose: revbump for go 1.21

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index f80e4b35a12ca..85e4e6778b281 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From 0ec13237339d4ad5132e0fb8162f413c3d2d4f02 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 094/364] docker-credential-pass: revbump for go 1.21

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From a1e98bd538a67fc4643337b8d6b2178336c24e77 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 095/364] docker-gen: revbump for go 1.21

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From 08a0ac83bfcb6efdd99261523696bbed0cb4bb11 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 096/364] docker-machine-driver-kvm: revbump for go 1.21

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From 1315a16ef0631f580212e96a2ecba6857fec00af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 097/364] docker-machine: revbump for go 1.21

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From 8ff4b2c34cd329efb5d8c3dc79038b063f5d65e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 098/364] doctl: revbump for go 1.21

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 238b128dee3f1..883de540c951a 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.98.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 4650aa78e9ae4bf038055858d3759d96ffabe62f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 099/364] domain_exporter: revbump for go 1.21

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From c691c5880ac3c1365bc76ee16445547a9067eaea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 100/364] dotool: revbump for go 1.21

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From ae5c9885d607bc7e64420aa69bf866c4a78450b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 101/364] drive: revbump for go 1.21

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 771a765e2e36556025642bbaad271fdcbc818551 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 102/364] drone-cli: revbump for go 1.21

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 3e58bfd56980330bab696cb599ad4d5cd8f13b63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 103/364] duf: revbump for go 1.21

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From a5b2779dc21ed442e976f2d4815c5d9536aab9de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 104/364] elfinfo: revbump for go 1.21

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From 37a480e08e97607483a976c9311a901473f8c8e9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 105/364] elvish: revbump for go 1.21

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 44b8a701a12420b52ef89cda369152c6ac836138 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 106/364] emptty: revbump for go 1.21

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 61f0eec2434fc155d8d82f9609c7a8cce32b72e9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 107/364] ensure-access: revbump for go 1.21

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From ab79aa7607589fcabbc389458e97c5c6836e991f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 108/364] etcd: revbump for go 1.21

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From a58848ff503ab8b37b724438039ed4946d6e6b96 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 109/364] exercism: revbump for go 1.21

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From 067a094dbbbfd02f6085edb6cc388c39a94a9d33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 110/364] ffuf: revbump for go 1.21

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From dd81af2efbde3077ac8a8264deb4fb47e19c4d7b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 111/364] figurine: revbump for go 1.21

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From 9155dedee084a5c2caec8cbd37c6fedce773757a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 112/364] flannel: revbump for go 1.21

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From d2cb70c846c2d77171d7fe32ae3c122ad4f72cc4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 113/364] flint: revbump for go 1.21

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From c64c19dd6b48061958d02d95c22f2ea6f8d33f8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 114/364] forego: revbump for go 1.21

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From 8a2bc41539c5b594f1e926f3fd5e27f43d1f52dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 115/364] frp: revbump for go 1.21

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 61a262102f3c9914968ea9fc8a2ba4e92f2b7ec7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 116/364] fs-repo-migrations: revbump for go 1.21

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 63c9662a1d52e0052e966171828915ead4d377a2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 117/364] fscrypt: revbump for go 1.21

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From 75ee0f9534a62c161bf5fc26d80c74ab3566d2fb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 118/364] fzf: revbump for go 1.21

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 84ab85821c51c11c6c84a64ae44f9136b3eccbb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 119/364] gdu: revbump for go 1.21

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 2d32fbacb1a7fa88dd684e8ef3c2320192a42a35 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 120/364] gemget: revbump for go 1.21

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From 9be3447e0d73da732e755278500df9410f344bcd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 121/364] gendesk: revbump for go 1.21

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 3bd57169cb9a0794d4d2821e43e2804a60c400c4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 122/364] gfuzz: revbump for go 1.21

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 2fc44ff324d9ba8598ba57c372992faa44d00237 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 123/364] ghq: revbump for go 1.21

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From 9cd568c0c1666c41371c9b934e705d4a24e726bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 124/364] gister: revbump for go 1.21

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From 9063e7506620df5987143a95254bf7a51a91e20d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 125/364] git-lfs: revbump for go 1.21

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From af1e4fe4667c4c19ba610ce0dfad9ba976546dd8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 126/364] git-sizer: revbump for go 1.21

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From 01f302aed220c51d357a6821a13492a1764d749e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 127/364] git-team: revbump for go 1.21

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From 1ceb64cddf6b9160354d6636fb7c93c8c60c6a55 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 128/364] gitbatch: revbump for go 1.21

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From c6683c6f572f293590374af99ec3731d65d8b50e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 129/364] gitea: revbump for go 1.21

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 784b19fe5c2af9233f9b2a330e0a148b3cce0048 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 130/364] github-cli: revbump for go 1.21

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index ab5fc7f342d98..76018d5baa68c 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.32.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 3f9742ee681c2b1aefd8db17d131a6e8dd99c932 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 131/364] github-opml: revbump for go 1.21

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From d656241be0735b44f5691dcdc8bb9f7f3de82b8e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 132/364] gitlab-runner: revbump for go 1.21

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From 647a871b091a714509dd2d58dfedc8a01ae47fbd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 133/364] gkill: revbump for go 1.21

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From b0856be6f92d55bb632024f267fc794aee0b4b5c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 134/364] glab: revbump for go 1.21

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From 2ba90db6a986f19fdf729bf5921e9a2b9e2abf07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 135/364] glide: revbump for go 1.21

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 25eae9fd9305aa04f6460ca91cfc56401a1ca205 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 136/364] glider: revbump for go 1.21

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From 9d0def4faa0330195c42f5118dc60eb566705bd0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 137/364] glock: revbump for go 1.21

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 3e47f5d3dd1fc9396b2db9ca0d32a7e538071f9c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 138/364] glow: revbump for go 1.21

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 40c2e13f79611afe86423299edb32266de192658 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 139/364] go-bindata: revbump for go 1.21

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From b25fe8752035001c22031238601e9616f4492842 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 140/364] go-capnproto2: revbump for go 1.21

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 89414e843e7e74a7c4f577db5184c709a61fa002 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 141/364] go-ipfs: revbump for go 1.21

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 89ae7b60e545062519bcab456c8b68d20ce875aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 142/364] go-jira: revbump for go 1.21

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From 8d411528ed16d3e35f6ec59f61a2cea99261d5cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 143/364] go-md2man: revbump for go 1.21

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From dd96c46fc4a5709dba5f1b27bbee5d4a781d9d63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 144/364] go-mtpfs: revbump for go 1.21

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 234e06ca93d3591bbd2cdf82886fdb78795bced2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 145/364] go-review: revbump for go 1.21

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From 198bc31638768b022109244da2bed303b13821f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 146/364] goatcounter: revbump for go 1.21

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From 0432d666a48a8bc6fdf3ac23cd7a6adeaebdf990 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 147/364] gobuster: revbump for go 1.21

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index cb8ff76b918a0..c80406546121c 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 26b112cf9668cd8d4fee582e62985667eaf545ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 148/364] gocloc: revbump for go 1.21

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From 71d9f4d906c09cbe002d27d33eb513284cfb0c66 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 149/364] gocryptfs: revbump for go 1.21

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From b1566be41f2e5abbbb580891329d75b1f1306043 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 150/364] godef: revbump for go 1.21

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From fb049eaf3a4cc112e9f7762569f6b5f659c8a22d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 151/364] gogs: revbump for go 1.21

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From a433be49aaeec571dca9dabc2d32c25cae8d9b4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 152/364] goimapnotify: revbump for go 1.21

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From ec3a48e9600c7877a668827a7bcfeb3c78bfd139 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 153/364] golangci-lint: revbump for go 1.21

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From bd18c90160f11f36b2bae1a76860cf7aabc5d66e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 154/364] gomatrix: revbump for go 1.21

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 15be94b5672e958ba6cd488e0a223b443633493f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 155/364] gopass-jsonapi: revbump for go 1.21

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From b4b0bbf97a8c2240c7a8bbb00ff95e5cf4c24e58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 156/364] gopass: revbump for go 1.21

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From b722e429744f7bc4d367a504f1e9151e361e6c05 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 157/364] gopls: revbump for go 1.21

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index ff0ce4225db57..530d8a626da12 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.2
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From e9e11a88ecc63bea8d7bbc53ef1439f1a78204b9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 158/364] gopm: revbump for go 1.21

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From c4667dc489a76c655a40f9fa504466a115a7da3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 159/364] gops: revbump for go 1.21

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index ffb31409f60c2..5d65be5bc6416 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.28
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From c9834c027df51e1cc0dcb61a0926994c5cc40970 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 160/364] goreleaser: revbump for go 1.21

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From 8e6d94596469a8e4e49068d29bd5a11c6c372f20 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 161/364] gotify-cli: revbump for go 1.21

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From 9055452d8dcb0c8efa87959dea40e93c238a214e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 162/364] gotify-server: revbump for go 1.21

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From e5d531fe7c395e2743bd380532e43c6af3b8b9cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 163/364] gotop: revbump for go 1.21

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From fa1358cdd876a110da7d1eab51b0f23a3fa28786 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 164/364] gotty: revbump for go 1.21

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From 0b23d9e9cb5b5d8511b53589fd83a375a6c0b619 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 165/364] goversion: revbump for go 1.21

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From c617490d9b03e5edfccf610630a76d1383704894 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 166/364] grafana: revbump for go 1.21

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From 0544a886715b10fd72bd33e62b456139fb800fce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 167/364] gron: revbump for go 1.21

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From 6e7888a3924904bfcd79d0988e108580c3eeaf6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 168/364] grype: revbump for go 1.21

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 533a1050ebd26..235f192250792 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From d2a81ba9c2c455861a0ac852a3d18f4dcdd37243 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 169/364] gucci: revbump for go 1.21

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From a3255f125e641778cf8008cf36f088f4c3673ebb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 170/364] gum: revbump for go 1.21

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From 11efc62090faa47fa98ed51f76632dee34a415e9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 171/364] hcloud: revbump for go 1.21

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From ec1861db99fb156f6a405c9919e915926d4ee8f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 172/364] hey: revbump for go 1.21

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From f1cdc056791ebd5c2060f430659a6b9b9cf6fbe2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 173/364] hivemind: revbump for go 1.21

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 0040ab30a2b77aec9986e5ce7a7f646c18ef1f0d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 174/364] hooktftp: revbump for go 1.21

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From a97aa60945b491983b0143ac9b8bea0cf9c53656 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 175/364] httpstat: revbump for go 1.21

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From b8cd5102d976440fb2b7e86730bab8f816eb25a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 176/364] hub: revbump for go 1.21

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From c321f55188a401b638a9d9b397187a445eeddf58 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 177/364] hugo: revbump for go 1.21

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index f87ef7a843ad4..2b7c30743bb83 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.116.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From 0d73fa201c936601b3644394072b23ae069f0407 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 178/364] hut: revbump for go 1.21

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From b7ec18561402f96ddbb0541967cf65544be77c0b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 179/364] hydroxide: revbump for go 1.21

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From 13ea01cbb663c9e58ca5a75725dd09e107fabe97 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 180/364] i3cat: revbump for go 1.21

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From e4aeb1d1a7cd34917b1ab489345880d8ae643178 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 181/364] ibus-bamboo: revbump for go 1.21

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From 6a43dee0ed3b76e178aab26a7651ccb0862ef48b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 182/364] img: revbump for go 1.21

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From 136e84a00b7bbdd3f48ebb8f700e07295368f79a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 183/364] immortal: revbump for go 1.21

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From ee9cd38db086abb27869f3a7e1b4ec1e48c25b69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 184/364] influxdb: revbump for go 1.21

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From d57d60ac0164033fb365baa9b18eab59dc727298 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 185/364] ipfs-cluster: revbump for go 1.21

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From 7f61a8a41d8ccdaf93e6159aa0b2af3e9ec3b908 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 186/364] ipp-usb: revbump for go 1.21

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From 0516eeb40ed94192985545dc0dc0b444b5e57bb0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 187/364] ircdog: revbump for go 1.21

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From b25b9f40ca17fabe7982e406988dd53c0223171a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 188/364] jd: revbump for go 1.21

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From 46bc222b87168a3ee3e0db48b4bd33eb295052b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 189/364] jid: revbump for go 1.21

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From d7fb76cd8100aa04a3b1ff8e3210a7bd1048968f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 190/364] jj: revbump for go 1.21

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From 7fdbc038c4d86862e13e029376b3c61c18dd38eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 191/364] joker: revbump for go 1.21

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From c06f2f8fdc7e85cf5b823d4e5f865f025fb3612b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 192/364] jp: revbump for go 1.21

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From ec4b597a4c65c7d955eb8bd344408ee8dc80c721 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 193/364] jsonnet-language-server: revbump for go 1.21

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From 31ade7ea32f5965d8839d7a812b210d106b16c92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 194/364] jump: revbump for go 1.21

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From b311cddf6f76ffc0b61c79789581e2e6c9838b44 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 195/364] k3d: revbump for go 1.21

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From 6eed97e293f27729a9a2b5594c8060afc1765539 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 196/364] k9s: revbump for go 1.21

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From 62ef37c54a17d5b69decbbbf374d53787b0b3d69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 197/364] kapacitor: revbump for go 1.21

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From c100f87cbd6263ccd1ecb60ffc4bc62ac1053311 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 198/364] keybase: revbump for go 1.21

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From 70f22d1f0af5cbca7aaab9d31e11de774cfafde5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 199/364] knit: revbump for go 1.21

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From 45310baffb1f393dcdfa0dab947f17328b0b815d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 200/364] kopia: revbump for go 1.21

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 0fd9cc80e3e4eed4d11cc1ffa63270a0a3aabe59 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 201/364] kops: revbump for go 1.21

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 9653f83d4b6c1386eeb38565cf2061dcbd61163c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 202/364] kubecfg: revbump for go 1.21

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From 6b9ce2c02ade8d9cf015ed50b9b44ee13ff14270 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 203/364] kubefwd: revbump for go 1.21

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From d31f479206afa1a2973e6f850bd82866a1b3d5f7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 204/364] kubernetes-kind: revbump for go 1.21

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From c3f5365ca9850e712f00b646f39f941d18d8e287 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 205/364] kubernetes: revbump for go 1.21

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 02a749171a664b78ad9feec7e557f339d8f917c7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 206/364] kurly: revbump for go 1.21

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From 8aa88b4aee076f63d49fa8b42c4d7ca62341ee27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 207/364] lazydocker: revbump for go 1.21

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From 7e8465a821e5c4db19b6902b8c29f2240c132e49 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 208/364] lazygit: revbump for go 1.21

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From b113aaf056907077f194d1f8a033700e7c9d3c5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 209/364] lego: revbump for go 1.21

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From 649516e2c95f63e4ff3fe1f59998c220b016901e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 210/364] lets: revbump for go 1.21

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 26b6e5b77c803..658a529cc3536 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.53
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From 73571ece5eee6f4f1b9c44c3554be9a0be1d6f75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 211/364] lf: revbump for go 1.21

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 83235af1fa98f6c12d49c3122ed1a13e9e116dd3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 212/364] licensechecker: revbump for go 1.21

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From c3458a17936350f0cfa476c268b2e7953485dd5f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 213/364] loki: revbump for go 1.21

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From e3f217916c6137d06b78b45ba96cbf792c828a3b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 214/364] lsp: revbump for go 1.21

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From 73a2f9194de7221bda9b956605d913382ba76cce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 215/364] lux: revbump for go 1.21

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From c13b76ad85bfa0c6ad589cdbaee997a03db10195 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 216/364] maddy: revbump for go 1.21

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From 76a31f06ba6c7ceeb6f1d9eec3759e8f880b8a8e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 217/364] madonctl: revbump for go 1.21

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From 3621ac8f715ada6ac332a45f4b667204bd67de2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 218/364] massren: revbump for go 1.21

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From c8e812e5261828131b2dc265021801c3fab0b67e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 219/364] mdr: revbump for go 1.21

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From a253db2a7ca4b05b914b6e73eee374865c0175ed Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 220/364] micro: revbump for go 1.21

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From d8ef2b80d647e664474b5e01c7018d2a66f7ccd3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 221/364] microhookd: revbump for go 1.21

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From 93ccf282f0c8f78a302168cf71baf91eb54b62b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 222/364] miller: revbump for go 1.21

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From c696b877467ef285c2b81a8ae1ca20a034b6f81d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 223/364] miniflux: revbump for go 1.21

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From d00f5dae0ca9a1b5e425d29091bf82ffeb2e7e8b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 224/364] minify: revbump for go 1.21

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From 7f5c6ea0315f46d0aa439d078dbf3eecf4ddd720 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 225/364] minikube: revbump for go 1.21

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From cdfff2d900bbffbf9ac4daea1aa11187c283c0cb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 226/364] minio: revbump for go 1.21

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 2feb8a82c7f1a1b6b6d75910fe5940a6cceb0df2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 227/364] misspell: revbump for go 1.21

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From 21186bc00673bdcceb6fc9e8f77b594fa0ca3f10 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 228/364] mmark: revbump for go 1.21

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From a035e1deed503dd4e159dbcea0f48352f2e314f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 229/364] mmv-go: revbump for go 1.21

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From 4a37ce66b28d5e08be4678db566d276e783e9026 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 230/364] moar: revbump for go 1.21

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From e3b1ce7102c198d530a81816c8b4de185b16850b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 231/364] moby: revbump for go 1.21

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From cf99dba59c463d0d663e06869f6bbb94eafe75f1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 232/364] mountain-backup: revbump for go 1.21

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From ccd0755ec74b44c161ea4ea3ca89faed1fa343e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 233/364] mpdviz: revbump for go 1.21

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From bf8fb80786ad0acc7fcc0377b9feb6649e5d2702 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 234/364] nebula: revbump for go 1.21

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From 6d9229fb0a70925307c7750e2463bd45a9190f22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 235/364] nerdctl: revbump for go 1.21

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From 2714689ce9fc270da4bbf43a682015add22229b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 236/364] netdata-plugins-go: revbump for go 1.21

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From 6fa7a5d93b52bea955d5be73781744f54af70ed7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 237/364] netns: revbump for go 1.21

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From 456e9e330f92f45b007a63ac00fb8fb165220461 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 238/364] netris: revbump for go 1.21

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 3f4e843b257d9f3dafd0b9176c78c315eab824ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 239/364] nextdns: revbump for go 1.21

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From 571d203c58bf8d04731c112c76cad28f570f85c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 240/364] nncp: revbump for go 1.21

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 27ab96ea84c88..57ab5a771f851 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.9.0
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From 0fb7ab26612bab86b53080a2134cd9faed9a8bd5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 241/364] node_exporter: revbump for go 1.21

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 88ebe7d4b7cac0297548871aa2bca92cad25e612 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 242/364] nomad: revbump for go 1.21

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 9d9ad804653a03985194552b464f4f1031cb3b74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 243/364] ntfy: revbump for go 1.21

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index a1afdb4340a10..414dbece5066b 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 5396e632fa5685831bb702d3a2e9ca5c5976843b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 244/364] nvidia-container-toolkit: revbump for go 1.21

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From 758ea5f57bbfe9950b27b6e910bb3e3dbfed6b35 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 245/364] nwg-look: revbump for go 1.21

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From af6bb89d13bfd2f94f20a76102112a00cd706360 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 246/364] obfs4proxy: revbump for go 1.21

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 8a04c071c8d9cac39bd1cf28443e3fa2c0e51d50 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 247/364] oh: revbump for go 1.21

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From 758edbec9f72fd0e8e00b315f1ee0e44f1a3867a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 248/364] opensmtpd-filter-rspamd: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From c04d74857f6e92f951da3c3623c864a8489a271b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 249/364] opensmtpd-filter-senderscore: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 3f82de581205c84e40057944534975a869f5fc64 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 250/364] operator-sdk: revbump for go 1.21

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From fc5f18a6dd6a0ef0601fba3f5b45f2217e9864bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 251/364] oragono: revbump for go 1.21

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From e22a98c2f4ea5dcc2852e5a75eca8bedb4384507 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 252/364] oras: revbump for go 1.21

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From 71933455c2b17658863b1b23eb4c7c9b9a4ea11b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 253/364] osv-scanner: revbump for go 1.21

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 7847f41b2da8828264318d7f1f336a78dfffdb62 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 254/364] packer: revbump for go 1.21

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index cb1d549723889..e3e779b482272 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From c4f344113181e5bfd4a6de0230e116f2427cc831 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 255/364] packr2: revbump for go 1.21

---
 srcpkgs/packr2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..1df39c1dfc3fb 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,15 +2,17 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
-go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+go_import_path="github.com/gobuffalo/${_pkgname}/v2"
+go_package="./packr2"
 short_desc="Static files embedder for Go binaries"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
+_go_mod_path="./v2/go.mod"
 
 post_install() {
 	vlicense v2/LICENSE.txt

From a27f2ff1e085019cc570d9132223f0327c7e7429 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 256/364] pam_netauth: revbump for go 1.21

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From de8aec7ca2c07397f159f6d587ab4961400b50a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 257/364] passphrase2pgp: revbump for go 1.21

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From 8acace8187e82295c0ad4fe34584d2a37defd8c2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 258/364] peco: revbump for go 1.21

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From 8e3d2b6ca698ede2e76747cc6eec98ff8e491f33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 259/364] pgmetrics: revbump for go 1.21

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 5341929f54719e49aa0f5fe077a7799bcfaf474d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 260/364] pgweb: revbump for go 1.21

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From b3794c206508e0f72db6cb3d80b0d6c50d1edcd9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 261/364] pkgtop: revbump for go 1.21

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From fb4465f730a96fcc6aa5a3733284a58387d868f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 262/364] podman-tui: revbump for go 1.21

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From b25ce21000c9b98adc088f2cab03efca51b52b18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 263/364] podman: revbump for go 1.21

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From eb0821329dd6a47fe320f8525e72158ccd7897b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 264/364] pong-command: revbump for go 1.21

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 162ee84ee452b610c9241c6048530d8b0c31abe3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 265/364] prometheus: revbump for go 1.21

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From 3559cf17afc3ef6ca065520059cd4be79a75566c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 266/364] pst: revbump for go 1.21

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From ab04a1435df562a6b1f44e7ba3e4e975a81ee9e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 267/364] pup: revbump for go 1.21

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 3eb9163946486f5195ebc85a215c4336b6dad48e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 268/364] pwget: revbump for go 1.21

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From a45821275a5746f3cd6204f262a2c165971d6c39 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 269/364] qrcp: revbump for go 1.21

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 240b64bac7be7192ad75745d079171e3743e7737 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 270/364] rancher-compose: revbump for go 1.21

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From c8f0daba92a53cf67eca88516b10f779f8157eb0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 271/364] rclone: revbump for go 1.21

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From 62a0211b2bcd07199c5fb56b2dd1dc486c9a35fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 272/364] rest-server: revbump for go 1.21

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 1b07e44e05e5b4143410c174ccdf23436f2b39c5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 273/364] restic: revbump for go 1.21

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 819af7d6ffcb3..b9599707c305a 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From d940f6beb6bac255cda29f76d2e25736f98603aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 274/364] revive: revbump for go 1.21

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From 78973c23c0a90d4616d131f847a17600cd5cca60 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 275/364] rmapi: revbump for go 1.21

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From d4a0a74f8312ec11842dc89c062d57e9409850a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 276/364] rocker: revbump for go 1.21

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From 069e8e6454cf1fbf2e5a5b90edfaabf7ede63485 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 277/364] rootlesskit: revbump for go 1.21

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From f4b84df15b06c730524c6f73170e6dda5b8ef213 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 278/364] runc: revbump for go 1.21

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5b74f35e8278a..a97efd0cd6084 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From 67da577ec5281d875ac569d469bf5b966e4fabfa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 279/364] ryzen-stabilizator: revbump for go 1.21

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From 188cf98799f5d89832898eb2d3b297d08049897b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 280/364] s: revbump for go 1.21

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From 33a7825ecf181d55d1f65657e0a764a39ab2055f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 281/364] saml2aws: revbump for go 1.21

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From fb66b31cb0f5695d1a59abbaf6c5ba7eeed5005e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 282/364] sampler: revbump for go 1.21

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From aeab9e00bfa7069c119d9030479acaa499626e7a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 283/364] sbctl: revbump for go 1.21

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From 7989fee948af54f6642656700fbbb3e61afa2d89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 284/364] scaleway-cli: revbump for go 1.21

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From 4eba1e93e8c1757a074a772e8f15bbe5df3517bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 285/364] scc: revbump for go 1.21

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 2bc5942c16e6440f99e2381eea0888b486313eb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 286/364] seaweedfs: revbump for go 1.21

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 7095de5d1b231be5f85daabda2f60d7f0ab919eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 287/364] senpai: revbump for go 1.21

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From 5441c24231b083f75cc49a4644c982296558566a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 288/364] sftpgo: revbump for go 1.21

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 9d39bf983268e413a8051172bd65ac4c26774dc6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 289/364] shadowfox-updater: revbump for go 1.21

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From 60c25d48b3b8cddb4a834ca36caaa539be6b2ff8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 290/364] sharenix: revbump for go 1.21

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From bd51e10afa0b9c79fa08e9b332ba8cc2c5eef366 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 291/364] shfmt: revbump for go 1.21

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From 707b33a1ea6bbbfa97f38c8664dde5a92655f7eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 292/364] shiori: revbump for go 1.21

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From ef39ae6380cbc348b443b0271565d5c1fb9b6058 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 293/364] sift: revbump for go 1.21

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From eabd6cebb466d212b2d209b4dc129c8ba68ab496 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 294/364] skaffold: revbump for go 1.21

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From 9f0fbda4e7d86483e717b68f39eb3b0b877a19de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 295/364] skate: revbump for go 1.21

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From 814f6e1271fa29b18a658d5b9880d7882156dc92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 296/364] skopeo: revbump for go 1.21

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 7d7ee86860df685dfe12fd8299aade900bfdc2db Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 297/364] slack-term: revbump for go 1.21

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 716bf6a710df962d72d5e7f7337a29c69d7ed32a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 298/364] slit: revbump for go 1.21

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From 3d45a7a2a1a4f75828a15271faed31df94a8af88 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 299/364] soju: revbump for go 1.21

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From 5e18a76687849163a8d855bfb08851fdf02fa396 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 300/364] sops: revbump for go 1.21

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 688aa50f43c3ad92a1c4ce4fc30334299e3116f1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 301/364] spreed-webrtc: revbump for go 1.21

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From 48e46ccd9e0ff437186a69419f252067e31c51c7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 302/364] ssl_exporter: revbump for go 1.21

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From 119edc018c4a28fd30bb65c826e1c742585c7796 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 303/364] stc: revbump for go 1.21

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From f4110abf5a9d84e43e4230535b537f9530cf8632 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 304/364] step-certificates: revbump for go 1.21

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From 83786cf3ce7fa3afa22f8d92520aca7b1d4e2970 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 305/364] step-cli: revbump for go 1.21

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From ee50b48477f0a0f2f2d9bea88c8c885a398b75a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 306/364] stern: revbump for go 1.21

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From 817de7ab3e26c162d2770505b281562661f8649d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 307/364] subfinder: revbump for go 1.21

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index d9930c62c438a..b68280d306f0c 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.2
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From 2e4798b18c91f303fc17adffa409a9f4fafaf91c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 308/364] subjack: revbump for go 1.21

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From c552dfb2b057b9dc59751a0bb0145cfc7b591fc9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 309/364] superd: revbump for go 1.21

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From 6421c13263c17e6fbac43dc9ca34b7643c845c03 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 310/364] svctl: revbump for go 1.21

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From 31cee3e6438ba98ab95b51b863642b6e47ebd41b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 311/364] syft: revbump for go 1.21

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index cdad5f20c2310..ec7704944e003 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.86.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 259179510a35f224bad543444e99927eb2fda000 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 312/364] syncthing: revbump for go 1.21

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From 3a757281720936b2e7c0cecc21b2302e70d49a75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 313/364] tag: revbump for go 1.21

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From bb46d2c6e259d1793a2e203857dcc6887c146bd7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 314/364] tailscale: revbump for go 1.21

---
 srcpkgs/tailscale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 83a1ace57b191..0fd3a50983919 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,7 +1,7 @@
 # Template file for 'tailscale'
 pkgname=tailscale
 version=1.46.0
-revision=1
+revision=2
 build_style=go
 go_import_path="tailscale.com"
 go_package="tailscale.com/cmd/tailscale tailscale.com/cmd/tailscaled"

From 5bf75b6f82975ecad0b1c77bf32622e056c166fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 315/364] tea: revbump for go 1.21

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From 7e87c08600a1d7aa33cbb5604859f5f5a49f3cc8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 316/364] telegraf: revbump for go 1.21

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From df8624c232ccf4065ab0bcb72075adb6126aa7bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 317/364] termshark: revbump for go 1.21

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From 016eff1cf15acc218805d42b0bedf39c753bb025 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 318/364] terraform-docs: revbump for go 1.21

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From 24e348e99df193a08a56320d0f19585f2efdc1e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 319/364] terraform-ls: revbump for go 1.21

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From 90f7ddc3904257e29b0a49a1bca6d02911eeaeef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 320/364] terraform: revbump for go 1.21

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a55d2da921f42..d13761997b601 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 5e1dc53b26d6fab5548a3ed5e718f2d21d6a67ae Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 321/364] terragrunt: revbump for go 1.21

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 8350956286414..9eed8d1ee7bf6 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.48.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From 35c5260af56424747a5003ba18d4bc4f88e8b899 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 322/364] tflint: revbump for go 1.21

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From c944715e18ebdb571094e8534a1c362fb24f5342 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 323/364] tinycron: revbump for go 1.21

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 6981b576a7308564dc2ed4f938e1b8f56038ee22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 324/364] tldr: revbump for go 1.21

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From 807304af744375ad0f3c2f3ba2f5a116910ec823 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 325/364] tml: revbump for go 1.21

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From fc0b4a551455f7dcd6168303453378a3c88ea7e9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 326/364] todoist: revbump for go 1.21

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 68dac1350fae7a273832cbb097a128080d3cd002 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 327/364] transifex-cli: revbump for go 1.21

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From 54dbea9fcaa9578179000b8776cdb3d672aaa19d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 328/364] twitch-cli: revbump for go 1.21

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From b412c3c5c657bd1158c5097e6919cd900bbe320b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 329/364] typioca: revbump for go 1.21

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From 7b1be23d472dcc413ab03dfbf7b9f3c725dac222 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 330/364] umoci: revbump for go 1.21

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From 3c5e7981a736b7f7fe8d060052b96db18cc31aff Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 331/364] unflac: revbump for go 1.21

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From 058f2ed651069399e6a6a3fd7caa0ed4283ab1de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 332/364] uni: revbump for go 1.21

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From 78140b8ff65619209ac8f6323778a4fa439ab0a0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 333/364] up: revbump for go 1.21

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 800b923a265451ece472aad7c3bf718075aaafd4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 334/364] up_rewrite: revbump for go 1.21

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 5beaaaefa076fbddfbe148a802065de0fc481131 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 335/364] upterm: revbump for go 1.21

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From c280d5e4a050e8d4bb7d7e8debc195fe448fe367 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 336/364] usql: revbump for go 1.21

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From b0322610f0f9af9a292f1229eefc39c1c0ab1518 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 337/364] v2ray: revbump for go 1.21

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From 24da4553ff791a83e93bf33c9fce831b150c4951 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 338/364] vale: revbump for go 1.21

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 094273ae30152..073e2f54bee9a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From a13c574b37cacf6c4ec4d0464e2c3c90359ff120 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 339/364] vault-acme: revbump for go 1.21

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From f66d3b318b2a1c0f885db559075e4105d665cf96 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 340/364] vault: revbump for go 1.21

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From 1e0a8520bc3bea972588e8ef5759e5cea80aa4ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 341/364] vegeta: revbump for go 1.21

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From 910eef6ce8d2b31959a76ae287e63b8959b69def Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 342/364] vhs: revbump for go 1.21

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 227c8c1f6d57e66ff858e01367ff99fe0e15f75a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 343/364] vmdfmt: revbump for go 1.21

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 99ba708078fb8d82ccb92ccee371bd719f0f080c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 344/364] vndr: revbump for go 1.21

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From b1ad1682ab88a28c3075063976f87f776786a46d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 345/364] vultr-cli: revbump for go 1.21

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From 013d23dabe44421e01c82d58df216e005a63fb7e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 346/364] vultr: revbump for go 1.21

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From ae69c586e7071d85f732ba986aeb3f72e2794ccc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 347/364] wally-cli: revbump for go 1.21

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From 1d0e3775c2768653133d31bce4593a1dc251f46c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 348/364] wander: revbump for go 1.21

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 70e9ac197f5500facbc0366c98f89830984ac5e3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 349/364] webcat: revbump for go 1.21

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From 48f4dc2b481a3b894c4ea807ac8be4556294d53e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 350/364] webhook: revbump for go 1.21

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From 9c224c5b1335b06fe1219bd80549a65958d3662e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 351/364] websocketd: revbump for go 1.21

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From 7e832e2a3a92bb013bbbe5289e591c4465ad30a5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 352/364] wego: revbump for go 1.21

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From dfa73f19c95b7fd80189038bf804d62975e8ed60 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 353/364] wireproxy: revbump for go 1.21

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From 9666ae0ac9e9be8e724bfef13e2fe1b8aa5b0c00 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 354/364] woke: revbump for go 1.21

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From e658b1bb62cd9faa7bed659fa52b0b5030f82268 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 355/364] wtfutil: revbump for go 1.21

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From 78a99d6b56e741174d678c9387b18f68c9f91fab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 356/364] wuzz: revbump for go 1.21

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From c061f20438fbc0e0155cf0bb4083a861790917b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 357/364] xmandump: revbump for go 1.21

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From eaa67ecb9f7ae3075056709bf4e6d26bf14277b2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 358/364] xq-api: revbump for go 1.21

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 269eaa09ebb37eb3e00dfa8e2f288a1945b36c03 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 359/364] xurls: revbump for go 1.21

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From ae1ac9f690c14730e313b9bbd050cdfe45fe60b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 360/364] yggdrasil: revbump for go 1.21

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From 974f7b25314faac9ce781b93e7adb5f82cd2d79a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 361/364] yj: revbump for go 1.21

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From 5454f1cb888108fbc3b272d53ae6552ac6a26c08 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 362/364] ymuse: revbump for go 1.21

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From 6196c7e8ecc5e0f8c8a4efcc08db332a7f15f0ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 363/364] yq-go: revbump for go 1.21

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index e9335605c6627..a69e0e5e96c0a 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.35.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 43d743a31eeaad998adb1886c076c562b1274070 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 364/364] zrepl: revbump for go 1.21

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (12 preceding siblings ...)
  2023-08-21  6:18 ` g4s8
@ 2023-08-22  7:28 ` g4s8
  2023-08-22  7:29 ` g4s8
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-22  7:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 259305 bytes --]

From 404406f52d330c7ff887e7edf51221b6c1d0463f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/363] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 7d3c1dea932879380db3ab51872e744f5532ec20 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/363] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 10 +++++++++-
 common/environment/build-style/go.sh |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..50524b07f768c 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,8 +32,13 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+
+		if [[ -n "${_go_mod_path}" ]]; then
+			pushd $(dirname ${_go_mod_path})
+		fi
+
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
@@ -46,6 +51,9 @@ do_build() {
 			go_mod_mode=
 		fi
 		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		if [[ -n "${_go_mod_path}" ]]; then
+			popd
+		fi
 	else
 		# Otherwise, build using GOPATH
 		go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 1c5edccfedd438a8acf23282336579bb15ae1fad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 003/363] 3mux: revbump for go 1.21

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From 8415636f8b5e1c3f50cd1b1220dacb9e2af377b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 004/363] Amass: revbump for go 1.21

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From 78848f048feadc80f9fdb4c633114fcb1bc9a98c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 005/363] Gokapi: revbump for go 1.21

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From d6d1b10156af1588eed37e9bc808fd2cb382e158 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 006/363] NetAuth-ldap: revbump for go 1.21

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From 399b9f1885a8debe9c5b04feb459377ee5c7b8cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 007/363] NetAuth-localizer: revbump for go 1.21

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From 0d7716f2fe8475b721ab05481682443be812db2d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 008/363] NetAuth-nsscache: revbump for go 1.21

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From c2887be4bffc64e47b5f87ba6c5820556f60e074 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 009/363] NetAuth-pam-helper: revbump for go 1.21

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From e23b32d0c2add4be77aaf1fe093f3183cbccb59f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 010/363] NetAuth-sftpgo-hook: revbump for go 1.21

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From f889c834ee5e7a2e58fa9ab206a48a0f90b5fef5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 011/363] NetAuth: revbump for go 1.21

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From 5e3a034228d9c270c909db0c2e51ef4b371bfb26 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 012/363] NetKeys: revbump for go 1.21

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From 5013c1c1ebc28d6208f6cc6d68035139ea16d7bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 013/363] NoiseTorch: revbump for go 1.21

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 20140087a0c8d82d1be368492bb917515dc5f84a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 014/363] PopCorn: revbump for go 1.21

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From dba7ad155528866e2553e10bf40745a175eb38fe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 015/363] TMSU: revbump for go 1.21

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From e67a57835983d76eacbc2c31d7c9d3cb5ff6d142 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 016/363] TerraState: revbump for go 1.21

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From b3149ab9e0032bb8d9ba43496b66b564c063d78b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 017/363] abireport: revbump for go 1.21

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From 04e6eb4dae539740a603c6da724c8a628ca4d145 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 018/363] acbuild: revbump for go 1.21

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From 7a81af10012e2827100f07fed0f6ea23836d4de6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 019/363] ace-util: revbump for go 1.21

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From f3f40b0f8480647cf34f8e083cacf298ffd17e79 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 020/363] acmetool: revbump for go 1.21

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 864a08d51f933967a209ddc34ef54ac137c2808e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 021/363] act: revbump for go 1.21

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 9e4622f6d0ac948c9a4897c05ad7255ac1c08954 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 022/363] aerc: revbump for go 1.21

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From 510a2e76076328bbbcd530840ddd00be195b36c2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 023/363] age: revbump for go 1.21

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From 548c3b2fd54c4071998cd188578c76e7215f96f2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 024/363] alertmanager: revbump for go 1.21

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From 6ea414d15404ca5367798a451a11bdd75e5429e8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 025/363] amfora: revbump for go 1.21

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From 2d6ee767b9618133bfcb34ce2df4d9f1eee2f690 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 026/363] antibody: revbump for go 1.21

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From 965792f0af23d73ef35a70c68bae39f5e71db8b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 027/363] app-builder: revbump for go 1.21

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From e1401dbb7157031fc6174b16f415c6b13b2f3564 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 028/363] aptly: revbump for go 1.21

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From 0b3861f9df191fc6dafd3da563ef4647601d3a62 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 029/363] aquatone: revbump for go 1.21

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From d00e143067bcc5f1077e918d6cc0b13853048309 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 030/363] archiver: revbump for go 1.21

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From 9010c1616adc5baff06962318a1f629ef8c3e2e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 031/363] arduino-cli: revbump for go 1.21

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From cd8a1561fba02d4c2b6e14eb147b560848771b7e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 032/363] arpfox: revbump for go 1.21

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From 49a4852950dd8705bcd34bba2ecc48003889a032 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 033/363] atlantis: revbump for go 1.21

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From e45e4b5b9a58bd1613d68f3ee87f0739bc90bab2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 034/363] autorestic: revbump for go 1.21

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From fd0835bf48eb1dd187ef956f710055a8774eb595 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 035/363] aws-vault: revbump for go 1.21

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 2a7bfe86b6fc41dd050562f008decdb08ac03a19 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 036/363] babelfish: revbump for go 1.21

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From 66668552cbb9239f38431715d7a7764cb010d954 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 037/363] bettercap: revbump for go 1.21

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From ddf6ad67ffadd8a32a86d8c6c24e20c48def8aa5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 038/363] bird_exporter: revbump for go 1.21

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From fee071dcf9fcd5cbea175f87ce2fb290bdf751c2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 039/363] blackbox_exporter: revbump for go 1.21

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 5b84a291e2b7ee071cd7be0aa4e136ad48875052 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 040/363] blush: revbump for go 1.21

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From 84d7ad88c9d55eb81e192922313f856fd12b24ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 041/363] bombadillo: revbump for go 1.21

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From 23bdaa90785392a5f7566d30b627a8eb89ffe6b4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 042/363] bombardier: revbump for go 1.21

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From 3a6318ec7129d8938853b35211fcc0c00d172469 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 043/363] booster: revbump for go 1.21

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From 2b5815631fe0fa3d35b5f9d318bbc7f21c038edf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 044/363] brig: revbump for go 1.21

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 087432008c305901be32c73868a1138b2ed7aced Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 045/363] browserpass: revbump for go 1.21

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From b27383897f68cc4ed9e90432cde81387a43bb9aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 046/363] browsh: revbump for go 1.21

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From 9fb230e6e48423bae926824dbcc96d0f1e122b75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 047/363] buildah: revbump for go 1.21

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From 095fd679397a2549e57c5320a59a2af140b8217b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 048/363] caddy: revbump for go 1.21

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From df9acd880fa0a24f1e19b5bf7669ff4d07cb072d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 049/363] carapace: revbump for go 1.21

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From 9ab6d1e78d78c6bc505e32f2c87da8df264a4714 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 050/363] cdetect: revbump for go 1.21

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From 88e8dfc6c53c14c4217b063e572e72a9103a1292 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 051/363] cfssl: revbump for go 1.21

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From 098a21b0ff723f498aea72739c5aa9e1d1716081 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 052/363] cgrps: revbump for go 1.21

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From 2dda88a402a51065b798c81817ecd9e32c116cc5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 053/363] chathistorysync: revbump for go 1.21

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From 1e8d21709d79f95eb7e4a7884d2582ba86bac961 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 054/363] cheat: revbump for go 1.21

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d7389200867316df2327ff8335d84ff7af57fdfb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 055/363] chezmoi: revbump for go 1.21

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 4882a651436640a31902d855d368507573980a69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 056/363] chroma: revbump for go 1.21

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From e58cbb9896046e05c353d52d09dd6d4e0a5483c4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 057/363] chronograf: revbump for go 1.21

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From c3a3f6e019e38aed0a1da1b3697378541f86da9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 058/363] circleci-cli: revbump for go 1.21

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 95aade00cb2feed9ba9e810c11b88db92fe7afad Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 059/363] cliphist: revbump for go 1.21

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From a02ccd21e89eb66b651d2a2e54c51d860b8a1b67 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 060/363] clipman: revbump for go 1.21

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 476a56e3b351127bf40149420c5bf2908b0956c3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 061/363] cloudflared: revbump for go 1.21

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From 524c3c75844ecf4a60cd0897cb7b554318b8d82d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 062/363] cni-plugin-dnsname: revbump for go 1.21

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From c78ba311f6d86d829304ad636e94ac83f947cba5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 063/363] cni-plugins: revbump for go 1.21

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From 533dfb832cf225ab806dbe3b1b116cad74de2dd8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 064/363] cni: revbump for go 1.21

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From acc3e33a88654eab9b2f05d23e2c5eda1af25cb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 065/363] cod: revbump for go 1.21

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From 7bd50463a790cbc4a43ab8e60b53569569635da4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 066/363] codesearch: revbump for go 1.21

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From f226d319ab8dc5dd864f109cc019fbbe71f9ebca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 067/363] consul-template: revbump for go 1.21

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From 511e1837793e281d02801dd0350c6e4f9e9c2093 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 068/363] consul: revbump for go 1.21

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From d6921b9fdcca8f8a8945f0bb54bca879e10184ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 069/363] containerd: revbump for go 1.21

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 195f21543fba7026f3cbb8d8ed6a945d58aa298f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 070/363] coredns: revbump for go 1.21

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From bdefc08b6ac13cc7147d41733a1b8f3fe236e5e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 071/363] cowyo: revbump for go 1.21

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From aa3d8562a8318a7f414a2d45167378c1028beadf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 072/363] coyim: revbump for go 1.21

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From e69a30b8e7117495c92abbbe2dc95f26ccdf1f1b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 073/363] crane: revbump for go 1.21

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From 9c00a697a6557234a550fe9fa357dc9dbff06a70 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 074/363] cri-o: revbump for go 1.21

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From 8e4d025501f167200c0568cae5c1badca3cace8c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 075/363] cri-tools: revbump for go 1.21

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From b3460c5cfcfcd112e55b2a203560096cf4aaf38a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 076/363] croc: revbump for go 1.21

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From 9b1e108c8ce1dccd07a6701dac716244e5080dd5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 077/363] d2: revbump for go 1.21

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From 876b73297df1f241b0ed6e8ce644e2376573c1ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 078/363] darch: revbump for go 1.21

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 83ba2888c51dd22c0309fd594505e955d0538a0f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 079/363] darkman: revbump for go 1.21

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 744565db40e6dd54b0a7ba6a13df59e6b17f5abe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 080/363] darktile: revbump for go 1.21

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From 6210163a54a0a8c7c99b856745e3699bc0c125f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 081/363] dasel: revbump for go 1.21

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From a561fa22b60e8c9ffadc7f02d6b75d8c6544ecf2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 082/363] delve: revbump for go 1.21

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From f5f6214202bb5c7fbe887b69c067f72390000665 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 083/363] dendrite: revbump for go 1.21

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From 7980f023b989a55c34b5a41feb3310762ff7b9b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 084/363] dep: revbump for go 1.21

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From e19a764d7965a41a5c1bce7ba3ae9b662cce2ebd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 085/363] direnv: revbump for go 1.21

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 4e1bd271455b03e605d38a2d202a536383bf7f97 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 086/363] dirstalk: revbump for go 1.21

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From 1e810548a26fb0a4b2bfca2d721cd0252b75a956 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 087/363] distrobuilder: revbump for go 1.21

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 43e55fef21dc0e5765ae6dbe216420afd37e3e9d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 088/363] dive: revbump for go 1.21

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From c90b39337e02f9e79222ad39bb966cea31b23fde Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 089/363] dlayer: revbump for go 1.21

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From 1134ce6d9e7083b59a36d2ca1d15c010ab2e208f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 090/363] dnscrypt-proxy: revbump for go 1.21

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From 5374b87a5db899fe3f4eeeff68e7379a3c497dfa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 091/363] docker-buildx: revbump for go 1.21

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 028aebed6dcc441b8376e6c3a08df6dac1b63796 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 092/363] docker-cli: revbump for go 1.21

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From d413a0e4f4f0621f917ea12c4357a8145ec085e6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 093/363] docker-compose: revbump for go 1.21

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index f80e4b35a12ca..85e4e6778b281 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From e60f34f610c5c2bba649afb6c21a064348b0119e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 094/363] docker-credential-pass: revbump for go 1.21

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From 5faabd1e373761535efc4c2dc4d17e7a5a5f0691 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 095/363] docker-gen: revbump for go 1.21

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From 3ca8c20a1a31781c6d0ee5b5733bdbd1c44f6b09 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 096/363] docker-machine-driver-kvm: revbump for go 1.21

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From 2e627f0a6a22955eb74a11422f139b01c6b1b636 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 097/363] docker-machine: revbump for go 1.21

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From f916207ce976046a2adf2fa9edb5d69619e78e8e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 098/363] doctl: revbump for go 1.21

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 238b128dee3f1..883de540c951a 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.98.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From f49ba630675e99b99cf6f6182653d9fa6bd00b5a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 099/363] domain_exporter: revbump for go 1.21

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 1a4ca860bf12a5dac5f42073a2063d55120827bd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 100/363] dotool: revbump for go 1.21

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From 59c18a0ad839bf6cd21da27fefaefd2d13bc1b2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 101/363] drive: revbump for go 1.21

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 99b03f5506c3436e47586bdaac1dc4f568a9de6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 102/363] drone-cli: revbump for go 1.21

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From a83c4b77ddad686925a37ce24167ad83230de4c5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 103/363] duf: revbump for go 1.21

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From 5649bebb3b12885a64ea73fb8b81bb5d27586b75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 104/363] elfinfo: revbump for go 1.21

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From 4e35441d64a4c90e6cb7a0da6ab5f2f3eee40808 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 105/363] elvish: revbump for go 1.21

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From 9d766deb6e60d8dd0911a04237526f2cc6a42f16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 106/363] emptty: revbump for go 1.21

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From 2e7a6f1505416947b4ea851a411b02fffca53995 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 107/363] ensure-access: revbump for go 1.21

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From c37a5a062c9748251a8f35ff269457cd27b3916f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 108/363] etcd: revbump for go 1.21

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 27f1e8eaf252dab4ba1755c6c184ac84bfb1248b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 109/363] exercism: revbump for go 1.21

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From e80a1f86a6df475e43ef2dcbaba4c4d73f7bc717 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 110/363] ffuf: revbump for go 1.21

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From 3d4d8419dbed0af65a37cf25b9aa40ac52afcee7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 111/363] figurine: revbump for go 1.21

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From 182c206365a9905ed03b61d12c58f08f9daa3c56 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 112/363] flannel: revbump for go 1.21

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 6fcf23e12292aa7717d52d4e1f4aee06e06fc6ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 113/363] flint: revbump for go 1.21

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From ddc4c38916ab3ce26ec58d7c746499c9f3be763b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 114/363] forego: revbump for go 1.21

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From e8e583b3abbf160d4232c2939ec345e03cf78e04 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 115/363] frp: revbump for go 1.21

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From 9cf2a1925a61bac2809495c34c6cb5640ff3f818 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 116/363] fs-repo-migrations: revbump for go 1.21

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 345ac961641572d68cb21e17e212eb37f831a35e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 117/363] fscrypt: revbump for go 1.21

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From 7da40196dde0235349ef7cbd92275f2b44a6c748 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 118/363] fzf: revbump for go 1.21

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From bfe5ec8a253e478643ae8b56269bb2d6902028c0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 119/363] gdu: revbump for go 1.21

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 210ad5e97c711493e2a8706c0f9d7e48e62b827e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 120/363] gemget: revbump for go 1.21

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From 1bfa2675f4aa798557dcc4410f50eaabb04cefc5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 121/363] gendesk: revbump for go 1.21

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 5c961c17a162fa8db30db254f8c536447c235529 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 122/363] gfuzz: revbump for go 1.21

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From c22b19c01e0674d372baadf4462a664234c2446a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 123/363] ghq: revbump for go 1.21

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From 12e47c620d0a095b2a98955e4f179ebb9d4c2ba2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 124/363] gister: revbump for go 1.21

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From 62660099de85794269900cdc8e76ebb990fadb3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 125/363] git-lfs: revbump for go 1.21

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From 63bc3db2b6e1e14c435bce536f1277d33a29ca83 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 126/363] git-sizer: revbump for go 1.21

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From c5740b61f57a0e8c47b35e5a7089bc3a86af87b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 127/363] git-team: revbump for go 1.21

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From f731cc579bb986da5b1ddf84fa6f1c48ca5b050a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 128/363] gitbatch: revbump for go 1.21

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From aa9173ed9189b36779e83c90cd953b7847dfbf81 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 129/363] gitea: revbump for go 1.21

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From d055ac7c87f1610e3a47675a74f3830e406e51ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 130/363] github-cli: revbump for go 1.21

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index bb3796a6245c7..06b1f70d90813 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.33.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 8c988f17c9ba5c05f31f7e7e87f90426cd365204 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 131/363] github-opml: revbump for go 1.21

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From 7e77bba89ffebdb27342628cc922a6d1673dfa75 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 132/363] gitlab-runner: revbump for go 1.21

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From b8e6d38b9881cb57b0ca8232e0803d957bf0f533 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 133/363] gkill: revbump for go 1.21

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From ff26213f42108a67d464902f757f4828e46c149d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 134/363] glab: revbump for go 1.21

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From 60a16e885b8cbf8194038ced00d5e90d78b890f3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 135/363] glide: revbump for go 1.21

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 84e8d3b0c766c2a7f3d9d4f0bccab7356af75103 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 136/363] glider: revbump for go 1.21

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From f0a7e88417b60219e22262e9f37db4493656a759 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 137/363] glock: revbump for go 1.21

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 2603c8397408df2ca8fd49e7c33fc3244df31148 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 138/363] glow: revbump for go 1.21

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From 768eefcdb91f75e286c2e01b52dd0fdd674c56c8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 139/363] go-bindata: revbump for go 1.21

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From 21966bcde15b4352f11d247d63e22a5c58f0b4dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 140/363] go-capnproto2: revbump for go 1.21

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 257e9d2b70660b4f31b8425773d9c6f52e9a3b5b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 141/363] go-ipfs: revbump for go 1.21

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 19798e8819ab4cdc032321808199b70990e8d5af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 142/363] go-jira: revbump for go 1.21

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From d99850ccfa38139757b59d7547ad8535e1a038cb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 143/363] go-md2man: revbump for go 1.21

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From e0300aa30602f3caed4cb1e93e1e126d8cde5645 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 144/363] go-mtpfs: revbump for go 1.21

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 68d9d4216efa72e296a572f5b7978ee3a415e359 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 145/363] go-review: revbump for go 1.21

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From 5242690cea4173e95a6f1ca1bdd560f3e4f5a09d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 146/363] goatcounter: revbump for go 1.21

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From 97cdf0b44f1594ccc9177808736b2b38a618331b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 147/363] gobuster: revbump for go 1.21

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index cb8ff76b918a0..c80406546121c 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From 2a147fe7130deea5bb29612b86c97078d279119e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 148/363] gocloc: revbump for go 1.21

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From 1be7b30f47fe7b3f562856d21a73afa261247f54 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 149/363] gocryptfs: revbump for go 1.21

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From 8ca2fc8258be0e1c4b2da45bf656419fe49efb22 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 150/363] godef: revbump for go 1.21

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From e636313d52e2fabfe4f003eb28905fb8adc31c91 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 151/363] gogs: revbump for go 1.21

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From af9b3b67c0d62982e310d5f0d5a7c78d89d0dcde Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 152/363] goimapnotify: revbump for go 1.21

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From e93e6e20c9f4753c5f29b6b426ad5b92a6cb86be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 153/363] golangci-lint: revbump for go 1.21

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From cabbef46d392abb100d30392879ebe09ebfae03c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 154/363] gomatrix: revbump for go 1.21

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From c3772160b2ef73d359ea8b39ec6fe50bc4cda67d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 155/363] gopass-jsonapi: revbump for go 1.21

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From c68ad39a6dfde563ced2250e4546500d7a341709 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 156/363] gopass: revbump for go 1.21

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From 6e63e13c47faaa4bfcd816824d170bb0aa34646c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 157/363] gopls: revbump for go 1.21

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index ff0ce4225db57..530d8a626da12 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.2
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From 5719977bed1a2efbf1877612707f6cebc7272d18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 158/363] gopm: revbump for go 1.21

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From 4b841e8cc8c0c0acc3c7dd46c72bc7fefe4bc4b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 159/363] gops: revbump for go 1.21

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index ffb31409f60c2..5d65be5bc6416 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.28
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From c049cd7c9f853d6628d0134bf3334d0555a5641d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 160/363] goreleaser: revbump for go 1.21

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From e3b66ab20e0bd37abf18f3ce9bfaa3f578d5785e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 161/363] gotify-cli: revbump for go 1.21

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From 20f24a1379c2674adaa4f8ee7f3d4dbd3ecb2783 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 162/363] gotify-server: revbump for go 1.21

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From 7dcc68a263a31e20d21af8ad6e4151c48b77c602 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 163/363] gotop: revbump for go 1.21

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From abf2210708199c7ef464740963a35c7b16ee0afd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 164/363] gotty: revbump for go 1.21

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From d5e951b3eeae25dd76eb10bb60288a540da6a47d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 165/363] goversion: revbump for go 1.21

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From efa58f12f1713990378286e8380f28842ac57db0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 166/363] grafana: revbump for go 1.21

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From ec72298fc95b6038bfcfb94bbfb0426639f592f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 167/363] gron: revbump for go 1.21

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From b3c4c1d3058a6e0b597eabd510501ec045c9db92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 168/363] grype: revbump for go 1.21

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 4b1abc0468302..7cfe530de8fa5 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From c90241a520d695d67183f1c1dc1a0a4174be77fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 169/363] gucci: revbump for go 1.21

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From 0bc26d7c23c51996b6d635d4bee381f36add89e2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 170/363] gum: revbump for go 1.21

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From 98e59f5db5fb0410c5e33ee7ca9ddc6cfc07c26c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 171/363] hcloud: revbump for go 1.21

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From d39e3a3642e41efae3e3de0ac1e1283a72f33774 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 172/363] hey: revbump for go 1.21

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From 855c7c2ac8e34f5557dea7d1abc6876e1f497087 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 173/363] hivemind: revbump for go 1.21

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 76a415ec27305c3fe8ce8e60faf06ea9e25993e5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 174/363] hooktftp: revbump for go 1.21

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From ce0ac766387451bf5b4cfea38ba1d9a5dce424ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 175/363] httpstat: revbump for go 1.21

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 7ac19415da3c55bcecc3f282f3fffb5e3828d625 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 176/363] hub: revbump for go 1.21

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From 08612a438cdb93998b40a810f6cc9d39b170a527 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 177/363] hugo: revbump for go 1.21

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 6b0eca3d36d65..4b1d38f04a354 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.117.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From a1d09690b945646a5601e908015c30c649550152 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 178/363] hut: revbump for go 1.21

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From 50ca8f031de486112979e1079c96d728580728aa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 179/363] hydroxide: revbump for go 1.21

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From b648fcbb927550c3845132d8d0ca62a07f3ff11b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 180/363] i3cat: revbump for go 1.21

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From 4fa748664eb947ef5fe56f63ee377fe704577d2a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 181/363] ibus-bamboo: revbump for go 1.21

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From d8688ebfe7607cb359cc635d5af4b8e862c84785 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 182/363] img: revbump for go 1.21

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From c0a299b734443cb0b71dc1a127b7fb76dbd99f46 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 183/363] immortal: revbump for go 1.21

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From 4cfb6c895be6631bdb442787bfa26ea8a740719a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 184/363] influxdb: revbump for go 1.21

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From 1cb87b64f7e26639d060ba7f5bf7b7811c6fec98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 185/363] ipfs-cluster: revbump for go 1.21

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From f1654f7d49eddc5cf5c1eb0555e9a870e5deeed0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 186/363] ipp-usb: revbump for go 1.21

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From e4ee5a2498f07b1b6042ac30e1fd3a794b74930f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 187/363] ircdog: revbump for go 1.21

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From 35be3cbddb7ed9756088b8da2b57b380845493ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 188/363] jd: revbump for go 1.21

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From 529df48bcc636d95e8a43282f710544f3f0dc357 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 189/363] jid: revbump for go 1.21

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 6126be9ce98387633bd3870355c93916cb70ba6d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 190/363] jj: revbump for go 1.21

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From b1a2ea577eab980f8c177016ac0c2ec3b35aa54a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 191/363] joker: revbump for go 1.21

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From e88a98fc6e6b5cb270660ac4ee5a823923d3d57e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 192/363] jp: revbump for go 1.21

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From 64bcd46ffb1f88c9738b8e1c91b4bb98a9ffae14 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 193/363] jsonnet-language-server: revbump for go 1.21

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From 5ec578115bab1e486f4568103df9d5c5f5867cf5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 194/363] jump: revbump for go 1.21

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From 9b92a2ab00bde0c7b0c27085317102f2e3ebd3d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 195/363] k3d: revbump for go 1.21

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From f5824a80f648bab17ba7d7e13067e272568e3a74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 196/363] k9s: revbump for go 1.21

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From d3c801e28025f29f4c79e3126d299096d964a35d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 197/363] kapacitor: revbump for go 1.21

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From 2714152d6c7cabfe39f1751e87aed955214d43a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 198/363] keybase: revbump for go 1.21

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From c0043c6ca8576c3ba6b13e92a8dbbc0bda32c492 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 199/363] knit: revbump for go 1.21

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From f0679074bb6bb3fd5e174aa9337a45e17536ae33 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 200/363] kopia: revbump for go 1.21

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 9ef7dce6b8613509d47fc1c810d28d1ce4b04f54 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 201/363] kops: revbump for go 1.21

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 70bb299dc770cd6423b8e239d9fcf89d47da43fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 202/363] kubecfg: revbump for go 1.21

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From 63af1afd9ae7849cd592bf7bdecdb47eeabac36f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 203/363] kubefwd: revbump for go 1.21

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From bdcf9312568a21808d36c20830eb415cac1eaa08 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 204/363] kubernetes-kind: revbump for go 1.21

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From 9a00eadc9ab5c0f95eee0d35dce5c4904cc8838f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 205/363] kubernetes: revbump for go 1.21

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 0333900030ce16fcdc541c240c82defd234348d8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 206/363] kurly: revbump for go 1.21

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From bcf00c181987a0b5a57b8f29d22da1190f9fc598 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 207/363] lazydocker: revbump for go 1.21

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From 4201a498f5220ba6928a17c8b9aaac5d9caec33a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 208/363] lazygit: revbump for go 1.21

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From b230de244311d790b9fe8227c663b21ec28ee48c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 209/363] lego: revbump for go 1.21

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From c67e5f6f09f8d557821cd264993177489eeedbb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 210/363] lets: revbump for go 1.21

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 26b6e5b77c803..658a529cc3536 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.53
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From 87da108365072bd05a066567b977badf3c9ce931 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 211/363] lf: revbump for go 1.21

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From f12aa6c8fd20201e441cef0e919ca85a95225ff6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 212/363] licensechecker: revbump for go 1.21

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From 7aba43e0b1b259df0ea77cf79baf493916d38683 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 213/363] loki: revbump for go 1.21

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From f884fdf6daac9fb65190007b80629b3fc9563817 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 214/363] lsp: revbump for go 1.21

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From 821965d8545619749f1d8a9755ca96cb80a03b27 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 215/363] lux: revbump for go 1.21

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 85324593197dc096d0f713b7b57bf5d73fd270ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 216/363] maddy: revbump for go 1.21

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From b605f7673284c8f2df716d3fed1bf7388190f6b4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 217/363] madonctl: revbump for go 1.21

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From 1e6278649906230e69a99cd627ae9324d6066a8d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 218/363] massren: revbump for go 1.21

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From 8ebfcbb3417341d99378c46b85052237859afacf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 219/363] mdr: revbump for go 1.21

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 2a293da91694198b198c1ef145524287b78386b9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 220/363] micro: revbump for go 1.21

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From 706206a56f5658897cf647026b42080ed03e4036 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 221/363] microhookd: revbump for go 1.21

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From f2a580fe1cbc8cede302ea8e4bc44c1b7e892698 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 222/363] miller: revbump for go 1.21

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 8b2719df2e20463b24ca1f5a5114e719f3e2702f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 223/363] miniflux: revbump for go 1.21

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From 91767830c69f0decc0f4dba0a8ea7248c60f58d8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 224/363] minify: revbump for go 1.21

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From 036d9e00b8b1e8f4c144efc06ae54471d5bfb16d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 225/363] minikube: revbump for go 1.21

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From 3efe49f89a9356bf62d9c8d649d9368306d0e460 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 226/363] minio: revbump for go 1.21

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 2284964d563d84e29f407c756e9ddd64d4936963 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 227/363] misspell: revbump for go 1.21

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From e4ab30e23681b712a860436dbc5700adb37f5323 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 228/363] mmark: revbump for go 1.21

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From 9a5a4d0bfa879d3caf4f24c48b15189a6bfe849a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 229/363] mmv-go: revbump for go 1.21

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From 7d85819dfd70b24d399c525e2e93733e44d74dd0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 230/363] moar: revbump for go 1.21

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From 524141524daeb48e72728ab1d58b80e13e4c8a43 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 231/363] moby: revbump for go 1.21

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From a67345b900ceb6c19db30a5eec12f6b0e3f7574c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 232/363] mountain-backup: revbump for go 1.21

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From 4cd04fa8e4d24953fbd563403fb350b51f6e78f4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 233/363] mpdviz: revbump for go 1.21

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From 084799eee9cac49d3eaebdaa0e686e2079e2cd4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 234/363] nebula: revbump for go 1.21

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From b3f6a49a218512ba067d3e3bc7b83a344da1cde5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 235/363] nerdctl: revbump for go 1.21

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From e83fa7380551ccd7fe85071718f8a0656cb5a18f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 236/363] netdata-plugins-go: revbump for go 1.21

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From c588a5290cbe3126c75e3e7bdc5b914afcd4754e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 237/363] netns: revbump for go 1.21

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From f96a7819d6454100bcebab08dea4d5646ce30bf6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 238/363] netris: revbump for go 1.21

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 5c9e3f6b2aac774e89344d67b5f747215440a050 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 239/363] nextdns: revbump for go 1.21

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From 2da8d32c8769c794df8961e5eeba29ce729e22ea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 240/363] nncp: revbump for go 1.21

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 27ab96ea84c88..57ab5a771f851 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.9.0
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From bb0e61ecff8c9ba42c769f7cefb7723ff082cd41 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 241/363] node_exporter: revbump for go 1.21

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 1a933df463a21d50414b4bb3ae32ad5b47034c2b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 242/363] nomad: revbump for go 1.21

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From 3944ad4e8e81a6cdcdae0a0ebab64be88d51bb41 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 243/363] ntfy: revbump for go 1.21

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index a1afdb4340a10..414dbece5066b 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From 89a57a44b9be2f014e6c5acff12d934bebc11ce5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 244/363] nvidia-container-toolkit: revbump for go 1.21

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From 417cf180c7e1e2efd887608a315b2eaee3dde2af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 245/363] nwg-look: revbump for go 1.21

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From d2e4af0b9d820a2a14b0d1092f86df78581350d9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 246/363] obfs4proxy: revbump for go 1.21

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From 8fa97ab861ac8cf746e79fd94eafc50dffe5cd9d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 247/363] oh: revbump for go 1.21

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From d27f8806d090b9b05e048a4c7f2fd8f16eae6d35 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 248/363] opensmtpd-filter-rspamd: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 73aa1b1f1b57dfe4e732d1833f39253d4ee70500 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 249/363] opensmtpd-filter-senderscore: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 2daa440331920221682c7c89dad5ba27f741d342 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 250/363] operator-sdk: revbump for go 1.21

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From ba375ee7939eae3b82f1399aa3e32acc61908ff6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 251/363] oragono: revbump for go 1.21

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From daf690e9f04dc0c8995c9f21baf6cb7fe9f0287b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 252/363] oras: revbump for go 1.21

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From 217c2b5ef2a16e68c16eb0383c226e9ef483551c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 253/363] osv-scanner: revbump for go 1.21

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 70e26328c6b060e1c26e96b8fe63a354a7780097 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 254/363] packer: revbump for go 1.21

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 915d9d8afebef..5ba70a422dc4a 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From 6a1a0f169414c1dde282adc7ebc1b1bc8eb8cd0c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 255/363] packr2: revbump for go 1.21

---
 srcpkgs/packr2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..1df39c1dfc3fb 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,15 +2,17 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
-go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+go_import_path="github.com/gobuffalo/${_pkgname}/v2"
+go_package="./packr2"
 short_desc="Static files embedder for Go binaries"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
+_go_mod_path="./v2/go.mod"
 
 post_install() {
 	vlicense v2/LICENSE.txt

From cb3f173f68a82e4387dfe4cff6bdb5a6730cb0e0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 256/363] pam_netauth: revbump for go 1.21

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From 8acc1771d9b39cd2b7950006b8d9a084918a90c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 257/363] passphrase2pgp: revbump for go 1.21

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From 9872381c6fd0c1956445836a603e4a655bc486ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 258/363] peco: revbump for go 1.21

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From 0cfdd75eddaab64a560d5330a2995b008404f4c4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 259/363] pgmetrics: revbump for go 1.21

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From ac92fbf09bd4211e45f304ea31f961fe0529fa90 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 260/363] pgweb: revbump for go 1.21

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From c841cf7328f002a65ea909c42aef9a5391766b6f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 261/363] pkgtop: revbump for go 1.21

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From a0c46e6e1f4ae7dc6e979ec50887f606ba36d212 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 262/363] podman-tui: revbump for go 1.21

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From 4d393b4d7bd80ae14b0e925ad5bfad0f293122c3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 263/363] podman: revbump for go 1.21

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From fc1993ae5a67bdabdb3e9de334d8d87e2ff325fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 264/363] pong-command: revbump for go 1.21

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 38afaed0648262382f9edf31ad2c17ab902bb92f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 265/363] prometheus: revbump for go 1.21

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From b940bb202690db04d4123ee53dc617818dc8eca3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 266/363] pst: revbump for go 1.21

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 3b130773c21ba579200008f57deb3ff361edde3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 267/363] pup: revbump for go 1.21

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 1fcc19852d33add22d7caa23b3e4799a1a4ef2a4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 268/363] pwget: revbump for go 1.21

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From 27f86cb6e6e6d5c05c67f74d52fa251eeb6b0bbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 269/363] qrcp: revbump for go 1.21

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From 2e232a3ff0af6eb2c50f37629d3d3e2b8b39cd9e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 270/363] rancher-compose: revbump for go 1.21

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From aa13740a153549dd61122875b726854ca8c6c6cf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 271/363] rclone: revbump for go 1.21

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From 4b1f622643b2590bf0cbec705c67a8191269c12e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 272/363] rest-server: revbump for go 1.21

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From 6c7afae48a462f089b41d89a0890b051e75726bb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 273/363] restic: revbump for go 1.21

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index e99279b12e385..ec5cc2fc9fbe0 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.16.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 66c2facdd0f987cfaf28f25eba78c87d38bb6f4b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 274/363] revive: revbump for go 1.21

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From dbbd7964c962ba473f40d3350779ab3c3af67470 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 275/363] rmapi: revbump for go 1.21

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From e2af896243251d426eec7b8c4c686c9bf3066f9a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 276/363] rocker: revbump for go 1.21

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From 9528b7dcd717bb02860857963c2e247180a1d457 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 277/363] rootlesskit: revbump for go 1.21

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From ad03884a8d86cf68afd7cda9207f291b16d224b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 278/363] runc: revbump for go 1.21

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5b74f35e8278a..a97efd0cd6084 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From 51fdcd895edd5f35c2caad88737181e4296410f8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 279/363] ryzen-stabilizator: revbump for go 1.21

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From 5ed186216b8de0f2d8a7bdc4599036036adb11be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 280/363] s: revbump for go 1.21

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From 765d7466866aedca40ceb83d055387e634de63f3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 281/363] saml2aws: revbump for go 1.21

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From 5609df647cf630dddc367943e2ef5bb2959b5746 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 282/363] sampler: revbump for go 1.21

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From aab47325b6e76accfafeb9be04eca454ba76ed13 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 283/363] sbctl: revbump for go 1.21

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From fba3442bae804ee3baa4fc67943c7d1fac3ea2e7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 284/363] scaleway-cli: revbump for go 1.21

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From 627f030f9b32a529d483aee8661c869425f5590d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 285/363] scc: revbump for go 1.21

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 7b788b75beda2d1b0473351c98c818ab9bd1ef81 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 286/363] seaweedfs: revbump for go 1.21

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 9578808922bfb81f94775786e9cf24ce47ed6601 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 287/363] senpai: revbump for go 1.21

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From 5b99f2dfaf74939ec14534e85e805b26f19b62a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 288/363] sftpgo: revbump for go 1.21

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 93552a28eb07eb765470f307d4506b2c99dee21f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 289/363] shadowfox-updater: revbump for go 1.21

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From b0ba634414fb2348c340948fa705d6b2cd19a05a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 290/363] sharenix: revbump for go 1.21

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From 99944bd23a6444e836ded9f295c7a6d9734f7627 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 291/363] shfmt: revbump for go 1.21

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From 61ebc536b183e2947b6fd616c0c8303ff4d6bfb2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 292/363] shiori: revbump for go 1.21

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From 69fa110fc8910750fbc0c8e3e00e3d6dc069ab45 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 293/363] sift: revbump for go 1.21

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From 4083a1fdcb209e6b343a115e68679495f41f065e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 294/363] skaffold: revbump for go 1.21

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From 7e984a25e7176e40e921b7b0b41fa9241675b108 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 295/363] skate: revbump for go 1.21

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From ad39a16a8671deac60a7739614307622b358290d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 296/363] skopeo: revbump for go 1.21

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 8f6aeb7073fea280d620d15564762a6e64e5d090 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 297/363] slack-term: revbump for go 1.21

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 0c4890a699432e0e88f7067e4a4b6857b7bfe730 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 298/363] slit: revbump for go 1.21

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From e989632f472ad9d7fe8fd7d92ca9216f4cc07d57 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 299/363] soju: revbump for go 1.21

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From b6dd433f46efe35af435c681c32fab0d51b3761f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 300/363] sops: revbump for go 1.21

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 87410a65f761e47d064a48b83a538b6fb000be2b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 301/363] spreed-webrtc: revbump for go 1.21

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From 64d0f0446a0cd1a1385e0dca24c85f4c2259c5da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 302/363] ssl_exporter: revbump for go 1.21

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From a671c2dbccbc5ad20276d42d31ae9bb204494eab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 303/363] stc: revbump for go 1.21

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From 4ba79f0d99a593ed668d6a71ad37a4a86bb8f190 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 304/363] step-certificates: revbump for go 1.21

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From ede575ed45df0d5abd5ef5d70f11047330bd4b05 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 305/363] step-cli: revbump for go 1.21

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From 7312343733638429b9b7bdceed4bdb949b747e68 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 306/363] stern: revbump for go 1.21

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From 6b8db5da89d40d67d24eef8d2f54e4dffe6200b5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 307/363] subfinder: revbump for go 1.21

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index d9930c62c438a..b68280d306f0c 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.2
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From d87fce4f678b4c6c522786dae3c70904435dbacd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 308/363] subjack: revbump for go 1.21

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From b2209036b8df7716cde8b28cd20ac5e2fe39e5f0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 309/363] superd: revbump for go 1.21

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From ba20270880e271348ebfd6f9965bb447fa238cc2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 310/363] svctl: revbump for go 1.21

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From 49ac2479c3ce7eac3a0efdd2c9626fdb7f20b890 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 311/363] syft: revbump for go 1.21

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index 64cf288a8f5e3..491d0f17cea03 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.87.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 1fc0b2df3c172d6f680b815183bd51fcf4e260f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 312/363] syncthing: revbump for go 1.21

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From 90030da5b05ce75b8444348061286dbe9d758bb3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 313/363] tag: revbump for go 1.21

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From 51915998d6e0ca7e748b66c94a97fa7ba78749d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 314/363] tea: revbump for go 1.21

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From e9354dfbebe71fe3b9315425678bb73f1feff20e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 315/363] telegraf: revbump for go 1.21

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From 8c9e6da5eaac46841e592b0bcf0a04dc5667e34d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 316/363] termshark: revbump for go 1.21

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From cf35d2b128140a965a3efc8809e1c20945dad152 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 317/363] terraform-docs: revbump for go 1.21

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From ac530ae6d5f86184587cf6a4ae3cc04c946dbd8f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 318/363] terraform-ls: revbump for go 1.21

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From 0fdb10ced6b036a0e4308db7d27c4fdef7736acf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 319/363] terraform: revbump for go 1.21

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d5cd51b04a168..63423b4bcb77f 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.5
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 5d402e4b4f7cdb81415a8ad7efa4616244fec4fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 320/363] terragrunt: revbump for go 1.21

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 104adc65a3ea0..0a36c43b85334 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.50.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From 01536fbd2e7071334fdcf37fccf16ab00e096a72 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 321/363] tflint: revbump for go 1.21

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From 22cb67157e67f0077767792cd177447e3825d986 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 322/363] tinycron: revbump for go 1.21

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 47a18c55becedd3aaf4dc68e7ebc6ff304f0bb80 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 323/363] tldr: revbump for go 1.21

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From fd0fbee6407eb8b02de99917981761bb99060e0d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 324/363] tml: revbump for go 1.21

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From 6f6be9fbda3468095f78492634d06ed1313e3c4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 325/363] todoist: revbump for go 1.21

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 82dccb2a01974cd039df447b0e46ecd05168d44c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 326/363] transifex-cli: revbump for go 1.21

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From be0ad74ce8935ac01f377a63aec6da2489ab7f07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 327/363] twitch-cli: revbump for go 1.21

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From 8e361cff7ab50d103027cce4cbb3cbc661124160 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 328/363] typioca: revbump for go 1.21

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From 8eed8cd5ef227914ea03f39e3aa10be54be5aa89 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 329/363] umoci: revbump for go 1.21

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From ccb478568032b575fbab7923c819b56e578ad5d4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 330/363] unflac: revbump for go 1.21

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From 23679e0a7a70a720cd7884b5318d794cece89d03 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 331/363] uni: revbump for go 1.21

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From 6fae5e5cc2f3bd6a1410b9598207acbfca0a7899 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 332/363] up: revbump for go 1.21

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 8e4b8ea6d7622097a2f223de36ead887d8ea914c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 333/363] up_rewrite: revbump for go 1.21

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 9ff311983b7d0463b72fdf6bacb0c0941df798e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 334/363] upterm: revbump for go 1.21

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From 380bdee115280db05211b9fe1d6ab3ba204fff37 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 335/363] usql: revbump for go 1.21

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From 537ebc912af0d376dda040e81400d630da239e6f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 336/363] v2ray: revbump for go 1.21

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From e825abce779c4690228e23af78d44fb495ce9745 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 337/363] vale: revbump for go 1.21

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 094273ae30152..073e2f54bee9a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From 3459d19ae11963acd94d0914aeb981ec2dbd5657 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 338/363] vault-acme: revbump for go 1.21

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From 685b033becf22797b62377dc53d3a00e9877ea31 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 339/363] vault: revbump for go 1.21

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From eb013924e105715150554d594ccaba7ba86b56ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 340/363] vegeta: revbump for go 1.21

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From 08572cbf6c92f430824c7a4ef65fdc39d1d91810 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 341/363] vhs: revbump for go 1.21

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From ea53cf9ab0e03a07ebae6d081121c66e8503b1ab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 342/363] vmdfmt: revbump for go 1.21

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 0380df66eef46513c7baa5e201a86c155a6e8dea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 343/363] vndr: revbump for go 1.21

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From 8e5fed9e4e8dd9366115a8cfdb5c002a01d8df87 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 344/363] vultr-cli: revbump for go 1.21

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From 4f855f34ef6e63c9f27f4e91fd8ce51b1bb7dba1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 345/363] vultr: revbump for go 1.21

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From 7c606a63c55b75e57f7bd763d9ceb94414a2b69e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 346/363] wally-cli: revbump for go 1.21

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From cc0e7d9001b0eb6b94ec81988ffb2bcde60688a1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 347/363] wander: revbump for go 1.21

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 4407cba025a84be33a2642555f48d69adeaf6807 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 348/363] webcat: revbump for go 1.21

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From de63f3758c3fcdce76e9b57cc6620fd305e283ab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 349/363] webhook: revbump for go 1.21

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From 2672c4a74671450722847a4bd669e72bab0d74cd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 350/363] websocketd: revbump for go 1.21

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From e487b065425f9c93027a89a3a42bdb58dd9a8cc6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 351/363] wego: revbump for go 1.21

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 48f87746cb40de1f29efb8b4d6d21bbb78208a70 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 352/363] wireproxy: revbump for go 1.21

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From cca76b906e374dba3c0b4f9622d3441b261e5298 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 353/363] woke: revbump for go 1.21

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From eb11a35b3b86edefecb87cc8be59ddb1d536405a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 354/363] wtfutil: revbump for go 1.21

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From b9dd0c8414f7edfbe4af369a42a500e399c22e8e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 355/363] wuzz: revbump for go 1.21

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 234abaccddbe64fcb90f1cb0be90f77c9a94fd0a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 356/363] xmandump: revbump for go 1.21

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From 862eb7d40e51333f70b84ee23187b62856182465 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 357/363] xq-api: revbump for go 1.21

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From 2e693c42de609361d288a5441a743da208ee6c4c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 358/363] xurls: revbump for go 1.21

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From aabaf5dd3d299cb4090d53d6e6c74e746fd23a4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 359/363] yggdrasil: revbump for go 1.21

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From c782568c2f5e1ec7d1b005c90d06e1151e3ab70b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 360/363] yj: revbump for go 1.21

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From 34af8a19ec69d4fe9e6a1c002f3c034856c90c59 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 361/363] ymuse: revbump for go 1.21

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From 5bec12890246047cbfa1397a7893e9e2b4626c3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 362/363] yq-go: revbump for go 1.21

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index e9335605c6627..a69e0e5e96c0a 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.35.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 796505db15af45cbccb99b563b00ac4caa60ed54 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 363/363] zrepl: revbump for go 1.21

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (13 preceding siblings ...)
  2023-08-22  7:28 ` g4s8
@ 2023-08-22  7:29 ` g4s8
  2023-08-23  8:13 ` [PR PATCH] [Updated] " g4s8
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-22  7:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by g4s8 on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1687627112

Comment:
@paper42 @the-maldridge any chance to review and merge this? I'm getting a lot of conflicts every day here

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (14 preceding siblings ...)
  2023-08-22  7:29 ` g4s8
@ 2023-08-23  8:13 ` g4s8
  2023-08-23 21:33 ` [PR PATCH] [Closed]: " the-maldridge
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-08-23  8:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

There is an updated pull request by g4s8 against master on the void-packages repository

https://github.com/g4s8/void-packages go-1.21
https://github.com/void-linux/void-packages/pull/45525

go: update to 1.21.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/45525.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-go-1.21-45525.patch --]
[-- Type: text/x-diff, Size: 259305 bytes --]

From 0ca28b5352e574417876d6fcfd4e0300803da0a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Wed, 9 Aug 2023 18:32:14 +0400
Subject: [PATCH 001/363] go: update to 1.21.0.

---
 srcpkgs/go/patches/fix-32bit-tests.patch | 10 ++++-----
 srcpkgs/go/patches/fix-musl-tests.patch  | 16 +++++++-------
 srcpkgs/go/patches/fix-tests.patch       | 27 +++++++++++++++++++++---
 srcpkgs/go/template                      | 19 ++++++-----------
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/go/patches/fix-32bit-tests.patch b/srcpkgs/go/patches/fix-32bit-tests.patch
index f5d8083b19f03..7ee2df7187ec7 100644
--- a/srcpkgs/go/patches/fix-32bit-tests.patch
+++ b/srcpkgs/go/patches/fix-32bit-tests.patch
@@ -1,13 +1,13 @@
-Fixes go1.19 error on i686 - 
-    runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
+Fixes go1.21 error on i686 -
+  runtime/cgo(.text): unknown symbol __stack_chk_fail_local in pcrel
 
 --- a/go/src/cmd/go/script_test.go
 +++ b/go/src/cmd/go/script_test.go
-@@ -148,6 +148,7 @@ var extraEnvKeys = []string{
+@@ -285,6 +285,7 @@ var extraEnvKeys = []string{
  	"GO_TESTING_GOTOOLS", // for gccgo testing
  	"GCCGO",              // for gccgo testing
  	"GCCGOTOOLDIR",       // for gccgo testing
-+	"CGO_CFLAGS",         // for working around go1.19 "unknown symbol __stack_chk_fail_local" error on x86
++	"CGO_CFLAGS",         // for working around "unknown symbol __stack_chk_fail_local" error on x86
  }
  
- // setup sets up the test execution temporary directory and environment.
+ // updateSum runs 'go mod tidy', 'go list -mod=mod -m all', or
diff --git a/srcpkgs/go/patches/fix-musl-tests.patch b/srcpkgs/go/patches/fix-musl-tests.patch
index f70cb456857b2..5b300f8e5ae2a 100644
--- a/srcpkgs/go/patches/fix-musl-tests.patch
+++ b/srcpkgs/go/patches/fix-musl-tests.patch
@@ -1,9 +1,9 @@
-These tests fail on musl because /proc/../status doesn't contain the "Groups"
-field, because musl lacks the getgroups() syscall.
+These tests fail on musl because /proc/../status doesn't
+contain the "Groups" field, because musl lacks the getgroups() syscall.
 
---- a/go/src/syscall/syscall_linux_test.go
-+++ b/go/src/syscall/syscall_linux_test.go
-@@ -530,10 +530,6 @@ func TestSetuidEtc(t *testing.T) {
+--- a/go/src/cmd/cgo/internal/test/issue1435.go
++++ b/go/src/cmd/cgo/internal/test/issue1435.go
+@@ -170,10 +170,6 @@ func test1435(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
@@ -14,9 +14,9 @@ field, because musl lacks the getgroups() syscall.
  		{call: "Setregid(101,0)", fn: func() error { return syscall.Setregid(101, 0) }, filter: "Gid:", expect: "\t101\t0\t0\t0"},
  		{call: "Setregid(0,102)", fn: func() error { return syscall.Setregid(0, 102) }, filter: "Gid:", expect: "\t0\t102\t102\t102"},
  		{call: "Setregid(0,0)", fn: func() error { return syscall.Setregid(0, 0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
---- a/go/misc/cgo/test/issue1435.go
-+++ b/go/misc/cgo/test/issue1435.go
-@@ -165,10 +165,6 @@ func test1435(t *testing.T) {
+--- a/go/src/syscall/syscall_linux_test.go
++++ b/go/src/syscall/syscall_linux_test.go
+@@ -533,10 +533,6 @@ func TestSetuidEtc(t *testing.T) {
  		{call: "Setgid(1)", fn: func() error { return syscall.Setgid(1) }, filter: "Gid:", expect: "\t1\t1\t1\t1"},
  		{call: "Setgid(0)", fn: func() error { return syscall.Setgid(0) }, filter: "Gid:", expect: "\t0\t0\t0\t0"},
  
diff --git a/srcpkgs/go/patches/fix-tests.patch b/srcpkgs/go/patches/fix-tests.patch
index c934156114138..c4e8397d33d56 100644
--- a/srcpkgs/go/patches/fix-tests.patch
+++ b/srcpkgs/go/patches/fix-tests.patch
@@ -1,13 +1,26 @@
-Inside user namespaces, if GID == OVERFLOWGID (65534), then chown won't work.
-https://github.com/golang/go/issues/42525
+Inside user namespaces, if GID == OVERFLOWGID (65534), then
+chown won't work. https://github.com/golang/go/issues/42525
 
 --- a/go/src/os/os_unix_test.go
 +++ b/go/src/os/os_unix_test.go
-@@ -39,144 +39,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+@@ -7,7 +7,6 @@
+ package os_test
+ 
+ import (
+-	"internal/testenv"
+ 	"io"
+ 	. "os"
+ 	"path/filepath"
+@@ -39,157 +38,6 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
  	}
  }
  
 -func TestChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -51,6 +64,11 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestFileChown(t *testing.T) {
+-	if runtime.GOOS == "wasip1" {
+-		t.Skip("file ownership not supported on " + runtime.GOOS)
+-	}
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
@@ -94,6 +112,9 @@ https://github.com/golang/go/issues/42525
 -}
 -
 -func TestLchown(t *testing.T) {
+-	testenv.MustHaveSymlink(t)
+-	t.Parallel()
+-
 -	// Use TempDir() to make sure we're on a local file system,
 -	// so that the group ids returned by Getgroups will be allowed
 -	// on the file. On NFS, the Getgroups groups are
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 6a8bed6ad01ac..dea0969cdb051 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.20.7
+version=1.21.0
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
+checksum=818d46ede85682dd551ad378ef37a4d247006f12ec59b5b755601d2ce114369a
 nostrip=yes
 noverifyrdeps=yes
 # on CI it tries to use `git submodule`, which is not part of chroot-git
@@ -55,7 +55,6 @@ do_build() {
 
 	export GOROOT_BOOTSTRAP="/usr/lib/go1.17.13"
 	export GOROOT=$PWD
-	export GOROOT_FINAL="/usr/lib/go"
 	export GOARCH=${_goarch}
 
 	cd "src"
@@ -83,21 +82,15 @@ do_install() {
 
 	vmkdir usr/bin
 	vmkdir usr/lib/go
+	vmkdir usr/lib/go/bin
 	vmkdir usr/share/go
-	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/bin || true
+	cp -d --preserve=all ${bindir}/* ${DESTDIR}/usr/lib/go/bin || true
 	cp -a pkg src lib ${DESTDIR}/usr/lib/go
 	cp -r doc misc -t ${DESTDIR}/usr/share/go
 	ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
 	cp VERSION ${DESTDIR}/usr/lib/go/VERSION
-
-	# This is to make go get code.google.com/p/go-tour/gotour and
-	# then running the gotour executable work out of the box.
-	#
-	# Also, /usr/bin is the place for system-wide executables,
-	# not /usr/lib/go/bin. Users should use different paths by
-	# setting the appropriate environment variables.
-	#
-	ln -sf /usr/bin ${DESTDIR}/usr/lib/go/bin
+	# GOROOT_FINAL doesn't work anymore, see: https://github.com/golang/go/issues/61921
+	ln -sfr ${DESTDIR}/usr/lib/go/bin/* ${DESTDIR}/usr/bin
 
 	# <dominikh> sigh. well, someone fix the template and add
 	# a symlink, usr/lib/go/misc -> /usr/share/go/misc

From 48268889b46934b6bbdb1882c85fa0f7bf04245a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Sat, 12 Aug 2023 20:21:53 +0400
Subject: [PATCH 002/363] common/build-style/go.sh: update go build style for
 go1.21.0

---
 common/build-style/go.sh             | 10 +++++++++-
 common/environment/build-style/go.sh |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index c16baa1238059..50524b07f768c 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -32,8 +32,13 @@ do_build() {
 	go_package=${go_package:-$go_import_path}
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
+
+		if [[ -n "${_go_mod_path}" ]]; then
+			pushd $(dirname ${_go_mod_path})
+		fi
+
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(head -n1 go.mod)" ]; then
+		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; then
 			msg_error "\"\$go_import_path\" doesn't match the one defined in go.mod!\n"
 		fi
 
@@ -46,6 +51,9 @@ do_build() {
 			go_mod_mode=
 		fi
 		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		if [[ -n "${_go_mod_path}" ]]; then
+			popd
+		fi
 	else
 		# Otherwise, build using GOPATH
 		go get -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index 68f88c6dbee8f..3094555220769 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -39,6 +39,10 @@ export CGO_CXXFLAGS="$CXXFLAGS"
 export CGO_LDFLAGS="$LDFLAGS"
 export CGO_ENABLED="${CGO_ENABLED:-1}"
 export GO111MODULE=auto
+export GOTOOLCHAIN=local
+export GOPROXY="https://proxy.golang.org,direct"
+export GOSUMDB="sum.golang.org"
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) export GOCACHE="${XBPS_HOSTDIR}/gocache-muslc" ;;
 	*)	export GOCACHE="${XBPS_HOSTDIR}/gocache-glibc" ;;

From 57857bab8bff04cb6d90e030ed6254a33fb4568f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 003/363] 3mux: revbump for go 1.21

---
 srcpkgs/3mux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
index 56ace4950113b..1c7ea9ffd5a07 100644
--- a/srcpkgs/3mux/template
+++ b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aaronjanse/3mux
 short_desc="Terminal multiplexer inspired by i3"

From 67b5ac8fe61145dd5ac77511adad146bc384d808 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:26 +0400
Subject: [PATCH 004/363] Amass: revbump for go 1.21

---
 srcpkgs/Amass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 3cc6672d72a42..3ff8d47a79c75 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/owasp-amass/amass/v4"
 go_package="${go_import_path}/cmd/amass"

From f65d8f166c04ec222e8adefd28b5dead61be499f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 005/363] Gokapi: revbump for go 1.21

---
 srcpkgs/Gokapi/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Gokapi/template b/srcpkgs/Gokapi/template
index e05199e32a957..ee10c5005d254 100644
--- a/srcpkgs/Gokapi/template
+++ b/srcpkgs/Gokapi/template
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=1.7.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/forceu/gokapi
 go_package="${go_import_path}/cmd/gokapi"
@@ -16,7 +16,8 @@ _gokapi_homedir="/var/lib/gokapi"
 make_dirs="/var/lib/gokapi 700 _gokapi _gokapi"
 
 pre_build() {
-	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" go generate ./...
+	env -i GOPATH="${GOPATH}" GOCACHE="${GOCACHE}" GOPROXY="${GOPROXY}" \
+		go generate ./...
 }
 
 post_install() {

From cdfbe14c03c8c35b63c87c8f5447d6799b669784 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 006/363] NetAuth-ldap: revbump for go 1.21

---
 srcpkgs/NetAuth-ldap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index c425b0d59e161..b47123534c933 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-ldap'
 pkgname=NetAuth-ldap
 version=0.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"

From 993e3441466728d0dd92ac5ba09599c0f31067f1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 007/363] NetAuth-localizer: revbump for go 1.21

---
 srcpkgs/NetAuth-localizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 88bdb4294360f..db440a43cff88 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize

From a302d1ca6d435544cd6752417f5080fcc1e57f5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:27 +0400
Subject: [PATCH 008/363] NetAuth-nsscache: revbump for go 1.21

---
 srcpkgs/NetAuth-nsscache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index e1bcaa33d9f3b..2ddd925c0e0aa 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/nsscache"
 short_desc="NetAuth nsscache implementation"

From 574a5edf18937ef159f7f13d92f3ed9de8edb28e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 009/363] NetAuth-pam-helper: revbump for go 1.21

---
 srcpkgs/NetAuth-pam-helper/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 9ea8e82b33471..c102c4dc890e5 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
 short_desc="Helper executable to use with pam_exec"

From d54f644489dc1bd4b917aad94bf408189b1f3292 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 010/363] NetAuth-sftpgo-hook: revbump for go 1.21

---
 srcpkgs/NetAuth-sftpgo-hook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index be155a1d7c6ee..998d6be4f2d49 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

From 4ba30bd2f3b75fd345aa50a30fcbbed0d1d3bfc9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 011/363] NetAuth: revbump for go 1.21

---
 srcpkgs/NetAuth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index afb5b0fa20bb1..08d5f78d0da88 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.1
-revision=4
+revision=5
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

From 01e4cd7c886f84299f43333f01660447ff423d9b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:28 +0400
Subject: [PATCH 012/363] NetKeys: revbump for go 1.21

---
 srcpkgs/NetKeys/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9e32c3ed79dc6..4e459699b1831 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/netkeys"
 short_desc="Key retrieval daemon for NetAuth"

From 5d9f680c84606300d2418021fec8a1516ee9b5fc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 013/363] NoiseTorch: revbump for go 1.21

---
 srcpkgs/NoiseTorch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NoiseTorch/template b/srcpkgs/NoiseTorch/template
index 1729a51943c59..b1cefe4fb1325 100644
--- a/srcpkgs/NoiseTorch/template
+++ b/srcpkgs/NoiseTorch/template
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=1
+revision=2
 build_wrksrc="NoiseTorch-${version}"
 build_style=go
 go_ldflags="-X main.version=${version} -X main.distribution=VoidLinux"

From 101d886f3546b5f02a0fa6f9df5f4c69674585b6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 014/363] PopCorn: revbump for go 1.21

---
 srcpkgs/PopCorn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index f2c61eb9e804e..30b82e37aa251 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn

From 583138ceab2c9797fbf6126f2d4370f557ee3b79 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:29 +0400
Subject: [PATCH 015/363] TMSU: revbump for go 1.21

---
 srcpkgs/TMSU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TMSU/template b/srcpkgs/TMSU/template
index 691fb7beb7c02..785c5f99a2931 100644
--- a/srcpkgs/TMSU/template
+++ b/srcpkgs/TMSU/template
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

From 5af1a57dc7ef93ec9ebc37bdc819777c6357c431 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 016/363] TerraState: revbump for go 1.21

---
 srcpkgs/TerraState/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 08f60ba2b73da..1cffccbba7049 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.1.1
-revision=2
+revision=3
 make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"

From 3b5064e834ab8fb5af7ebd4af2b2b8b5084ec481 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 017/363] abireport: revbump for go 1.21

---
 srcpkgs/abireport/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/abireport/template b/srcpkgs/abireport/template
index f60fffb91bfb2..aeb77a64e31e0 100644
--- a/srcpkgs/abireport/template
+++ b/srcpkgs/abireport/template
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/clearlinux/abireport
 go_package="${go_import_path}/abi-report"

From 50aa6c0ba16a66c7e0693f9ea19df962be0293a2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 018/363] acbuild: revbump for go 1.21

---
 srcpkgs/acbuild/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acbuild/template b/srcpkgs/acbuild/template
index 90baac57c30f5..c6a374236afcc 100644
--- a/srcpkgs/acbuild/template
+++ b/srcpkgs/acbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=14
+revision=15
 build_style=go
 go_import_path=github.com/appc/acbuild
 go_package=github.com/appc/acbuild/acbuild

From 61747853d915a1d9e89c9c574ee861d3b94f15e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:30 +0400
Subject: [PATCH 019/363] ace-util: revbump for go 1.21

---
 srcpkgs/ace-util/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ace-util/template b/srcpkgs/ace-util/template
index c3c2dc5c26523..4c91c384116f1 100644
--- a/srcpkgs/ace-util/template
+++ b/srcpkgs/ace-util/template
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=2
+revision=3
 build_style=go
 hostmakedepends="git"
 short_desc="Command line utility for the Ace HTML template engine"

From eeaecfab296b4f1d2b11959e6e8ab1d9a80b9a92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 020/363] acmetool: revbump for go 1.21

---
 srcpkgs/acmetool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/acmetool/template b/srcpkgs/acmetool/template
index 155515aa55a66..78fcb19b77f9b 100644
--- a/srcpkgs/acmetool/template
+++ b/srcpkgs/acmetool/template
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hlandau/acme
 go_package="github.com/hlandau/acme/cmd/acmetool"

From 259844d1df70c721de286b74d97226f00cdaa265 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 021/363] act: revbump for go 1.21

---
 srcpkgs/act/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/act/template b/srcpkgs/act/template
index a8b8e3e5e4be8..5ea8350570823 100644
--- a/srcpkgs/act/template
+++ b/srcpkgs/act/template
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.34
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/nektos/act"
 go_ldflags="-X main.version=${version}"

From 4bb0bab307d8d0f602f3062e08bb478a047fa67a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 022/363] aerc: revbump for go 1.21

---
 srcpkgs/aerc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 4ce7cbc48a789..f2df836afebc7 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
 go_build_tags=notmuch

From 025a09a29a1827785c7915299c0278de16c2c1f5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:31 +0400
Subject: [PATCH 023/363] age: revbump for go 1.21

---
 srcpkgs/age/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/age/template b/srcpkgs/age/template
index b021fd8cef41a..185333212a01e 100644
--- a/srcpkgs/age/template
+++ b/srcpkgs/age/template
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="filippo.io/age"
 go_package="${go_import_path}/cmd/..."

From e0c0d601fa8527b23252eda2c1507597d6885113 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 024/363] alertmanager: revbump for go 1.21

---
 srcpkgs/alertmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/alertmanager/template b/srcpkgs/alertmanager/template
index 92a064ba373cb..6e8bfeba61528 100644
--- a/srcpkgs/alertmanager/template
+++ b/srcpkgs/alertmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.20.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/alertmanager"
 go_package="${go_import_path}/cmd/alertmanager ${go_import_path}/cmd/amtool"

From ab4f1455791800c4ef82ae3231e42f0cffe3180e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 025/363] amfora: revbump for go 1.21

---
 srcpkgs/amfora/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/amfora/template b/srcpkgs/amfora/template
index 9434ee464d569..75d4c9dcbe6cb 100644
--- a/srcpkgs/amfora/template
+++ b/srcpkgs/amfora/template
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/${pkgname}"
 short_desc="Fancy terminal browser for the Gemini protocol"

From d445895c3ec885836b004f2353dbbf1a9f1b381a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 026/363] antibody: revbump for go 1.21

---
 srcpkgs/antibody/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index d64797511bad1..424d35c877a71 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -1,7 +1,7 @@
 # Template file for 'antibody'
 pkgname=antibody
 version=6.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/getantibody/antibody
 short_desc="Fast and lightweight shell plugin manager"

From f3fb455ffe8cdc70eed73350da1a71f0326dee13 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:32 +0400
Subject: [PATCH 027/363] app-builder: revbump for go 1.21

---
 srcpkgs/app-builder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/app-builder/template b/srcpkgs/app-builder/template
index c4c6dd2679e7c..d16e421a9544f 100644
--- a/srcpkgs/app-builder/template
+++ b/srcpkgs/app-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'app-builder'
 pkgname=app-builder
 version=3.4.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/develar/app-builder
 short_desc="Generic helper tool to build app in a distributable format"

From c526686a6829bb102c297c958c544020584f3012 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 028/363] aptly: revbump for go 1.21

---
 srcpkgs/aptly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aptly/template b/srcpkgs/aptly/template
index 17fe7cacdd9e9..a4bca04fdff40 100644
--- a/srcpkgs/aptly/template
+++ b/srcpkgs/aptly/template
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/aptly-dev/aptly
 short_desc="Debian repository management tool"

From e0be6a1589748420593d2afe96702ba917b93944 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 029/363] aquatone: revbump for go 1.21

---
 srcpkgs/aquatone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aquatone/template b/srcpkgs/aquatone/template
index 83af003ed2223..869fa88062543 100644
--- a/srcpkgs/aquatone/template
+++ b/srcpkgs/aquatone/template
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

From e8acfe405a5e7aeab9d7dbb117786a8019d61d92 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 030/363] archiver: revbump for go 1.21

---
 srcpkgs/archiver/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
index a93e7f5afba8e..00ca19e535db1 100644
--- a/srcpkgs/archiver/template
+++ b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mholt/archiver/v3
 go_package="${go_import_path}/cmd/arc"

From a7e482559d0412f9e8aab3b14667649e2a0a8d47 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:33 +0400
Subject: [PATCH 031/363] arduino-cli: revbump for go 1.21

---
 srcpkgs/arduino-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index d8ee02a3b755e..97168399c4816 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=0.33.0
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/arduino/arduino-cli

From 350005be2b22f1bda0575e0f48611c278c4cc347 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 032/363] arpfox: revbump for go 1.21

---
 srcpkgs/arpfox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/arpfox/template b/srcpkgs/arpfox/template
index 1f2e94b3e2f36..2abe8b0f21f04 100644
--- a/srcpkgs/arpfox/template
+++ b/srcpkgs/arpfox/template
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

From a1651cef1a7c38732896b2e342274e3f5cd7cb6a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 033/363] atlantis: revbump for go 1.21

---
 srcpkgs/atlantis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
index df9ba3b2da4c0..cb5bc4c713285 100644
--- a/srcpkgs/atlantis/template
+++ b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.24.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 depends="terraform"

From 7a580260a39f5d9512e543296b74f983b6f21094 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 034/363] autorestic: revbump for go 1.21

---
 srcpkgs/autorestic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
index b97290c2a3862..f946c2691d698 100644
--- a/srcpkgs/autorestic/template
+++ b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.7.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/cupcakearmy/autorestic"
 depends="restic"

From 2907a599358e50dd644717df8f58daa35b46a97e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:34 +0400
Subject: [PATCH 035/363] aws-vault: revbump for go 1.21

---
 srcpkgs/aws-vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aws-vault/template b/srcpkgs/aws-vault/template
index c0abaae96558c..8ea83260473a1 100644
--- a/srcpkgs/aws-vault/template
+++ b/srcpkgs/aws-vault/template
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/99designs/aws-vault/v7
 go_ldflags="-X main.Version=${version}"

From 26bf776c7c9775b3f109170ead1803742328bf98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 036/363] babelfish: revbump for go 1.21

---
 srcpkgs/babelfish/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/babelfish/template b/srcpkgs/babelfish/template
index d14a9f042cd08..73e31bc5cd14a 100644
--- a/srcpkgs/babelfish/template
+++ b/srcpkgs/babelfish/template
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path="bou.ke/babelfish"
 short_desc="Translate bash scripts to fish"

From b85b458b1bd8d76fdf54b8e779e5b7aab6f73553 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 037/363] bettercap: revbump for go 1.21

---
 srcpkgs/bettercap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bettercap/template b/srcpkgs/bettercap/template
index f9b8614824f1b..59f9ceaf8e0c0 100644
--- a/srcpkgs/bettercap/template
+++ b/srcpkgs/bettercap/template
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"

From 18007be863718dd2abef676db2d017d8b794ce37 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 038/363] bird_exporter: revbump for go 1.21

---
 srcpkgs/bird_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 44ded1c65e76a..a1e3b730030e7 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'bird_exporter'
 pkgname=bird_exporter
 version=1.4.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/czerwonk/bird_exporter"
 hostmakedepends="$(vopt_if man pandoc)"

From dc3826e9430ea271a74d36b1d0f99b21ff23c385 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:35 +0400
Subject: [PATCH 039/363] blackbox_exporter: revbump for go 1.21

---
 srcpkgs/blackbox_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 01e306317630d..0ca014b51a3e2 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From ba65a08dfa78e89a4017876c90afc237265b7353 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 040/363] blush: revbump for go 1.21

---
 srcpkgs/blush/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c90ef91b79a71..7eae175225ac1 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,7 +1,7 @@
 # Template file for 'blush'
 pkgname=blush
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/blush
 short_desc="Grep with colours"

From c4fa1968810aa457e283bceafb5c4eb7a72cc3ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 041/363] bombadillo: revbump for go 1.21

---
 srcpkgs/bombadillo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombadillo/template b/srcpkgs/bombadillo/template
index 979e5a622e6c9..be7356c0cd35c 100644
--- a/srcpkgs/bombadillo/template
+++ b/srcpkgs/bombadillo/template
@@ -1,7 +1,7 @@
 # Template file for 'bombadillo'
 pkgname=bombadillo
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="tildegit.org/sloum/bombadillo"
 short_desc="Non-web client for the terminal"

From cab271c07d72b222ee90a89f1ecedbaf56e61883 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 042/363] bombardier: revbump for go 1.21

---
 srcpkgs/bombardier/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bombardier/template b/srcpkgs/bombardier/template
index e204deb6a0ce3..2289492e46591 100644
--- a/srcpkgs/bombardier/template
+++ b/srcpkgs/bombardier/template
@@ -1,7 +1,7 @@
 # Template file for 'bombardier'
 pkgname=bombardier
 version=1.2.6
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/codesenberg/bombardier
 go_ldflags=" -X main.version=${version}"

From b2e6b738b232f42542d86df8082a14e6577774de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:36 +0400
Subject: [PATCH 043/363] booster: revbump for go 1.21

---
 srcpkgs/booster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/booster/template b/srcpkgs/booster/template
index 9d407ebfdd3d1..1e904ae1d8664 100644
--- a/srcpkgs/booster/template
+++ b/srcpkgs/booster/template
@@ -1,7 +1,7 @@
 # Template file for 'booster'
 pkgname=booster
 version=0.10
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/anatol/booster
 hostmakedepends="git ruby-ronn"

From 24c113bea4ea95122f7f7dcb2bac08358b3f81b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 044/363] brig: revbump for go 1.21

---
 srcpkgs/brig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brig/template b/srcpkgs/brig/template
index bacffc2437eae..42bf86b0be065 100644
--- a/srcpkgs/brig/template
+++ b/srcpkgs/brig/template
@@ -1,7 +1,7 @@
 # Template file for 'brig'
 pkgname=brig
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/sahib/brig
 short_desc="File synchronization on top of IPFS with git-like interface and WebUI"

From 4acc7b304641e5245cef9aa3215e96740caa6d72 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 045/363] browserpass: revbump for go 1.21

---
 srcpkgs/browserpass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index 38344573fdcc6..6e94b64cee37f 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -1,7 +1,7 @@
 # Template file for 'browserpass'
 pkgname=browserpass
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
 short_desc="Browser extension for pass"

From b01ecd457891e4e64517a3d3bd70aa13d5b77d3d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 046/363] browsh: revbump for go 1.21

---
 srcpkgs/browsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/browsh/template b/srcpkgs/browsh/template
index 9c2e14d7242ee..6fa397b04305f 100644
--- a/srcpkgs/browsh/template
+++ b/srcpkgs/browsh/template
@@ -1,10 +1,10 @@
 # Template file for 'browsh'
 pkgname=browsh
 version=1.6.4
-revision=3
+revision=4
 build_wrksrc=interfacer
 build_style=go
-go_import_path="github.com/browsh-org/browsh"
+go_import_path="github.com/browsh-org/browsh/interfacer"
 go_package=./cmd/browsh
 hostmakedepends="go-bindata"
 depends="firefox"

From 83f83b3fb8d98c2ad5eb77d6ac5957ea3c037362 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:37 +0400
Subject: [PATCH 047/363] buildah: revbump for go 1.21

---
 srcpkgs/buildah/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 6f84b078ac0a5..2809ddccd6029 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,7 +1,7 @@
 # Template file for 'buildah'
 pkgname=buildah
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containers/buildah
 go_package="${go_import_path}/cmd/buildah"

From a8521cd50a2d5eac500d3da04774df639436ec2b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 048/363] caddy: revbump for go 1.21

---
 srcpkgs/caddy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 2a06c4a6c9916..c7cb4848259ae 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=2.6.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -28,6 +28,10 @@ post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv caddy
 

From 169345ab4742824c62f384c76ad2e2588637c86e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 049/363] carapace: revbump for go 1.21

---
 srcpkgs/carapace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/carapace/template b/srcpkgs/carapace/template
index 7967262ec7b4e..21e9c8a2b0eae 100644
--- a/srcpkgs/carapace/template
+++ b/srcpkgs/carapace/template
@@ -1,7 +1,7 @@
 # Template file for 'carapace'
 pkgname=carapace
 version=0.26.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/rsteube/carapace-bin
 go_package="${go_import_path}/cmd/carapace"

From 34b98bcf57be71abba2022270e90c1ce40e4ad35 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:38 +0400
Subject: [PATCH 050/363] cdetect: revbump for go 1.21

---
 srcpkgs/cdetect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index a854dd8a33d2d..5c0c32d49a904 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -1,7 +1,7 @@
 # Template file for 'cdetect'
 pkgname=cdetect
 version=0.6.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/cdetect
 short_desc="Detects the compiler (and version) used to compile an ELF binary"

From 6e4eb11ee1b8a86fb27837b22e9b1d51ca78f11b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 051/363] cfssl: revbump for go 1.21

---
 srcpkgs/cfssl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cfssl/template b/srcpkgs/cfssl/template
index 022f09d2f46a8..c6185c71e252c 100644
--- a/srcpkgs/cfssl/template
+++ b/srcpkgs/cfssl/template
@@ -1,7 +1,7 @@
 # Template file for 'cfssl'
 pkgname=cfssl
 version=1.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/cloudflare/cfssl
 go_package="${go_import_path}/cmd/..."

From e6870bea24257db64a6a9be8cab604a104a1ff99 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 052/363] cgrps: revbump for go 1.21

---
 srcpkgs/cgrps/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cgrps/template b/srcpkgs/cgrps/template
index 56101606c039f..3a8ac5fad35f3 100644
--- a/srcpkgs/cgrps/template
+++ b/srcpkgs/cgrps/template
@@ -1,7 +1,7 @@
 # Template file for 'cgrps'
 pkgname=cgrps
 version=0.8.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/k1LoW/cgrps
 short_desc="Set of commands for checking cgroups"

From fcf9afc40066ae0c95fcdcdd8179bbb254e03f57 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 053/363] chathistorysync: revbump for go 1.21

---
 srcpkgs/chathistorysync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chathistorysync/template b/srcpkgs/chathistorysync/template
index 897c010e0f064..bc4842043a6dc 100644
--- a/srcpkgs/chathistorysync/template
+++ b/srcpkgs/chathistorysync/template
@@ -1,7 +1,7 @@
 # Template file for 'chathistorysync'
 pkgname=chathistorysync
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="git.sr.ht/~emersion/chathistorysync"
 hostmakedepends="scdoc"

From 47402aabc34356d86493964b05768e72cad650dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:39 +0400
Subject: [PATCH 054/363] cheat: revbump for go 1.21

---
 srcpkgs/cheat/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cheat/template b/srcpkgs/cheat/template
index ecdc225951f5c..4873540334965 100644
--- a/srcpkgs/cheat/template
+++ b/srcpkgs/cheat/template
@@ -1,9 +1,10 @@
 # Template file for 'cheat'
 pkgname=cheat
 version=4.4.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/cheat/cheat/cmd/cheat"
+go_import_path="github.com/cheat/cheat"
+go_package="./cmd/cheat"
 short_desc="Create and view interactive cheatsheets on the command-line"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From dbabdc3cd34909e9db0e553bfcd8c78f3bd58dc5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 055/363] chezmoi: revbump for go 1.21

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index a220dd00c0f86..1d927293d89d9 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.37.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

From 8cb263c5b1da7e53886af584d51ffb5c8330927d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 056/363] chroma: revbump for go 1.21

---
 srcpkgs/chroma/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index bc19f850d59e8..64e204d6b1406 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,7 +1,7 @@
 # Template file for 'chroma'
 pkgname=chroma
 version=2.8.0
-revision=1
+revision=2
 build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/v2/cmd/chroma"

From e8fa8546b8f725a421099798ea2b8433f2fb491f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 057/363] chronograf: revbump for go 1.21

---
 srcpkgs/chronograf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index ef562ad65c9ea..10fc5fcfc3699 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,7 +1,7 @@
 # Template file for 'chronograf'
 pkgname=chronograf
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
 go_package="${go_import_path}/cmd/chronograf"

From ea60fce1736b14681c12eb9c6efb6ceee290e19d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:40 +0400
Subject: [PATCH 058/363] circleci-cli: revbump for go 1.21

---
 srcpkgs/circleci-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index b8a2550c8c644..23f5a1a5495e0 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
 version=0.1.15224
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}

From 5c69601fe8f939bcee9b5ac25e267e4faf4a959e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 059/363] cliphist: revbump for go 1.21

---
 srcpkgs/cliphist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cliphist/template b/srcpkgs/cliphist/template
index 2f665b576b444..6daefc8988772 100644
--- a/srcpkgs/cliphist/template
+++ b/srcpkgs/cliphist/template
@@ -1,7 +1,7 @@
 # Template file for 'cliphist'
 pkgname=cliphist
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.senan.xyz/cliphist
 depends="wl-clipboard xdg-utils"

From 1c720628cb017fc51a6b8eebd9c2148f057b95ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 060/363] clipman: revbump for go 1.21

---
 srcpkgs/clipman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
index f6665547f4ef9..3a88f8938aae7 100644
--- a/srcpkgs/clipman/template
+++ b/srcpkgs/clipman/template
@@ -1,7 +1,7 @@
 # Template file for 'clipman'
 pkgname=clipman
 version=1.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/yory8/clipman
 depends="wl-clipboard"

From 27420d40d0bd8c8e83de918f3ffb31e3219dd2f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 061/363] cloudflared: revbump for go 1.21

---
 srcpkgs/cloudflared/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index d93781c62d331..011751819f7c9 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,7 +1,7 @@
 # Template file for 'cloudflared'
 pkgname=cloudflared
 version=2023.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/cloudflare/cloudflared
 go_package="${go_import_path}/cmd/cloudflared"
@@ -16,4 +16,5 @@ checksum=ee2c2a4b0c290c39475f79ab74972dfbce817df8e5090813cad0e58f33836194
 
 pre_build() {
 	go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
+	export GOTOOLCHAIN="go1.20.7"
 }

From 3b6590183dfc2a9e3d715b847a4a1cc7a5a7b551 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:41 +0400
Subject: [PATCH 062/363] cni-plugin-dnsname: revbump for go 1.21

---
 srcpkgs/cni-plugin-dnsname/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugin-dnsname/template b/srcpkgs/cni-plugin-dnsname/template
index 7726140822add..3e34421912dc7 100644
--- a/srcpkgs/cni-plugin-dnsname/template
+++ b/srcpkgs/cni-plugin-dnsname/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugin-dnsname'
 pkgname=cni-plugin-dnsname
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/dnsname"
 go_package="${go_import_path}/plugins/meta/dnsname"

From ec3ae37058993dc732e6dff981f9aa1c5c86e4ef Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 063/363] cni-plugins: revbump for go 1.21

---
 srcpkgs/cni-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni-plugins/template b/srcpkgs/cni-plugins/template
index 6645dfaa983eb..589913adc6268 100644
--- a/srcpkgs/cni-plugins/template
+++ b/srcpkgs/cni-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cni-plugins'
 pkgname=cni-plugins
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/plugins"
 short_desc="Container Network Interface (plugins)"

From 4becb5f622dbffc34f44e662cafd4aa2c27e07b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 064/363] cni: revbump for go 1.21

---
 srcpkgs/cni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cni/template b/srcpkgs/cni/template
index a14bb01228144..050b201df6a57 100644
--- a/srcpkgs/cni/template
+++ b/srcpkgs/cni/template
@@ -1,7 +1,7 @@
 # Template file for 'cni'
 pkgname=cni
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containernetworking/cni"
 go_package="${go_import_path}/cnitool"

From f431b29259e71331a9182c93bc5a7a28d19cd31f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 065/363] cod: revbump for go 1.21

---
 srcpkgs/cod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cod/template b/srcpkgs/cod/template
index 2ede420d33c1c..818a577b231e2 100644
--- a/srcpkgs/cod/template
+++ b/srcpkgs/cod/template
@@ -1,7 +1,7 @@
 # Template file for 'cod'
 pkgname=cod
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dim-an/cod"
 short_desc="Completion daemon for bash/zsh"

From b8706af908ab29f31a05970e4ef41b094c061b1c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:42 +0400
Subject: [PATCH 066/363] codesearch: revbump for go 1.21

---
 srcpkgs/codesearch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codesearch/template b/srcpkgs/codesearch/template
index 3f522ff80cfb8..b8d5d31ca40d5 100644
--- a/srcpkgs/codesearch/template
+++ b/srcpkgs/codesearch/template
@@ -1,7 +1,7 @@
 # Template file for 'codesearch'
 pkgname=codesearch
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/google/codesearch"
 go_package="github.com/google/codesearch/cmd/cgrep

From d67783ca556f5cb67c2c5dc6ff0f71f9c2377a7c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 067/363] consul-template: revbump for go 1.21

---
 srcpkgs/consul-template/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index e47789a7fa032..b8015ba932d6c 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,7 +1,7 @@
 # Template file for 'consul-template'
 pkgname=consul-template
 version=0.28.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"

From 20462348928d25e12c980a9a3e9472e0e0f2751f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 068/363] consul: revbump for go 1.21

---
 srcpkgs/consul/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index 7fbe8549d11ba..e84e308069d9c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da

From 970ef14adc045604a77cd9148a3021244defb5f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 069/363] containerd: revbump for go 1.21

---
 srcpkgs/containerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/containerd/template b/srcpkgs/containerd/template
index a2078cfccc935..9074847205f02 100644
--- a/srcpkgs/containerd/template
+++ b/srcpkgs/containerd/template
@@ -1,7 +1,7 @@
 # Template file for 'containerd'
 pkgname=containerd
 version=1.7.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/containerd/containerd
 go_package="${go_import_path}/cmd/containerd

From 5ed6beafe06cb8f87cdef46319bb85608d809db2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:43 +0400
Subject: [PATCH 070/363] coredns: revbump for go 1.21

---
 srcpkgs/coredns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
index decf19f647e8c..96eea332713e2 100644
--- a/srcpkgs/coredns/template
+++ b/srcpkgs/coredns/template
@@ -1,7 +1,7 @@
 # Template file for 'coredns'
 pkgname=coredns
 version=1.10.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/coredns/coredns
 hostmakedepends="mmark"

From 8e46bcbcebeaa76214f075a338216a8631f79419 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 071/363] cowyo: revbump for go 1.21

---
 srcpkgs/cowyo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cowyo/template b/srcpkgs/cowyo/template
index 856c1a611a26d..e014e4035c89f 100644
--- a/srcpkgs/cowyo/template
+++ b/srcpkgs/cowyo/template
@@ -1,7 +1,7 @@
 # Template file for 'cowyo'
 pkgname=cowyo
 version=2.12.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/schollz/cowyo"
 short_desc="Wiki webserver for minimalists"

From 852bca9945d30a8549c0065c9efbdd986082a19d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 072/363] coyim: revbump for go 1.21

---
 srcpkgs/coyim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coyim/template b/srcpkgs/coyim/template
index b29378e1c6990..3e1336f140f7a 100644
--- a/srcpkgs/coyim/template
+++ b/srcpkgs/coyim/template
@@ -1,7 +1,7 @@
 # Template file for 'coyim'
 pkgname=coyim
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/coyim/coyim
 hostmakedepends="pkg-config"

From 220360413b14bc223be29fca533af00a6487ab50 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 073/363] crane: revbump for go 1.21

---
 srcpkgs/crane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index b8c05d22e5838..1cdf9b327fae3 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -1,7 +1,7 @@
 # Template file for 'crane'
 pkgname=crane
 version=3.6.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/michaelsauter/crane"
 short_desc="Lift containers with ease"

From 231935f7e3c2323f81e9bdd40ae4bb9122513d4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:44 +0400
Subject: [PATCH 074/363] cri-o: revbump for go 1.21

---
 srcpkgs/cri-o/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-o/template b/srcpkgs/cri-o/template
index 6deba02d7d4bc..47cb2865d09c6 100644
--- a/srcpkgs/cri-o/template
+++ b/srcpkgs/cri-o/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-o'
 pkgname=cri-o
 version=1.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kubernetes-sigs/cri-o"
 go_package="${go_import_path}/cmd/crio ${go_import_path}/cmd/crio-config"

From 385dc72f83937948442d5728c018a708b4da98ac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 075/363] cri-tools: revbump for go 1.21

---
 srcpkgs/cri-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cri-tools/template b/srcpkgs/cri-tools/template
index 7ef574dec0846..f402cbd770d6b 100644
--- a/srcpkgs/cri-tools/template
+++ b/srcpkgs/cri-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'cri-tools'
 pkgname=cri-tools
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/kubernetes-sigs/cri-tools
 short_desc="CLI and validation tools for Kubelet Container Runtime Interface (CRI)"

From 52cdf4840a74daf02df4a4f38ac8b2f5799035a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 076/363] croc: revbump for go 1.21

---
 srcpkgs/croc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 25cd3a2e33f7f..25b315a343373 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,7 +1,7 @@
 # Template file for 'croc'
 pkgname=croc
 version=9.6.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
 short_desc="Easily and securely send things from one computer to another"

From 372cd92656dac30df0655a0e0bb09407f08d450f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:45 +0400
Subject: [PATCH 077/363] d2: revbump for go 1.21

---
 srcpkgs/d2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/d2/template b/srcpkgs/d2/template
index 03b1686f186cd..fcd15b55c2cfb 100644
--- a/srcpkgs/d2/template
+++ b/srcpkgs/d2/template
@@ -1,7 +1,7 @@
 # Template file for 'd2'
 pkgname=d2
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path="oss.terrastruct.com/d2"
 go_ldflags="-X ${go_import_path}/lib/version.Version=${version}"

From c8b2e626c02b7e29dcf3f690f27568ec360f1cf1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 078/363] darch: revbump for go 1.21

---
 srcpkgs/darch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/template b/srcpkgs/darch/template
index 9df3de960fd2f..ee015983d74e0 100644
--- a/srcpkgs/darch/template
+++ b/srcpkgs/darch/template
@@ -1,7 +1,7 @@
 # Template file for 'darch'
 pkgname=darch
 version=0.28.0
-revision=2
+revision=3
 archs="x86_64* ppc64le*"
 build_style=go
 go_import_path=github.com/godarch/darch

From 2270dfaa1bf62cb58b2796f46edda216d1ef6fc9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 079/363] darkman: revbump for go 1.21

---
 srcpkgs/darkman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darkman/template b/srcpkgs/darkman/template
index 123091a952a14..9b73ad81d8624 100644
--- a/srcpkgs/darkman/template
+++ b/srcpkgs/darkman/template
@@ -1,7 +1,7 @@
 # Template file for 'darkman'
 pkgname=darkman
 version=1.5.4
-revision=1
+revision=2
 build_style=go
 go_import_path="gitlab.com/WhyNotHugo/darkman"
 go_package="${go_import_path}/cmd/darkman"

From 01dc71f12ddac2076db1acc5df68c5f804d4be51 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 080/363] darktile: revbump for go 1.21

---
 srcpkgs/darktile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darktile/template b/srcpkgs/darktile/template
index 6553ac1faa44a..9d0b1d3770505 100644
--- a/srcpkgs/darktile/template
+++ b/srcpkgs/darktile/template
@@ -1,7 +1,7 @@
 # Template file for 'darktile'
 pkgname=darktile
 version=0.0.10
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/liamg/darktile
 go_package="${go_import_path}/cmd/darktile"

From a8eed64e3eb39278694ea4ebd0f5410f3c3daf6c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:46 +0400
Subject: [PATCH 081/363] dasel: revbump for go 1.21

---
 srcpkgs/dasel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index ec258642a32f0..8f55f96d0f775 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,7 +1,7 @@
 # Template file for 'dasel'
 pkgname=dasel
 version=2.3.4
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/tomwright/dasel/v2

From 392adc1ad61f9be9f2412de3ba5dd39f3ef94751 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 082/363] delve: revbump for go 1.21

---
 srcpkgs/delve/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/delve/template b/srcpkgs/delve/template
index b296933043939..aa4f560ac6d95 100644
--- a/srcpkgs/delve/template
+++ b/srcpkgs/delve/template
@@ -1,7 +1,7 @@
 # Template file for 'delve'
 pkgname=delve
 version=1.21.0
-revision=1
+revision=2
 # https://github.com/go-delve/delve/blob/master/pkg/proc/native/support_sentinel_linux.go
 archs="x86_64* i686* aarch64*"
 build_style=go

From 6b214f77f52e5af6e7831341de0588e75559fcf4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 083/363] dendrite: revbump for go 1.21

---
 srcpkgs/dendrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 131de0d147f65..3395379ee1480 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,7 +1,7 @@
 # Template file for 'dendrite'
 pkgname=dendrite
 version=0.13.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
 go_package="./cmd/create-account ./cmd/dendrite ./cmd/generate-config

From f59c0bb5cbddcb5cfdd151ac7d2e4eac08b55e1d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 084/363] dep: revbump for go 1.21

---
 srcpkgs/dep/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 15e46e74f2208..53d2ca09c1873 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -1,7 +1,7 @@
 # Template file for 'dep'
 pkgname=dep
 version=0.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"

From 5b8009b9fab41f17fb495903b24d376e56e352cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:47 +0400
Subject: [PATCH 085/363] direnv: revbump for go 1.21

---
 srcpkgs/direnv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/direnv/template b/srcpkgs/direnv/template
index 487c5fac96ab9..4ecf2d10d0da2 100644
--- a/srcpkgs/direnv/template
+++ b/srcpkgs/direnv/template
@@ -1,7 +1,7 @@
 # Template file for 'direnv'
 pkgname=direnv
 version=2.32.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/direnv/direnv/v2
 short_desc="Environment switcher for the shell"

From 9ae0d7eabb2cd440cf5044dbed9d08fc387ce950 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 086/363] dirstalk: revbump for go 1.21

---
 srcpkgs/dirstalk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dirstalk/template b/srcpkgs/dirstalk/template
index 2b45241695440..d75ab27cdf49f 100644
--- a/srcpkgs/dirstalk/template
+++ b/srcpkgs/dirstalk/template
@@ -1,7 +1,7 @@
 # Template file for 'dirstalk'
 pkgname=dirstalk
 version=1.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stefanoj3/dirstalk"
 go_package="${go_import_path}/cmd/${pkgname}"

From c2838e8e72329c02f97a5983e6b2ad052bcfeddb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 087/363] distrobuilder: revbump for go 1.21

---
 srcpkgs/distrobuilder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index 9a041d75969d7..004c02b828fb6 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,7 +1,7 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
 version=1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"

From 46ffcd7ec88220351bf5d74cbd1e6ab705d1e41b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 088/363] dive: revbump for go 1.21

---
 srcpkgs/dive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index fdbf382532530..ecd0f355f9492 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,7 +1,7 @@
 # Template file for 'dive'
 pkgname=dive
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wagoodman/dive"
 short_desc="Container image exploration tool"

From e309b28d16bd7fd41b1b2e5b680424b8ee6553b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:48 +0400
Subject: [PATCH 089/363] dlayer: revbump for go 1.21

---
 srcpkgs/dlayer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 8f9a8bf064d02..1b4678543c75b 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -1,7 +1,7 @@
 # Template file for 'dlayer'
 pkgname=dlayer
 version=0.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/orisano/dlayer
 short_desc="Dlayer is a docker layer analyzer"

From f01c593d5bb41f7163ff858a3cd3ef4187cbd3dc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 090/363] dnscrypt-proxy: revbump for go 1.21

---
 srcpkgs/dnscrypt-proxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index f2b4ba9c8a447..b2ddf223bd77a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'dnscrypt-proxy'
 pkgname=dnscrypt-proxy
 version=2.1.4
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/dnscrypt/dnscrypt-proxy
 go_package="${go_import_path}/dnscrypt-proxy"
@@ -16,6 +16,10 @@ conf_files="/etc/dnscrypt-proxy.toml"
 system_accounts="dnscrypt_proxy"
 make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vconf dnscrypt-proxy/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
 	vlicense LICENSE

From f1661c3a1d54d7d6fec3a1e2ddfe9f33fbfbc726 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 091/363] docker-buildx: revbump for go 1.21

---
 srcpkgs/docker-buildx/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/docker-buildx/template b/srcpkgs/docker-buildx/template
index 90109d3b32ff5..049bd9ac176ac 100644
--- a/srcpkgs/docker-buildx/template
+++ b/srcpkgs/docker-buildx/template
@@ -1,9 +1,10 @@
 # Template file for 'docker-buildx'
 pkgname=docker-buildx
 version=0.10.3
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/docker/buildx/cmd/buildx"
+go_import_path="github.com/docker/buildx"
+go_package="./cmd/buildx"
 go_ldflags="-X github.com/docker/buildx/version.Version=v${version}"
 depends="docker-cli"
 short_desc="Docker CLI plugin for extended build capabilities with BuildKit"

From 05961c7098a36823b723d0308c089e416e358380 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 092/363] docker-cli: revbump for go 1.21

---
 srcpkgs/docker-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 34f43602019d5..dd99fcc34cdd0 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,7 +2,7 @@
 # should be kept in sync with moby
 pkgname=docker-cli
 version=24.0.5
-revision=1
+revision=2
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
 go_import_path="github.com/docker/cli"

From 724f275550917cb39a66bdd7a1d46684e2470cac Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:49 +0400
Subject: [PATCH 093/363] docker-compose: revbump for go 1.21

---
 srcpkgs/docker-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index f80e4b35a12ca..85e4e6778b281 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
 version=2.20.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/docker/compose/v2"
 go_package="${go_import_path}/cmd"

From acd5a126076ae3c4a74922ba49ae77c57715df0b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 094/363] docker-credential-pass: revbump for go 1.21

---
 srcpkgs/docker-credential-pass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-credential-pass/template b/srcpkgs/docker-credential-pass/template
index 527371ff4c8c3..2f066120004b3 100644
--- a/srcpkgs/docker-credential-pass/template
+++ b/srcpkgs/docker-credential-pass/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-credential-pass'
 pkgname=docker-credential-pass
 version=0.6.4
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/docker/docker-credential-helpers"
 go_package="${go_import_path}/pass/cmd"

From b27f7f754d944183e40374be98424b56c2e61fba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 095/363] docker-gen: revbump for go 1.21

---
 srcpkgs/docker-gen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 825001874d406..854d74f2029f3 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-gen'
 pkgname=docker-gen
 version=0.10.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nginx-proxy/docker-gen"
 go_package="${go_import_path}/cmd/docker-gen"

From 27927e78451bc991ba187ed564f88601b4c8989e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 096/363] docker-machine-driver-kvm: revbump for go 1.21

---
 srcpkgs/docker-machine-driver-kvm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine-driver-kvm/template b/srcpkgs/docker-machine-driver-kvm/template
index 101319182a0e5..7606e2d86e0c8 100644
--- a/srcpkgs/docker-machine-driver-kvm/template
+++ b/srcpkgs/docker-machine-driver-kvm/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine-driver-kvm'
 pkgname=docker-machine-driver-kvm
 version=0.10.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/dhiltgen/docker-machine-kvm"
 go_package="github.com/dhiltgen/docker-machine-kvm/cmd/docker-machine-driver-kvm"

From 8d0e7d9a9eaf1f8b15057c52840c2c178ea9689b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:50 +0400
Subject: [PATCH 097/363] docker-machine: revbump for go 1.21

---
 srcpkgs/docker-machine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/docker-machine/template b/srcpkgs/docker-machine/template
index 9b7119018712d..578c2e2e933f3 100644
--- a/srcpkgs/docker-machine/template
+++ b/srcpkgs/docker-machine/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-machine'
 pkgname=docker-machine
 version=0.16.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/docker/machine
 go_package="${go_import_path}/cmd/docker-machine"

From ef197db719d443b5b120263002ccd6549bf1a77d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 098/363] doctl: revbump for go 1.21

---
 srcpkgs/doctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 238b128dee3f1..883de540c951a 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,7 +1,7 @@
 # Template file for 'doctl'
 pkgname=doctl
 version=1.98.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/digitalocean/doctl"
 go_package="${go_import_path}/cmd/doctl"

From 9972be753b259e42427e855ac33b5499d0a32631 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 099/363] domain_exporter: revbump for go 1.21

---
 srcpkgs/domain_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 028cdb8100d15..e351b0f39b4e2 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'domain_exporter'
 pkgname=domain_exporter
 version=0.1.24
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/shift/domain_exporter"
 short_desc="Prometheus WHOIS domain details exporter"

From 0d96763a2b8025b8c5c6c670626723779e246a56 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 100/363] dotool: revbump for go 1.21

---
 srcpkgs/dotool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dotool/template b/srcpkgs/dotool/template
index 391923d10113b..ee970fcd5507d 100644
--- a/srcpkgs/dotool/template
+++ b/srcpkgs/dotool/template
@@ -1,7 +1,7 @@
 # Template file for 'dotool'
 pkgname=dotool
 version=1.3
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~geb/dotool"
 go_ldflags="-X main.Version=${version}"

From 0ad900468eea79b51572193d110a1ee9ed282232 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:51 +0400
Subject: [PATCH 101/363] drive: revbump for go 1.21

---
 srcpkgs/drive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drive/template b/srcpkgs/drive/template
index bebb4bb6f26e4..f77f9066951aa 100644
--- a/srcpkgs/drive/template
+++ b/srcpkgs/drive/template
@@ -1,7 +1,7 @@
 # Template file for 'drive'
 pkgname=drive
 version=0.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/odeke-em/drive"
 go_package="github.com/odeke-em/drive/cmd/drive github.com/odeke-em/drive/drive-server "

From 4174f9e570589a4a60ae20b92d190e2aba09081e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 102/363] drone-cli: revbump for go 1.21

---
 srcpkgs/drone-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index 962306c0d96a1..80aa3162f1f0f 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'drone-cli'
 pkgname=drone-cli
 version=1.7.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/drone/drone-cli
 go_package="${go_import_path}/drone"

From 35eb0424047bc7cb7ce5b9ef2ab81d253899f09c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 103/363] duf: revbump for go 1.21

---
 srcpkgs/duf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index e54a1be3a3f65..e10126b6afda6 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,7 +1,7 @@
 # Template file for 'duf'
 pkgname=duf
 version=0.8.1
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"

From 5e120174fa1e045cde742fd10eea057f2a16e3b7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:52 +0400
Subject: [PATCH 104/363] elfinfo: revbump for go 1.21

---
 srcpkgs/elfinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 9be5f293f9219..e7f093ecd0dba 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'elfinfo'
 pkgname=elfinfo
 version=1.2.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
 short_desc="Emit basic information about an ELF file"

From d24f9ae6ff58154fe6d6a45fa0f4edbbfc5544d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 105/363] elvish: revbump for go 1.21

---
 srcpkgs/elvish/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elvish/template b/srcpkgs/elvish/template
index 480ebf6af409b..d801ddaa950a3 100644
--- a/srcpkgs/elvish/template
+++ b/srcpkgs/elvish/template
@@ -1,9 +1,10 @@
 # Template file for 'elvish'
 pkgname=elvish
 version=0.19.2
-revision=2
+revision=3
 build_style=go
-go_import_path="src.elv.sh/cmd/elvish"
+go_import_path="src.elv.sh"
+go_package="./cmd/elvish"
 short_desc="Novel Unix shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"

From c5e9d0b07e98005f71093642ee0021e7f8dcaead Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 106/363] emptty: revbump for go 1.21

---
 srcpkgs/emptty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 111af0ee9d55e..2f7566f82ff48 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,7 +1,7 @@
 # Template file for 'emptty'
 pkgname=emptty
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tvrzna/emptty
 makedepends="pam-devel libX11-devel"

From e629b72320e5b6dd2765256a15b31bbe0511adfd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 107/363] ensure-access: revbump for go 1.21

---
 srcpkgs/ensure-access/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index 0d0f4f5e0c7c3..9c3c9036268e7 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -1,7 +1,7 @@
 # Template file for 'ensure-access'
 pkgname=ensure-access
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
 short_desc="Tool which ensures permissions exists for files and directories"

From 3899d841e803200c49fdfa260e3e168562394cb8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:53 +0400
Subject: [PATCH 108/363] etcd: revbump for go 1.21

---
 srcpkgs/etcd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index ce54b3e43cfbf..e8fc584661a12 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,7 +1,7 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.4.24
-revision=3
+revision=4
 build_style=go
 go_import_path="go.etcd.io/etcd"
 go_package="${go_import_path} ${go_import_path}/etcdctl"

From 2d01d365938e0c17a5b7bac0f521ca386c73b88c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 109/363] exercism: revbump for go 1.21

---
 srcpkgs/exercism/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index 81a160e5992a6..45579ff00c5f8 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -1,7 +1,7 @@
 # Template file for 'exercism'
 pkgname=exercism
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"

From 793b71280481567ced5f7fa6226342e99fb9c5d0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 110/363] ffuf: revbump for go 1.21

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 72a73e82f0360..c29d057dd317d 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,9 +1,9 @@
 # Template file for 'ffuf'
 pkgname=ffuf
 version=2.0.0
-revision=3
+revision=4
 build_style=go
-go_import_path="github.com/ffuf/ffuf/v2@latest"
+go_import_path="github.com/ffuf/ffuf/v2"
 short_desc="Fast web fuzzer"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From ec50bf8fa66fd52d5a27e415908ca2f8b92573d2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 111/363] figurine: revbump for go 1.21

---
 srcpkgs/figurine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index fa4d8983abbc9..352e3e9db86e9 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -1,7 +1,7 @@
 # Template file for 'figurine'
 pkgname=figurine
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/arsham/figurine
 short_desc="Print your name in style"

From 9894eecd1815df06f8691b9b00d658400b627d9f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:54 +0400
Subject: [PATCH 112/363] flannel: revbump for go 1.21

---
 srcpkgs/flannel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 06f9c9f6adb03..af986484b420a 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,7 +1,7 @@
 # Template file for 'flannel'
 pkgname=flannel
 version=0.21.5
-revision=1
+revision=2
 build_style=go
 go_mod_mode=off
 go_import_path="github.com/flannel-io/flannel"

From 4572ced0f3d1d971a78cd78a76a3d6e9450b8faa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 113/363] flint: revbump for go 1.21

---
 srcpkgs/flint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index ad3f0e783d74b..95e13bd8799a5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -1,7 +1,7 @@
 # Template file for 'flint'
 pkgname=flint
 version=0.1.0
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/pengwynn/flint"
 short_desc="Check your project for common sources of contributor friction"

From 7b7fe518b5636bd0068493d9528e8909b547d0d2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 114/363] forego: revbump for go 1.21

---
 srcpkgs/forego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 96237d807227c..56908f4530c63 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -1,7 +1,7 @@
 # Template file for 'forego'
 pkgname=forego
 version=20180216151118
-revision=6
+revision=7
 build_style=go
 go_import_path="github.com/ddollar/forego"
 hostmakedepends="git mercurial"

From aaf4764b179eded293b98b90dab26488b37436c6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 115/363] frp: revbump for go 1.21

---
 srcpkgs/frp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frp/template b/srcpkgs/frp/template
index 7dd96b63b8558..e3bf3442f07bc 100644
--- a/srcpkgs/frp/template
+++ b/srcpkgs/frp/template
@@ -1,7 +1,7 @@
 # Template file for 'frp'
 pkgname=frp
 version=0.37.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/fatedier/frp
 go_package="${go_import_path}/cmd/frpc ${go_import_path}/cmd/frps"

From c49fa438c403554d1c00532b701afd19701b2f0c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:55 +0400
Subject: [PATCH 116/363] fs-repo-migrations: revbump for go 1.21

---
 srcpkgs/fs-repo-migrations/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fs-repo-migrations/template b/srcpkgs/fs-repo-migrations/template
index a4c4abee12cb1..00b9072beec5a 100644
--- a/srcpkgs/fs-repo-migrations/template
+++ b/srcpkgs/fs-repo-migrations/template
@@ -1,7 +1,7 @@
 # Template file for 'fs-repo-migrations'
 pkgname=fs-repo-migrations
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/fs-repo-migrations"
 short_desc="Tool to upgrade the IPFS filesystem repository"

From 607c41ed0db05fe3615da00cef987a9b4ebde87b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 117/363] fscrypt: revbump for go 1.21

---
 srcpkgs/fscrypt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index f3de2ea5d0123..4c4622f398abf 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,7 +1,7 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
 version=0.3.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"

From 468782fe39711331231ebb92d714d7bd1d45c112 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 118/363] fzf: revbump for go 1.21

---
 srcpkgs/fzf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 2236d90f5cd37..9aec0ec4825ca 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,7 +1,7 @@
 # Template file for 'fzf'
 pkgname=fzf
 version=0.42.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/junegunn/fzf"
 go_ldflags="-X main.version=${version} -X main.revision="

From 6a6b43f3023f766b2742a84ec25ff2591c2e8222 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 119/363] gdu: revbump for go 1.21

---
 srcpkgs/gdu/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 35b31bc494067..7d14c98ec53ef 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,9 +1,10 @@
 # Template file for 'gdu'
 pkgname=gdu
 version=5.25.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
+go_import_path="github.com/dundee/gdu/v5"
+go_package="./cmd/gdu"
 go_ldflags="-X github.com/dundee/gdu/v5/build.Version=${version}"
 short_desc="Disk usage analyzer intended primarily for SSD disks"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 1c0cd0f177a59d2f92e3cd762a8729db8d35e2a6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:56 +0400
Subject: [PATCH 120/363] gemget: revbump for go 1.21

---
 srcpkgs/gemget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gemget/template b/srcpkgs/gemget/template
index d257d1a8bdd5b..fee9f46ea52a8 100644
--- a/srcpkgs/gemget/template
+++ b/srcpkgs/gemget/template
@@ -1,7 +1,7 @@
 # Template file for 'gemget'
 pkgname=gemget
 version=1.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/gemget"
 short_desc="Command line downloader for the Gemini protocol"

From 52b98004d45feade4468e781da2ad38af9ff9287 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 121/363] gendesk: revbump for go 1.21

---
 srcpkgs/gendesk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 2077401dfb74a..c841cd99e8b78 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -1,7 +1,7 @@
 # Template file for 'gendesk'
 pkgname=gendesk
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 short_desc="Utility to generate .desktop files and download icons"

From 98c812f77efcf2bab4cda3e59d49227e28a84c9d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 122/363] gfuzz: revbump for go 1.21

---
 srcpkgs/gfuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index 4e24097cf7644..dab1f5e673142 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"

From 14d01e83edfa90747736ccb88cbbc6272e493e6a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 123/363] ghq: revbump for go 1.21

---
 srcpkgs/ghq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 4c826587146ab..1a13598cfb23a 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,7 +1,7 @@
 # Template file for 'ghq'
 pkgname=ghq
 version=1.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"

From 617087bfc4a03a6dd2a236b1b6f48687a95e35bc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:57 +0400
Subject: [PATCH 124/363] gister: revbump for go 1.21

---
 srcpkgs/gister/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gister/template b/srcpkgs/gister/template
index d444ad9c242d4..2ce078bfbcb3c 100644
--- a/srcpkgs/gister/template
+++ b/srcpkgs/gister/template
@@ -1,7 +1,7 @@
 # Template file for 'gister'
 pkgname=gister
 version=0.5.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/viyatb/gister
 short_desc="Command line app to create Gists in Go"

From 8111e2cd78cebe98c89b3cece2c8764faea333d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 125/363] git-lfs: revbump for go 1.21

---
 srcpkgs/git-lfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index b1951dc55b772..81a7049133152 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -1,7 +1,7 @@
 # Template file for 'git-lfs'
 pkgname=git-lfs
 version=3.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs/v3"
 hostmakedepends="git ruby-asciidoctor"

From 41c87473d024e8c746c80a3fe47c723263cde7c8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 126/363] git-sizer: revbump for go 1.21

---
 srcpkgs/git-sizer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-sizer/template b/srcpkgs/git-sizer/template
index 80409b18e97ec..986581e948a82 100644
--- a/srcpkgs/git-sizer/template
+++ b/srcpkgs/git-sizer/template
@@ -1,7 +1,7 @@
 # Template file for 'git-sizer'
 pkgname=git-sizer
 version=1.5.0
-revision=4
+revision=5
 build_style=go
 go_import_path="github.com/github/git-sizer"
 go_ldflags="-X main.ReleaseVersion=${version}"

From 9317585c997d42dc06463537185470971fb31b3f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 127/363] git-team: revbump for go 1.21

---
 srcpkgs/git-team/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/git-team/template b/srcpkgs/git-team/template
index 7aaca39281475..de1c6bc7118ad 100644
--- a/srcpkgs/git-team/template
+++ b/srcpkgs/git-team/template
@@ -1,7 +1,7 @@
 # Template file for 'git-team'
 pkgname=git-team
 version=1.8.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/hekmekk/git-team
 short_desc="Manage and enhance git commit messages with co-authors"

From ebff2168df1550f825058f9bc83bec85b9282c6f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:58 +0400
Subject: [PATCH 128/363] gitbatch: revbump for go 1.21

---
 srcpkgs/gitbatch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 0beb686d309f9..b99ef3144de62 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -1,7 +1,7 @@
 # Template file for 'gitbatch'
 pkgname=gitbatch
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
 short_desc="Command line tool to manage your git repositories in one place"

From 1963349bbbd77bd2cf902344ca604be407510f78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 129/363] gitea: revbump for go 1.21

---
 srcpkgs/gitea/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 732a3337b2111..eac852ea4ed38 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,7 +1,7 @@
 # Template file for 'gitea'
 pkgname=gitea
 version=1.20.2
-revision=1
+revision=2
 build_style=go
 go_import_path=code.gitea.io/gitea
 go_ldflags=" -X main.Version=${version}"

From 1ddcac427fae62aa7009404987ea72af37819f78 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 130/363] github-cli: revbump for go 1.21

---
 srcpkgs/github-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index bb3796a6245c7..06b1f70d90813 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.33.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/cli/cli/v2"

From 0e3e99f9a1099edd47982390c9996125c43efa53 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 131/363] github-opml: revbump for go 1.21

---
 srcpkgs/github-opml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/github-opml/template b/srcpkgs/github-opml/template
index d7cb5ce11abbf..926b1f7c42589 100644
--- a/srcpkgs/github-opml/template
+++ b/srcpkgs/github-opml/template
@@ -1,7 +1,7 @@
 # Template file for 'github-opml'
 pkgname=github-opml
 version=1.0
-revision=7
+revision=8
 build_style=go
 go_import_path=github.com/jojomi/github-opml
 hostmakedepends="git"

From 2b22c27675d58f2042de4b2f56a4ab987170d566 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:33:59 +0400
Subject: [PATCH 132/363] gitlab-runner: revbump for go 1.21

---
 srcpkgs/gitlab-runner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gitlab-runner/template b/srcpkgs/gitlab-runner/template
index caa89d508a3a3..8b0a5457f2039 100644
--- a/srcpkgs/gitlab-runner/template
+++ b/srcpkgs/gitlab-runner/template
@@ -1,7 +1,7 @@
 # Template file for 'gitlab-runner'
 pkgname=gitlab-runner
 version=16.1.0
-revision=1
+revision=2
 build_style=go
 go_import_path=gitlab.com/gitlab-org/gitlab-runner
 short_desc="Official GitLab CI runner written in Go"

From 103a46002f323c69e148beffc47bfcc7600fdbd8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 133/363] gkill: revbump for go 1.21

---
 srcpkgs/gkill/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index 5dad93db12581..bd64b642da8c8 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -1,7 +1,7 @@
 # Template file for 'gkill'
 pkgname=gkill
 version=1.0.2
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/heppu/gkill"
 hostmakedepends="git"

From 04954720f277c6b31d698d0dd2d9a7c3403f6bc6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 134/363] glab: revbump for go 1.21

---
 srcpkgs/glab/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 5772901e60390..0c6343ec92ae0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,7 +1,7 @@
 # Template file for 'glab'
 pkgname=glab
 version=1.31.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.version=$version"

From cb6f14c51c76d25024561412af9776d6b49a4da0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:00 +0400
Subject: [PATCH 135/363] glide: revbump for go 1.21

---
 srcpkgs/glide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 74d798a3cd81b..878ab343b0bbd 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -1,7 +1,7 @@
 # Template file for 'glide'
 pkgname=glide
 version=0.13.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Masterminds/glide"
 depends="go git"

From 76838cb457959d5c981b6300be0fd6f00ac45cf8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 136/363] glider: revbump for go 1.21

---
 srcpkgs/glider/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index 7b6b2f821602b..c1037e2444a82 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -1,7 +1,7 @@
 # Template file for 'glider'
 pkgname=glider
 version=0.13.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/nadoo/glider
 short_desc="Forward proxy with multiple protocols support"

From dd74a6d0653d2f62e4bd1f4d0e6593553c485f63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 137/363] glock: revbump for go 1.21

---
 srcpkgs/glock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 27458eb53fc85..8263846b7b23a 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -1,7 +1,7 @@
 # Template file for 'glock'
 pkgname=glock
 version=0.0.0.20150512
-revision=13
+revision=14
 _commit=30723574b54030cef8a13e672ce287f29c59f369
 build_style=go
 go_import_path="github.com/robfig/glock"

From 5c2df3c8df3119bf89b0d670f454dcab7eb7d798 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 138/363] glow: revbump for go 1.21

---
 srcpkgs/glow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index b0ca8b7429b13..9db40444caf42 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,7 +1,7 @@
 # Template file for 'glow'
 pkgname=glow
 version=1.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/charmbracelet/glow
 go_ldflags="-X main.Version=${version}"

From a4a088bf4cf062baf5298bd3784b4b613057d8b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:01 +0400
Subject: [PATCH 139/363] go-bindata: revbump for go 1.21

---
 srcpkgs/go-bindata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-bindata/template b/srcpkgs/go-bindata/template
index 7a3f7c5e5a6eb..dad00443ee529 100644
--- a/srcpkgs/go-bindata/template
+++ b/srcpkgs/go-bindata/template
@@ -1,7 +1,7 @@
 # Template file for 'go-bindata'
 pkgname=go-bindata
 version=3.0.7.20151023
-revision=13
+revision=14
 _commit=a0ff2567cfb70903282db057e799fd826784d41d
 build_style=go
 go_import_path="github.com/jteeuwen/go-bindata"

From 1f058525f5966e0c9e3f4f62a35cb2bfe2e100ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 140/363] go-capnproto2: revbump for go 1.21

---
 srcpkgs/go-capnproto2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-capnproto2/template b/srcpkgs/go-capnproto2/template
index 1218c7f48bbac..5c7565560d7ec 100644
--- a/srcpkgs/go-capnproto2/template
+++ b/srcpkgs/go-capnproto2/template
@@ -1,7 +1,7 @@
 # Template file for 'go-capnproto2'
 pkgname=go-capnproto2
 version=2.18.0
-revision=3
+revision=4
 build_style=go
 go_import_path=zombiezen.com/go/capnproto2
 go_package=zombiezen.com/go/capnproto2/capnpc-go

From 65291bf6c6428a8d501b3b6782ae11b23268e408 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 141/363] go-ipfs: revbump for go 1.21

---
 srcpkgs/go-ipfs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index b8de9038e4590..08401345807e6 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-ipfs'
 pkgname=go-ipfs
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
@@ -23,6 +23,7 @@ pre_build() {
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi
+	export GOTOOLCHAIN="go1.16"
 }
 
 post_install() {

From 4003e7c4ac764fa5e2a910f484a003b22705d6fd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 142/363] go-jira: revbump for go 1.21

---
 srcpkgs/go-jira/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-jira/template b/srcpkgs/go-jira/template
index e53c007012225..5e80ab41445cd 100644
--- a/srcpkgs/go-jira/template
+++ b/srcpkgs/go-jira/template
@@ -1,7 +1,7 @@
 # Template file for 'go-jira'
 pkgname=go-jira
 version=1.0.28
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-jira/jira"
 go_package="$go_import_path/cmd/jira"

From 77d20ed3f164d5fb7e65a00ac2e9fcfa8e404cdc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:02 +0400
Subject: [PATCH 143/363] go-md2man: revbump for go 1.21

---
 srcpkgs/go-md2man/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e2f76d3fe619a..7898513b58ff2 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,7 +1,7 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
 version=2.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
 short_desc="Convert md to manpages"

From d5700cb8dd234dee27144eb9ac616d1afc18f4e1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 144/363] go-mtpfs: revbump for go 1.21

---
 srcpkgs/go-mtpfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-mtpfs/template b/srcpkgs/go-mtpfs/template
index 1c441d68ab81b..92a906cfa95cb 100644
--- a/srcpkgs/go-mtpfs/template
+++ b/srcpkgs/go-mtpfs/template
@@ -1,7 +1,7 @@
 # Template file for 'go-mtpfs'
 pkgname=go-mtpfs
 version=1.0.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/hanwen/go-mtpfs
 hostmakedepends="pkg-config"

From 9139b83f4d1bae0202d33d7f799b680d357a59fd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 145/363] go-review: revbump for go 1.21

---
 srcpkgs/go-review/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index 3e3d648f55d3b..c30713835056e 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -1,7 +1,7 @@
 # Template file for 'go-review'
 pkgname=go-review
 version=1.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"

From f680952c26af810ffc422fcfe540c23239d9bd87 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 146/363] goatcounter: revbump for go 1.21

---
 srcpkgs/goatcounter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index f2f602f9d34f8..94c3add2c682c 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,7 +1,7 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
 version=2.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/goatcounter/v2
 go_package="${go_import_path}/cmd/goatcounter"

From 60ba8c033ca8219fdef0b925a578b5a7801ed353 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:03 +0400
Subject: [PATCH 147/363] gobuster: revbump for go 1.21

---
 srcpkgs/gobuster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index cb8ff76b918a0..c80406546121c 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -1,7 +1,7 @@
 # Template file for 'gobuster'
 pkgname=gobuster
 version=3.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
 short_desc="Directory, file and DNS busting tool"

From db947aab3efe78f4af4e810591cd6fd9dd8e7f7a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 148/363] gocloc: revbump for go 1.21

---
 srcpkgs/gocloc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocloc/template b/srcpkgs/gocloc/template
index 4c4644249886f..6cdc8b2b3b1e8 100644
--- a/srcpkgs/gocloc/template
+++ b/srcpkgs/gocloc/template
@@ -1,7 +1,7 @@
 # Template file for 'gocloc'
 pkgname=gocloc
 version=0.4.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hhatto/gocloc"
 go_package="${go_import_path}/cmd/gocloc"

From dec0a4e323517b8f725836b7cc2a4e9e2a7c5dd8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 149/363] gocryptfs: revbump for go 1.21

---
 srcpkgs/gocryptfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gocryptfs/template b/srcpkgs/gocryptfs/template
index faae12d35ccb8..4ad7555a10a76 100644
--- a/srcpkgs/gocryptfs/template
+++ b/srcpkgs/gocryptfs/template
@@ -1,7 +1,7 @@
 # Template file for 'gocryptfs'
 pkgname=gocryptfs
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rfjakob/gocryptfs/v2"
 go_build_tags="without_openssl"

From 8e83bb258f7b1942a9b4cf62f767b42e405ea887 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 150/363] godef: revbump for go 1.21

---
 srcpkgs/godef/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godef/template b/srcpkgs/godef/template
index e30af33909932..5af98414b5733 100644
--- a/srcpkgs/godef/template
+++ b/srcpkgs/godef/template
@@ -1,7 +1,7 @@
 # Template file for 'godef'
 pkgname=godef
 version=1.1.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rogpeppe/godef"
 short_desc="Print where symbols are defined in Go source code"

From b80a72bd1bdde8ce1725a23555ca8025eb562e63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:04 +0400
Subject: [PATCH 151/363] gogs: revbump for go 1.21

---
 srcpkgs/gogs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
index 2db23f2d9bcb9..68a136a80c171 100644
--- a/srcpkgs/gogs/template
+++ b/srcpkgs/gogs/template
@@ -1,7 +1,7 @@
 # Template file for 'gogs'
 pkgname=gogs
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"

From c4338ed289de11f3aafe543c9e128595aeb2574b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 152/363] goimapnotify: revbump for go 1.21

---
 srcpkgs/goimapnotify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 07bf6b5d51558..311573f7a334d 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -1,7 +1,7 @@
 # Template file for 'goimapnotify'
 pkgname=goimapnotify
 version=2.3.7
-revision=2
+revision=3
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"

From 50357779f43815fe80f437d732ec07d8ae5b1ac0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 153/363] golangci-lint: revbump for go 1.21

---
 srcpkgs/golangci-lint/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/golangci-lint/template b/srcpkgs/golangci-lint/template
index 173632a02ff40..6da307ecef2b8 100644
--- a/srcpkgs/golangci-lint/template
+++ b/srcpkgs/golangci-lint/template
@@ -1,9 +1,10 @@
 # Template file for 'golangci-lint'
 pkgname=golangci-lint
 version=1.53.3
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/golangci/golangci-lint/cmd/golangci-lint
+go_import_path="github.com/golangci/golangci-lint"
+go_package="./cmd/golangci-lint"
 go_ldflags="-X main.version=${version} -X main.date=${SOURCE_DATE_EPOCH} -X main.commit=v${version}"
 short_desc="Linters Runner for Go"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From d23be1d30dda6efa9e3ea09b846818b54a7ee000 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 154/363] gomatrix: revbump for go 1.21

---
 srcpkgs/gomatrix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index 4d25d7e8ddafc..c78893ef1337a 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -1,7 +1,7 @@
 # Template file for 'gomatrix'
 pkgname=gomatrix
 version=101.0.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
 short_desc="Terminal Matrix display in golang"

From 8ae94baf648d43514578f404eacd922759af16a7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:05 +0400
Subject: [PATCH 155/363] gopass-jsonapi: revbump for go 1.21

---
 srcpkgs/gopass-jsonapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass-jsonapi/template b/srcpkgs/gopass-jsonapi/template
index f4e0e67d60635..2f93438ecfbcd 100644
--- a/srcpkgs/gopass-jsonapi/template
+++ b/srcpkgs/gopass-jsonapi/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass-jsonapi'
 pkgname=gopass-jsonapi
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/gopasspw/gopass-jsonapi
 go_ldflags="-X main.version=${version}"

From 82d60f3444e4d727ba5e9686669c971a9416162f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 156/363] gopass: revbump for go 1.21

---
 srcpkgs/gopass/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 66b113ae5a7bc..4f518d5486548 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,7 +1,7 @@
 # Template file for 'gopass'
 pkgname=gopass
 version=1.15.5
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/gopasspw/gopass

From 7d582a49ece321562d13ed3fd74b906fc6c0116b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 157/363] gopls: revbump for go 1.21

---
 srcpkgs/gopls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index ff0ce4225db57..530d8a626da12 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,7 +1,7 @@
 # Template file for 'gopls'
 pkgname=gopls
 version=0.13.2
-revision=1
+revision=2
 build_wrksrc=gopls
 build_style=go
 go_import_path=golang.org/x/tools/gopls

From f39d6c7b4b05477337e82eacb3aadfb9d9d43fd4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:06 +0400
Subject: [PATCH 158/363] gopm: revbump for go 1.21

---
 srcpkgs/gopm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index 05f9d6d2572ee..815a52704789c 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,7 +1,7 @@
 # Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=16
+revision=17
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 build_style=go
 go_import_path="github.com/gpmgo/gopm"

From 31f2e167a2824d1f5594c99c675423be425dc2da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 159/363] gops: revbump for go 1.21

---
 srcpkgs/gops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gops/template b/srcpkgs/gops/template
index ffb31409f60c2..5d65be5bc6416 100644
--- a/srcpkgs/gops/template
+++ b/srcpkgs/gops/template
@@ -1,7 +1,7 @@
 # Template file for 'gops'
 pkgname=gops
 version=0.3.28
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/gops"
 short_desc="List and diagnose Go processes currently running on your system"

From 5b8d96e0125916a3b6a9d3d94a555fe384616ebe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 160/363] goreleaser: revbump for go 1.21

---
 srcpkgs/goreleaser/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index db93f6aa267a8..ef073a193a92f 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,7 +1,7 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
 version=1.19.2
-revision=2
+revision=3
 build_style=go
 build_helper="qemu"
 go_import_path=github.com/goreleaser/goreleaser

From 516aa90753fa9a27dd3e26874b1db48573501503 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 161/363] gotify-cli: revbump for go 1.21

---
 srcpkgs/gotify-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
index bf84f07bd1e67..a2a5e758f6cee 100644
--- a/srcpkgs/gotify-cli/template
+++ b/srcpkgs/gotify-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-cli'
 pkgname=gotify-cli
 version=2.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/gotify/cli/v2"
 go_ldflags="-X main.Version=${version} -X main.BuildDate=${SOURCE_DATE_EPOCH}

From 72f0b349b1977b51a861ff93b2589c959fbf3f98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:07 +0400
Subject: [PATCH 162/363] gotify-server: revbump for go 1.21

---
 srcpkgs/gotify-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
index cc12d3174a19b..016fb6cb40e9c 100644
--- a/srcpkgs/gotify-server/template
+++ b/srcpkgs/gotify-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gotify-server'
 pkgname=gotify-server
 version=2.2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gotify/server/v2"
 go_ldflags="-extldflags=-fuse-ld=bfd -X main.Version=${version}

From 0993491201d7d01a2a1dd6b722704cfa50601c74 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 163/363] gotop: revbump for go 1.21

---
 srcpkgs/gotop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index daa1bc31f4429..4d988e52cfa02 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,7 +1,7 @@
 # Template file for 'gotop'
 pkgname=gotop
 version=4.2.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_ldflags="-X main.Version=v${version}"

From 1249bed7931fd714e5e3e1bc13edaeb696e15b93 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 164/363] gotty: revbump for go 1.21

---
 srcpkgs/gotty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 93283eca4e731..655809e9d66b9 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -1,7 +1,7 @@
 # Template file for 'gotty'
 pkgname=gotty
 version=1.0.1
-revision=9
+revision=10
 build_style=go
 go_import_path="github.com/yudai/gotty"
 short_desc="Share your terminal as a web application"

From d792857da98f105b36dcbc4170f5823621fc6b18 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 165/363] goversion: revbump for go 1.21

---
 srcpkgs/goversion/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index f0fc184ccfb1e..de9bf309ab4c8 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -1,7 +1,7 @@
 # Template file for 'goversion'
 pkgname=goversion
 version=1.2.0
-revision=4
+revision=5
 build_style=go
 go_import_path=rsc.io/goversion
 short_desc="Print version used to build Go executables"

From c404be215b9a47d84442493001d568bce1f36807 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:08 +0400
Subject: [PATCH 166/363] grafana: revbump for go 1.21

---
 srcpkgs/grafana/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template
index 75db1925d8285..af67b08c6bbef 100644
--- a/srcpkgs/grafana/template
+++ b/srcpkgs/grafana/template
@@ -1,7 +1,7 @@
 # Template file for 'grafana'
 pkgname=grafana
 version=10.0.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/grafana/grafana
 go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana"

From d7cee5a6aba51307e9800dba13ad9cc45876a284 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 167/363] gron: revbump for go 1.21

---
 srcpkgs/gron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gron/template b/srcpkgs/gron/template
index 85e5e794b0d83..6909c6a65ff8d 100644
--- a/srcpkgs/gron/template
+++ b/srcpkgs/gron/template
@@ -1,7 +1,7 @@
 # Template file for 'gron'
 pkgname=gron
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tomnomnom/gron
 short_desc="Tool to make JSON greppable"

From d304415f024328218f15663e24fe58b47b6d0d6a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 168/363] grype: revbump for go 1.21

---
 srcpkgs/grype/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index 4b1abc0468302..7cfe530de8fa5 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,7 +1,7 @@
 # Template file for 'grype'
 pkgname=grype
 version=0.65.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"

From 30c31ac56c848411a29ac1119ae3b03dbfab2abe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 169/363] gucci: revbump for go 1.21

---
 srcpkgs/gucci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 887d8a1ad5afe..63bee6ecfc703 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,7 +1,7 @@
 # Template file for 'gucci'
 pkgname=gucci
 version=1.6.10
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/noqcks/gucci"
 go_ldflags="-X main.AppVersion=${version}"

From ee4aa22090ac9879a8e0b33d6695cab21aef4436 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:09 +0400
Subject: [PATCH 170/363] gum: revbump for go 1.21

---
 srcpkgs/gum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gum/template b/srcpkgs/gum/template
index f864cdc1c16eb..55292f72b1a2f 100644
--- a/srcpkgs/gum/template
+++ b/srcpkgs/gum/template
@@ -1,7 +1,7 @@
 # Template file for 'gum'
 pkgname=gum
 version=0.11.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/gum"

From 8c1cfb2ad1ca89483faad61453cd9d11ca40aee5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 171/363] hcloud: revbump for go 1.21

---
 srcpkgs/hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index cf663f5dea31f..f603f3975587c 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,7 +1,7 @@
 # Template file for 'hcloud'
 pkgname=hcloud
 version=1.36.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/hetznercloud/cli

From b7db3901fb4e52c325f09ef81adf2153531f2fbe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 172/363] hey: revbump for go 1.21

---
 srcpkgs/hey/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 09861576a9d4e..00292442e6abe 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -1,7 +1,7 @@
 # Template file for 'hey'
 pkgname=hey
 version=0.1.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/rakyll/hey
 short_desc="HTTP load generator"

From db1cdc750880d64ac9e3f4a3d2f1ab18fe222870 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 173/363] hivemind: revbump for go 1.21

---
 srcpkgs/hivemind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivemind/template b/srcpkgs/hivemind/template
index f38c560305bc0..695a32afde4a2 100644
--- a/srcpkgs/hivemind/template
+++ b/srcpkgs/hivemind/template
@@ -1,7 +1,7 @@
 # Template file for 'hivemind'
 pkgname=hivemind
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/DarthSim/hivemind"
 short_desc="Process manager for Procfile-based applications"

From 937b560f0625e85bc168619f962b1e621ba275eb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:10 +0400
Subject: [PATCH 174/363] hooktftp: revbump for go 1.21

---
 srcpkgs/hooktftp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index be8dc632ee57c..9d3f51b616935 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -1,7 +1,7 @@
 # Template file for 'hooktftp'
 pkgname=hooktftp
 version=1.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"

From bd7170dae9a5c98f3579f28cd74a1d2e01e5443c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 175/363] httpstat: revbump for go 1.21

---
 srcpkgs/httpstat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index ecc76c972c4d3..d6f11cc61cca6 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,7 +1,7 @@
 # Template file for 'httpstat'
 pkgname=httpstat
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"

From 01d6a74a83da69c102f04a3fe3e6775519e43eee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 176/363] hub: revbump for go 1.21

---
 srcpkgs/hub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hub/template b/srcpkgs/hub/template
index 2bfd9320d7c58..4517d5e22f567 100644
--- a/srcpkgs/hub/template
+++ b/srcpkgs/hub/template
@@ -1,7 +1,7 @@
 # Template file for 'hub'
 pkgname=hub
 version=2.14.2
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/github/hub
 hostmakedepends="git groff"

From 2afa647fc4de35a251e03385f33dc584b8df50a8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 177/363] hugo: revbump for go 1.21

---
 srcpkgs/hugo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 6b0eca3d36d65..4b1d38f04a354 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.117.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/gohugoio/hugo"

From daddeae02ab684e55c0ab025d3aeed7133061543 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:11 +0400
Subject: [PATCH 178/363] hut: revbump for go 1.21

---
 srcpkgs/hut/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hut/template b/srcpkgs/hut/template
index 30c2df12bce7f..cfca65b492a53 100644
--- a/srcpkgs/hut/template
+++ b/srcpkgs/hut/template
@@ -1,7 +1,7 @@
 # Template file for 'hut'
 pkgname=hut
 version=0.3.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="git.sr.ht/~emersion/hut"

From d028ded804e8d4028d76de72cd0f2f067c33d9c7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 179/363] hydroxide: revbump for go 1.21

---
 srcpkgs/hydroxide/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 66c4448397541..00c3e91af1314 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -1,7 +1,7 @@
 # Template file for 'hydroxide'
 pkgname=hydroxide
 version=0.2.27
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide

From dfac9bbe79832d73eff4e04e15003aa85fe0b2b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 180/363] i3cat: revbump for go 1.21

---
 srcpkgs/i3cat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/i3cat/template b/srcpkgs/i3cat/template
index 55593fff28e80..91fb0fe5777ad 100644
--- a/srcpkgs/i3cat/template
+++ b/srcpkgs/i3cat/template
@@ -1,7 +1,7 @@
 # Template file for 'i3cat'
 pkgname=i3cat
 version=1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/vincent-petithory/i3cat"
 hostmakedepends="git"

From e7b600fa9fbe6499394e44a4f742a2405796ecdf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 181/363] ibus-bamboo: revbump for go 1.21

---
 srcpkgs/ibus-bamboo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ibus-bamboo/template b/srcpkgs/ibus-bamboo/template
index f3cf8bc5511f7..e848a28b45961 100644
--- a/srcpkgs/ibus-bamboo/template
+++ b/srcpkgs/ibus-bamboo/template
@@ -1,7 +1,7 @@
 # Template file for 'ibus-bamboo'
 pkgname=ibus-bamboo
 version=0.7.8
-revision=2
+revision=3
 build_style=go
 makedepends="libXtst-devel libX11-devel"
 depends="ibus"

From fc42976a920f7ef9af32636cd19edc2a6a9f21da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:12 +0400
Subject: [PATCH 182/363] img: revbump for go 1.21

---
 srcpkgs/img/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/img/template b/srcpkgs/img/template
index e84084f1c00f0..0965d023a704c 100644
--- a/srcpkgs/img/template
+++ b/srcpkgs/img/template
@@ -1,7 +1,7 @@
 # Template file for 'img'
 pkgname=img
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/img
 go_build_tags="noembed seccomp"

From 82c4f721ce0c8e6c46f5a2c45b218252aef29f6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 183/363] immortal: revbump for go 1.21

---
 srcpkgs/immortal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index c1a4347539c05..6e8fde3aafb9c 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -1,7 +1,7 @@
 # Template file for 'immortal'
 pkgname=immortal
 version=0.24.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl

From 63f90e718d1291a1c425c020a511f22a5d5a21e4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 184/363] influxdb: revbump for go 1.21

---
 srcpkgs/influxdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/influxdb/template b/srcpkgs/influxdb/template
index 9235ce0a88eea..70544e746f864 100644
--- a/srcpkgs/influxdb/template
+++ b/srcpkgs/influxdb/template
@@ -1,7 +1,7 @@
 # Template file for 'influxdb'
 pkgname=influxdb
 version=1.8.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/influxdb
 go_package="${go_import_path}/cmd/influx

From efc7cc4c2d967b93bd8413656afc56cd3a7d6ae5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:13 +0400
Subject: [PATCH 185/363] ipfs-cluster: revbump for go 1.21

---
 srcpkgs/ipfs-cluster/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index b227681c64d86..465cd3d293061 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -1,7 +1,7 @@
 # Template file for 'ipfs-cluster'
 pkgname=ipfs-cluster
 version=0.12.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"

From bd3c6088e3571b6c42ac51daf0fd0a4de2ec92d3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 186/363] ipp-usb: revbump for go 1.21

---
 srcpkgs/ipp-usb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
index 61f85a7b5c084..5f3615254f912 100644
--- a/srcpkgs/ipp-usb/template
+++ b/srcpkgs/ipp-usb/template
@@ -1,7 +1,7 @@
 # Template file for 'ipp-usb'
 pkgname=ipp-usb
 version=0.9.23
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/OpenPrinting/ipp-usb"
 conf_files="/etc/ipp-usb/ipp-usb.conf"

From a573f92d2636cc5d8d67dd67363cf2892e55e347 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 187/363] ircdog: revbump for go 1.21

---
 srcpkgs/ircdog/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
index e4988efb392a4..b8d22e9b7c927 100644
--- a/srcpkgs/ircdog/template
+++ b/srcpkgs/ircdog/template
@@ -1,7 +1,7 @@
 # Template file for 'ircdog'
 pkgname=ircdog
 version=0.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/ergochat/ircdog"
 short_desc="Simple wrapper over the raw IRC protocol"

From e7307bd4a8e8bd3a26577d94521fbc6bf36aa8ca Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 188/363] jd: revbump for go 1.21

---
 srcpkgs/jd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jd/template b/srcpkgs/jd/template
index 48da8b9e0e54a..ffbfdbbc41d23 100644
--- a/srcpkgs/jd/template
+++ b/srcpkgs/jd/template
@@ -1,7 +1,7 @@
 # Template file for 'jd'
 pkgname=jd
 version=1.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/josephburnett/jd"
 short_desc="JSON diff and patch"

From 51ff1a3e73fa34dd4706eaac7840b90e0f2d3b5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:14 +0400
Subject: [PATCH 189/363] jid: revbump for go 1.21

---
 srcpkgs/jid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index c125c926e316f..51dc72df9fd62 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -1,7 +1,7 @@
 # Template file for 'jid'
 pkgname=jid
 version=0.7.6
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid

From 448b5e624b41e9f539b4377c0ae70127e9127828 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 190/363] jj: revbump for go 1.21

---
 srcpkgs/jj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index fd18b28f8391c..b234c0ff3696d 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,7 +1,7 @@
 # Template file for 'jj'
 pkgname=jj
 version=1.9.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/tidwall/jj"
 go_package="${go_import_path}/cmd/jj"

From f0c1e2a94eac2254412a642367080c404b59d062 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 191/363] joker: revbump for go 1.21

---
 srcpkgs/joker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index d03cc95f51f82..eee3631aa599c 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -1,7 +1,7 @@
 # Template file for 'joker'
 pkgname=joker
 version=1.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/candid82/joker
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"

From d030acd0c6c2c63408c5fa6037932425a9155c16 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 192/363] jp: revbump for go 1.21

---
 srcpkgs/jp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jp/template b/srcpkgs/jp/template
index e15d1fffd9365..f3c06c22f64ce 100644
--- a/srcpkgs/jp/template
+++ b/srcpkgs/jp/template
@@ -1,7 +1,7 @@
 # Template file for 'jp'
 pkgname=jp
 version=0.1.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/jmespath/jp
 short_desc="Command line interface to JMESPath"

From 30bede8cd651f6dd34f4ece97e370a17890cd059 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:15 +0400
Subject: [PATCH 193/363] jsonnet-language-server: revbump for go 1.21

---
 srcpkgs/jsonnet-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jsonnet-language-server/template b/srcpkgs/jsonnet-language-server/template
index 5a6b780d39e6f..81d3890cc7c16 100644
--- a/srcpkgs/jsonnet-language-server/template
+++ b/srcpkgs/jsonnet-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonnet-language-server'
 pkgname=jsonnet-language-server
 version=0.11.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/grafana/jsonnet-language-server
 short_desc="Language Server Protocol (LSP) server for Jsonnet"

From 779a99b4bbe9b60082be48d62890db6f367d1b69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 194/363] jump: revbump for go 1.21

---
 srcpkgs/jump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index c892a709c1e4d..326135b032dc0 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -1,7 +1,7 @@
 # Template file for 'jump'
 pkgname=jump
 version=0.51.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
 short_desc="Fuzzy directory jumper that learns your habits"

From ae6b5d834f53dbc80f8ed94724cc331b5b4e9814 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 195/363] k3d: revbump for go 1.21

---
 srcpkgs/k3d/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/k3d/template b/srcpkgs/k3d/template
index 51b378c50cce1..d3cd00083d8e4 100644
--- a/srcpkgs/k3d/template
+++ b/srcpkgs/k3d/template
@@ -1,7 +1,7 @@
 # Template file for 'k3d'
 pkgname=k3d
 version=5.5.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/k3d-io/k3d/v5"
@@ -16,6 +16,10 @@ distfiles="https://github.com/k3d-io/k3d/archive/v${version}.tar.gz"
 checksum=b9be4f6e21017e0dae06c0e7d234ff99b0e1a49edc44d3af821b6bdb5f3d2992
 _completions="bash zsh fish"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_build() {
 	local cli=$(find $GOPATH/bin -name k3d)
 	for shell in $_completions

From 7dcd4c3b9f993b2dd12958809f30f1914ad51ce8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 196/363] k9s: revbump for go 1.21

---
 srcpkgs/k9s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5353bad9ad51e..3af793e618d60 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,7 +1,7 @@
 # Template file for 'k9s'
 pkgname=k9s
 version=0.27.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/derailed/k9s"
 go_ldflags="-X ${go_import_path}/cmd.version=${version}"

From 8fdda0f5907afc9bf554723076fec9eefddf1e07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:16 +0400
Subject: [PATCH 197/363] kapacitor: revbump for go 1.21

---
 srcpkgs/kapacitor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kapacitor/template b/srcpkgs/kapacitor/template
index b9439fa9ebd0a..e17a5cbe55dd0 100644
--- a/srcpkgs/kapacitor/template
+++ b/srcpkgs/kapacitor/template
@@ -1,7 +1,7 @@
 # Template file for 'kapacitor'
 pkgname=kapacitor
 version=1.5.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/kapacitor
 go_package="${go_import_path}/cmd/kapacitor

From 80c27fbdec9d96507c782b20500fd1dd36b79073 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 198/363] keybase: revbump for go 1.21

---
 srcpkgs/keybase/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index c2dce9dae4733..4ee39784b1f73 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -1,7 +1,7 @@
 # Template file for 'keybase'
 pkgname=keybase
 version=5.8.1
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/keybase/client"
 go_package="${go_import_path}/go/keybase

From f3d12d3fa836776b5ccac4fee8191dbd11dff1b4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 199/363] knit: revbump for go 1.21

---
 srcpkgs/knit/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knit/template b/srcpkgs/knit/template
index 0476523cf1b44..58b074985140d 100644
--- a/srcpkgs/knit/template
+++ b/srcpkgs/knit/template
@@ -1,9 +1,9 @@
 # Template file for 'knit'
 pkgname=knit
 version=1.1.1
-revision=1
+revision=2
 build_style=go
-go_import_path="./cmd/..."
+go_import_path="github.com/zyedidia/knit"
 go_ldflags="-X github.com/zyedidia/knit/info.Version=$version"
 hostmakedepends="pandoc"
 short_desc="Simple and flexible build tool using Lua, similar to make/mk"
@@ -12,6 +12,7 @@ license="MIT, MPL-2.0"
 homepage="https://github.com/zyedidia/knit"
 distfiles="https://github.com/zyedidia/knit/archive/refs/tags/v${version}.tar.gz"
 checksum=f4a073568ef3b44d4cf80f4acff021368c5a2cc4f047ce7b4c6b5bfa57562e2b
+go_packages="./cmd/knit"
 
 post_build() {
 	go run ./tools/replace/replace.go man/knit.md | pandoc -s -t man -o knit.1

From da0a4b2947b79c3aedbb894a3ff352e702639fd6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 200/363] kopia: revbump for go 1.21

---
 srcpkgs/kopia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index 1f0b8a0161187..ba0a3936e7630 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,7 +1,7 @@
 # Template file for 'kopia'
 pkgname=kopia
 version=0.13.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/kopia/kopia

From 22a04189b62709ea84bc8a93e5a37a897b2edf47 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:17 +0400
Subject: [PATCH 201/363] kops: revbump for go 1.21

---
 srcpkgs/kops/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 9ea81d46c24a4..3d97af94004a9 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,10 +1,11 @@
 # Template file for 'kops'
 pkgname=kops
 version=1.26.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=go
-go_import_path="k8s.io/kops/cmd/kops"
+go_import_path="k8s.io/kops"
+go_package="./cmd/kops"
 go_ldflags="-X k8s.io/kops.Version=${version} -X k8s.io/kops.GitVersion=${version}"
 depends="kubectl"
 short_desc="Production Grade K8s Installation, Upgrades, and Management"

From 3888582a7dbf35c3f98790735609dfd9bf7ba7b7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 202/363] kubecfg: revbump for go 1.21

---
 srcpkgs/kubecfg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubecfg/template b/srcpkgs/kubecfg/template
index 704282be61d9a..b86bf6da4dfe3 100644
--- a/srcpkgs/kubecfg/template
+++ b/srcpkgs/kubecfg/template
@@ -1,7 +1,7 @@
 # Template file for 'kubecfg'
 pkgname=kubecfg
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bitnami/kubecfg"
 go_ldflags="-X main.version=v${version}"

From ccd1b1ac507a0f7c06054ec88d9ad3d94e1ade1c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 203/363] kubefwd: revbump for go 1.21

---
 srcpkgs/kubefwd/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 0b880bca37b72..37aa7450ac55b 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,9 +1,10 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
 version=1.22.5
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
+go_import_path="github.com/txn2/kubefwd"
+go_package="./cmd/kubefwd"
 go_ldflags="-X main.Version=v${version}"
 short_desc="Bulk port forwarding Kubernetes services for local development"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,7 +15,3 @@ checksum=988bf1f6618000aca658b91427f09502f61ed5ec8d78fcafd1bc5ece173a4ece
 
 # fix: collect2: fatal error: cannot find 'ld'
 export LDFLAGS="-fuse-ld=bfd"
-
-post_install() {
-	vlicense NOTICE
-}

From 8725d07fdf86365c9ae049f89ee37cd41c6301ee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 204/363] kubernetes-kind: revbump for go 1.21

---
 srcpkgs/kubernetes-kind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 334bc718b48d9..91c184fca46be 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.17.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="sigs.k8s.io/kind"

From 897c54cc6180666b3eceb92e1f3332c074d063ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:18 +0400
Subject: [PATCH 205/363] kubernetes: revbump for go 1.21

---
 srcpkgs/kubernetes/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 09e7771c816d6..5ca63b13fa13d 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes'
 pkgname=kubernetes
 version=1.27.4
-revision=1
+revision=2
 archs="aarch64* x86_64* ppc64le*"
 build_style=go
 go_import_path="github.com/kubernetes/kubernetes"

From 0e11f723c747b0e48446142cc62cee36a5a7b0d6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 206/363] kurly: revbump for go 1.21

---
 srcpkgs/kurly/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kurly/template b/srcpkgs/kurly/template
index 920be46ea53b3..9edeb2600a27b 100644
--- a/srcpkgs/kurly/template
+++ b/srcpkgs/kurly/template
@@ -1,7 +1,7 @@
 # Template file for 'kurly'
 pkgname=kurly
 version=1.2.2
-revision=3
+revision=4
 build_style=go
 go_import_path="gitlab.com/davidjpeacock/kurly"
 short_desc="Alternative to the widely popular curl program"

From 22e0ecdab1c0265948a3556ffbb7e68f6b2cb1ea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 207/363] lazydocker: revbump for go 1.21

---
 srcpkgs/lazydocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index 7feb06ce54090..297802826b431 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,7 +1,7 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
 version=0.21.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
 go_ldflags="-X main.version=${version}"

From 71f1a32fe29f00878f43b6b0fadcc6f5ea1fbab5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 208/363] lazygit: revbump for go 1.21

---
 srcpkgs/lazygit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index db18c80bb9793..e42946b6df873 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,7 +1,7 @@
 # Template file for 'lazygit'
 pkgname=lazygit
 version=0.40.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"

From 7fba97bc10b07d24aeded043476ce7387c6d735b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:19 +0400
Subject: [PATCH 209/363] lego: revbump for go 1.21

---
 srcpkgs/lego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index e1e336f990301..7b3c017cf922f 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -1,7 +1,7 @@
 # Template file for 'lego'
 pkgname=lego
 version=4.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"

From 3bdf217b73e934ffe4d8d9ea46246f521e030409 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 210/363] lets: revbump for go 1.21

---
 srcpkgs/lets/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
index 26b6e5b77c803..658a529cc3536 100644
--- a/srcpkgs/lets/template
+++ b/srcpkgs/lets/template
@@ -1,7 +1,7 @@
 # Template file for 'lets'
 pkgname=lets
 version=0.0.53
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X main.version=${version}"
 go_import_path="github.com/lets-cli/lets"

From e1a1fef912b2f0535f5a25aa43d34e9eda374ea9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 211/363] lf: revbump for go 1.21

---
 srcpkgs/lf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 22e9de8d19e7a..48278613ff261 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,7 +1,7 @@
 # Template file for 'lf'
 pkgname=lf
 version=r30
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
 go_ldflags="-X main.gVersion=$version"

From 69e4b6c79878612bf43d2ca390731e1bc19244fa Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:20 +0400
Subject: [PATCH 212/363] licensechecker: revbump for go 1.21

---
 srcpkgs/licensechecker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index 0d2af0b4fdb57..04ebacce15814 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -1,7 +1,7 @@
 # Template file for 'licensechecker'
 pkgname=licensechecker
 version=1.3.1
-revision=6
+revision=7
 build_style=go
 go_import_path=github.com/boyter/lc
 short_desc="Identify software licenses used on a source tree"

From 3bfd9392e66d73958945e9d7058e9a964aefc44d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 213/363] loki: revbump for go 1.21

---
 srcpkgs/loki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/loki/template b/srcpkgs/loki/template
index 7246e92134ce2..f052faefb07c4 100644
--- a/srcpkgs/loki/template
+++ b/srcpkgs/loki/template
@@ -1,7 +1,7 @@
 # Template file for 'loki'
 pkgname=loki
 version=2.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grafana/loki"
 go_package="${go_import_path}/cmd/loki

From f0157b66a458af9fdb63f819d5e29a5bbfaa7324 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 214/363] lsp: revbump for go 1.21

---
 srcpkgs/lsp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lsp/template b/srcpkgs/lsp/template
index 0eed3a406317d..0bc70ccd5aaa9 100644
--- a/srcpkgs/lsp/template
+++ b/srcpkgs/lsp/template
@@ -1,7 +1,7 @@
 # Template file for 'lsp'
 pkgname=lsp
 version=0.2.0.20160318
-revision=2
+revision=3
 _githash=83465c0199da613c3f2e76f1308213fef4e52a75
 build_style=go
 go_import_path="github.com/dborzov/lsp"

From 58425cfb82b8f2c69bffcb55693cf2eece953ca5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 215/363] lux: revbump for go 1.21

---
 srcpkgs/lux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index dcb88fe4956c2..08706df089997 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,7 +1,7 @@
 # Template file for 'lux'
 pkgname=lux
 version=0.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/iawia002/lux
 depends="ffmpeg"

From 6db92f154c4835ccd47964a1a07af57a0a9a62b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:21 +0400
Subject: [PATCH 216/363] maddy: revbump for go 1.21

---
 srcpkgs/maddy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maddy/template b/srcpkgs/maddy/template
index 85dff9d4b8b16..f0392f1bdf0df 100644
--- a/srcpkgs/maddy/template
+++ b/srcpkgs/maddy/template
@@ -1,7 +1,7 @@
 # Template file for 'maddy'
 pkgname=maddy
 version=0.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/foxcpp/maddy"
 go_package="$go_import_path/cmd/maddy

From 4b6e9d984713119302e25956de55cc81ff70485a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 217/363] madonctl: revbump for go 1.21

---
 srcpkgs/madonctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/madonctl/template b/srcpkgs/madonctl/template
index 94cdfa5dda85e..c236be35d7322 100644
--- a/srcpkgs/madonctl/template
+++ b/srcpkgs/madonctl/template
@@ -1,7 +1,7 @@
 # Template file for 'madonctl'
 pkgname=madonctl
 version=2.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/McKael/madonctl
 short_desc="CLI client for the Mastodon social network API"

From 14446e7d8b481bbccf5e7041f3bfca52f355df6b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 218/363] massren: revbump for go 1.21

---
 srcpkgs/massren/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index 7e883b8bc7d3b..0abec48b7e9a2 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -1,7 +1,7 @@
 # Template file for 'massren'
 pkgname=massren
 version=1.5.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/laurent22/massren"
 short_desc="Massive renamer from command line"

From 48c92dceb01a21ff6f07b49643f64f3f7e942534 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 219/363] mdr: revbump for go 1.21

---
 srcpkgs/mdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mdr/template b/srcpkgs/mdr/template
index 0271183193d91..dd1f9efc253c7 100644
--- a/srcpkgs/mdr/template
+++ b/srcpkgs/mdr/template
@@ -1,7 +1,7 @@
 # Template file for 'mdr'
 pkgname=mdr
 version=0.2.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/MichaelMure/mdr"
 short_desc="MarkDown Renderer for the terminal"

From 883f1044c3e2a9db5d575b13a0b185a84c7d6143 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:22 +0400
Subject: [PATCH 220/363] micro: revbump for go 1.21

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ba86f252371f4..9d57a354765e2 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -1,7 +1,7 @@
 # Template file for 'micro'
 pkgname=micro
 version=2.0.11
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/zyedidia/micro/v2"
 go_package="${go_import_path}/cmd/micro"

From 34a29a39bf887b8a68d874b0ad412bf61b03f6c8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 221/363] microhookd: revbump for go 1.21

---
 srcpkgs/microhookd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/microhookd/template b/srcpkgs/microhookd/template
index 8010f697fd4f1..24fdae1fa9293 100644
--- a/srcpkgs/microhookd/template
+++ b/srcpkgs/microhookd/template
@@ -1,7 +1,7 @@
 # Template file for 'microhookd'
 pkgname=microhookd
 version=0.0.1
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/the-maldridge/microhookd
 short_desc="Simplest possible webhook daemon"

From c7ec210b0b62ea24fcf19833d27f80a96c99d740 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 222/363] miller: revbump for go 1.21

---
 srcpkgs/miller/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index de7d5e2259818..4f46a302ddaac 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -1,7 +1,7 @@
 # Template file for 'miller'
 pkgname=miller
 version=6.8.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/johnkerl/miller"
 go_package="${go_import_path}/cmd/mlr"

From 9d6885e0e541ce61407802d2950badf9dc7e5ad7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 223/363] miniflux: revbump for go 1.21

---
 srcpkgs/miniflux/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 30313c3979c1a..f9694f214c97d 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,7 +1,7 @@
 # Template file for 'miniflux'
 pkgname=miniflux
 version=2.0.45
-revision=1
+revision=2
 build_style=go
 go_import_path="miniflux.app"
 go_ldflags="-X miniflux.app/version.Version=${version}"

From 6f28c019ce6b0a096443c7ef9b0b1778c3be9f34 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:23 +0400
Subject: [PATCH 224/363] minify: revbump for go 1.21

---
 srcpkgs/minify/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 47d89444c9d83..e2254f898d15b 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,7 +1,7 @@
 # Template file for 'minify'
 pkgname=minify
 version=2.12.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"

From 63c36cc543317fe0d886faff7f3a15d6393f5389 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 225/363] minikube: revbump for go 1.21

---
 srcpkgs/minikube/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index dc0ea5c8cd033..4727df887aebe 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,12 +1,13 @@
 # Template file for 'minikube'
 pkgname=minikube
 version=1.27.0
-revision=2
+revision=3
 archs="x86_64* i686* aarch64*"
 build_style=go
 build_helper=qemu
 go_ldflags="-X k8s.io/minikube/pkg/version.version=$version"
-go_import_path="k8s.io/minikube/cmd/minikube k8s.io/minikube/cmd/drivers/kvm"
+go_import_path="k8s.io/minikube"
+go_package="./cmd/minikube ./cmd/drivers/kvm"
 hostmakedepends="go-bindata pkg-config"
 makedepends="libvirt-devel"
 depends="kubectl"

From a2aacd9257ddf48c8455a71f4a7b494583acb2ab Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 226/363] minio: revbump for go 1.21

---
 srcpkgs/minio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 4443b03679aed..1cde67ee210dd 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,7 +1,7 @@
 # Template file for 'minio'
 pkgname=minio
 version=2021.04.06
-revision=2
+revision=3
 _version="${version//./-}T23-11-00Z"
 build_style=go
 go_import_path="github.com/minio/minio"

From 6175c5c3e6ff9bde2540769d01435c0ff8424068 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 227/363] misspell: revbump for go 1.21

---
 srcpkgs/misspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/misspell/template b/srcpkgs/misspell/template
index 11022f97ceae4..ec9f7124111d9 100644
--- a/srcpkgs/misspell/template
+++ b/srcpkgs/misspell/template
@@ -1,7 +1,7 @@
 # Template file for 'misspell'
 pkgname=misspell
 version=0.3.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/client9/misspell"
 go_package="${go_import_path}/cmd/misspell"

From 1f82380a9bc5161a3e4b1d848d732b818efc74f6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:24 +0400
Subject: [PATCH 228/363] mmark: revbump for go 1.21

---
 srcpkgs/mmark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mmark/template b/srcpkgs/mmark/template
index 6b26defff66dd..6e2061f8a6552 100644
--- a/srcpkgs/mmark/template
+++ b/srcpkgs/mmark/template
@@ -1,7 +1,7 @@
 # Template file for 'mmark'
 pkgname=mmark
 version=2.2.31
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/mmarkdown/mmark/v2
 short_desc="Powerful markdown processor geared towards the IETF"

From 5bfe01bbd3fc626cab2a51e76856f8f1805985be Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 229/363] mmv-go: revbump for go 1.21

---
 srcpkgs/mmv-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mmv-go/template b/srcpkgs/mmv-go/template
index 28f23c1354fac..ae20500d36258 100644
--- a/srcpkgs/mmv-go/template
+++ b/srcpkgs/mmv-go/template
@@ -1,9 +1,10 @@
 # Template file for 'mmv-go'
 pkgname=mmv-go
 version=0.1.6
-revision=1
+revision=2
 build_style=go
-go_import_path=github.com/itchyny/mmv/cmd/mmv@latest
+go_import_path="github.com/itchyny/mmv"
+go_package="./cmd/mmv"
 short_desc="Rename and move multiple files at once with your editor"
 maintainer="anelki <akierig@fastmail.de>"
 license="MIT"

From ef9c10afdbb6639a7eb08c82d219057c2035b406 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 230/363] moar: revbump for go 1.21

---
 srcpkgs/moar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moar/template b/srcpkgs/moar/template
index be85cb8544274..77707b1c6e2a3 100644
--- a/srcpkgs/moar/template
+++ b/srcpkgs/moar/template
@@ -1,7 +1,7 @@
 # Template file for 'moar'
 pkgname=moar
 version=1.15.3
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/walles/moar
 go_ldflags="-X main.versionString=${version}"

From dfa45d1109701c7f4e199ac3e7bdaf59d5b64eaf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:25 +0400
Subject: [PATCH 231/363] moby: revbump for go 1.21

---
 srcpkgs/moby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 58da158f50c39..cba52c3c6b225 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,7 +2,7 @@
 # should be kept in sync with docker-cli
 pkgname=moby
 version=24.0.5
-revision=1
+revision=2
 # libnetwork commit is mentioned in vendor.conf
 _libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
 create_wrksrc=yes

From 0c6514413754ee59b6deb96f802b7ae0d7304950 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 232/363] mountain-backup: revbump for go 1.21

---
 srcpkgs/mountain-backup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index be79e745fbdee..d87b0f68106c7 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -1,7 +1,7 @@
 # Template file for 'mountain-backup'
 pkgname=mountain-backup
 version=0.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
 short_desc="File backup tool"

From ea814f98b062d9e57a86e60616a068e851372734 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 233/363] mpdviz: revbump for go 1.21

---
 srcpkgs/mpdviz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpdviz/template b/srcpkgs/mpdviz/template
index f7f5eab55c855..ca96ae50e9a44 100644
--- a/srcpkgs/mpdviz/template
+++ b/srcpkgs/mpdviz/template
@@ -1,7 +1,7 @@
 # Template file for 'mpdviz'
 pkgname=mpdviz
 version=0.4.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/lucy/mpdviz"
 hostmakedepends="git pkg-config"

From b2655317d8b8abd82e70a6c9f0e2c31588fd3ade Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 234/363] nebula: revbump for go 1.21

---
 srcpkgs/nebula/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 394308eba7abf..dc61fa88ea3b6 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -1,7 +1,7 @@
 # Template file for 'nebula'
 pkgname=nebula
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula

From 1d2c413daf8b9b70c4af5b7970c6264ba27cca94 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:26 +0400
Subject: [PATCH 235/363] nerdctl: revbump for go 1.21

---
 srcpkgs/nerdctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nerdctl/template b/srcpkgs/nerdctl/template
index c0fc0166e2ed6..1fc779dea988f 100644
--- a/srcpkgs/nerdctl/template
+++ b/srcpkgs/nerdctl/template
@@ -1,7 +1,7 @@
 # Template file for 'nerdctl'
 pkgname=nerdctl
 version=0.18.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/containerd/nerdctl
 go_package=$go_import_path/cmd/nerdctl

From b1e14fe4f095dc8aca23caafc298a6d84248f4b6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 236/363] netdata-plugins-go: revbump for go 1.21

---
 srcpkgs/netdata-plugins-go/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netdata-plugins-go/template b/srcpkgs/netdata-plugins-go/template
index 35b59b0b7c2d3..198669e4715ce 100644
--- a/srcpkgs/netdata-plugins-go/template
+++ b/srcpkgs/netdata-plugins-go/template
@@ -1,9 +1,10 @@
 # Template file for 'netdata-plugins-go'
 pkgname=netdata-plugins-go
 version=0.45.0
-revision=2
+revision=3
 build_style=go
-go_import_path="github.com/netdata/go.d.plugin/cmd/godplugin"
+go_import_path="github.com/netdata/go.d.plugin"
+go_package="./cmd/godplugin"
 depends="netdata"
 short_desc="Netdata - Go Plugins"
 maintainer="sn0w <me@sn0w.cx>"

From 30a63436a02e0593a55de0f9c70dc8939c4d2b98 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 237/363] netns: revbump for go 1.21

---
 srcpkgs/netns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/netns/template b/srcpkgs/netns/template
index fd556c4d9105b..71287f72ce3da 100644
--- a/srcpkgs/netns/template
+++ b/srcpkgs/netns/template
@@ -1,7 +1,7 @@
 # Template file for 'netns'
 pkgname=netns
 version=0.5.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/genuinetools/netns
 short_desc="Runc hook for setting up default bridge networking for containers"

From cb2702932ae6efa76ae7583c2655504bb545e423 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 238/363] netris: revbump for go 1.21

---
 srcpkgs/netris/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
index 7420055ca43d6..fe37b6572d355 100644
--- a/srcpkgs/netris/template
+++ b/srcpkgs/netris/template
@@ -1,9 +1,10 @@
 # Template file for 'netris'
 pkgname=netris
 version=0.1.8
-revision=2
+revision=3
 build_style=go
-go_import_path=gitlab.com/tslocum/netris/cmd/netris
+go_import_path="gitlab.com/tslocum/netris"
+go_package="./cmd/netris"
 short_desc="Multiplayer Tetris clone"
 maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"

From 9dd9c68da552e7023cdddfa526d92c808187f060 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:27 +0400
Subject: [PATCH 239/363] nextdns: revbump for go 1.21

---
 srcpkgs/nextdns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template
index 576e9c169401b..30e576265def1 100644
--- a/srcpkgs/nextdns/template
+++ b/srcpkgs/nextdns/template
@@ -1,7 +1,7 @@
 # Template file for 'nextdns'
 pkgname=nextdns
 version=1.39.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/nextdns/nextdns"
 go_ldflags="-X main.version=${version}"

From 08fb8ff7603df0d4bb35cc94bd4015c8a708fb88 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 240/363] nncp: revbump for go 1.21

---
 srcpkgs/nncp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 27ab96ea84c88..57ab5a771f851 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,7 +1,7 @@
 # Template file for 'nncp'
 pkgname=nncp
 version=8.9.0
-revision=1
+revision=2
 build_style=go
 go_import_path=cypherpunks.ru/nncp
 short_desc="Node to Node copy, utilities for secure store-and-forward"

From fa292b0ce57cf7112609a1ca41c638af48910f3f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 241/363] node_exporter: revbump for go 1.21

---
 srcpkgs/node_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index a3dc25da281e2..f94cffa557b45 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
 version=1.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}

From 25303cc495cc873dab02130edd39cc3e8f8523ce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 242/363] nomad: revbump for go 1.21

---
 srcpkgs/nomad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index ef3c1b0a66ecd..121edb0dde2da 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,7 +1,7 @@
 # Template file for 'nomad'
 pkgname=nomad
 version=1.5.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"

From f38bf701ad07f1146748bdddc6401637b7310563 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:28 +0400
Subject: [PATCH 243/363] ntfy: revbump for go 1.21

---
 srcpkgs/ntfy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template
index a1afdb4340a10..414dbece5066b 100644
--- a/srcpkgs/ntfy/template
+++ b/srcpkgs/ntfy/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfy'
 pkgname=ntfy
 version=2.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="heckel.io/ntfy"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}

From c4f1787d8d71e411b60c9a7dddbd98c1efa867cc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 244/363] nvidia-container-toolkit: revbump for go 1.21

---
 srcpkgs/nvidia-container-toolkit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index c4c675cb8d8b5..e3614fe6bbb37 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'nvidia-container-toolkit'
 pkgname=nvidia-container-toolkit
 version=1.11.0
-revision=2
+revision=3
 archs="x86_64"
 build_style=go
 go_import_path=github.com/NVIDIA/nvidia-container-toolkit

From aab9980159f5e17a3df4f53504d1559ce6ec8817 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 245/363] nwg-look: revbump for go 1.21

---
 srcpkgs/nwg-look/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nwg-look/template b/srcpkgs/nwg-look/template
index 0e109192263bd..58b75f32f9434 100644
--- a/srcpkgs/nwg-look/template
+++ b/srcpkgs/nwg-look/template
@@ -1,7 +1,7 @@
 # Template file for 'nwg-look'
 pkgname=nwg-look
 version=0.2.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/nwg-piotr/nwg-look
 hostmakedepends="pkg-config"

From 9cc670762cbecb5c015232c13c5f674b42cabedb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 246/363] obfs4proxy: revbump for go 1.21

---
 srcpkgs/obfs4proxy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index f8a479d925eb8..8e83a7c1bed77 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -1,7 +1,7 @@
 # Template file for 'obfs4proxy'
 pkgname=obfs4proxy
 version=0.0.13
-revision=2
+revision=3
 _pkgname=obfs4-obfs4proxy
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git

From ab7220e6f52bf052366eb9ae08bd6368c70a284a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:29 +0400
Subject: [PATCH 247/363] oh: revbump for go 1.21

---
 srcpkgs/oh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index e8a106cee7072..b14c9321f41d8 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -1,7 +1,7 @@
 # Template file for 'oh'
 pkgname=oh
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
 short_desc="Surprisingly powerful Unix shell"

From d074dad21d86ac6cde5f6618507d068b19bb6e7c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 248/363] opensmtpd-filter-rspamd: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-rspamd/template b/srcpkgs/opensmtpd-filter-rspamd/template
index 333c0a960f271..16d5fe58650d5 100644
--- a/srcpkgs/opensmtpd-filter-rspamd/template
+++ b/srcpkgs/opensmtpd-filter-rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-rspamd'
 pkgname=opensmtpd-filter-rspamd
 version=0.1.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-rspamd"
 short_desc="Filter incoming mail based on sender reputation"

From 67ea37bb24f5a3f70dc8bb55d93af8751769aa64 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 249/363] opensmtpd-filter-senderscore: revbump for go 1.21

---
 srcpkgs/opensmtpd-filter-senderscore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opensmtpd-filter-senderscore/template b/srcpkgs/opensmtpd-filter-senderscore/template
index 6b314b2ea2663..30507544c6769 100644
--- a/srcpkgs/opensmtpd-filter-senderscore/template
+++ b/srcpkgs/opensmtpd-filter-senderscore/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-filter-senderscore'
 pkgname=opensmtpd-filter-senderscore
 version=0.1.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/poolpOrg/filter-senderscore"
 short_desc="Filter incoming mail based on sender reputation"

From 7ca15d3afc498c3ccefcab54007309895b263d69 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 250/363] operator-sdk: revbump for go 1.21

---
 srcpkgs/operator-sdk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/operator-sdk/template b/srcpkgs/operator-sdk/template
index 43cf775e33d7c..dd0866c7dde15 100644
--- a/srcpkgs/operator-sdk/template
+++ b/srcpkgs/operator-sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'operator-sdk'
 pkgname=operator-sdk
 version=0.18.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/operator-framework/operator-sdk"
 go_package="${go_import_path}/cmd/operator-sdk"

From 0dd286e2d0aba4e548b2289369a11e136997af72 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:30 +0400
Subject: [PATCH 251/363] oragono: revbump for go 1.21

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index d9e555153ea7b..075b44c0f98ae 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,7 +1,7 @@
 # Template file for 'oragono'
 pkgname=oragono
 version=2.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/oragono/oragono"
 hostmakedepends="git"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
+checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 4110e730074c288b2e903b61b751c2c1b40a658f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 252/363] oras: revbump for go 1.21

---
 srcpkgs/oras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oras/template b/srcpkgs/oras/template
index b55640948f5aa..1c4b36503397d 100644
--- a/srcpkgs/oras/template
+++ b/srcpkgs/oras/template
@@ -1,7 +1,7 @@
 # Template file for 'oras'
 pkgname=oras
 version=0.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="oras.land/oras"
 go_package="$go_import_path/cmd/oras"

From 9a6ab7c7dd7dc2b501f1acd4be583e1cea6a03ba Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 253/363] osv-scanner: revbump for go 1.21

---
 srcpkgs/osv-scanner/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/osv-scanner/template b/srcpkgs/osv-scanner/template
index de8942d5724fb..8e22d71be0dde 100644
--- a/srcpkgs/osv-scanner/template
+++ b/srcpkgs/osv-scanner/template
@@ -1,7 +1,7 @@
 # Template file for 'osv-scanner'
 pkgname=osv-scanner
 version=1.3.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/google/osv-scanner"
 go_package="${go_import_path}/cmd/osv-scanner"

From 6587b0ad76239d264f01f22a499555183e091067 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:31 +0400
Subject: [PATCH 254/363] packer: revbump for go 1.21

---
 srcpkgs/packer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 915d9d8afebef..5ba70a422dc4a 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,7 +1,7 @@
 # Template file for 'packer'
 pkgname=packer
 version=1.9.4
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/packer"
 short_desc="Create identical multiplatform machine images from a single source"

From da3adaa664138dfb4c462aee9caff1760b06a61a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 255/363] packr2: revbump for go 1.21

---
 srcpkgs/packr2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packr2/template b/srcpkgs/packr2/template
index db6b5ac0ba4d6..1df39c1dfc3fb 100644
--- a/srcpkgs/packr2/template
+++ b/srcpkgs/packr2/template
@@ -2,15 +2,17 @@
 pkgname=packr2
 _pkgname=packr
 version=2.8.1
-revision=2
+revision=3
 build_style=go
-go_import_path=github.com/gobuffalo/${_pkgname}/v2/packr2
+go_import_path="github.com/gobuffalo/${_pkgname}/v2"
+go_package="./packr2"
 short_desc="Static files embedder for Go binaries"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://github.com/gobuffalo/packr"
 distfiles="https://github.com/gobuffalo/${_pkgname}/archive/v${version}.tar.gz"
 checksum=648f8690e0349039300d3603708bd383f3568193ebaeb0760a87da8760dc7fa7
+_go_mod_path="./v2/go.mod"
 
 post_install() {
 	vlicense v2/LICENSE.txt

From 9d677da206323a8dbac572fcac187a5de7e97e62 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 256/363] pam_netauth: revbump for go 1.21

---
 srcpkgs/pam_netauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index e092748695ba2..e960cc454912c 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -1,7 +1,7 @@
 # Template file for 'pam_netauth'
 pkgname=pam_netauth
 version=0.3.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
 makedepends=pam-devel

From fd8f6eaac56ccd473fd6d00d913271df17858cdd Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 257/363] passphrase2pgp: revbump for go 1.21

---
 srcpkgs/passphrase2pgp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index 8ed860827a7f4..a72f95ee311ae 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,7 +1,7 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
 short_desc="Generate a PGP key from a passphrase"

From 80f54990998c90aea4450dac2356d481d8c1083c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:32 +0400
Subject: [PATCH 258/363] peco: revbump for go 1.21

---
 srcpkgs/peco/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 3ae66e69b93e4..c3aa52df0a215 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -1,7 +1,7 @@
 # Template file for 'peco'
 pkgname=peco
 version=0.5.11
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"

From 0fb1f25edb19b76da6c5d5f5234101930ade62df Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 259/363] pgmetrics: revbump for go 1.21

---
 srcpkgs/pgmetrics/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgmetrics/template b/srcpkgs/pgmetrics/template
index de82b6132519f..38a107da98648 100644
--- a/srcpkgs/pgmetrics/template
+++ b/srcpkgs/pgmetrics/template
@@ -1,9 +1,10 @@
 # Template file for 'pgmetrics'
 pkgname=pgmetrics
 version=1.15.0
-revision=1
+revision=2
 build_style=go
-go_import_path="github.com/rapidloop/pgmetrics/cmd/pgmetrics"
+go_import_path="github.com/rapidloop/pgmetrics"
+go_package="./cmd/pgmetrics"
 short_desc="Collect and display statistics from running Postgresql"
 maintainer="Gerardo Di iorio <arete74@gmail.com>"
 license="Apache-2.0"

From 27b6cba31d3c34e0c560501848aedae1e1bf9b9d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 260/363] pgweb: revbump for go 1.21

---
 srcpkgs/pgweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 2520622abc877..8c4f87b407e34 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,7 +1,7 @@
 # Template file for 'pgweb'
 pkgname=pgweb
 version=0.14.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
 short_desc="Cross-platform client for Postgresql databases"

From 80c59dfe59290140c88a59eff79436f3669f1fb1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 261/363] pkgtop: revbump for go 1.21

---
 srcpkgs/pkgtop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pkgtop/template b/srcpkgs/pkgtop/template
index 1ae1b6955736e..72a5895b225e2 100644
--- a/srcpkgs/pkgtop/template
+++ b/srcpkgs/pkgtop/template
@@ -1,7 +1,7 @@
 # Template file for 'pkgtop'
 pkgname=pkgtop
 version=2.4
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/orhun/pkgtop"
 go_package="${go_import_path}/src"

From 9d998376aa423629b76b58f4d8898aadbbba0f94 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:33 +0400
Subject: [PATCH 262/363] podman-tui: revbump for go 1.21

---
 srcpkgs/podman-tui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman-tui/template b/srcpkgs/podman-tui/template
index 05777323de458..331e11b75a27f 100644
--- a/srcpkgs/podman-tui/template
+++ b/srcpkgs/podman-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'podman-tui'
 pkgname=podman-tui
 version=0.9.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman-tui"
 hostmakedepends="pkg-config"

From ceb542d629079e5bd3b71322eb782644ceb5b49c Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 263/363] podman: revbump for go 1.21

---
 srcpkgs/podman/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bf19bf7577c4a..04b2b9c38bad4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.5.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"

From 02dddff0c59ae80ac2ecade47a7da11f3661a88b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 264/363] pong-command: revbump for go 1.21

---
 srcpkgs/pong-command/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pong-command/template b/srcpkgs/pong-command/template
index 41aa563aae975..c96f0b2ce073e 100644
--- a/srcpkgs/pong-command/template
+++ b/srcpkgs/pong-command/template
@@ -1,7 +1,7 @@
 # Template file for 'pong-command'
 pkgname=pong-command
 version=2.02
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/kurehajime/pong-command
 go_package="${go_import_path}/pong"

From 6b02cc2b7924cd9e40b03a24ac3f0f463c27b198 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 265/363] prometheus: revbump for go 1.21

---
 srcpkgs/prometheus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index 2ba32b6da771d..ca5a48fcee0c4 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,7 +1,7 @@
 # Template file for 'prometheus'
 pkgname=prometheus
 version=2.43.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
 go_package="github.com/prometheus/prometheus/cmd/prometheus github.com/prometheus/prometheus/cmd/promtool"

From 09440bad39a4d7d6a40261591a7b8c71b778a873 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:34 +0400
Subject: [PATCH 266/363] pst: revbump for go 1.21

---
 srcpkgs/pst/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 94dc4ce34f451..5f72b3d13632d 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -1,7 +1,7 @@
 # Template file for 'pst'
 pkgname=pst
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/skanehira/pst
 short_desc="TUI process monitor"

From 932745c63b02e7308a060f21c5f07ccd076aa3b5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 267/363] pup: revbump for go 1.21

---
 srcpkgs/pup/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pup/template b/srcpkgs/pup/template
index 5f1f1fb7c96b7..21de5695c265a 100644
--- a/srcpkgs/pup/template
+++ b/srcpkgs/pup/template
@@ -1,7 +1,7 @@
 # Template file for 'pup'
 pkgname=pup
 version=0.4.0
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/ericchiang/pup"
 short_desc="Command line tool for processing HTML"

From 274d4c806d6a5c9f8396265ea633c38fa5faf1bf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 268/363] pwget: revbump for go 1.21

---
 srcpkgs/pwget/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index b927fa47374d6..91214c9156a63 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -1,7 +1,7 @@
 # Template file for 'pwget'
 pkgname=pwget
 version=2.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/majewsky/pwget"
 short_desc="Single-binary stateless password manager"

From 1d05a8662ce7107e2bc0e782b085f9aa2d25beee Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:35 +0400
Subject: [PATCH 269/363] qrcp: revbump for go 1.21

---
 srcpkgs/qrcp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
index 59a1e32e301a0..a63eed7cdcb89 100644
--- a/srcpkgs/qrcp/template
+++ b/srcpkgs/qrcp/template
@@ -1,7 +1,7 @@
 # Template file for 'qrcp'
 pkgname=qrcp
 version=0.10.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/claudiodangelis/qrcp
 go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}

From bc1cbebbe7430d5cff382d1d077ed7316f9bdceb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 270/363] rancher-compose: revbump for go 1.21

---
 srcpkgs/rancher-compose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rancher-compose/template b/srcpkgs/rancher-compose/template
index f069106f969e7..476ce36f98311 100644
--- a/srcpkgs/rancher-compose/template
+++ b/srcpkgs/rancher-compose/template
@@ -1,7 +1,7 @@
 # Template file for 'rancher-compose'
 pkgname=rancher-compose
 version=0.12.5
-revision=7
+revision=8
 build_style=go
 go_import_path="github.com/rancher/rancher-compose"
 short_desc="Docker compose compatible client to deploy to Rancher"

From ea805d2803ef487d25ed32252debb632123a058d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 271/363] rclone: revbump for go 1.21

---
 srcpkgs/rclone/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index a881f5d0b8cba..74a2d21ea094b 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,7 +1,7 @@
 # Template file for 'rclone'
 pkgname=rclone
 version=1.63.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path=github.com/rclone/rclone

From dac7db78181fea97f55714e943de7ced7008a488 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 272/363] rest-server: revbump for go 1.21

---
 srcpkgs/rest-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rest-server/template b/srcpkgs/rest-server/template
index 2e18f41a2cf7f..64eb7a303570e 100644
--- a/srcpkgs/rest-server/template
+++ b/srcpkgs/rest-server/template
@@ -1,7 +1,7 @@
 # Template file for 'rest-server'
 pkgname=rest-server
 version=0.12.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/restic/rest-server"
 go_package="${go_import_path}/cmd/rest-server"

From aafe1342996ad47c4629d920820ef7cd9e919847 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:36 +0400
Subject: [PATCH 273/363] restic: revbump for go 1.21

---
 srcpkgs/restic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index e99279b12e385..ec5cc2fc9fbe0 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,7 +1,7 @@
 # Template file for 'restic'
 pkgname=restic
 version=0.16.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/restic/restic
 go_package="${go_import_path}/cmd/restic"

From 422c603ee55db5dec8c19dca7bef617bfe43c604 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 274/363] revive: revbump for go 1.21

---
 srcpkgs/revive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index c6958416ddbcb..4b1506e1db802 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,7 +1,7 @@
 # Template file for 'revive'
 pkgname=revive
 version=1.3.2
-revision=1
+revision=2
 build_style=go
 go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"

From e771dd6afc304922f8c9f48ebfa8c45326d4bbce Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 275/363] rmapi: revbump for go 1.21

---
 srcpkgs/rmapi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rmapi/template b/srcpkgs/rmapi/template
index c83277e83ed95..42ef94247e26c 100644
--- a/srcpkgs/rmapi/template
+++ b/srcpkgs/rmapi/template
@@ -1,7 +1,7 @@
 # Template file for 'rmapi'
 pkgname=rmapi
 version=0.0.25
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/juruen/rmapi
 short_desc="CLI for accessing reMarkable table files through the cloud api"

From ccdc595bbebf2479079a7e922a048202c64b63a0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 276/363] rocker: revbump for go 1.21

---
 srcpkgs/rocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rocker/template b/srcpkgs/rocker/template
index e39ba8d0e1cef..e029af88e3db1 100644
--- a/srcpkgs/rocker/template
+++ b/srcpkgs/rocker/template
@@ -1,7 +1,7 @@
 # Template file for 'rocker'
 pkgname=rocker
 version=1.3.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/grammarly/rocker"
 depends="docker"

From 07714423c722b4fd4d398f8b83c60a2a6e9a119b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:37 +0400
Subject: [PATCH 277/363] rootlesskit: revbump for go 1.21

---
 srcpkgs/rootlesskit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
index 480fc63759e37..5d1e1be4bc9f5 100644
--- a/srcpkgs/rootlesskit/template
+++ b/srcpkgs/rootlesskit/template
@@ -1,7 +1,7 @@
 # Template file for 'rootlesskit'
 pkgname=rootlesskit
 version=0.14.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/rootless-containers/rootlesskit"
 go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl

From 1aec3c868746449d5a117d9e807dab2e5b0b40a3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 278/363] runc: revbump for go 1.21

---
 srcpkgs/runc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 5b74f35e8278a..a97efd0cd6084 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,7 +1,7 @@
 # Template file for 'runc'
 pkgname=runc
 version=1.1.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/opencontainers/runc
 go_build_tags="seccomp apparmor"

From 4ac44751d2a0426b16a67e5b31267b5699358a40 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 279/363] ryzen-stabilizator: revbump for go 1.21

---
 srcpkgs/ryzen-stabilizator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ryzen-stabilizator/template b/srcpkgs/ryzen-stabilizator/template
index b46b4ab6cce54..d176e368070c2 100644
--- a/srcpkgs/ryzen-stabilizator/template
+++ b/srcpkgs/ryzen-stabilizator/template
@@ -1,7 +1,7 @@
 # Template file for 'ryzen-stabilizator'
 pkgname=ryzen-stabilizator
 version=0.0.0.20180309
-revision=4
+revision=5
 _commit=90a2f7adc94baa484cbf2590455fb1f4a25126d8
 archs="i686* x86_64*"
 build_style=go

From ffb9f1407d33019fc8a56b4816363bb775171cbc Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:38 +0400
Subject: [PATCH 280/363] s: revbump for go 1.21

---
 srcpkgs/s/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 39bc849edfc07..ce0eb8a799346 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,7 +1,7 @@
 # Template file for 's'
 pkgname=s
 version=0.6.8
-revision=1
+revision=2
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s

From d43305dc712a9bdc8ffacc342e485cd9c4b75a9b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 281/363] saml2aws: revbump for go 1.21

---
 srcpkgs/saml2aws/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 8962d3780d09a..87eed2598054d 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -1,7 +1,7 @@
 # Template file for 'saml2aws'
 pkgname=saml2aws
 version=2.36.9
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"

From 69d22c7caa985b9249d9e14a09610771184fce41 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 282/363] sampler: revbump for go 1.21

---
 srcpkgs/sampler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 0e7806ea5b591..298e9b910f77b 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -1,7 +1,7 @@
 # Template file for 'sampler'
 pkgname=sampler
 version=1.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sqshq/sampler"
 makedepends="alsa-lib-devel"

From f3315c91abb4e3855ddeded856a9129ea252ed02 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 283/363] sbctl: revbump for go 1.21

---
 srcpkgs/sbctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 4f7dcc5da5880..5d181cd62da0d 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,7 +1,7 @@
 # Template file for 'sbctl'
 pkgname=sbctl
 version=0.10
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
 hostmakedepends="asciidoc"

From f964acb2638e1a10e39bfce7421560368b2a2039 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:39 +0400
Subject: [PATCH 284/363] scaleway-cli: revbump for go 1.21

---
 srcpkgs/scaleway-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 9d148f54bd9f7..2a598ce99a608 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
 version=2.19.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli/v2
 go_package=github.com/scaleway/scaleway-cli/v2/cmd/scw

From 1df051159997b89ed88b9955993249a8528119f9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 285/363] scc: revbump for go 1.21

---
 srcpkgs/scc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/scc/template b/srcpkgs/scc/template
index 978c6e1a4aefa..ffdaa25a1d688 100644
--- a/srcpkgs/scc/template
+++ b/srcpkgs/scc/template
@@ -1,7 +1,7 @@
 # Template file for 'scc'
 pkgname=scc
 version=3.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/boyter/scc/v3"
 short_desc="Fast cloc replacement written in pure Go"

From 902830e345c91d7373562b506681066d2d6d6a8a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 286/363] seaweedfs: revbump for go 1.21

---
 srcpkgs/seaweedfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 38d1a91c388b2..a9580e76ad299 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -1,7 +1,7 @@
 # Template file for 'seaweedfs'
 pkgname=seaweedfs
 version=3.37
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/seaweedfs/seaweedfs"
 go_package="github.com/seaweedfs/seaweedfs/weed"

From 474785ca5164130f96800cf14de457b095761f07 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 287/363] senpai: revbump for go 1.21

---
 srcpkgs/senpai/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/senpai/template b/srcpkgs/senpai/template
index 0546d041f163d..a0c4a8aa2ee6d 100644
--- a/srcpkgs/senpai/template
+++ b/srcpkgs/senpai/template
@@ -1,7 +1,7 @@
 # Template file for 'senpai'
 pkgname=senpai
 version=0.2.0
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~taiite/senpai"
 go_package="./cmd/senpai"

From a0b7fe15d7dad2f22595cc9cb28fc0764f08697e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:40 +0400
Subject: [PATCH 288/363] sftpgo: revbump for go 1.21

---
 srcpkgs/sftpgo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sftpgo/template b/srcpkgs/sftpgo/template
index 6664c08c55728..94e0747d78dcc 100644
--- a/srcpkgs/sftpgo/template
+++ b/srcpkgs/sftpgo/template
@@ -1,7 +1,7 @@
 # Template file for 'sftpgo'
 pkgname=sftpgo
 version=2.3.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/drakkan/sftpgo/v2
 short_desc="Fully featured and highly configurable SFTP server"

From 502caaef8ba41a8c9cf9d1b2ad59963766a4228e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 289/363] shadowfox-updater: revbump for go 1.21

---
 srcpkgs/shadowfox-updater/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 77e632de0da0c..cdcb0be82aad3 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -1,7 +1,7 @@
 # Template file for 'shadowfox-updater'
 pkgname=shadowfox-updater
 version=2.2.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"

From e498b30ae599ee45631e028aaef8fd5d9bf7f089 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 290/363] sharenix: revbump for go 1.21

---
 srcpkgs/sharenix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sharenix/template b/srcpkgs/sharenix/template
index 0098e8c11723f..cf0ba3a6d3d91 100644
--- a/srcpkgs/sharenix/template
+++ b/srcpkgs/sharenix/template
@@ -1,7 +1,7 @@
 # Template file for 'sharenix'
 pkgname=sharenix
 version=0.12.0a
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/Francesco149/sharenix"
 hostmakedepends="pkg-config git"

From 92403d35e3f93ea3e98d6627e84b962729ed3225 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:41 +0400
Subject: [PATCH 291/363] shfmt: revbump for go 1.21

---
 srcpkgs/shfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shfmt/template b/srcpkgs/shfmt/template
index 61667a1862e55..ed9df841ac34b 100644
--- a/srcpkgs/shfmt/template
+++ b/srcpkgs/shfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'shfmt'
 pkgname=shfmt
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path=mvdan.cc/sh/v3
 go_package="${go_import_path}/cmd/shfmt"

From dcd818a75eee738744e25c62430b1c2f3e725263 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 292/363] shiori: revbump for go 1.21

---
 srcpkgs/shiori/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/shiori/template b/srcpkgs/shiori/template
index f5049e1150706..df21b84547e73 100644
--- a/srcpkgs/shiori/template
+++ b/srcpkgs/shiori/template
@@ -1,7 +1,7 @@
 # Template file for 'shiori'
 pkgname=shiori
 version=1.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/go-shiori/shiori
 short_desc="Simple bookmark manager built with Go"

From 61d507c8cfa0c7587f91c95d66795bacd81073de Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 293/363] sift: revbump for go 1.21

---
 srcpkgs/sift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index 978879b7c5460..7b0e3ec450a1e 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -1,7 +1,7 @@
 # Template file for 'sift'
 pkgname=sift
 version=0.9.0
-revision=14
+revision=15
 build_style=go
 go_import_path="github.com/svent/sift"
 hostmakedepends="git"

From 3ab09d80fabccae4c0d28fb3e4ce83e8a630cc57 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 294/363] skaffold: revbump for go 1.21

---
 srcpkgs/skaffold/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 98b9ebccd94bc..da9a6e0c441fb 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,7 +1,7 @@
 # Template file for 'skaffold'
 pkgname=skaffold
 version=1.39.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
 go_package="${go_import_path}/cmd/skaffold"

From 2348ca8dfdbcb1ec22e3289c3bfd1be883e52eb4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:42 +0400
Subject: [PATCH 295/363] skate: revbump for go 1.21

---
 srcpkgs/skate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skate/template b/srcpkgs/skate/template
index df8f47371c47c..a2d72fd14b2a6 100644
--- a/srcpkgs/skate/template
+++ b/srcpkgs/skate/template
@@ -1,7 +1,7 @@
 # Template file for 'skate'
 pkgname=skate
 version=0.2.2
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/skate"

From 452e320fff11a55ec3ea0377afe6cec0366d1ac0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 296/363] skopeo: revbump for go 1.21

---
 srcpkgs/skopeo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index 35335c9bb72c2..e387662607274 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,7 +1,7 @@
 # Template file for 'skopeo'
 pkgname=skopeo
 version=1.10.0
-revision=3
+revision=4
 build_style=go
 build_helper=qemu
 go_import_path="github.com/containers/${pkgname}"

From 88e4dd6fc8c1438aa3496110b08d12a8ad7d08d7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 297/363] slack-term: revbump for go 1.21

---
 srcpkgs/slack-term/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slack-term/template b/srcpkgs/slack-term/template
index 09818e8250def..e289f3aa7c056 100644
--- a/srcpkgs/slack-term/template
+++ b/srcpkgs/slack-term/template
@@ -1,7 +1,7 @@
 # Template file for 'slack-term'
 pkgname=slack-term
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/erroneousboat/slack-term"
 short_desc="Slack client for your terminal"

From 7bddd7f90e307c65a2c8f2a61d021fd5a1d93c3a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 298/363] slit: revbump for go 1.21

---
 srcpkgs/slit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slit/template b/srcpkgs/slit/template
index da7894b55770c..c5b820b6c4264 100644
--- a/srcpkgs/slit/template
+++ b/srcpkgs/slit/template
@@ -1,7 +1,7 @@
 # Template file for 'slit'
 pkgname=slit
 version=1.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/tigrawap/slit
 go_package="${go_import_path}/cmd/slit"

From 2ec403382311561602303ef33947d49a1066cf63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:43 +0400
Subject: [PATCH 299/363] soju: revbump for go 1.21

---
 srcpkgs/soju/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 6d7c82e58ccf3..fd3769d03eb05 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
 version=0.6.2
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/..."

From 79597caeed1c2bb290bf812b6fd39fc5ee3fda53 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 300/363] sops: revbump for go 1.21

---
 srcpkgs/sops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index 624b42cf864db..b8d1248605b98 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,7 +1,7 @@
 # Template file for 'sops'
 pkgname=sops
 version=3.7.3
-revision=2
+revision=3
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"

From 1726d5a9e65ca321a8d2f81c65f7de3f49a7aa63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 301/363] spreed-webrtc: revbump for go 1.21

---
 srcpkgs/spreed-webrtc/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index a1eb1f8091659..594588f72bffd 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,10 +1,11 @@
 # Template file for 'spreed-webrtc'
 pkgname=spreed-webrtc
 version=0.29.7
-revision=10
+revision=11
 build_style=go
 go_import_path="github.com/strukturag/spreed-webrtc"
 go_package="${go_import_path}/src/app/spreed-webrtc-server"
+go_mod_mode=off
 hostmakedepends="automake nodejs git which"
 conf_files="/etc/spreed/webrtc.conf"
 short_desc="WebRTC audio/video call and conferencing server and web client"
@@ -17,6 +18,7 @@ checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268
 system_accounts="_spreed_webrtc"
 
 pre_build() {
+	export GOTOOLCHAIN="go1.26"
 	./autogen.sh
 	./configure ${configure_args}
 	make assets

From c78112ddf17b463fb5ca8ae87041e8156c03f99d Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 302/363] ssl_exporter: revbump for go 1.21

---
 srcpkgs/ssl_exporter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ssl_exporter/template b/srcpkgs/ssl_exporter/template
index 7c5f2234f99d1..f713c4d8ec331 100644
--- a/srcpkgs/ssl_exporter/template
+++ b/srcpkgs/ssl_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'ssl_exporter'
 pkgname=ssl_exporter
 version=2.3.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/ribbybibby/ssl_exporter
 short_desc="Exports Prometheus metrics for SSL certificates"

From 18d8bfafd8fbcb98fa9e74c757b7b999da0feaea Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:44 +0400
Subject: [PATCH 303/363] stc: revbump for go 1.21

---
 srcpkgs/stc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stc/template b/srcpkgs/stc/template
index ff2964d169e1f..f4ddd53f00f03 100644
--- a/srcpkgs/stc/template
+++ b/srcpkgs/stc/template
@@ -1,7 +1,7 @@
 # Template file for 'stc'
 pkgname=stc
 version=1.4
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/tenox7/stc
 short_desc="Syncthing CLI Tool"

From b16079be6e918ef17f9c78b48a0ba6234350d270 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 304/363] step-certificates: revbump for go 1.21

---
 srcpkgs/step-certificates/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
index 7acd1d0311b25..380fac8cd350a 100644
--- a/srcpkgs/step-certificates/template
+++ b/srcpkgs/step-certificates/template
@@ -1,7 +1,7 @@
 # Template file for 'step-certificates'
 pkgname=step-certificates
 version=0.22.1
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/certificates
 go_package="$go_import_path/cmd/step-ca

From 9fd6e01e760746cae61e3aae7b849e8ffea290cb Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 305/363] step-cli: revbump for go 1.21

---
 srcpkgs/step-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
index 508efb8633627..14b8b0f282508 100644
--- a/srcpkgs/step-cli/template
+++ b/srcpkgs/step-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'step-cli'
 pkgname=step-cli
 version=0.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/smallstep/cli
 go_package=$go_import_path/cmd/step

From df083ed54d78a212b2ccebcc4f68e51a9cc5ab4e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:45 +0400
Subject: [PATCH 306/363] stern: revbump for go 1.21

---
 srcpkgs/stern/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/stern/template b/srcpkgs/stern/template
index 769d0e2dd6f9b..b1380516e7cd3 100644
--- a/srcpkgs/stern/template
+++ b/srcpkgs/stern/template
@@ -1,7 +1,7 @@
 # Template file for 'stern'
 pkgname=stern
 version=1.22.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/stern/stern"
 short_desc="Multi pod and container log tailing for Kubernetes"

From 2603fcb0fe1a58c2cef4bd1fe5f19539fdedad5e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 307/363] subfinder: revbump for go 1.21

---
 srcpkgs/subfinder/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subfinder/template b/srcpkgs/subfinder/template
index d9930c62c438a..b68280d306f0c 100644
--- a/srcpkgs/subfinder/template
+++ b/srcpkgs/subfinder/template
@@ -1,7 +1,7 @@
 # Template file for 'subfinder'
 pkgname=subfinder
 version=2.6.2
-revision=1
+revision=2
 build_wrksrc=v2
 build_style=go
 go_import_path="github.com/projectdiscovery/subfinder/v2"

From bed8e66ebcadd95d8f064da39a2bfdc20be3f823 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 308/363] subjack: revbump for go 1.21

---
 srcpkgs/subjack/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/subjack/template b/srcpkgs/subjack/template
index b2aa3d2bbcb8d..16cc2d04d6545 100644
--- a/srcpkgs/subjack/template
+++ b/srcpkgs/subjack/template
@@ -1,7 +1,7 @@
 # Template file for 'subjack'
 pkgname=subjack
 version=2.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/haccer/subjack"
 hostmakedepends="git"

From 786db648002bacd6b3b51cff530b2d85485363a9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 309/363] superd: revbump for go 1.21

---
 srcpkgs/superd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/superd/template b/srcpkgs/superd/template
index 01e8ae8979bec..8fe52f1e3e275 100644
--- a/srcpkgs/superd/template
+++ b/srcpkgs/superd/template
@@ -1,7 +1,7 @@
 # Template file for 'superd'
 pkgname=superd
 version=0.7.1
-revision=2
+revision=3
 build_style=go
 go_import_path="sr.ht/~craftyguy/superd"
 go_package="${go_import_path}/cmd/superd ${go_import_path}/cmd/superctl"

From 81436287c96fafbe965e7b6265aa04e7503a6b68 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:46 +0400
Subject: [PATCH 310/363] svctl: revbump for go 1.21

---
 srcpkgs/svctl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/svctl/template b/srcpkgs/svctl/template
index 849382e39d953..968ae1f7f4a24 100644
--- a/srcpkgs/svctl/template
+++ b/srcpkgs/svctl/template
@@ -1,7 +1,7 @@
 # Template file for 'svctl'
 pkgname=svctl
 version=1
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/KenjiTakahashi/svctl"
 go_ldflags="-X main.Version=v${version}"

From 50551056d22a9a93fd90f9bc4add1670c9a90a49 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 311/363] syft: revbump for go 1.21

---
 srcpkgs/syft/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/syft/template b/srcpkgs/syft/template
index 64cf288a8f5e3..491d0f17cea03 100644
--- a/srcpkgs/syft/template
+++ b/srcpkgs/syft/template
@@ -1,7 +1,7 @@
 # Template file for 'syft'
 pkgname=syft
 version=0.87.1
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/syft"

From 98301c0f38509762549ce01658f81793a0891bf9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 312/363] syncthing: revbump for go 1.21

---
 srcpkgs/syncthing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 2881b8a6743f5..c99d2c696e86e 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=1.23.7
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
@@ -19,6 +19,7 @@ distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
 checksum=cc36d6244590f0eeaa1df6f465b617dd7fdbee3dae434d55b272b25580f6e53b
 
 pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
 	GOARCH= go generate \
 		github.com/syncthing/syncthing/lib/api/auto \
 		github.com/syncthing/syncthing/cmd/strelaypoolsrv/auto

From 88f72f89475cef778f11f6f6d01663790ab09372 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:47 +0400
Subject: [PATCH 313/363] tag: revbump for go 1.21

---
 srcpkgs/tag/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index cd801e26bcf71..e3af79dde1bd7 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -1,7 +1,7 @@
 # Template file for 'tag'
 pkgname=tag
 version=1.4.0
-revision=8
+revision=9
 build_style=go
 go_import_path="github.com/aykamko/tag"
 hostmakedepends="git mercurial"

From 6d35a5c3e45277bff16c61c3b8fedd4488242a95 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 314/363] tea: revbump for go 1.21

---
 srcpkgs/tea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
index 2d4a5b74e4ba7..9880e02530d6c 100644
--- a/srcpkgs/tea/template
+++ b/srcpkgs/tea/template
@@ -1,7 +1,7 @@
 # Template file for 'tea'
 pkgname=tea
 version=0.9.2
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path="code.gitea.io/tea"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://gitea.com/gitea/tea"
 changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
 distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
-checksum=edcd1e9af43c91c653b19ba2f58297b4815afd285657221282321ceb2930c537
+checksum=b5a944de8db7d5af4aa87e9640261c925f094d2b6d26c4faf2701773acab219b
 
 post_install() {
 	vcompletion contrib/autocomplete.sh bash

From 97c64b5ec049c9f63a85bcfe9c71fd72b8ecb014 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 315/363] telegraf: revbump for go 1.21

---
 srcpkgs/telegraf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/telegraf/template b/srcpkgs/telegraf/template
index 4e4490743e4e2..4db1f29e2f1f9 100644
--- a/srcpkgs/telegraf/template
+++ b/srcpkgs/telegraf/template
@@ -1,7 +1,7 @@
 # Template file for 'telegraf'
 pkgname=telegraf
 version=1.18.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/influxdata/telegraf
 go_package="${go_import_path}/cmd/telegraf"

From a0848b47220c162d1ead857efc2d320b28198a63 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:48 +0400
Subject: [PATCH 316/363] termshark: revbump for go 1.21

---
 srcpkgs/termshark/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4dab16dd6b72e..3ee25f5278935 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,7 +1,7 @@
 # Template file for 'termshark'
 pkgname=termshark
 version=2.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"

From 4e638068c57ff04a124d7636cda6ea780f45ab09 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 317/363] terraform-docs: revbump for go 1.21

---
 srcpkgs/terraform-docs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
index a63765a2d5fcd..028aa131b60ae 100644
--- a/srcpkgs/terraform-docs/template
+++ b/srcpkgs/terraform-docs/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-docs'
 pkgname=terraform-docs
 version=0.16.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/$pkgname/$pkgname"
 short_desc="Utility to generate documentation from Terraform modules"

From 9ba0caf7f95c0702c9cafd4d0a95b2db9310bd4f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 318/363] terraform-ls: revbump for go 1.21

---
 srcpkgs/terraform-ls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 6ea9354f412e4..a472069c63622 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
 version=0.31.3
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/terraform-ls"
 short_desc="Terraform Language Server"

From c5dc875dd704176ba3cda1e9f081dff9263174b8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 319/363] terraform: revbump for go 1.21

---
 srcpkgs/terraform/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index d5cd51b04a168..63423b4bcb77f 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
 # Template file for 'terraform'
 pkgname=terraform
 version=1.5.5
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
 short_desc="Tool for building, changing, and combining infrastructure"

From 40578cad908eef8cb33bcf50db643842ac51c350 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:49 +0400
Subject: [PATCH 320/363] terragrunt: revbump for go 1.21

---
 srcpkgs/terragrunt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 104adc65a3ea0..0a36c43b85334 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
 version=0.50.6
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
 depends="terraform"

From a67343db4f35febad7b263ea014501ec96b9d9ec Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 321/363] tflint: revbump for go 1.21

---
 srcpkgs/tflint/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tflint/template b/srcpkgs/tflint/template
index 25af31f8b16d7..6dfaaa63db22c 100644
--- a/srcpkgs/tflint/template
+++ b/srcpkgs/tflint/template
@@ -1,7 +1,7 @@
 # Template file for 'tflint'
 pkgname=tflint
 version=0.47.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/terraform-linters/tflint"
 short_desc="Terraform linter focused on possible errors, best practices, etc"

From 04450549930acad5d91edf03c307d8cf879d77d5 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 322/363] tinycron: revbump for go 1.21

---
 srcpkgs/tinycron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tinycron/template b/srcpkgs/tinycron/template
index 184be80e64350..5c70efe42db9e 100644
--- a/srcpkgs/tinycron/template
+++ b/srcpkgs/tinycron/template
@@ -1,7 +1,7 @@
 # Template file for 'tinycron'
 pkgname=tinycron
 version=0.4
-revision=13
+revision=14
 build_style=go
 go_import_path="github.com/bcicen/tinycron"
 hostmakedepends="git"

From 1e43ec784071f30983bda8c16cd9d7e4bf20bfd7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 323/363] tldr: revbump for go 1.21

---
 srcpkgs/tldr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tldr/template b/srcpkgs/tldr/template
index ce201a2f4121b..ef68b4f488e93 100644
--- a/srcpkgs/tldr/template
+++ b/srcpkgs/tldr/template
@@ -1,7 +1,7 @@
 # Template file for 'tldr'
 pkgname=tldr
 version=1.0.0.alpha
-revision=2
+revision=3
 _version=${version/.alpha/-alpha}
 build_style=go
 go_import_path="github.com/isacikgoz/tldr"

From 3babff352d34f88a0d352c7df905b97807e4421f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:50 +0400
Subject: [PATCH 324/363] tml: revbump for go 1.21

---
 srcpkgs/tml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 55da9c4b2b73f..3e4b88ec64714 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -1,7 +1,7 @@
 # Template file for 'tml'
 pkgname=tml
 version=0.6.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"

From 9ed57af01d71092a3fc7a39cff5fef56c9752e88 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 325/363] todoist: revbump for go 1.21

---
 srcpkgs/todoist/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/todoist/template b/srcpkgs/todoist/template
index 72c1e50ed1c54..15a2fba8864d6 100644
--- a/srcpkgs/todoist/template
+++ b/srcpkgs/todoist/template
@@ -1,7 +1,7 @@
 # Template file for 'todoist'
 pkgname=todoist
 version=0.20.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/sachaos/todoist"
 short_desc="Todoist CLI Client"

From 030986ec766e323e64540c7a7f99d3907e3d5bf8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 326/363] transifex-cli: revbump for go 1.21

---
 srcpkgs/transifex-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template
index 470b2b7ca2726..1a43ca02c5bb9 100644
--- a/srcpkgs/transifex-cli/template
+++ b/srcpkgs/transifex-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'transifex-cli'
 pkgname=transifex-cli
 version=1.6.6
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/transifex/cli"
 go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}"

From cc0f9113dd3ea3cefc02a590fcbaf466d7d14af7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:51 +0400
Subject: [PATCH 327/363] twitch-cli: revbump for go 1.21

---
 srcpkgs/twitch-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/twitch-cli/template b/srcpkgs/twitch-cli/template
index 2644f63dc64c4..b17b9adf3609e 100644
--- a/srcpkgs/twitch-cli/template
+++ b/srcpkgs/twitch-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'twitch-cli'
 pkgname=twitch-cli
 version=1.1.14
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/twitchdev/twitch-cli"
 go_ldflags="-X main.buildVersion=$version"

From d807dbabe9b92c79cb4f32c74afc14839ee30e15 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 328/363] typioca: revbump for go 1.21

---
 srcpkgs/typioca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index da8e8c17760ae..4cda98c5a3749 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,7 +1,7 @@
 # Template file for 'typioca'
 pkgname=typioca
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/bloznelis/typioca"
 short_desc="Minimal, terminal based typing speed tester"

From 4b401aa90360d1c9a9b14d02415c0360c2859b25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 329/363] umoci: revbump for go 1.21

---
 srcpkgs/umoci/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/umoci/template b/srcpkgs/umoci/template
index 818a58833fe1e..fa8d28d127468 100644
--- a/srcpkgs/umoci/template
+++ b/srcpkgs/umoci/template
@@ -1,7 +1,7 @@
 # Template file for 'umoci'
 pkgname=umoci
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/opencontainers/umoci
 go_package="${go_import_path}/cmd/${pkgname}"

From 912b692899502b033270d85f4379e3902abb9c93 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 330/363] unflac: revbump for go 1.21

---
 srcpkgs/unflac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unflac/template b/srcpkgs/unflac/template
index 37af4634493bc..8e23fad034c15 100644
--- a/srcpkgs/unflac/template
+++ b/srcpkgs/unflac/template
@@ -1,7 +1,7 @@
 # Template file for 'unflac'
 pkgname=unflac
 version=1.1
-revision=1
+revision=2
 build_style=go
 go_import_path="git.sr.ht/~ft/unflac"
 depends="ffmpeg"

From d5d37a69f2386423e168b41fa78e749d801a9a1b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:52 +0400
Subject: [PATCH 331/363] uni: revbump for go 1.21

---
 srcpkgs/uni/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/uni/template b/srcpkgs/uni/template
index 11dc86271bcca..4f9a156a5bda4 100644
--- a/srcpkgs/uni/template
+++ b/srcpkgs/uni/template
@@ -1,7 +1,7 @@
 # Template file for 'uni'
 pkgname=uni
 version=2.5.1
-revision=2
+revision=3
 build_style=go
 go_import_path=zgo.at/uni/v2
 go_ldflags="-X main.version=${version}"

From 3d849d38707b6fac0b0789abfd2009f9b4de973e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 332/363] up: revbump for go 1.21

---
 srcpkgs/up/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index 2bfc59feeaf93..46d85b3d3176f 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -1,7 +1,7 @@
 # Template file for 'up'
 pkgname=up
 version=0.4
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/akavel/up
 short_desc="Ultimate Plumber - write Linux pipes interactively"

From 7bcd715e22f457c32cb94a13bebe8dbffc18b00a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 333/363] up_rewrite: revbump for go 1.21

---
 srcpkgs/up_rewrite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
index ff2ba671c776e..c0272382750c5 100644
--- a/srcpkgs/up_rewrite/template
+++ b/srcpkgs/up_rewrite/template
@@ -1,7 +1,7 @@
 # Template file for 'up_rewrite'
 pkgname=up_rewrite
 version=1.4.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/karmanyaahm/up_rewrite"
 go_ldflags="-X $go_import_path/config.Version=$version"

From 5ced67de752f0f5ea8176ae42e3b5093fcb2dadf Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 334/363] upterm: revbump for go 1.21

---
 srcpkgs/upterm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 0b8ca34ec592f..e7068a38d9acd 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,7 +1,7 @@
 # Template file for 'upterm'
 pkgname=upterm
 version=0.10.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
 go_package="${go_import_path}/cmd/upterm"

From 819413df9e6045258c092a57af605ff74831aa8a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:53 +0400
Subject: [PATCH 335/363] usql: revbump for go 1.21

---
 srcpkgs/usql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index a2fc0dbc4c7ec..a64134684df79 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,7 +1,7 @@
 # Template file for 'usql'
 pkgname=usql
 version=0.14.12
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/xo/usql
 go_ldflags="-X github.com/xo/usql/text.CommandVersion=${version}"

From 7d14d2a0c53ab6844eaed3376a119dbcd056b5e4 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 336/363] v2ray: revbump for go 1.21

---
 srcpkgs/v2ray/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
index 2034e96813d97..4ffa22d801a00 100644
--- a/srcpkgs/v2ray/template
+++ b/srcpkgs/v2ray/template
@@ -1,7 +1,7 @@
 # Template file for 'v2ray'
 pkgname=v2ray
 version=5.3.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/v2fly/v2ray-core/v5"
 go_ldflags="-X github.com/v2fly/v2ray-core/v5.codename=$pkgname
@@ -20,6 +20,10 @@ system_accounts="_v2ray"
 export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
 export CGO_ENABLED=0
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 do_build() {
 	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
 }

From 3d2804595e66ba8d67fd502b4f495d9866897fc6 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 337/363] vale: revbump for go 1.21

---
 srcpkgs/vale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 094273ae30152..073e2f54bee9a 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,7 +1,7 @@
 # Template file for 'vale'
 pkgname=vale
 version=2.28.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
 go_package="${go_import_path}/cmd/vale"

From b90f150b2494372433c704ccf4bbc018d1900377 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:54 +0400
Subject: [PATCH 338/363] vault-acme: revbump for go 1.21

---
 srcpkgs/vault-acme/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault-acme/template b/srcpkgs/vault-acme/template
index 8d06bfdd0bf15..833d8dff2e5e1 100644
--- a/srcpkgs/vault-acme/template
+++ b/srcpkgs/vault-acme/template
@@ -1,7 +1,7 @@
 # Template file for 'vault-acme'
 pkgname=vault-acme
 version=0.0.8
-revision=5
+revision=6
 build_style=go
 go_import_path=github.com/remilapeyre/vault-acme
 go_package="$go_import_path/cmd/acme $go_import_path/cmd/sidecar"

From e8ca8ca80e91eda6b0998cd393c0807791facbf0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 339/363] vault: revbump for go 1.21

---
 srcpkgs/vault/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index efe62f6cfeadd..26cf9379b2984 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,7 +1,7 @@
 # Template file for 'vault'
 pkgname=vault
 version=1.13.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"

From 73444d01f99b0e6cc6b5d394d59f5472ed08433a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 340/363] vegeta: revbump for go 1.21

---
 srcpkgs/vegeta/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vegeta/template b/srcpkgs/vegeta/template
index 966d17db6c797..8a42e3dfa98c3 100644
--- a/srcpkgs/vegeta/template
+++ b/srcpkgs/vegeta/template
@@ -1,7 +1,7 @@
 # Template file for 'vegeta'
 pkgname=vegeta
 version=12.8.4
-revision=3
+revision=4
 build_style=go
 go_import_path="github.com/tsenart/vegeta/v${version%%.*}"
 go_ldflags="-X main.Version=${version}"

From c4dcdd3ad9fd27bdf92432770366a8ddd2f82426 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 341/363] vhs: revbump for go 1.21

---
 srcpkgs/vhs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vhs/template b/srcpkgs/vhs/template
index 2c8e4ec48b7c6..8ed8894538100 100644
--- a/srcpkgs/vhs/template
+++ b/srcpkgs/vhs/template
@@ -1,7 +1,7 @@
 # Template file for 'vhs'
 pkgname=vhs
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 build_helper=qemu
 go_import_path="github.com/charmbracelet/vhs"

From 1acce659f2d6430b2f9812df8cb06d491be3c4b3 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:55 +0400
Subject: [PATCH 342/363] vmdfmt: revbump for go 1.21

---
 srcpkgs/vmdfmt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vmdfmt/template b/srcpkgs/vmdfmt/template
index 2d5353a5d3981..07b8aa706bf05 100644
--- a/srcpkgs/vmdfmt/template
+++ b/srcpkgs/vmdfmt/template
@@ -1,7 +1,7 @@
 # Template file for 'vmdfmt'
 pkgname=vmdfmt
 version=0.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/bobertlo/vmd"
 go_package="github.com/bobertlo/vmd/cmd/vmdfmt"

From 6c00469b8341a83a7f542407912bb0303a804db2 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 343/363] vndr: revbump for go 1.21

---
 srcpkgs/vndr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vndr/template b/srcpkgs/vndr/template
index 4bdc014005288..3c496bad79823 100644
--- a/srcpkgs/vndr/template
+++ b/srcpkgs/vndr/template
@@ -1,7 +1,7 @@
 # Template file for 'vndr'
 pkgname=vndr
 version=0.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/LK4D4/vndr
 short_desc="Stupid vendoring tool"

From edde6498668b0f5ca1445bed144fe187a369c409 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 344/363] vultr-cli: revbump for go 1.21

---
 srcpkgs/vultr-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index e1ebdb9a9339d..108268988596a 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
 version=2.15.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
 short_desc="Official command line tool for Vultr services"

From acb89fb14e64cbf97818ac17617162c8879428da Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 345/363] vultr: revbump for go 1.21

---
 srcpkgs/vultr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vultr/template b/srcpkgs/vultr/template
index f5864680d3209..6629c23541610 100644
--- a/srcpkgs/vultr/template
+++ b/srcpkgs/vultr/template
@@ -1,7 +1,7 @@
 # Template file for 'vultr'
 pkgname=vultr
 version=2.0.3
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/JamesClonk/vultr"
 short_desc="Vultr CLI and API client"

From b0dbcb9c286d5fbb637ce54c404d41c07973334b Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:56 +0400
Subject: [PATCH 346/363] wally-cli: revbump for go 1.21

---
 srcpkgs/wally-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wally-cli/template b/srcpkgs/wally-cli/template
index bca0a9e1ebd6b..4665ecb92ff84 100644
--- a/srcpkgs/wally-cli/template
+++ b/srcpkgs/wally-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-cli'
 pkgname=wally-cli
 version=2.0.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/zsa/wally-cli"
 hostmakedepends="pkg-config"

From a5ae36a97d63bb0de83d0c4b769cfb949606a975 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 347/363] wander: revbump for go 1.21

---
 srcpkgs/wander/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wander/template b/srcpkgs/wander/template
index 8ff34dfda5ca0..0944f1e863fdd 100644
--- a/srcpkgs/wander/template
+++ b/srcpkgs/wander/template
@@ -1,7 +1,7 @@
 # Template file for 'wander'
 pkgname=wander
 version=0.8.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/robinovitch61/wander"
 short_desc="Terminal application for HashiCorp Nomad"

From 26327ac94fbc5d261efb2220b479c51acbc9501f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 348/363] webcat: revbump for go 1.21

---
 srcpkgs/webcat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index 183eae705fc49..628aaeaa2aee0 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -1,7 +1,7 @@
 # Template file for 'webcat'
 pkgname=webcat
 version=1.0
-revision=17
+revision=18
 build_style=go
 go_import_path="github.com/thypon/webcat"
 hostmakedepends="git"

From 4bef89990cdbc3d8b940175461a72e4421785ace Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:57 +0400
Subject: [PATCH 349/363] webhook: revbump for go 1.21

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index 8dd10051f2fae..6eac98512b885 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -1,7 +1,7 @@
 # Template file for 'webhook'
 pkgname=webhook
 version=2.8.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"

From 5180ee6d98d9fa4cff77796a729bb39f11235c4f Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 350/363] websocketd: revbump for go 1.21

---
 srcpkgs/websocketd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 9f21995700d75..4d56b463fdc87 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -1,7 +1,7 @@
 # Template file for 'websocketd'
 pkgname=websocketd
 version=0.4.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"

From 3ae0bcd6722ce8a497e0cb8141c6f8b305434797 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 351/363] wego: revbump for go 1.21

---
 srcpkgs/wego/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 077d3968bf34d..a9e5dd491bd51 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -1,7 +1,7 @@
 # Template file for 'wego'
 pkgname=wego
 version=2.2
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From a836284f794087fddbecdaceab60821a48deee5a Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 352/363] wireproxy: revbump for go 1.21

---
 srcpkgs/wireproxy/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
index b5ad3872e0458..07109da1107b2 100644
--- a/srcpkgs/wireproxy/template
+++ b/srcpkgs/wireproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'wireproxy'
 pkgname=wireproxy
 version=1.0.5
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/octeep/wireproxy"
 go_package="${go_import_path}/cmd/wireproxy"
@@ -19,6 +19,10 @@ make_dirs="
 system_accounts="_wireproxy"
 _wireproxy_homedir="/var/lib/wireproxy"
 
+pre_build() {
+	export GOTOOLCHAIN="go1.20.7"
+}
+
 post_install() {
 	vsv wireproxy
 	vlicense LICENSE

From 3bd29465d902333ed7df46bf41d9f71c0231aaa7 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:58 +0400
Subject: [PATCH 353/363] woke: revbump for go 1.21

---
 srcpkgs/woke/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/woke/template b/srcpkgs/woke/template
index a7b44149938e8..b408ff0cf5d5f 100644
--- a/srcpkgs/woke/template
+++ b/srcpkgs/woke/template
@@ -1,7 +1,7 @@
 # Template file for 'woke'
 pkgname=woke
 version=0.19.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/get-woke/woke"
 short_desc="Detect non-inclusive language in your source code"

From 66e70bf4176676701620c77181ea8829ee9acd20 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 354/363] wtfutil: revbump for go 1.21

---
 srcpkgs/wtfutil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wtfutil/template b/srcpkgs/wtfutil/template
index 363b4e71f2d97..7edb8c4f4774d 100644
--- a/srcpkgs/wtfutil/template
+++ b/srcpkgs/wtfutil/template
@@ -1,7 +1,7 @@
 # Template file for 'wtfutil'
 pkgname=wtfutil
 version=0.43.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/wtfutil/wtf"
 short_desc="Personal information dashboard for the terminal"

From f7268022ebc22f9d70cdfa37d8c966f28775eec8 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 355/363] wuzz: revbump for go 1.21

---
 srcpkgs/wuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wuzz/template b/srcpkgs/wuzz/template
index 734963b93e212..89a949171925c 100644
--- a/srcpkgs/wuzz/template
+++ b/srcpkgs/wuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'wuzz'
 pkgname=wuzz
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/asciimoo/wuzz
 short_desc="Interactive cli tool for HTTP inspection"

From 0963bf6d2ffb1623c1ff122881edaa6de59233b1 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 356/363] xmandump: revbump for go 1.21

---
 srcpkgs/xmandump/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index 3321025e89fd3..5f2e6a99c7a2e 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,7 +1,7 @@
 # Template file for 'xmandump'
 pkgname=xmandump
 version=0.2.7
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
 go_package="${go_import_path}/cmd/xmandump"

From 5528e9d4f85e9e6ca3e0c93176fc8a40e026b8b0 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:34:59 +0400
Subject: [PATCH 357/363] xq-api: revbump for go 1.21

---
 srcpkgs/xq-api/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xq-api/template b/srcpkgs/xq-api/template
index e598fca2139ca..b159653ea4bb0 100644
--- a/srcpkgs/xq-api/template
+++ b/srcpkgs/xq-api/template
@@ -1,7 +1,7 @@
 # Template file for 'xq-api'
 pkgname=xq-api
 version=0.5.0
-revision=2
+revision=3
 build_style=go
 go_import_path=go.spiff.io/xq-api
 conf_files="/etc/sv/xq-api/conf"

From c87c5559cc21f894b179ab898264853cd19c44c9 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 358/363] xurls: revbump for go 1.21

---
 srcpkgs/xurls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index c05f5e4438c7e..eed302fcf4130 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -1,7 +1,7 @@
 # Template file for 'xurls'
 pkgname=xurls
 version=2.5.0
-revision=1
+revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"

From d9da8a4fba65462e7a6cf9a857e2f036c4896d3e Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 359/363] yggdrasil: revbump for go 1.21

---
 srcpkgs/yggdrasil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index 64548f1ea80af..ffe828d3e9cc4 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -1,7 +1,7 @@
 # Template file for 'yggdrasil'
 pkgname=yggdrasil
 version=0.4.7
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"

From 109ceb474e89bee4bef9670c4ed996073e7e8f25 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 360/363] yj: revbump for go 1.21

---
 srcpkgs/yj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index fadb1db8f041d..90f93bb9e9bd7 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,7 +1,7 @@
 # Template file for 'yj'
 pkgname=yj
 version=5.1.0
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"

From 70e92722d568311c2dd1a83db81f10e2333615af Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:00 +0400
Subject: [PATCH 361/363] ymuse: revbump for go 1.21

---
 srcpkgs/ymuse/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ymuse/template b/srcpkgs/ymuse/template
index 0be1c9c75ae2c..d4822bea9d4fc 100644
--- a/srcpkgs/ymuse/template
+++ b/srcpkgs/ymuse/template
@@ -1,7 +1,7 @@
 # Template file for 'ymuse'
 pkgname=ymuse
 version=0.21
-revision=2
+revision=3
 build_style=go
 go_import_path=github.com/yktoo/ymuse
 hostmakedepends="pkg-config gettext"

From 06ff98dcbcb2b96567b9f69696754e7ed2b11bbe Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 362/363] yq-go: revbump for go 1.21

---
 srcpkgs/yq-go/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index e9335605c6627..a69e0e5e96c0a 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
 # Template file for 'yq-go'
 pkgname=yq-go
 version=4.35.1
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/mikefarah/yq/v4
 short_desc="Lightweight and portable command-line YAML processor written in go"

From 077e19bd824ab6864b497e4f5355e29cd27a6682 Mon Sep 17 00:00:00 2001
From: Kirill <g4s8.public@gmail.com>
Date: Mon, 14 Aug 2023 19:35:01 +0400
Subject: [PATCH 363/363] zrepl: revbump for go 1.21

---
 srcpkgs/zrepl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index bdc82dcf8a60f..afdd85ca74241 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,7 +1,7 @@
 # Template file for 'zrepl'
 pkgname=zrepl
 version=0.6.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Closed]: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (15 preceding siblings ...)
  2023-08-23  8:13 ` [PR PATCH] [Updated] " g4s8
@ 2023-08-23 21:33 ` the-maldridge
  2023-12-02 21:58 ` dkwo
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: the-maldridge @ 2023-08-23 21:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]

There's a closed pull request on the void-packages repository

go: update to 1.21.0.
https://github.com/void-linux/void-packages/pull/45525

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

- I built this PR locally for my native architecture, (amd64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - i686
  - aarch64
  - armv7l

This version update has patch files changes, because sources were changed. I tested it with `./xbps-src check go`.

Also `do_isntall` script changed because go binary is built with `-trimpath` option since 1.21 version, see https://github.com/golang/go/issues/61921#issuecomment-1673399370. It's recommended to use symlinks for `/usr/big/go` instead of copying binaries:
> is there a reason your script is using cp to make copies of the binaries in GOROOT/bin, instead of using ln to make /usr/bin/go a symbolic link? It seems like that would be a simpler solution, and would allow the Go toolchain installed on Void Linux to use the same [reproducible binaries](https://go.dev/rebuild) that are distributed through the Go project.

[ci skip]

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (16 preceding siblings ...)
  2023-08-23 21:33 ` [PR PATCH] [Closed]: " the-maldridge
@ 2023-12-02 21:58 ` dkwo
  2023-12-02 22:01 ` dkwo
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-12-02 21:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1837263784

Comment:
why wasn't `lxd` revbumped here? if i try to rebuild it, it fails at `post_build` phase. any idea how to fix it?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (17 preceding siblings ...)
  2023-12-02 21:58 ` dkwo
@ 2023-12-02 22:01 ` dkwo
  2023-12-07 10:22 ` g4s8
  2023-12-07 15:01 ` dkwo
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-12-02 22:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1837263784

Comment:
why wasn't `lxd` revbumped here? if i try to rebuild it (after switching to canonical github), it fails at `post_build` phase.
any idea how to fix it?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (18 preceding siblings ...)
  2023-12-02 22:01 ` dkwo
@ 2023-12-07 10:22 ` g4s8
  2023-12-07 15:01 ` dkwo
  20 siblings, 0 replies; 22+ messages in thread
From: g4s8 @ 2023-12-07 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

New comment by g4s8 on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1845073436

Comment:
@dkwo I suppose it was not revbumped due to this error:
```txt
=> lxd-5.9_3: running do-fetch hook: 00-distfiles ...
=> lxd-5.9_3: fetching distfile 'lxd-5.9.tar.gz' from 'https://linuxcontainers.org/downloads/lxd/lxd-5.9.tar.gz'...
https://linuxcontainers.org/downloads/lxd/lxd-5.9.tar.gz: Not Found
=> ERROR: lxd-5.9_3: failed to fetch 'lxd-5.9.tar.gz'.
```
So I can't build it locally with old go-1.20 version because `https://linuxcontainers.org/downloads/lxd/lxd-5.9.tar.gz` URL returns 404 code.

Maybe distfiles URL should be fixed before revbumping this package?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: go: update to 1.21.0.
  2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
                   ` (19 preceding siblings ...)
  2023-12-07 10:22 ` g4s8
@ 2023-12-07 15:01 ` dkwo
  20 siblings, 0 replies; 22+ messages in thread
From: dkwo @ 2023-12-07 15:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/45525#issuecomment-1845505207

Comment:
They switched the distfiles (due to canonical takeover).
The longterm plan seems to be to migrate to `incus` https://github.com/void-linux/void-packages/pull/47573
What I meant is that, even if you switch to old distfiles https://github.com/canonical/lxd/archive/refs/tags/lxd-5.9.tar.gz (hopefully they did not retroactively make changes), this fails to build at `post_build` phase with go 1.21 (not at `do-fetch`).

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2023-12-07 15:01 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-10 18:10 [PR PATCH] go: update to 1.21.0 g4s8
2023-08-10 18:24 ` g4s8
2023-08-11 11:54 ` mhmdanas
2023-08-12 15:42 ` [PR PATCH] [Updated] " g4s8
2023-08-12 15:47 ` g4s8
2023-08-12 16:33 ` g4s8
2023-08-12 21:15 ` g4s8
2023-08-12 21:27 ` Bnyro
2023-08-13  8:03 ` paper42
2023-08-14 15:39 ` [PR PATCH] [Updated] " g4s8
2023-08-14 15:42 ` g4s8
2023-08-14 16:01 ` mhmdanas
2023-08-14 21:11 ` [PR PATCH] [Updated] " g4s8
2023-08-21  6:18 ` g4s8
2023-08-22  7:28 ` g4s8
2023-08-22  7:29 ` g4s8
2023-08-23  8:13 ` [PR PATCH] [Updated] " g4s8
2023-08-23 21:33 ` [PR PATCH] [Closed]: " the-maldridge
2023-12-02 21:58 ` dkwo
2023-12-02 22:01 ` dkwo
2023-12-07 10:22 ` g4s8
2023-12-07 15:01 ` dkwo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).