srcpkgs/: most Go packages shouldn't have git in hostmakedepends.

Depending on git for building can sometimes happen due to issue #27690, where instead of using the unpacked tarball, Go clones the package's repository itself, since the tarball we provided doesn't contain the go_import_path we pass to it in the command line. Since we should require as few dependencies as possible, and this measure can help catch issues of building the wrong version of a Go package, we remove git from hostmakedepends where possible. Also fix small discrepancies in homepage, expand some variables and fix some inconsequential typos.
void-linux · Feb 19, 2021 · c0c4abf · c0c4abf
1 parent 53f48c1
commit c0c4abf
Show file tree

Hide file tree

Showing 62 changed files with 28 additions and 79 deletions.
diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
@@ -6,7 +6,6 @@ wrksrc=ldap-$version
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
-hostmakedepends="git"
 short_desc="LDAP Proxy for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
@@ -6,7 +6,6 @@ wrksrc=localizer-$version
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
-hostmakedepends="git"
 depends="snooze"
 short_desc="Make NetAuth accounts local in Linux"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="nsscache-$version"
 build_style=go
 go_import_path="github.com/netauth/nsscache"
-hostmakedepends="git"
 short_desc="NetAuth nsscache implementation"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=pam-helper-$version
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
-hostmakedepends="git"
 short_desc="A helper executable to use with pam_exec"
 maintainer="Michael Aldridge <maldridge@VoidLinux.org>"
 license="MIT"

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=netkeys-$version
 build_style=go
 go_import_path="github.com/netauth/netkeys"
-hostmakedepends="git"
 short_desc="Key retrieval daemon for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
@@ -8,7 +8,7 @@ go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="git gcc-go-tools"
+hostmakedepends="gcc-go-tools"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
@@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
 go_package="${go_import_path}/cmd/terrastate"
-hostmakedepends="git"
 short_desc="Remote state for Terraform"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
@@ -3,7 +3,7 @@ pkgname=aerc
 version=0.5.2
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
@@ -4,12 +4,11 @@ version=6.1.1
 revision=1
 build_style=go
 go_import_path=github.com/getantibody/antibody
-hostmakedepends="git"
 short_desc="Fast and lightweight shell plugin manager"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://getantibody.github.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/getantibody/antibody/archive/v${version}.tar.gz"
 checksum=87bced5fba8cf5d587ea803d33dda72e8bcbd4e4c9991a9b40b2de4babbfc24f
 
 post_install() {

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="browserpass-native-${version}"
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
-hostmakedepends="git"
 short_desc="Browser extension for pass"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
@@ -3,9 +3,9 @@ pkgname=caddy
 version=1.0.5
 revision=1
 build_style=go
+# XXX: use caddy/v2 when updating
 go_import_path=github.com/caddyserver/caddy
 go_package="${go_import_path}/caddy"
-hostmakedepends="git"
 short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
@@ -4,7 +4,6 @@ version=0.5.4
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/cdetect
-hostmakedepends="git"
 short_desc="Detects the compiler (and version) used to compile an ELF binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
@@ -7,12 +7,11 @@ go_import_path="github.com/twpayne/chezmoi"
 go_build_tags="noembeddocs noupgrade"
 go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps
  -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/chezmoi"
-hostmakedepends="git"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
-distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
 checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1
 
 post_install() {

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
 go_package="${go_import_path}/cmd/chroma"
 go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)"
-hostmakedepends="git"
 short_desc="General purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

diff --git a/srcpkgs/clipman/template b/srcpkgs/clipman/template
@@ -4,7 +4,6 @@ version=1.5.2
 revision=1
 build_style=go
 go_import_path=github.com/yory8/clipman
-hostmakedepends="git"
 depends="wl-clipboard"
 short_desc="Simple clipboard manager for Wayland"
 maintainer="travankor <travankor@tuta.io>"

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
@@ -3,8 +3,7 @@ pkgname=consul-template
 version=0.25.1
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/$pkgname"
-hostmakedepends="git"
+go_import_path="github.com/hashicorp/consul-template"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
@@ -3,18 +3,17 @@ pkgname=consul
 version=1.8.4
 revision=1
 build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/consul"
 _git_commit=9ea1a204d832cfd4d8c5cba9df56876a526a4531
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
 go_mod_mode=default
-hostmakedepends="git"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/hashicorp/consul/archive/v${version}.tar.gz"
 checksum=77d1dfa93da66ccb222049bd892e46f8ddb11516589311fbdc24bd658d64b372
 
 post_install() {

diff --git a/srcpkgs/coredns/template b/srcpkgs/coredns/template
@@ -4,7 +4,7 @@ version=1.7.1
 revision=1
 build_style=go
 go_import_path=github.com/coredns/coredns
-hostmakedepends="git make mmark"
+hostmakedepends="make mmark"
 short_desc="CoreDNS is a DNS server that chains plugins"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="Apache-2.0"

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
@@ -3,12 +3,11 @@ pkgname=crane
 version=3.6.0
 revision=1
 build_style=go
-hostmakedepends="git"
 short_desc="Lift containers with ease"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 go_import_path="github.com/michaelsauter/crane"
-homepage="https://${go_import_path}"
+homepage="https://github.com/michaelsauter/crane"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=00f202783ae2ef3a2d0e02fba0454defe53e823b4c99e2e3b5af734dc870906e
 

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
@@ -4,7 +4,6 @@ version=8.6.7
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
-hostmakedepends="git"
 short_desc="Easily and securely send things from one computer to another"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

diff --git a/srcpkgs/dht-node/template b/srcpkgs/dht-node/template
@@ -5,7 +5,6 @@ revision=3
 build_style=go
 go_import_path="github.com/ipfs/dht-node"
 go_build_tags="netgo"
-hostmakedepends="git"
 short_desc="IPFS dht node"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
@@ -4,7 +4,6 @@ version=0.9.2
 revision=1
 build_style=go
 go_import_path="github.com/wagoodman/dive"
-hostmakedepends="git"
 short_desc="Container image exploration tool"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
@@ -4,7 +4,6 @@ version=0.2.4
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
-hostmakedepends="git"
 short_desc="Dlayer is a docker layer analyzer"
 maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
-hostmakedepends="git"
 short_desc="Emit basic information about an ELF file"
 maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
@@ -4,7 +4,6 @@ version=0.1.0
 revision=1
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
-hostmakedepends="git"
 short_desc="Tool which ensures permissions exists for files and directories"
 maintainer="Noah Huppert <contact@noahh.io>"
 license="MIT"

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
@@ -6,7 +6,6 @@ wrksrc="cli-${version}"
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"
-hostmakedepends="git"
 short_desc="Command line tool for exercism.io"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
@@ -3,12 +3,11 @@ pkgname=flint
 version=0.1.0
 revision=9
 build_style=go
-hostmakedepends="git"
 short_desc="Check your project for common sources of contributor friction"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 go_import_path="github.com/pengwynn/flint"
-homepage="https://${go_import_path}"
+homepage="https://github.com/pengwynn/flint"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=ec865ec5cad191c7fc9c7c6d5007754372696a708825627383913367f3ef8b7f
 

diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
@@ -3,11 +3,10 @@ pkgname=forego
 version=20180216151118
 revision=5
 build_style=go
-hostmakedepends="git mercurial"
 short_desc="A process supervisor in Go"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 go_import_path="github.com/ddollar/forego"
-homepage="https://$go_import_path"
+homepage="https://github.com/ddollar/forego"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=23119550cc0e45191495823aebe28b42291db6de89932442326340042359b43d
diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
@@ -4,7 +4,6 @@ version=0.25.1
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
-hostmakedepends="git"
 makedepends="ncurses-devel"
 short_desc="Command-line fuzzy finder"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
@@ -5,12 +5,11 @@ revision=1
 build_style=go
 go_import_path=github.com/xyproto/gendesk
 go_mod_mode=default
-hostmakedepends="git"
 short_desc="Utility to generate .desktop files and download icons"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="http://roboticoverlords.org/gendesk/"
-distfiles="https://github.com/xyproto/${pkgname}/archive/${version}.tar.gz
+distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz
  http://roboticoverlords.org/images/default.png"
 checksum="924606ca1c15a140b70f363c4a0ac46fb3ad4d05bc39db400d0b0e41dd4456bb
  4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
-hostmakedepends="git"
 depends="git"
 short_desc="Remote repository management made easy"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"

diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
@@ -4,12 +4,12 @@ version=2.12.1
 revision=1
 build_style=go
 go_import_path="github.com/git-lfs/git-lfs"
-hostmakedepends="git ruby-ronn"
+hostmakedepends="ruby-ronn"
 short_desc="Git extension for versioning large files"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://git-lfs.github.com/"
-distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/git-lfs/git-lfs/archive/v${version}.tar.gz"
 checksum=2b2e70f1233f7efe9a010771510391a07527ec7c0af721ecf8edabac5d60f62b
 
 post_build() {

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
@@ -4,7 +4,6 @@ version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
-hostmakedepends="git"
 short_desc="Command line tool to manage your git repositories in one place"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="MIT"

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
@@ -23,7 +23,7 @@ go_ldflags=" -X main.Version=${version}"
 #     rather not use SQLite3 for some reason.  It is also potentially
 #     more resiliant to corrupted writes.
 go_build_tags="bindata sqlite pam tidb"
-hostmakedepends="go-bindata git"
+hostmakedepends="go-bindata"
 makedepends="sqlite-devel pam-devel"
 depends="git bash"
 short_desc="Git with a cup of Tea"

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
@@ -4,7 +4,6 @@ version=0.13.3
 revision=1
 build_style=go
 go_import_path="github.com/Masterminds/glide"
-hostmakedepends="git"
 depends="go git"
 short_desc="Vendor package management for golang"
 maintainer="ananteris <ananteris@protonmail.ch>"

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
@@ -4,7 +4,6 @@ version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/nadoo/glider
-hostmakedepends="git"
 short_desc="Forward proxy with multiple protocols support"
 maintainer="whoami <whoami@systemli.org>"
 license="GPL-3.0-or-later"

diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
@@ -3,23 +3,23 @@ pkgname=go-ipfs
 version=0.7.0
 revision=2
 build_style=go
-go_import_path="github.com/ipfs/${pkgname}"
+go_import_path="github.com/ipfs/go-ipfs"
 go_package="${go_import_path}/cmd/ipfs"
-hostmakedepends="git"
 depends="fs-repo-migrations>=1.6.4"
 short_desc="Global versioned P2P merkle DAG file system"
 maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="MIT, Apache-2.0"
 homepage="https://ipfs.io"
 changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz"
 checksum=152986ebb30657ab706bee708fbe929114f5e8c39fbe602e3bbec93fe74c9123
 
 system_accounts="_ipfs"
 make_dirs="/var/lib/ipfs 0700 _ipfs _ipfs"
 _ipfs_homedir="/var/lib/ipfs"
 
 pre_build() {
+	# XXX: try to use buildmode=pie instead
 	if [ "$CROSS_BUILD" ]; then
 		export CGO_ENABLED=0
 	fi

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"
-hostmakedepends="git"
 short_desc="Publish reports from different Go linters as gerrit reviews"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"

diff --git a/srcpkgs/gogs/template b/srcpkgs/gogs/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=gogs.io/gogs
 go_build_tags="sqlite pam cert"
-hostmakedepends="git curl"
 makedepends="pam-devel"
 depends="git"
 short_desc="Self-hosted Git Service in Go"