* update consul to 1.20.2-1
This commit is contained in:
parent
0b08083312
commit
54c43b7413
@ -1,11 +1,13 @@
|
|||||||
pkgbase = consul
|
pkgbase = consul
|
||||||
pkgdesc = A tool for service discovery, monitoring and configuration.
|
pkgdesc = A tool for service discovery, monitoring and configuration.
|
||||||
pkgver = 1.20.1
|
pkgver = 1.20.2
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://www.consul.io
|
url = https://www.consul.io
|
||||||
install = consul.install
|
install = consul.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
arch = powerpc64le
|
arch = powerpc64le
|
||||||
|
arch = powerpc64
|
||||||
|
arch = riscv64
|
||||||
license = BUSL-1.1
|
license = BUSL-1.1
|
||||||
makedepends = git
|
makedepends = git
|
||||||
makedepends = go
|
makedepends = go
|
||||||
@ -14,19 +16,21 @@ pkgbase = consul
|
|||||||
makedepends = procps-ng
|
makedepends = procps-ng
|
||||||
makedepends = zip
|
makedepends = zip
|
||||||
makedepends = yarn
|
makedepends = yarn
|
||||||
makedepends = nodejs-lts-hydrogen
|
makedepends = nodejs-lts-iron
|
||||||
makedepends = npm
|
makedepends = npm
|
||||||
depends = glibc
|
depends = glibc
|
||||||
backup = etc/default/consul
|
backup = etc/default/consul
|
||||||
source = git+https://github.com/hashicorp/consul#tag=v1.20.1
|
source = git+https://github.com/hashicorp/consul#tag=v1.20.2
|
||||||
source = consul.service
|
source = consul.service
|
||||||
source = consul.default
|
source = consul.default
|
||||||
source = consul.sysusers
|
source = consul.sysusers
|
||||||
source = example.json
|
source = example.json
|
||||||
sha512sums = 05594ffdb74d043b5df08d0f320a7849c8e874d5b3f471725298c11d1a7784d11e529b70759b5228e2f8e6d57a5e5cd2af705daa2d95405f0de76dee274a4901
|
source = https://github.com/hashicorp/consul/commit/3ecdb19cc69396a3232bdb74116f30b7b3a72d04.patch
|
||||||
|
sha512sums = b923403413b066fe72d632b4805cc91c4385e3df4b225ca14d001912ed6940e186132a5c5537cdd3113135226993abf74e004daab3bfb960c3f9424286eba536
|
||||||
sha512sums = c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04
|
sha512sums = c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04
|
||||||
sha512sums = ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079
|
sha512sums = ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079
|
||||||
sha512sums = ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87
|
sha512sums = ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87
|
||||||
sha512sums = c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348
|
sha512sums = c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348
|
||||||
|
sha512sums = 39aa5761a725fab8e9cf3eabd7c47d64b91489c03c059747849ec4a4b1032e44f2770a238338fb43c963516c6e941fd82157b91128c2c1899ba5448a9dc49979
|
||||||
|
|
||||||
pkgname = consul
|
pkgname = consul
|
||||||
|
@ -4,28 +4,31 @@
|
|||||||
# Maintainer: Justin Kromlinger <hashworks@archlinux.org>
|
# Maintainer: Justin Kromlinger <hashworks@archlinux.org>
|
||||||
|
|
||||||
pkgname=consul
|
pkgname=consul
|
||||||
pkgver=1.20.1
|
pkgver=1.20.2
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="A tool for service discovery, monitoring and configuration."
|
pkgdesc="A tool for service discovery, monitoring and configuration."
|
||||||
arch=(x86_64 powerpc64le)
|
arch=(x86_64 powerpc64le powerpc64 riscv64)
|
||||||
url="https://www.consul.io"
|
url="https://www.consul.io"
|
||||||
license=('BUSL-1.1')
|
license=('BUSL-1.1')
|
||||||
depends=('glibc')
|
depends=('glibc')
|
||||||
makedepends=('git' 'go' 'gox' 'go-tools')
|
makedepends=('git' 'go' 'gox' 'go-tools')
|
||||||
makedepends+=('procps-ng' 'zip' 'yarn' 'nodejs-lts-hydrogen' 'npm') # makedepends for the UI
|
makedepends+=('procps-ng' 'zip' 'yarn' 'nodejs-lts-iron' 'npm') # makedepends for the UI
|
||||||
source=("git+https://github.com/hashicorp/consul#tag=v${pkgver}"
|
source=("git+https://github.com/hashicorp/consul#tag=v${pkgver}"
|
||||||
'consul.service'
|
'consul.service'
|
||||||
'consul.default'
|
'consul.default'
|
||||||
'consul.sysusers'
|
'consul.sysusers'
|
||||||
'example.json'
|
'example.json'
|
||||||
|
# Switch to NodeJS LTS 20 "Iron"
|
||||||
|
'https://github.com/hashicorp/consul/commit/3ecdb19cc69396a3232bdb74116f30b7b3a72d04.patch'
|
||||||
)
|
)
|
||||||
install=consul.install
|
install=consul.install
|
||||||
backup=('etc/default/consul')
|
backup=('etc/default/consul')
|
||||||
sha512sums=('05594ffdb74d043b5df08d0f320a7849c8e874d5b3f471725298c11d1a7784d11e529b70759b5228e2f8e6d57a5e5cd2af705daa2d95405f0de76dee274a4901'
|
sha512sums=('b923403413b066fe72d632b4805cc91c4385e3df4b225ca14d001912ed6940e186132a5c5537cdd3113135226993abf74e004daab3bfb960c3f9424286eba536'
|
||||||
'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
|
'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
|
||||||
'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
|
'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
|
||||||
'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
|
'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
|
||||||
'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348')
|
'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
|
||||||
|
'39aa5761a725fab8e9cf3eabd7c47d64b91489c03c059747849ec4a4b1032e44f2770a238338fb43c963516c6e941fd82157b91128c2c1899ba5448a9dc49979')
|
||||||
|
|
||||||
export CGO_LDFLAGS="${LDFLAGS}"
|
export CGO_LDFLAGS="${LDFLAGS}"
|
||||||
export CGO_CFLAGS="${CFLAGS}"
|
export CGO_CFLAGS="${CFLAGS}"
|
||||||
@ -35,10 +38,18 @@ export CGO_CXXFLAGS="${CXXFLAGS}"
|
|||||||
export GOFLAGS="-trimpath -mod=readonly -modcacherw"
|
export GOFLAGS="-trimpath -mod=readonly -modcacherw"
|
||||||
|
|
||||||
case "${CARCH}" in
|
case "${CARCH}" in
|
||||||
|
powerpc64)
|
||||||
|
export GOARCH='ppc64'
|
||||||
|
export XC_OSARCH='linux/ppc64'
|
||||||
|
;;
|
||||||
powerpc64le)
|
powerpc64le)
|
||||||
export GOARCH='ppc64le'
|
export GOARCH='ppc64le'
|
||||||
export XC_OSARCH='linux/ppc64le'
|
export XC_OSARCH='linux/ppc64le'
|
||||||
;;
|
;;
|
||||||
|
riscv64)
|
||||||
|
export GOARCH='riscv64'
|
||||||
|
export XC_OSARCH='linux/riscv64'
|
||||||
|
;;
|
||||||
x86_64)
|
x86_64)
|
||||||
export GOARCH='amd64'
|
export GOARCH='amd64'
|
||||||
export XC_OSARCH='linux/amd64'
|
export XC_OSARCH='linux/amd64'
|
||||||
@ -55,6 +66,11 @@ prepare() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
go mod edit -replace=github.com/boltdb/bolt=go.etcd.io/bbolt@v1.3.6
|
||||||
|
go mod edit -replace=go.etcd.io/bbolt=github.com/coreos/bbolt@v1.3.6
|
||||||
|
go mod edit -replace=github.com/shirou/gopsutil/v3=github.com/shirou/gopsutil/v3@v3.24.5
|
||||||
|
go mod tidy
|
||||||
|
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user