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
SynoCommunity · Jan 25, 2024 · 223b3cc · 223b3cc
1 parent e6187a5
commit 223b3cc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/cross/cloudflared/Makefile b/cross/cloudflared/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = cloudflared
-PKG_VERS = 2023.7.1
+PKG_VERS = 2024.1.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cloudflare/cloudflared/archive
@@ -20,4 +20,10 @@ include ../../mk/spksrc.cross-go.mk
 
 .PHONY: cloudflared_compile
 cloudflared_compile:
- @$(RUN) $(MAKE) VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
+ifeq (,$(wildcard /tmp/go))
+ @$(MSG) " Call install-cloudflare-go.sh"
+ @$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ \
+ .teamcity/install-cloudflare-go.sh
+endif
+ @$(MSG) " Build cloudflared"
+ @$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
diff --git a/cross/cloudflared/digests b/cross/cloudflared/digests
@@ -1,3 +1,3 @@
-cloudflared-2023.7.1.tar.gz SHA1 0aec1a1e9509b830181577700badf4bc4d8d2a62
-cloudflared-2023.7.1.tar.gz SHA256 0863eadade6c6ac5838510d8fb514ec2332bb79bf54edc34e90cc79652b6c816
-cloudflared-2023.7.1.tar.gz MD5 5ca3cdf330f00a5b10e200a4dd3f710b
+cloudflared-2024.1.5.tar.gz SHA1 863e69aa29ba4f77954d5bd5b2a92f418953a746
+cloudflared-2024.1.5.tar.gz SHA256 0a0da188e162680927ebafcef32c3366aed26661273dc63c540bbebee435bd4e
+cloudflared-2024.1.5.tar.gz MD5 6143597dac66081d65d862be6521f4d4
diff --git a/cross/cloudflared/patches/001-disable-buildvcs.patch b/cross/cloudflared/patches/001-disable-buildvcs.patch
@@ -7,8 +7,8 @@
  $(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 -buildvcs=false -mod=vendor $(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=$(TARGET_OS) GOARCH=$(TARGET_ARCH) $(ARM_COMMAND) go build -buildvcs=false -mod=vendor $(GO_BUILD_TAGS) $(LDFLAGS) $(IMPORT_PATH)/cmd/cloudflared
  ifeq ($(FIPS), true)
  rm -f cmd/cloudflared/fips.go
  ./check-fips.sh cloudflared
diff --git a/spk/cloudflared/Makefile b/spk/cloudflared/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = cloudflared
-SPK_VERS = 2023.7.1
-SPK_REV = 10
+SPK_VERS = 2024.1.5
+SPK_REV = 11
 SPK_ICON = src/cloudflared.png
 
 DEPENDS = cross/cloudflared
@@ -9,9 +9,9 @@ UNSUPPORTED_ARCHS = $(PPC_ARCHS)
 MAINTAINER = karasevm
 DISPLAY_NAME = cloudflared
 DESCRIPTION = "Cloudflare Tunnel client \(formerly Argo Tunnel\)."
-HOMEPAGE = https://github.com/cloudflare/cloudflared
+HOMEPAGE = https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/
 LICENSE = Apache-2.0
-CHANGELOG = "Update to 2023.7.1"
+CHANGELOG = "Update to 2024.1.5"
 
 WIZARDS_DIR = src/wizard/