Merge branch 'master' into caddyfile

1 files changed, 8 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 749bdc656b27..267d3e17e6ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,13 +38,16 @@ validpgpkeys=(
   '29D0817A67156E4F25DC24782A349DD577D586A5' # Matthew Holt <mholt@users.noreply.github.com>
 )
 
-pkgver() {
-  cd ${_pkgname}
-  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 prepare() {
   sed 's|/var/www/html|/srv/http|g' -i "${srcdir}/index-${_distcommit}.html"
+  
+  # Build instructions as per https://github.com/caddyserver/caddy#with-version-information-andor-plugins
+  cd "${_pkgname}/cmd/caddy/"
+  if ! test -f go.mod; then
+    go mod init caddy
+  fi
+  go get github.com/caddyserver/caddy/v2@${_tag} # Pin version
+  go mod tidy # Update go.sum
 }
 
 build() {