update-11.24
This commit is contained in:
github-actions[bot]
parent
5907ec62ae
commit
5b6699f5d1
|
|
@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=UnblockNeteaseMusic
|
PKG_NAME:=UnblockNeteaseMusic
|
||||||
PKG_BASE_VERSION:=0.27.0-beta.9
|
PKG_BASE_VERSION:=0.27.0-beta.9
|
||||||
PKG_RELEASE:=29
|
PKG_RELEASE:=30
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
|
PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
|
||||||
PKG_SOURCE_DATE:=2021-11-16
|
PKG_SOURCE_DATE:=2021-11-16
|
||||||
PKG_SOURCE_VERSION:=ff2d1563d8349f7b368c2ed3f5f231d555e13fa6
|
PKG_SOURCE_VERSION:=a25bf38d0cf41e708abc8e27399e4037ed7db772
|
||||||
PKG_MIRROR_HASH:=skip
|
PKG_MIRROR_HASH:=skip
|
||||||
|
|
||||||
PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
|
PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
|
||||||
|
|
|
||||||
|
|
@ -722,4 +722,4 @@ msgid "Used with AdGuardHome"
|
||||||
msgstr "与AdGuardHome搭配使用"
|
msgstr "与AdGuardHome搭配使用"
|
||||||
|
|
||||||
msgid "Luci-app-adguardhome require"
|
msgid "Luci-app-adguardhome require"
|
||||||
msgstr "请确保luci-app-adguardhome能正常启用"
|
msgstr "请确保luci-app-adguardhome能正常启用,本插件会联动开启并配置ADG,ADG无需任何设置"
|
||||||
|
|
@ -1,40 +1,40 @@
|
||||||
2021-11-21 23:58:49: ------------------- 规则更新 -----------------------
|
2021-11-24 02:30:10: ------------------- 规则更新 -----------------------
|
||||||
2021-11-21 23:58:49: ====================================================
|
2021-11-24 02:30:10: ====================================================
|
||||||
2021-11-21 23:58:49: 开始更新koolproxy的规则，请等待...
|
2021-11-24 02:30:10: 开始更新koolproxy的规则，请等待...
|
||||||
2021-11-21 23:58:50: ---------------------------------------------------------------------------------------
|
2021-11-24 02:30:11: ---------------------------------------------------------------------------------------
|
||||||
2021-11-21 23:58:50: Yhosts规则本地版本号： 202111082343
|
2021-11-24 02:30:11: Yhosts规则本地版本号： 202111082343
|
||||||
2021-11-21 23:58:50: Yhosts规则在线版本号： 202111082343
|
2021-11-24 02:30:11: Yhosts规则在线版本号： 202111082343
|
||||||
2021-11-21 23:58:50: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
|
2021-11-24 02:30:11: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
|
||||||
2021-11-21 23:58:50: ---------------------------------------------------------------------------------------
|
2021-11-24 02:30:11: ---------------------------------------------------------------------------------------
|
||||||
2021-11-21 23:58:50: Antiad规则本地版本号： 20211120024124
|
2021-11-24 02:30:11: Antiad规则本地版本号： 20211120024124
|
||||||
2021-11-21 23:58:50: Antiad规则在线版本号： 20211120024124
|
2021-11-24 02:30:11: Antiad规则在线版本号： 20211123024150
|
||||||
2021-11-21 23:58:50: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
2021-11-24 02:30:11: 检测到新版本 Antiad规则 列表，开始更新...
|
||||||
2021-11-21 23:58:50: ---------------------------------------------------------------------------------------
|
2021-11-24 02:30:11: 将临时文件覆盖到原始 Antiad规则 文件
|
||||||
2021-11-21 23:58:50: StevenBlack规则本地版本号： 18 November 2021 03:49:14
|
2021-11-24 02:30:11: ---------------------------------------------------------------------------------------
|
||||||
2021-11-21 23:58:50: StevenBlack规则在线版本号： 21 November 2021 16:22:17
|
2021-11-24 02:30:11: StevenBlack规则本地版本号： 21 November 2021 16:22:17
|
||||||
2021-11-21 23:58:50: 检测到新版本 StevenBlack规则 列表，开始更新...
|
2021-11-24 02:30:11: StevenBlack规则在线版本号： 21 November 2021 16:22:17
|
||||||
2021-11-21 23:58:50: 将临时文件覆盖到原始 StevenBlack规则 文件
|
2021-11-24 02:30:11: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||||
2021-11-21 23:58:50: ---------------------------------------------------------------------------------------
|
2021-11-24 02:30:11: ---------------------------------------------------------------------------------------
|
||||||
2021-11-21 23:58:50: AdGuard DNS规则本地版本号： 2021-11-21T12:07:42.648Z
|
2021-11-24 02:30:12: AdGuard DNS规则本地版本号： 2021-11-21T18:04:54.395Z
|
||||||
2021-11-21 23:58:50: AdGuard DNS规则在线版本号： 2021-11-21T18:04:54.395Z
|
2021-11-24 02:30:12: AdGuard DNS规则在线版本号： 2021-11-24T00:19:03.087Z
|
||||||
2021-11-21 23:58:50: 检测到新版本 AdGuard DNS规则 列表，开始更新...
|
2021-11-24 02:30:12: 检测到新版本 AdGuard DNS规则 列表，开始更新...
|
||||||
2021-11-21 23:58:50: 将临时文件覆盖到原始 AdGuard DNS规则 文件
|
2021-11-24 02:30:12: 将临时文件覆盖到原始 AdGuard DNS规则 文件
|
||||||
2021-11-21 23:58:50: ---------------------------------------------------------------------------------------
|
2021-11-24 02:30:12: ---------------------------------------------------------------------------------------
|
||||||
2021-11-21 23:58:50: ADgk规则本地版本号： 20211120183731
|
2021-11-24 02:30:12: ADgk规则本地版本号： 20211120183731
|
||||||
2021-11-21 23:58:50: ADgk规则在线版本号： 20211120183731
|
2021-11-24 02:30:12: ADgk规则在线版本号： 20211120183731
|
||||||
2021-11-21 23:58:50: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
2021-11-24 02:30:12: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊!
|
||||||
2021-11-21 23:58:50: 跳过优化 补充规则Yhosts。。。。。
|
2021-11-24 02:30:12: 跳过优化 补充规则Yhosts。。。。。
|
||||||
2021-11-21 23:58:50: 跳过优化 补充规则Antiad。。。。。
|
2021-11-24 02:30:12: 正在优化 补充规则antiad。。。。。
|
||||||
2021-11-21 23:58:50: 正在优化 补充规则steven。。。。。
|
2021-11-24 02:30:13: 跳过优化 补充规则StevenBlack。。。。。
|
||||||
2021-11-21 23:58:51: 正在优化 补充规则AdGuard DNS。。。。。
|
2021-11-24 02:30:13: 正在优化 补充规则AdGuard DNS。。。。。
|
||||||
2021-11-21 23:58:58: 跳过优化 ADgk规则。。。。。
|
2021-11-24 02:30:20: 跳过优化 ADgk规则。。。。。
|
||||||
2021-11-21 23:58:58: 所有规则更新并优化完毕！
|
2021-11-24 02:30:20: 所有规则更新并优化完毕！
|
||||||
2021-11-21 23:58:58: ====================================================
|
2021-11-24 02:30:20: ====================================================
|
||||||
2021-11-21 23:58:59: -------------------AdGuard DNS规则 version 2021-11-21T18:04:54.395Z
|
2021-11-24 02:30:22: -------------------AdGuard DNS规则 version 2021-11-24T00:19:03.087Z
|
||||||
2021-11-21 23:58:59: -------------------Antiad规则 version 20211120024124
|
2021-11-24 02:30:22: -------------------Antiad规则 version 20211123024150
|
||||||
2021-11-21 23:58:59: -------------------坂本ADgk规则 version 20211120183731
|
2021-11-24 02:30:22: -------------------坂本ADgk规则 version 20211120183731
|
||||||
2021-11-21 23:58:59: -------------------Yhosts规则 version 202111082343
|
2021-11-24 02:30:22: -------------------Yhosts规则 version 202111082343
|
||||||
2021-11-21 23:58:59: -------------------StevenBlack规则 version 21 November 2021 16:22:17
|
2021-11-24 02:30:22: -------------------StevenBlack规则 version 21 November 2021 16:22:17
|
||||||
2021-11-21 23:58:59: -------------------静态规则 version 2021-10-07 18:00
|
2021-11-24 02:30:22: -------------------静态规则 version 2021-10-07 18:00
|
||||||
2021-11-21 23:58:59: ------------------- 内置规则更新成功！ -------------------
|
2021-11-24 02:30:22: ------------------- 内置规则更新成功！ -------------------
|
||||||
2021-11-21 23:58:59: ------------------- 规则更新成功！ -------------------
|
2021-11-24 02:30:22: ------------------- 规则更新成功！ -------------------
|
||||||
|
|
|
||||||
|
|
@ -5,22 +5,31 @@ STOP=15
|
||||||
|
|
||||||
CONFIG=passwall
|
CONFIG=passwall
|
||||||
APP_FILE=/usr/share/${CONFIG}/app.sh
|
APP_FILE=/usr/share/${CONFIG}/app.sh
|
||||||
LOCK_FILE=/var/lock/${CONFIG}.lock
|
LOCK_FILE_DIR=/var/lock
|
||||||
|
LOCK_FILE=${LOCK_FILE_DIR}/${CONFIG}.lock
|
||||||
|
|
||||||
lock() {
|
set_lock() {
|
||||||
if [ -s ${LOCK_FILE} ]; then
|
[ ! -d "$LOCK_FILE_DIR" ] && mkdir -p $LOCK_FILE_DIR
|
||||||
SPID=$(cat ${LOCK_FILE})
|
exec 999>"$LOCK_FILE"
|
||||||
if [ -e /proc/${SPID}/status ]; then
|
flock -xn 999
|
||||||
#echo "脚本已经在运行，不重复运行，退出."
|
}
|
||||||
exit 1
|
|
||||||
fi
|
unset_lock() {
|
||||||
cat /dev/null > ${LOCK_FILE}
|
flock -u 999
|
||||||
fi
|
rm -rf "$LOCK_FILE"
|
||||||
echo $$ > ${LOCK_FILE}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unlock() {
|
unlock() {
|
||||||
rm -rf ${LOCK_FILE}
|
failcount=1
|
||||||
|
while [ "$failcount" -le 10 ]; do
|
||||||
|
if [ -f "$LOCK_FILE" ]; then
|
||||||
|
let "failcount++"
|
||||||
|
sleep 1s
|
||||||
|
[ "$failcount" -ge 10 ] && unset_lock
|
||||||
|
else
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
boot() {
|
boot() {
|
||||||
|
|
@ -28,22 +37,26 @@ boot() {
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
lock
|
set_lock
|
||||||
|
[ $? == 1 ] && $APP_FILE echolog "脚本已经在运行，不重复运行，退出." && exit 0
|
||||||
$APP_FILE start
|
$APP_FILE start
|
||||||
unlock
|
unset_lock
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
lock
|
|
||||||
$APP_FILE stop
|
|
||||||
unlock
|
unlock
|
||||||
|
set_lock
|
||||||
|
[ $? == 1 ] && $APP_FILE echolog "停止脚本等待超时，不重复运行，退出." && exit 0
|
||||||
|
$APP_FILE stop
|
||||||
|
unset_lock
|
||||||
}
|
}
|
||||||
|
|
||||||
restart() {
|
restart() {
|
||||||
lock
|
set_lock
|
||||||
|
[ $? == 1 ] && $APP_FILE echolog "脚本已经在运行，不重复运行，退出." && exit 0
|
||||||
$APP_FILE stop
|
$APP_FILE stop
|
||||||
$APP_FILE start
|
$APP_FILE start
|
||||||
unlock
|
unset_lock
|
||||||
}
|
}
|
||||||
|
|
||||||
disable() {
|
disable() {
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,18 @@ get_enabled_anonymous_secs() {
|
||||||
uci -q show "${CONFIG}" | grep "${1}\[.*\.enabled='1'" | cut -d '.' -sf2
|
uci -q show "${CONFIG}" | grep "${1}\[.*\.enabled='1'" | cut -d '.' -sf2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
convert_ip_port_format() {
|
||||||
|
local ip=$1
|
||||||
|
local ip_port=
|
||||||
|
local result=$(echo $ip | grep "#")
|
||||||
|
if [ -z "$result" ]; then
|
||||||
|
ip_port=$(echo $ip | sed -E 's/\:([^:]+)$/#\1/g')
|
||||||
|
else
|
||||||
|
ip_port=$result
|
||||||
|
fi
|
||||||
|
echo $ip_port
|
||||||
|
}
|
||||||
|
|
||||||
get_host_ip() {
|
get_host_ip() {
|
||||||
local host=$2
|
local host=$2
|
||||||
local count=$3
|
local count=$3
|
||||||
|
|
@ -301,7 +313,7 @@ load_config() {
|
||||||
chnlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${LOCALHOST_UDP_PROXY_MODE}" | grep "chnroute")
|
chnlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${LOCALHOST_UDP_PROXY_MODE}" | grep "chnroute")
|
||||||
gfwlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${LOCALHOST_UDP_PROXY_MODE}" | grep "gfwlist")
|
gfwlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${LOCALHOST_UDP_PROXY_MODE}" | grep "gfwlist")
|
||||||
DNS_MODE=$(config_t_get global dns_mode pdnsd)
|
DNS_MODE=$(config_t_get global dns_mode pdnsd)
|
||||||
DNS_FORWARD=$(config_t_get global dns_forward 1.1.1.1:53 | sed 's/:/#/g')
|
DNS_FORWARD=$(convert_ip_port_format $(config_t_get global dns_forward 1.1.1.1:53))
|
||||||
DNS_CACHE=$(config_t_get global dns_cache 0)
|
DNS_CACHE=$(config_t_get global dns_cache 0)
|
||||||
CHINADNS_NG=$(config_t_get global chinadns_ng 1)
|
CHINADNS_NG=$(config_t_get global chinadns_ng 1)
|
||||||
dns_listen_port=${DNS_PORT}
|
dns_listen_port=${DNS_PORT}
|
||||||
|
|
@ -1150,7 +1162,7 @@ start_dns() {
|
||||||
;;
|
;;
|
||||||
custom)
|
custom)
|
||||||
custom_dns=$(config_t_get global custom_dns)
|
custom_dns=$(config_t_get global custom_dns)
|
||||||
TUN_DNS="$(echo ${custom_dns} | sed 's/:/#/g')"
|
TUN_DNS="$(convert_ip_port_format $(echo ${custom_dns}))"
|
||||||
echolog " - 域名解析：使用UDP协议自定义DNS（$TUN_DNS）解析..."
|
echolog " - 域名解析：使用UDP协议自定义DNS（$TUN_DNS）解析..."
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
@ -1466,6 +1478,9 @@ run_redir)
|
||||||
node_switch)
|
node_switch)
|
||||||
node_switch $@
|
node_switch $@
|
||||||
;;
|
;;
|
||||||
|
echolog)
|
||||||
|
echolog $@
|
||||||
|
;;
|
||||||
stop)
|
stop)
|
||||||
[ "$1" = "force" ] && force_stop
|
[ "$1" = "force" ] && force_stop
|
||||||
stop
|
stop
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue