update-10.11

This commit is contained in:
github-actions[bot] 2021-10-11 20:30:11 +08:00
parent 4d127af306
commit 842f2f9abf
9 changed files with 8 additions and 14 deletions

View File

@ -20,7 +20,6 @@ PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += BROOK_COMPRESS_UPX:upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -18,7 +18,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_HYSTERIA_COMPRESS_UPX
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += HYSTERIA_COMPRESS_UPX:upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -17,7 +17,7 @@ LOCK_FILE=/var/lock/ssrplus.lock
LOG_FILE=/var/log/ssrplus.log
TMP_PATH=/var/etc/ssrplus
TMP_BIN_PATH=$TMP_PATH/bin
TMP_DNSMASQ_PATH=/var/etc/dnsmasq-ssrplus.d
TMP_DNSMASQ_PATH=/tmp/dnsmasq.d/dnsmasq-ssrplus.d
tcp_config_file=
udp_config_file=
shunt_config_file=
@ -810,8 +810,8 @@ start_rules() {
start() {
set_lock
echolog "----------start------------"
mkdir -p /var/run /var/lock /var/log /var/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
echo "conf-dir=${TMP_DNSMASQ_PATH}" >"/var/dnsmasq.d/dnsmasq-ssrplus.conf"
mkdir -p /var/run /var/lock /var/log /tmp/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
echo "conf-dir=${TMP_DNSMASQ_PATH}" >"/tmp/dnsmasq.d/dnsmasq-ssrplus.conf"
if load_config; then
Start_Run
start_rules
@ -844,7 +844,7 @@ start() {
boot() {
echolog "boot"
mkdir -p /var/run /var/lock /var/log /var/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
mkdir -p /var/run /var/lock /var/log /tmp/dnsmasq.d $TMP_BIN_PATH $TMP_DNSMASQ_PATH
ulimit -n 65535
start
}
@ -869,8 +869,8 @@ stop() {
$PS -w | grep -v "grep" | grep "$TMP_PATH" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
killall -q -9 v2ray-plugin obfs-local xray-plugin
rm -f /var/lock/ssr-monitor.lock
if [ -f "/var/dnsmasq.d/dnsmasq-ssrplus.conf" ]; then
rm -rf /var/dnsmasq.d/dnsmasq-ssrplus.conf $TMP_DNSMASQ_PATH $TMP_PATH/*-ssr-*.json $TMP_PATH/ssr-server*.json
if [ -f "/tmp/dnsmasq.d/dnsmasq-ssrplus.conf" ]; then
rm -rf /tmp/dnsmasq.d/dnsmasq-ssrplus.conf $TMP_DNSMASQ_PATH $TMP_PATH/*-ssr-*.json $TMP_PATH/ssr-server*.json
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
del_cron

View File

@ -9,7 +9,7 @@ require "luci.model.uci"
local icount = 0
local args = arg[1]
local uci = luci.model.uci.cursor()
local TMP_DNSMASQ_PATH = "/var/etc/dnsmasq-ssrplus.d"
local TMP_DNSMASQ_PATH = "/tmp/dnsmasq.d/dnsmasq-ssrplus.d"
local TMP_PATH = "/var/etc/ssrplus"
-- match comments/title/whitelist/ip address/excluded_domain
local comment_pattern = "^[!\\[@]+"

View File

@ -18,7 +18,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_TROJAN_GO_COMPRESS_UPX
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += TROJAN_GO_COMPRESS_UPX:upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -23,7 +23,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_V2RAY_CTL_COMPRESS_UPX
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += (V2RAY_CORE_COMPRESS_UPX||V2RAY_CTL_COMPRESS_UPX):upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -20,7 +20,7 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=madeye <max.c.lv@gmail.com>
PKG_BUILD_DEPENDS:=golang/host upx/host
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -24,7 +24,6 @@ PKG_CONFIG_DEPENDS:= \
PKG_BUILD_DIR:=$(BUILD_DIR)/Xray-core-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += XRAY_CORE_COMPRESS_UPX:upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0

View File

@ -26,7 +26,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_XRAY_PLUGIN_COMPRESS_UPX
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DEPENDS += XRAY_PLUGIN_COMPRESS_UPX:upx/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0