diff --git a/PKGBUILD b/PKGBUILD index 31697f2..ca0c422 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,16 +4,17 @@ pkgname='vault' pkgdesc='A tool for managing secrets' -pkgver='1.2.3' +pkgver='1.3.1' pkgrel='1' url="https://vaultproject.io/" license=('MPL') arch=('x86_64') -makedepends=('go-pie' 'git' 'yarn' 'python2' 'bower' 'nodejs-lts-dubnium' 'npm' 'zip') +makedepends=('go-pie' 'git' 'yarn' 'bower' 'nodejs-lts-dubnium' 'npm' 'zip' +'go-bindata-hashicorp' 'go-bindata-assetfs' 'gox' 'go-tools') depends=('glibc') install='vault.install' backup=('etc/vault.hcl') -_vault_commit='c14bd9a2b1d2c20f15b9f93f5c2d487507bb8a2f' +_vault_commit='cec3fdeda0077efb0a6b0343908322f806a1dfef' source=("git+https://github.com/hashicorp/vault#commit=${_vault_commit}" 'vault.service' 'vault.sysusers' @@ -28,39 +29,15 @@ changelog=CHANGELOG.md prepare () { export GOPATH="${srcdir}" - export PATH="$PATH:$GOPATH/bin" - mkdir -p src/github.com/hashicorp/ +# export PATH="$PATH:$GOPATH/bin" + mkdir -p src/github.com/hashicorp/ "$GOPATH/bin" mv "${pkgname}" "src/github.com/hashicorp/${pkgname}" - # this is temporary - go get github.com/kardianos/govendor export PACKAGE_ROOT="${GOPATH}/src/github.com/hashicorp/${pkgname}" + cd $PACKAGE_ROOT + git revert -n 61ff0fd8699dfe9efb9b014df8e9aff86a0aa924 #https://github.com/hashicorp/vault/issues/7475 } build () { - cd $PACKAGE_ROOT - - # We will provide these packages in the future ourself - govendor fetch github.com/mitchellh/gox - govendor fetch github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs - govendor fetch github.com/hashicorp/go-bindata/go-bindata - govendor fetch golang.org/x/tools/cmd/goimports - - cd $PACKAGE_ROOT/vendor/github.com/hashicorp/go-bindata/go-bindata - go build - go install - - cd $PACKAGE_ROOT/vendor/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs - go build - go install - - cd $PACKAGE_ROOT/vendor/github.com/mitchellh/gox - go build - go install - - cd $PACKAGE_ROOT/vendor/golang.org/x/tools/cmd/goimports - go build - go install - cd $PACKAGE_ROOT XC_OSARCH='linux/amd64' make static-dist bin }