mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-09-10 18:34:18 +08:00
🎨 Sync 2026-09-09 00:58:08
This commit is contained in:
+1
-1
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=frp
|
||||
PKG_VERSION:=0.71.0
|
||||
PKG_RELEASE:=6
|
||||
PKG_RELEASE:=7
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
config init
|
||||
option enabled '1'
|
||||
option stdout '1'
|
||||
option stderr '1'
|
||||
# Uncomment to run frpc as an existing user/group. Keep disabled by
|
||||
|
||||
+18
-14
@@ -912,6 +912,7 @@ service_triggers() {
|
||||
|
||||
start_service() {
|
||||
local init_cfg=
|
||||
local enabled=1
|
||||
local stdout=1
|
||||
local stderr=1
|
||||
local respawn=1
|
||||
@@ -919,14 +920,27 @@ start_service() {
|
||||
local run_group=
|
||||
local old_umask
|
||||
|
||||
mkdir -p /var/etc
|
||||
_TOML_ERR=0
|
||||
_ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
||||
|
||||
config_load "$NAME"
|
||||
|
||||
config_foreach _find_init_section init
|
||||
|
||||
if [ -n "$init_cfg" ]; then
|
||||
config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
||||
|
||||
config_get_bool enabled "$init_cfg" enabled 1
|
||||
config_get_bool stdout "$init_cfg" stdout 1
|
||||
config_get_bool stderr "$init_cfg" stderr 1
|
||||
config_get_bool respawn "$init_cfg" respawn 1
|
||||
config_get run_user "$init_cfg" user
|
||||
config_get run_group "$init_cfg" group
|
||||
fi
|
||||
|
||||
[ "$enabled" -eq 0 ] && return 1
|
||||
|
||||
mkdir -p /var/etc
|
||||
_TOML_ERR=0
|
||||
_ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
||||
|
||||
old_umask="$(umask)"
|
||||
umask 077
|
||||
: > "$CONF_FILE" || {
|
||||
@@ -948,16 +962,6 @@ start_service() {
|
||||
} >> "$CONF_FILE" || return 1
|
||||
[ "$_TOML_ERR" = "0" ] || return 1
|
||||
|
||||
if [ -n "$init_cfg" ]; then
|
||||
config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
||||
|
||||
config_get_bool stdout "$init_cfg" stdout 1
|
||||
config_get_bool stderr "$init_cfg" stderr 1
|
||||
config_get_bool respawn "$init_cfg" respawn 1
|
||||
config_get run_user "$init_cfg" user
|
||||
config_get run_group "$init_cfg" group
|
||||
fi
|
||||
|
||||
{
|
||||
config_foreach _emit_conf_section conf
|
||||
} >> "$CONF_FILE" || return 1
|
||||
|
||||
@@ -79,6 +79,7 @@ upgrade_init() {
|
||||
changed=1
|
||||
fi
|
||||
|
||||
set_if_empty "$init_section" enabled 1
|
||||
set_if_empty "$init_section" stdout 1
|
||||
set_if_empty "$init_section" stderr 1
|
||||
set_if_empty "$init_section" respawn 1
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
config init
|
||||
option enabled '1'
|
||||
option stdout '1'
|
||||
option stderr '1'
|
||||
# Uncomment to run frps as an existing user/group. Keep disabled by
|
||||
|
||||
+18
-10
@@ -689,6 +689,7 @@ service_triggers() {
|
||||
|
||||
start_service() {
|
||||
local init_cfg=
|
||||
local enabled=1
|
||||
local stdout=1
|
||||
local stderr=1
|
||||
local respawn=1
|
||||
@@ -696,13 +697,28 @@ start_service() {
|
||||
local run_group=
|
||||
local old_umask
|
||||
|
||||
config_load "$NAME"
|
||||
|
||||
config_foreach _find_init_section init
|
||||
|
||||
if [ -n "$init_cfg" ]; then
|
||||
config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
||||
|
||||
config_get_bool enabled "$init_cfg" enabled 1
|
||||
config_get_bool stdout "$init_cfg" stdout 1
|
||||
config_get_bool stderr "$init_cfg" stderr 1
|
||||
config_get_bool respawn "$init_cfg" respawn 1
|
||||
config_get run_user "$init_cfg" user
|
||||
config_get run_group "$init_cfg" group
|
||||
fi
|
||||
|
||||
[ "$enabled" -eq 0 ] && return 1
|
||||
|
||||
mkdir -p /var/etc
|
||||
_TOML_ERR=0
|
||||
_ALLOW_UNSAFE_TOKEN_SOURCE_EXEC=0
|
||||
|
||||
config_load "$NAME"
|
||||
|
||||
config_foreach _find_init_section init
|
||||
|
||||
old_umask="$(umask)"
|
||||
umask 077
|
||||
@@ -725,15 +741,7 @@ start_service() {
|
||||
} >> "$CONF_FILE" || return 1
|
||||
[ "$_TOML_ERR" = "0" ] || return 1
|
||||
|
||||
if [ -n "$init_cfg" ]; then
|
||||
config_list_foreach "$init_cfg" conf_inc _append_conf_file
|
||||
|
||||
config_get_bool stdout "$init_cfg" stdout 1
|
||||
config_get_bool stderr "$init_cfg" stderr 1
|
||||
config_get_bool respawn "$init_cfg" respawn 1
|
||||
config_get run_user "$init_cfg" user
|
||||
config_get run_group "$init_cfg" group
|
||||
fi
|
||||
|
||||
{
|
||||
config_foreach _emit_http_plugin http_plugin
|
||||
|
||||
@@ -90,6 +90,7 @@ upgrade_init() {
|
||||
changed=1
|
||||
fi
|
||||
|
||||
set_if_empty "$init_section" enabled 1
|
||||
set_if_empty "$init_section" stdout 1
|
||||
set_if_empty "$init_section" stderr 1
|
||||
set_if_empty "$init_section" respawn 1
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-passwall
|
||||
PKG_VERSION:=26.9.1
|
||||
PKG_RELEASE:=261
|
||||
PKG_VERSION:=26.9.9
|
||||
PKG_RELEASE:=262
|
||||
PKG_PO_VERSION:=$(PKG_VERSION)
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
|
||||
Reference in New Issue
Block a user