Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cloudflared: update to 2024.1.5 #5850

Merged
merged 12 commits into from
Jan 25, 2024
Merged

cloudflared: update to 2024.1.5 #5850

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f396481
cloudflared: update to 2023.8.0
karasevm Aug 23, 2023
9b01cc4
cloudflared: update to 2023.8.1
karasevm Aug 28, 2023
df719e9
cloudflared: update to 2023.8.2
karasevm Aug 31, 2023
bd4e713
cloudflared: update to 2023.10.0
karasevm Oct 31, 2023
c9d7967
cloudflared: update to 2024.1.1
karasevm Jan 11, 2024
26477c5
cloudflared: update build process to support 2024.1.1
karasevm Jan 11, 2024
281a701
cloudflared: update to 2024.1.2
karasevm Jan 11, 2024
3396ef4
cloudflared: update to 2024.1.3
karasevm Jan 17, 2024
d81a1ec
cloudflared: update to 2024.1.4
karasevm Jan 19, 2024
c920cfb
cloudflared: update to 2024.1.5
karasevm Jan 25, 2024
fc2e8c2
cloudflared: update compile target
karasevm Jan 25, 2024
8de77be
cloudflared: replace homepage url
karasevm Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions cross/cloudflared/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,10 +14,17 @@ LICENSE = Apache-2.0

GO_SRC_DIR = $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)
GO_BIN_DIR = $(GO_SRC_DIR)/$(PKG_NAME)
COMPILE_TARGET = cloudflared_compile
COMPILE_TARGET = install-go cloudflared_compile

include ../../mk/spksrc.cross-go.mk

.PHONY: cloudflared_compile
cloudflared_compile:
@$(RUN) $(MAKE) VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared
@$(RUN) $(MAKE) PATH="/tmp/go/bin:${PATH}" VERSION=$(PKG_VERS) LINK_FLAGS="-s -w" cloudflared

.PHONY: install-go
install-go:
ifeq (,$(wildcard /tmp/go))
$(RUN) GOARCH= GOOS= GOROOT_BOOTSTRAP=$(WORK_DIR)/../../../native/go/work-native/go/ \
$(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/.teamcity/install-cloudflare-go.sh
endif
hgy59 marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 3 additions & 3 deletions cross/cloudflared/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions cross/cloudflared/patches/001-disable-buildvcs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions spk/cloudflared/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,7 +11,7 @@ DISPLAY_NAME = cloudflared
DESCRIPTION = "Cloudflare Tunnel client \(formerly Argo Tunnel\)."
HOMEPAGE = https://github.com/cloudflare/cloudflared
hgy59 marked this conversation as resolved.
Show resolved Hide resolved
LICENSE = Apache-2.0
CHANGELOG = "Update to 2023.7.1"
CHANGELOG = "Update to 2024.1.5"

WIZARDS_DIR = src/wizard/

Expand Down
Loading