From 0353e4188037ed17ef004a0c44b50c12e90563b7 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 30 Sep 2021 13:04:05 +0000
Subject: [PATCH] Use proper 1.8.3 commit, re-add go-bindata-hashicorp, add
 pkgver()

---
 PKGBUILD | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index edfe07f..fa585b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,17 +5,17 @@
 
 pkgname='vault'
 pkgdesc='A tool for managing secrets'
-pkgver='1.8.3'
-pkgrel='2'
+pkgver=1.8.3
+pkgrel=3
 url="https://vaultproject.io/"
 license=('MPL')
 arch=('x86_64')
 makedepends=('go' 'git' 'yarn' 'bower' 'nodejs-lts-fermium' 'npm' 'zip'
-'go-bindata-hashicorp' 'gox' 'go-tools')
+'go-bindata-hashicorp' 'go-bindata-assetfs' 'gox' 'go-tools')
 depends=('glibc')
 install='vault.install'
 backup=('etc/vault.hcl')
-_vault_commit='d340179ec7f6af6673b1e66c68c37e5d0bf6648d'
+_vault_commit='73e85c3c21dfd1e835ded0053f08e3bd73a24ad6'
 source=("git+https://github.com/hashicorp/vault#commit=${_vault_commit}"
         'vault.service'
         'vault.sysusers'
@@ -37,6 +37,11 @@ prepare () {
   sed -i 's/gofumpt/gofmt/g' Makefile
 }
 
+pkgver() {
+  cd $PACKAGE_ROOT
+  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build () {
   cd $PACKAGE_ROOT
   export CGO_CPPFLAGS="${CPPFLAGS}"