From: Van Waholtz <brvphoenix@gmail.com>
Date: Thu, 16 Feb 2023 02:21:20 +0000 (+0800)
Subject: frp: update to 0.47.0
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8fcc48c339060b6652f6093278c8a74b0c7ca542;p=feed%2Fpackages.git

frp: update to 0.47.0

A restart is only required if `$conf_file` has been modified.

Signed-off-by: Van Waholtz <brvphoenix@gmail.com>
---

diff --git a/net/frp/Makefile b/net/frp/Makefile
index d77066e9be..f664fa8e12 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=frp
-PKG_VERSION:=0.46.1
+PKG_VERSION:=0.47.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=af3e8d9d4144cf520cee2609cd45fb575afe711c03cc7441dc89d0402628a869
+PKG_HASH:=d98ebf8638701cf8662604b9fe2fb355f91209f87edcb77f2830c7fa40ccbe37
 
 PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com>
 PKG_LICENSE:=Apache-2.0
diff --git a/net/frp/files/frpc.init b/net/frp/files/frpc.init
index e7f06edbd5..68fe43c4e0 100644
--- a/net/frp/files/frpc.init
+++ b/net/frp/files/frpc.init
@@ -69,6 +69,7 @@ start_service() {
 
 	procd_open_instance
 	procd_set_param command "$PROG" -c "$conf_file"
+	procd_set_param file $conf_file
 	procd_set_param stdout $stdout
 	procd_set_param stderr $stderr
 	[ -n "$user" ] && procd_set_param user "$user"
@@ -77,8 +78,3 @@ start_service() {
 	[ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
 	procd_close_instance
 }
-
-reload_service() {
-	stop
-	start
-}
diff --git a/net/frp/files/frps.init b/net/frp/files/frps.init
index b87525cd2a..38f714fb1b 100644
--- a/net/frp/files/frps.init
+++ b/net/frp/files/frps.init
@@ -67,6 +67,7 @@ start_service() {
 
 	procd_open_instance
 	procd_set_param command "$PROG" -c "$conf_file"
+	procd_set_param file $conf_file
 	procd_set_param stdout $stdout
 	procd_set_param stderr $stderr
 	[ -n "$user" ] && procd_set_param user "$user"
@@ -75,8 +76,3 @@ start_service() {
 	[ -n "$env" ] && config_list_foreach "$init_cfg" env "procd_append_param env"
 	procd_close_instance
 }
-
-reload_service() {
-	stop
-	start
-}