void-linux · dkwo · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026
diff --git a/common/build-style/go.sh b/common/build-style/go.sh
@@ -5,7 +5,7 @@
 do_configure() {
 	# $go_import_path must be set, or we can't link $PWD into $GOSRCPATH
 	# nor build from modules
-	if [ -z "$go_import_path" ]; then
+	if [ -z "${go_import_path}" ]; then
 		msg_error "\"\$go_import_path\" not set on $pkgname template.\n"
 	fi
 
@@ -23,13 +23,26 @@ do_configure() {
 
 do_build() {
 	# remove -s and -w from go_ldflags, we should let xbps-src strip binaries itself
-	for wd in $go_ldflags; do
-		if [ "$wd" == "-s" ] || [ "$wd" == "-w" ]; then
-			msg_error "$pkgname: remove -s and -w from go_ldflags\n"
+	for wd in ${go_ldflags}; do
+		if [ "${wd}" == "-s" ] || [ "$wd" == "-w" ]; then
+			msg_error "${pkgname}: remove -s and -w from go_ldflags\n"
 		fi
 	done
 
 	: ${go_package:=$go_import_path}
+	local buildmode
+	if [ -z "${nopie}" ]; then
+		buildmode=-buildmode=pie
+
+		# The linker checks the host sysroot, breaking static PIE musl cross builds
+		if [ -n "${CROSS_BUILD}" ] && [ "${XBPS_TARGET_LIBC}" = "musl" ]; then
+			case "${XBPS_TARGET_MACHINE}" in
+				aarch64*)
+					go_ldflags+=" -I /lib/ld-musl-aarch64.so.1"
+					;;
+			esac
+		fi
+	fi
 	# Build using Go modules if there's a go.mod file
 	if [ "${go_mod_mode}" != "off" ] && [ -f go.mod ]; then
 
@@ -38,7 +51,7 @@ do_build() {
 		fi
 
 		# Check if go_import_path matches module
-		if [ "module $go_import_path" != "$(grep '^module' go.mod | head -n1)" ]; 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
 
@@ -50,20 +63,20 @@ do_build() {
 			# default behavior.
 			go_mod_mode=
 		fi
-		go install -p "$XBPS_MAKEJOBS" -mod="${go_mod_mode}" -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		go install -p "${XBPS_MAKEJOBS}" -mod="${go_mod_mode}" ${buildmode} -trimpath -modcacherw -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
 		if [[ -n "${_go_mod_path}" ]]; then
 			popd
 		fi
 	else
 		# Otherwise, build using GOPATH
-		go install -p "$XBPS_MAKEJOBS" -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
+		go install -p "${XBPS_MAKEJOBS}" ${buildmode} -trimpath -v -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
 	fi
 }
 
 do_check() {
 	: ${make_check_target:=./...}
 
-	${make_check_pre} go test -p "$XBPS_MAKEJOBS" -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${make_check_args} ${make_check_target}
+	${make_check_pre} go test -p "${XBPS_MAKEJOBS}" -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${make_check_args} ${make_check_target}
 }
 
 do_install() {

diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
@@ -4,7 +4,6 @@ if [ -z "$hostmakedepends" -o "${hostmakedepends##*gcc-go-tools*}" ]; then
 		archs="aarch64* armv[567]* i686* x86_64* ppc64le* riscv64*"
 	fi
 	hostmakedepends+=" go"
-	nopie=yes
 else
 	# gccgo compiler
 	if [ -z "$archs" ]; then

diff --git a/srcpkgs/3mux/template b/srcpkgs/3mux/template
@@ -1,7 +1,7 @@
 # Template file for '3mux'
 pkgname=3mux
 version=1.1.0
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'Amass'
 pkgname=Amass
 version=4.2.0
-revision=2
+revision=3
 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
@@ -1,7 +1,7 @@
 # Template file for 'Gokapi'
 pkgname=Gokapi
 version=2.2.3
-revision=1
+revision=2
 build_style=go
 make_check_args="--tags=test,noaws"
 go_import_path=github.com/forceu/gokapi

diff --git 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=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-localizer'
 pkgname=NetAuth-localizer
 version=0.1.3
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-nsscache'
 pkgname=NetAuth-nsscache
 version=0.6.5
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-pam-helper'
 pkgname=NetAuth-pam-helper
 version=0.1.5
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth-sftpgo-hook'
 pkgname=NetAuth-sftpgo-hook
 version=0.1.1
-revision=4
+revision=5
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
 depends="sftpgo"

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
@@ -1,7 +1,7 @@
 # Template file for 'NetAuth'
 pkgname=NetAuth
 version=0.6.4
-revision=1
+revision=2
 build_style=go
 build_helper="qemu"
 go_import_path="github.com/netauth/netauth"

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
@@ -1,7 +1,7 @@
 # Template file for 'NetKeys'
 pkgname=NetKeys
 version=0.5.5
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'NoiseTorch'
 pkgname=NoiseTorch
 version=0.12.2
-revision=3
+revision=4
 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
@@ -1,7 +1,7 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=12
+revision=13
 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
@@ -1,7 +1,7 @@
 # Template file for 'TMSU'
 pkgname=TMSU
 version=0.7.5
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/oniony/TMSU
 hostmakedepends="git"

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
@@ -1,7 +1,7 @@
 # Template file for 'TerraState'
 pkgname=TerraState
 version=1.2.4
-revision=1
+revision=2
 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
@@ -1,7 +1,7 @@
 # Template file for 'abireport'
 pkgname=abireport
 version=1.0.11
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=16
+revision=17
 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
@@ -1,7 +1,7 @@
 # Template file for 'ace-util'
 pkgname=ace-util
 version=160221
-revision=3
+revision=4
 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
@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.2.2
-revision=3
+revision=4
 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
@@ -1,7 +1,7 @@
 # Template file for 'act'
 pkgname=act
 version=0.2.78
-revision=1
+revision=2
 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
@@ -1,7 +1,7 @@
 # Template file for 'aerc'
 pkgname=aerc
 version=0.21.0
-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
@@ -1,7 +1,7 @@
 # Template file for 'age'
 pkgname=age
 version=1.3.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
@@ -1,7 +1,7 @@
 # Template file for 'alertmanager'
 pkgname=alertmanager
 version=0.28.1
-revision=1
+revision=2
 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
@@ -1,7 +1,7 @@
 # Template file for 'amfora'
 pkgname=amfora
 version=1.11.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/makeworld-the-better-one/amfora"
 short_desc="Fancy terminal browser for the Gemini protocol"

diff --git a/srcpkgs/anubis/template b/srcpkgs/anubis/template
@@ -1,7 +1,7 @@
 # Template file for 'anubis'
 pkgname=anubis
 version=1.25.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/TecharoHQ/anubis"
 go_ldflags="-X ${go_import_path}.Version=${version}"

diff --git 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=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'aptly'
 pkgname=aptly
 version=1.4.0
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'aquatone'
 pkgname=aquatone
 version=1.7.0
-revision=3
+revision=4
 build_style=go
 go_import_path=github.com/michenriksen/aquatone
 hostmakedepends="git"

diff --git a/srcpkgs/archiver/template b/srcpkgs/archiver/template
@@ -1,7 +1,7 @@
 # Template file for 'archiver'
 pkgname=archiver
 version=3.5.1
-revision=4
+revision=5
 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
@@ -1,7 +1,7 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
 version=1.4.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
@@ -1,7 +1,7 @@
 # Template file for 'arpfox'
 pkgname=arpfox
 version=1.0.0
-revision=4
+revision=5
 build_style=go
 go_import_path=github.com/malfunkt/arpfox
 makedepends="libpcap-devel"

diff --git a/srcpkgs/atlantis/template b/srcpkgs/atlantis/template
@@ -1,7 +1,7 @@
 # Template file for 'atlantis'
 pkgname=atlantis
 version=0.29.0
-revision=1
+revision=2
 build_style=go
 go_import_path=github.com/runatlantis/atlantis
 short_desc="Terraform Automation By Pull Request"

diff --git a/srcpkgs/autorestic/template b/srcpkgs/autorestic/template
@@ -1,7 +1,7 @@
 # Template file for 'autorestic'
 pkgname=autorestic
 version=1.8.3
-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
@@ -1,7 +1,7 @@
 # Template file for 'aws-vault'
 pkgname=aws-vault
 version=7.2.0
-revision=3
+revision=4
 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
@@ -1,7 +1,7 @@
 # Template file for 'babelfish'
 pkgname=babelfish
 version=1.1.0
-revision=3
+revision=4
 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
@@ -1,7 +1,7 @@
 # Template file for 'bettercap'
 pkgname=bettercap
 version=2.32.0
-revision=4
+revision=5
 build_style=go
 go_import_path=github.com/bettercap/bettercap
 hostmakedepends="pkg-config"