From 1c8c65bbafd59cdc8f07b1bbcc329851555deeb9 Mon Sep 17 00:00:00 2001
From: Internet1235 <135099493+Internet1235@users.noreply.github.com>
Date: Tue, 4 Feb 2025 21:22:40 +0800
Subject: [PATCH] rclone: bump to 1.69.0

---
 net/rclone/Makefile          | 36 +++++-------------------------------
 net/rclone/files/rclone.init |  1 +
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index a3f6bf87..9a481c07 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -6,29 +6,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rclone
-PKG_VERSION:=1.61.1
+PKG_VERSION:=1.69.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f9fb7bae1f19896351db64e3713b67bfd151c49b2b28e6c6233adf67dbc2c899
+PKG_HASH:=9b360793108d0b9a3208dacece76e72f5d9253c6710da1c08a1eb8a91eeb9854
 
 PKG_LICENSE:=MIT
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Elon Huang <elonhhuang@gmail.com> \
 		Tianling Shen <cnsztl@immortalwrt.org>
 
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_RCLONE_COMPRESS_GOPROXY \
-	CONFIG_RCLONE_COMPRESS_UPX
-
-PKG_BUILD_DEPENDS:=golang/host upx/host
+PKG_BUILD_DEPENDS:=golang/host
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/rclone/rclone
 GO_PKG_EXCLUDES:=test
-GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:= \
 	github.com/rclone/rclone/fs.Version=v$(PKG_VERSION) \
 	main.Version=v$(PKG_VERSION) \
@@ -48,7 +43,7 @@ endef
 
 define Package/rclone
   $(call Package/rclone/Default)
-  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +fuse-utils
+  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +fuse3-utils
   USERID:=rclone:rclone
 endef
 
@@ -63,31 +58,10 @@ define Package/rclone/description
   files and directories to and from different cloud storage providers.
 endef
 
-define Package/rclone/config
-config RCLONE_COMPRESS_GOPROXY
-	bool "Compiling with GOPROXY proxy"
-	default n
-
-config RCLONE_COMPRESS_UPX
-	bool "Compress executable files with UPX"
-	default n
-endef
-
-ifeq ($(CONFIG_RCLONE_COMPRESS_GOPROXY),y)
-	export GO111MODULE=on
-endif
-
 define Package/rclone-config/conffiles
 /etc/config/rclone
 endef
 
-define Build/Compile
-	$(call GoPackage/Build/Compile)
-ifeq ($(CONFIG_RCLONE_COMPRESS_UPX),y)
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/rclone
-endif
-endef
-
 define Package/rclone/install
 	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
 	$(INSTALL_DIR) $(1)/usr/bin/
diff --git a/net/rclone/files/rclone.init b/net/rclone/files/rclone.init
index 276a3b19..29fe2f2d 100755
--- a/net/rclone/files/rclone.init
+++ b/net/rclone/files/rclone.init
@@ -58,6 +58,7 @@ start_service() {
 	local config_dir="${config_path%/*}"
 	[ -d "$config_dir" ] || mkdir -p "$config_dir"
 	touch "${config_path}"
+	chown rclone "${config_dir}"
 	chown rclone "${config_path}"
 
 	[ -d "/lib/upgrade/keep.d" ] || mkdir -p "/lib/upgrade/keep.d/"