Use proper 1.8.3 commit, re-add go-bindata-hashicorp, add pkgver()

This commit is contained in:
Justin Kromlinger 2021-09-30 13:04:05 +00:00
parent b701e813b9
commit 0353e41880

View File

@ -5,17 +5,17 @@
pkgname='vault' pkgname='vault'
pkgdesc='A tool for managing secrets' pkgdesc='A tool for managing secrets'
pkgver='1.8.3' pkgver=1.8.3
pkgrel='2' pkgrel=3
url="https://vaultproject.io/" url="https://vaultproject.io/"
license=('MPL') license=('MPL')
arch=('x86_64') arch=('x86_64')
makedepends=('go' 'git' 'yarn' 'bower' 'nodejs-lts-fermium' 'npm' 'zip' 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') depends=('glibc')
install='vault.install' install='vault.install'
backup=('etc/vault.hcl') backup=('etc/vault.hcl')
_vault_commit='d340179ec7f6af6673b1e66c68c37e5d0bf6648d' _vault_commit='73e85c3c21dfd1e835ded0053f08e3bd73a24ad6'
source=("git+https://github.com/hashicorp/vault#commit=${_vault_commit}" source=("git+https://github.com/hashicorp/vault#commit=${_vault_commit}"
'vault.service' 'vault.service'
'vault.sysusers' 'vault.sysusers'
@ -37,6 +37,11 @@ prepare () {
sed -i 's/gofumpt/gofmt/g' Makefile 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 () { build () {
cd $PACKAGE_ROOT cd $PACKAGE_ROOT
export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CPPFLAGS="${CPPFLAGS}"