diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | vault.hcl | 4 |
4 files changed, 33 insertions, 25 deletions
@@ -1,16 +1,14 @@ pkgbase = vault-git pkgdesc = A tool for managing secrets - pkgver = v0.8.0.r13.g4bbaaac6b + pkgver = v1.2.0.8635.g54304bf6f4 pkgrel = 1 url = https://vaultproject.io/ install = vault.install arch = i686 arch = x86_64 - license = MPL - makedepends = gox - makedepends = go - depends = glibc - depends = libcap + license = BUSL-1.1 + makedepends = go>=1.21.8 + makedepends = git provides = vault conflicts = vault source = vault-git::git+https://github.com/hashicorp/vault/ @@ -18,7 +16,6 @@ pkgbase = vault-git source = vault.hcl sha512sums = SKIP sha512sums = a97d10208fd99b29cf532c9b5882fe1bbb3faee1d1d706f95a9c379fef461c65a9f16c8530438920024e69871ebd8c7329e6b65025ad65092950bfb74ce393b3 - sha512sums = 8c064aa5dcca84822c1fa85e9d0ff520df46f794b2e9c689a9b4f81f74279387b3aebc08b3ca26cf786c2fcf1a330e765bf5a511074c24f87e5346672346ba1c + sha512sums = ee6f91c766415fcd38d9929e9715609bd63abf1ccd6fc618c0655c09dadb1dfbf146c4e9ed7d789a8ff75a1dcdbbc17ff0bb1795e7dcc8f595d68d9b538fb67a pkgname = vault-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..0465a9340583 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +* +!/PKGBUILD +!/.SRCINFO +!/.gitignore +!/vault.install +!/vault.service +!/vault.hcl @@ -1,12 +1,14 @@ -pkgname='vault-git' +# Maintainer: Adrian Perez de Castro <aperez@igalia.com> + pkgdesc='A tool for managing secrets' -pkgver=v0.8.0.r13.g4bbaaac6b +pkgname=vault-git +pkgver=v1.2.0.8635.g54304bf6f4 pkgrel=1 url='https://vaultproject.io/' -license=('MPL') +license=(BUSL-1.1) arch=('i686' 'x86_64') -makedepends=('gox' 'go') -depends=('glibc' 'libcap') +makedepends=('go>=1.21.8' git) +depends=() provides=("${pkgname%-git}") conflicts=("${provides[@]}") install='vault.install' @@ -15,12 +17,12 @@ source=("${pkgname}::git+https://github.com/hashicorp/vault/" 'vault.hcl') sha512sums=('SKIP' 'a97d10208fd99b29cf532c9b5882fe1bbb3faee1d1d706f95a9c379fef461c65a9f16c8530438920024e69871ebd8c7329e6b65025ad65092950bfb74ce393b3' - '8c064aa5dcca84822c1fa85e9d0ff520df46f794b2e9c689a9b4f81f74279387b3aebc08b3ca26cf786c2fcf1a330e765bf5a511074c24f87e5346672346ba1c') + 'ee6f91c766415fcd38d9929e9715609bd63abf1ccd6fc618c0655c09dadb1dfbf146c4e9ed7d789a8ff75a1dcdbbc17ff0bb1795e7dcc8f595d68d9b538fb67a') pkgver () { cd "${pkgname}" ( set -o pipefail - git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + git describe --long --tags --match 'v*' 2>/dev/null | sed 's/v\([^-]*-g\)/r\1/;s/-/./g' || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" ) } @@ -28,26 +30,26 @@ pkgver () { _srcpath='src/github.com/hashicorp/vault' prepare () { - if [[ ! -r ${_srcpath} ]] ; then - mkdir -p "$(dirname "${_srcpath}")" - ln -s "$(pwd)/${pkgname}" "${_srcpath}" - fi + mkdir -vp "$srcdir/go" } build () { - export GOPATH="${srcdir}:$(pwd)" - cd "${_srcpath}" - gox -verbose -osarch="$(go env GOOS)/$(go env GOARCH)" -output=_build/vault . + export GOPATH="${srcdir}/go:$(pwd)" + export PATH="$srcdir/go/bin:$PATH" + + cd "$pkgname" + tools/tools.sh install + make bootstrap bin } package () { cd "${pkgname}" - install -Dm755 _build/vault "${pkgdir}/usr/bin/vault" + install -Dm755 bin/vault "${pkgdir}/usr/bin/vault" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 "${srcdir}/vault.hcl" "${pkgdir}/etc/vault.hcl" install -Dm644 "${srcdir}/vault.service" \ "${pkgdir}/usr/lib/systemd/system/vault.service" - for file in README.md CHANGELOG.md ; do + for file in README.md CHANGELOG*.md ; do install -Dm644 "${file}" "${pkgdir}/usr/share/doc/${pkgname}/${file}" done } diff --git a/vault.hcl b/vault.hcl index b74da5ed80f7..2c4bb75444f8 100644 --- a/vault.hcl +++ b/vault.hcl @@ -2,7 +2,9 @@ * Vault configuration. See: https://vaultproject.io/docs/config/ */ -backend "file" { +ui = true + +storage "file" { path = "/var/lib/vault" } |