Date: Wednesday, October 26, 2022 @ 13:01:41 Author: foxxx0 Revision: 1335440
upgpkg: consul 1.13.3-1 | bump to 1.13.3, switch to VCS source Switching to the git source will be required for building the UI as there are some hardcoded git commands in the build suite for it, that expect to be run from within a git checkout. We're not currently building the UI (yet), but there is no harm in switching to the VCS source with a pinned commit. (The release tarballs on github weren't signed either.) Modified: consul/trunk/PKGBUILD ----------+ PKGBUILD | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-26 13:01:34 UTC (rev 1335439) +++ PKGBUILD 2022-10-26 13:01:41 UTC (rev 1335440) @@ -2,7 +2,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=consul -pkgver=1.13.1 +_commit=b29e5894f2322c9294b1f03c9b264ae2e6ae0eb0 +pkgver=1.13.3 pkgrel=1 pkgdesc="A tool for service discovery, monitoring and configuration." arch=('x86_64') @@ -9,18 +10,17 @@ url="https://www.consul.io"; license=('MPL2') depends=('glibc') -makedepends=('git' 'go' 'go-bindata-assetfs' 'go-bindata-hashicorp' 'procps-ng' 'zip' 'yarn' 'bower' 'nodejs-lts-fermium' 'npm' 'zip' 'gox' 'go-tools') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/hashicorp/consul/archive/v${pkgver}.tar.gz"; +makedepends=('git' 'go' 'gox' 'go-tools') +#makedepends+=('procps-ng' 'zip' 'yarn' 'nodejs-lts-fermium' 'npm') # makedepds for the UI +source=("git+https://github.com/hashicorp/consul#commit=${_commit}"; 'consul.service' 'consul.default' 'consul.sysusers' 'example.json' - # 'fix-build-version-info.patch' - # 'unparallelize-or-disable-flaky-tests.patch' ) install=consul.install backup=('etc/default/consul') -sha512sums=('b70760ec9b7339f8a1aed76db89d1ea8f96dba6a4d996993b21d59228e885b5f577bab36bf2f153db9572bf81590927442db2ae074ef5f45ccfd154b0ff27284' +sha512sums=('SKIP' 'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04' 'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079' 'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87' @@ -38,7 +38,7 @@ export XC_OSARCH='linux/amd64' prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" local filename for filename in "${source[@]}"; do @@ -51,33 +51,17 @@ } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" go build -o build './...' + + # resulting UI build can be found in the dist/ subdirectory + # TODO: decide if we want the UI and then figure out where to put it in the pkgdir + #cd ui/packages/consul-ui + #make build } -############################################################################## -#### -#### test suite is currently broken and fails horribly -#### upstream is not interested in helping to debug failures downstream -#### -#### therefore the testsuite is disabled for the time being -#### -############################################################################## -# check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# -# # prevent e.g. syslog tests -# export TRAVIS='true' -# -# # some tests need the built `consul` binary in $PATH -# export PATH="${PWD}/build:${PATH}" -# -# # weird race conditions when being run overparallelized -# go test -v -p 2 -parallel 2 './...' -# } - package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul" install -D -d -m750 -o 0 -g 208 "${pkgdir}/etc/consul.d"
