Skip to content

Commit 223b3cc

Browse files
authored
cloudflared: update to 2024.1.5 (#5850)
* cloudflared: update build process to support 2024.1.1 * cloudflared: update to 2024.1.5 * cloudflared: update compile target
1 parent e6187a5 commit 223b3cc

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

cross/cloudflared/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = cloudflared
2-
PKG_VERS = 2023.7.1
2+
PKG_VERS = 2024.1.5
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive
@@ -20,4 +20,10 @@ include ../../mk/spksrc.cross-go.mk
2020

2121
.PHONY: cloudflared_compile
2222
cloudflared_compile:
23-
@$(RUN) $(MAKE) VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
23+
ifeq (,$(wildcard /tmp/go))
24+
@$(MSG) " Call install-cloudflare-go.sh"
25+
@$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ \
26+
.teamcity/install-cloudflare-go.sh
27+
endif
28+
@$(MSG) " Build cloudflared"
29+
@$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared

cross/cloudflared/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cloudflared-2023.7.1.tar.gz SHA1 0aec1a1e9509b830181577700badf4bc4d8d2a62
2-
cloudflared-2023.7.1.tar.gz SHA256 0863eadade6c6ac5838510d8fb514ec2332bb79bf54edc34e90cc79652b6c816
3-
cloudflared-2023.7.1.tar.gz MD5 5ca3cdf330f00a5b10e200a4dd3f710b
1+
cloudflared-2024.1.5.tar.gz SHA1 863e69aa29ba4f77954d5bd5b2a92f418953a746
2+
cloudflared-2024.1.5.tar.gz SHA256 0a0da188e162680927ebafcef32c3366aed26661273dc63c540bbebee435bd4e
3+
cloudflared-2024.1.5.tar.gz MD5 6143597dac66081d65d862be6521f4d4

cross/cloudflared/patches/001-disable-buildvcs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
$(info Building cloudflared with go-fips)
88
cp -f fips/fips.go.linux-amd64 cmd/cloudflared/fips.go
99
endif
10-
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
11-
+ GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -v -buildvcs=false -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
10+
- GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
11+
+ GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -buildvcs=false -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
1212
ifeq ($(FIPS), true)
1313
rm -f cmd/cloudflared/fips.go
1414
./check-fips.sh cloudflared

spk/cloudflared/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = cloudflared
2-
SPK_VERS = 2023.7.1
3-
SPK_REV = 10
2+
SPK_VERS = 2024.1.5
3+
SPK_REV = 11
44
SPK_ICON = src/cloudflared.png
55

66
DEPENDS = cross/cloudflared
@@ -9,9 +9,9 @@ UNSUPPORTED_ARCHS = $(PPC_ARCHS)
99
MAINTAINER = karasevm
1010
DISPLAY_NAME = cloudflared
1111
DESCRIPTION = "Cloudflare Tunnel client \(formerly Argo Tunnel\)."
12-
HOMEPAGE = https://github.com/cloudflare/cloudflared
12+
HOMEPAGE = https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/
1313
LICENSE = Apache-2.0
14-
CHANGELOG = "Update to 2023.7.1"
14+
CHANGELOG = "Update to 2024.1.5"
1515

1616
WIZARDS_DIR = src/wizard/
1717

0 commit comments

Comments
 (0)