Github messages for voidlinux
 help / color / mirror / Atom feed
From: g4s8 <g4s8@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] go: update to 1.21.0.
Date: Sat, 12 Aug 2023 17:47:42 +0200	[thread overview]
Message-ID: <20230812154742.l-zCGpnJ7PtyJ0YgW2KFsqXXV3Wd77b5vMYXbGLId2o@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45525@inbox.vuxu.org>

[-- 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}"

  parent reply	other threads:[~2023-08-12 15:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-10 18:10 [PR PATCH] " 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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230812154742.l-zCGpnJ7PtyJ0YgW2KFsqXXV3Wd77b5vMYXbGLId2o@z \
    --to=g4s8@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).