mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

testing/cloudflared: upgrade to 2024.8.3

Browse source 
Fixes #15252
This commit is contained in:
Sertonix 2024-07-07 22:32:02 +02:00 committed by J0WI
parent 6f20ace38e
commit 5971e663ff
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
testing/cloudflared/APKBUILD
View file

@ -1,14 +1,12 @@
# Contributor: Piper McCorkle <piper@cloudflare.com>
# Maintainer: Piper McCorkle <piper@cloudflare.com>
pkgname=cloudflared
pkgver=2023.7.3
pkgrel=7
pkgver=2024.8.3
pkgrel=0
pkgdesc="Cloudflare Tunnel client"
url="https://github.com/cloudflare/cloudflared"
# TODO: Doesn't compile with Go 1.21.
# See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15252
#arch="aarch64 x86 x86_64"
arch=""
# ppc64le/riscv64/loongarch64: Not supported by upstream
arch="all !ppc64le !riscv64 !loongarch64"
license="Apache-2.0"
makedepends="go gettext"
subpackages="$pkgname-doc $pkgname-openrc"
@ -33,8 +31,9 @@ prepare() {
}
build() {
make cloudflared
DATE="2023" VERSION="$pkgver" envsubst < cloudflared_man_template > cloudflared.1
export VERSION="$pkgver" DATE="$(date -u '+%Y-%m-%d-%H%M UTC' -d @"$SOURCE_DATE_EPOCH")"
make VERSION="$VERSION" DATE="$DATE" cloudflared
envsubst < cloudflared_man_template > cloudflared.1
}
check() {
@ -56,8 +55,8 @@ package() {
}
sha512sums="
45833cfd35ad8458882008dc73878948955584a1ce26ff63126b7045d5807d67d275c56ac5d39695f42839daf948a78c894c28f692183e92674d43d9254d7534 cloudflared-2023.7.3.tar.gz
deb54b26ac89da74f6d1016deebdd2a15e302d49c1c2b83787b905e70b00250ddf9568d078c4d1d7b53bba9ab1aa182fbcadca2376a7008f07ce4502a4c6f91c goflags.patch
368bfd0252601f4b19bf14740915a8aa733df7dc28eeb5a5b018639f6daea94ee1627e51d484a5802525326ceca08adccf9269e5fb8cf6a5d06891d439028441 cloudflared-2024.8.3.tar.gz
e5071da9eb2b01bfc678366b21a77ffb319de54e41c6a8d02f99831b0c3a6e9117fa3f8680eba5b987dd404d22a257c7903fb14edae37fd1ff18d28f8a2e16e3 goflags.patch
01f43af92c2c804f6b31189b78f81a76f078179065bebf12118a8bb3ba22e1c8042ef760f24acdf1356bbe5235df7d2a00d55a158e5fec5063c5d2d6abcd7dee config.yml
76b684ef4d0267e8546a21cc60239ef94cbb5fd6b3c0f4fbf4e843eb6e8b56943d3200a160e1749b228306e5649e6a1fa90a58f14fb68c5794f2c760a6c14506 cloudflared.initd
47c71a328d49f3d35dd6e0268e1d734cd21ecc84b24459f77a46df7632f9a8fdb7817cf49187f965c13c94017e4454897caa99ca12b41037dfe0455bb156ef09 cloudflared.confd

4
testing/cloudflared/goflags.patch
View file

@ -6,8 +6,8 @@ index 06fa005..6146471 100644
$(info Building cloudflared with go-fips)
cp -f fips/fips.go.linux-amd64 cmd/cloudflared/fips.go
endif
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
+ GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v $(GOFLAGS) $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
+ GOOS=linux $(ARM_COMMAND) go build $(GOFLAGS) $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
ifeq ($(FIPS), true)
rm -f cmd/cloudflared/fips.go
./check-fips.sh cloudflared