diff --git a/UnblockNeteaseMusic/Makefile b/UnblockNeteaseMusic/Makefile index 2e18501fe..f8849df8a 100644 --- a/UnblockNeteaseMusic/Makefile +++ b/UnblockNeteaseMusic/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic PKG_BASE_VERSION:=0.27.0-rc.4 -PKG_RELEASE:=95 +PKG_RELEASE:=96 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git PKG_SOURCE_DATE:=2021-12-21 -PKG_SOURCE_VERSION:=fe6f20f4de7942bb91ddc4b52bc279881b4a4140 +PKG_SOURCE_VERSION:=ff52a65c28ea444fb9fef522f85f53e6374cd3ef PKG_MIRROR_HASH:=skip PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) diff --git a/aliyundrive-fuse/Makefile b/aliyundrive-fuse/Makefile index da65f6a42..b79faf20f 100644 --- a/aliyundrive-fuse/Makefile +++ b/aliyundrive-fuse/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-fuse -PKG_VERSION:=0.1.7 +PKG_VERSION:=0.1.8 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=MIT diff --git a/dat/serverlist.txt b/dat/serverlist.txt index 7c25bd2a5..5d9055544 100644 --- a/dat/serverlist.txt +++ b/dat/serverlist.txt @@ -8135,6 +8135,7 @@ diguver.com dihutyaiafuhr.cloudfront.net diitlm.com dikeletwhelk.cam +dikematou.com dikkoplida.cam dilateneedybeyond.com dilemmaemergencyleisure.com @@ -9191,6 +9192,7 @@ emodoinc.com emolah.com emolapnay.com emotersjervina.com +emotionally.wang emotionpiousconformity.com empirelayer.club empiremoney.com @@ -12075,6 +12077,7 @@ hnwjlhg.cn hnxahz.com hnxbls.cn hnxinkejg.com +hnycwh.cn hnyczs.club hnyishidengbao.com hnylb8.cn @@ -16721,6 +16724,7 @@ netmera.com netmng.com netpatas.com netpool.netbookia.net +netshare.ltd netshelter.net netund.com networkdarling.com @@ -27337,7 +27341,6 @@ znaptag.com znazlahbcu.com zncat.cn zndsssp.dangbei.net -znqip.net znurmlkkeltsb.com znznrccyrcr.com zo7gihmry2.com @@ -27355,6 +27358,7 @@ zonealta.com zoneletbinned.com zongjiangc.top zongjiangd.top +zonmxej.cn zooahm2fx2v1.com zoologicalavid.com zoom.zshu.net diff --git a/luci-app-aliyundrive-fuse/Makefile b/luci-app-aliyundrive-fuse/Makefile index 80882c986..e252856c0 100644 --- a/luci-app-aliyundrive-fuse/Makefile +++ b/luci-app-aliyundrive-fuse/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-fuse -PKG_VERSION:=0.1.7 +PKG_VERSION:=0.1.8 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/luci-app-bypass/root/etc/init.d/bypass b/luci-app-bypass/root/etc/init.d/bypass index 4f2704a58..e2ab96e28 100755 --- a/luci-app-bypass/root/etc/init.d/bypass +++ b/luci-app-bypass/root/etc/init.d/bypass @@ -13,7 +13,6 @@ SDNS=/var/etc/smartdns DNS_T=$SDNS/smartdns.conf CON_T=$SDNS/rules.conf PID=/var/run/smartdns.pid -K=/tmp/bypass LOG=/var/log/bypass.log BIN_DIR=/usr/share/bypass DNS_FILE=/tmp/dnsmasq.d/dnsmasq-by.conf @@ -32,6 +31,12 @@ switch_server=$1 server_count=0 STATUS=Y +extra_command "updated" "" + +updated() { +updated=Y +start +} uci_get_by_name(){ ret=$(uci -q get $NAME.$1.$2) echo ${ret:=$3} @@ -190,7 +195,7 @@ start_dns(){ ;; esac if [ $run_mode = router ];then - service_start $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g $K/gfw.list) + service_start $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g $T_FILE/gfw.list) log "ChinaDNS : Start ChinaDNS-NG successful!" fi if [[ "$(uci -q get dhcp.@dnsmasq[0].cachesize)" == "0" && $adguardhome == 0 ]]; then @@ -215,9 +220,8 @@ preload(){ check_net(){ if ! curl -so /dev/null -m 3 www.baidu.com;then - log "Wait for network to connect..." /etc/init.d/dnsmasq restart - firstdown 1;exit 1 + firstdown 1;exit 0; fi } @@ -226,7 +230,6 @@ get_soip(){ if [ "$1" = 1 ];then cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Check network status...' || gen_log check_net - cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Check network status successful!' || log "Check network status successful!" fi socks5_ip=$(uci_get_by_name $SO_SERVER server) if ! echo $socks5_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then @@ -254,11 +257,11 @@ rules(){ fi cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Check network status...\|Download IP/GFW files...' || gen_log check_net - cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Download IP/GFW files...' || (log "Check network status successful!";log "Check IP/GFW files...") + cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Download IP/GFW files...' || (log "Check IP/GFW files...") mkdir -p /var/run $VAR - if ([ $run_mode = router ] && [ ! -s $K/china.txt -o ! -s $K/china_v6.txt ]) || ([ $run_mode = gfw -o $gfw_mode = 1 ] && [ ! -s $K/gfw.list ]);then + if [[ ! -f $PID && "$updated" != Y ]];then log "Download IP/GFW files..." - firstdown 2;exit 1 + firstdown 2;exit 0; fi log "Check IP/GFW files successful!" kcp_enable=$(uci_get_by_name $GLOBAL_SERVER kcp_enable 0) @@ -784,7 +787,7 @@ gen_dns(){ awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' $O >$DNS_DIR/black.conf if [ $run_mode = gfw ];then [ "$dns_a" = 1 ] && echo "server=/$doh_o_dom/127.0.0.1#5335" >>$DNS_DIR/black.conf - cp -f $K/gfw.list $O + cp -f $T_FILE/gfw.list $O awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' $O >>$DNS_DIR/black.conf fi fi @@ -849,7 +852,7 @@ add_cron(){ if [ $(uci_get_by_type server_subscribe auto_update 0) = 1 ];then if ! grep -wq "$(uci_get_by_type server_subscribe auto_update_time 6) \* \* \* .*$BIN_DIR" $CRON_FILE;then eval $CRON - echo "0 $(uci_get_by_type server_subscribe auto_update_time 6) * * * $BIN_DIR/update" >>$CRON_FILE + echo "0 $(uci_get_by_type server_subscribe auto_update_time 6) * * * $BIN_DIR/update restart" >>$CRON_FILE echo "5 $(uci_get_by_type server_subscribe auto_update_time 6) * * * $BIN_DIR/subscribe" >>$CRON_FILE A=1 fi @@ -1025,14 +1028,12 @@ stop(){ kill -9 $(ps -w | grep $VAR | grep -v grep | awk '{print$1}') 2>/dev/null killall -q -9 smartdns chinadns-ng kcptun-client microsocks rm -rf $DNS_DIR $VAR $DNS_FILE $CON_T /var/lock/bypass-update.lock - [ $run_mode = gfw -o $gfw_mode = 1 ] || rm -f $K/gfw.list - [ $run_mode = router ] || rm -f $K/china_v6.txt [ -z "$GLOBAL_SERVER" ] && grep -q bypass $CRON_FILE && sed -i '/bypass/d' $CRON_FILE && /etc/init.d/cron restart if [ $STATUS = Y -o -z "$GLOBAL_SERVER" ];then if [[ -f /etc/init.d/AdGuardHome && "$(uci -q get AdGuardHome.AdGuardHome.redirect)" == "exchange" ]]; then /etc/init.d/AdGuardHome stop >/dev/null 2>&1 & fi - rm -rf $K $SDNS $PID $LOC + rm -rf $SDNS $PID $LOC /etc/init.d/dnsmasq restart >/dev/null 2>&1 elif [ -s $DNS_T ];then cat > $DNS_T <<-EOF diff --git a/luci-app-bypass/root/usr/share/bypass/by-monitor b/luci-app-bypass/root/usr/share/bypass/by-monitor index 3443ece2f..bb40aca47 100755 --- a/luci-app-bypass/root/usr/share/bypass/by-monitor +++ b/luci-app-bypass/root/usr/share/bypass/by-monitor @@ -86,7 +86,7 @@ while :;do t=`ps -w | grep chinadns-ng | grep -v grep | wc -l` if [ $t = 0 ];then echolog "ChinaDNS-NG Error. Restart!" - $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g /tmp/bypass/gfw.list) >/dev/null 2>&1 & + $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g /etc/bypass/gfw.list) >/dev/null 2>&1 & fi fi #localsocks diff --git a/luci-app-bypass/root/usr/share/bypass/checknetwork b/luci-app-bypass/root/usr/share/bypass/checknetwork index 2b73a3aaa..9c847cfc2 100755 --- a/luci-app-bypass/root/usr/share/bypass/checknetwork +++ b/luci-app-bypass/root/usr/share/bypass/checknetwork @@ -6,16 +6,8 @@ log(){ echo "$(date +'%Y-%m-%d %H:%M:%S') : $*" >> /var/log/$NAME.log } -sleep 2 while ! curl -so /dev/null -m 3 www.baidu.com;do + log "请检查网络..." sleep 2 done -log "Check network status successful!" -if [ -z "$(uci -q get $NAME.@global[0].global_server)" ];then - /etc/init.d/$NAME start & -elif ([ "$(uci -q get $NAME.@global[0].run_mode)" = router ] && [ ! -s /tmp/$NAME/china.txt -o ! -s /tmp/$NAME/china_v6.txt ]) || ([ "$(uci -q get $NAME.@global[0].run_mode)" = gfw -o "$(uci -q get $NAME.@global[0].gfw_mode)" = 1 ] && [ ! -s /tmp/$NAME/gfw.list ]);then - log "Download IP/GFW files..." - /usr/share/$NAME/update --First & -else - /etc/init.d/$NAME start & -fi +/etc/init.d/$NAME start & \ No newline at end of file diff --git a/luci-app-bypass/root/usr/share/bypass/chinaipset b/luci-app-bypass/root/usr/share/bypass/chinaipset index 3b96ceaa0..a3683b21a 100755 --- a/luci-app-bypass/root/usr/share/bypass/chinaipset +++ b/luci-app-bypass/root/usr/share/bypass/chinaipset @@ -1,12 +1,12 @@ #!/bin/sh if [ "$1" = v6 ];then ipset -N china_v6 hash:net family inet6 2>/dev/null - awk '!/^$/&&!/^#/{printf("add china_v6 %s'" "'\n",$0)}' /tmp/bypass/china_v6.txt > /tmp/china_v6.ipset + awk '!/^$/&&!/^#/{printf("add china_v6 %s'" "'\n",$0)}' /etc/bypass/china_v6.txt > /tmp/china_v6.ipset ipset -F china_v6 2>/dev/null ipset -R < /tmp/china_v6.ipset 2>/dev/null else ipset -N china_v4 hash:net 2>/dev/null - awk '!/^$/&&!/^#/{printf("add china_v4 %s'" "'\n",$0)}' /tmp/bypass/china.txt > /tmp/china.ipset + awk '!/^$/&&!/^#/{printf("add china_v4 %s'" "'\n",$0)}' /etc/bypass/china.txt > /tmp/china.ipset ipset -F china_v4 2>/dev/null ipset -R < /tmp/china.ipset 2>/dev/null fi diff --git a/luci-app-bypass/root/usr/share/bypass/update b/luci-app-bypass/root/usr/share/bypass/update index c5e330055..de550af15 100755 --- a/luci-app-bypass/root/usr/share/bypass/update +++ b/luci-app-bypass/root/usr/share/bypass/update @@ -1,12 +1,10 @@ #!/bin/sh -[ "$1" = --First ] && A=Y || A=N # 防止重复启动 -[ -f /var/lock/bypass.lock -a $A = N ] && exit 1 LOCK=/var/lock/bypass-update.lock [ -f $LOCK ] && exit 1 touch $LOCK DIR=/usr/share/bypass -TMP=/tmp/bypass +T_FILE=/etc/bypass log(){ echo "$(date +'%Y-%m-%d %H:%M:%S') $*" >> /var/log/bypass.log @@ -14,55 +12,58 @@ log(){ C=$(uci -q get bypass.@global[0].run_mode) -if [ $A = Y ];then - mkdir -p $TMP -fi +mkdir -p $T_FILE 2>/dev/null if [ "$C" = router ];then - if [ $A = Y ];then - while ! B=$(curl -kLfs https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt || curl -kLfs https://op.supes.top/all_cn.txt);do + if [ ! -f $T_FILE/china.txt ];then + while ! B=$(curl -kLfsm 3 https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt || curl -kLfsm 3 https://op.supes.top/all_cn.txt);do sleep 2 done + else + B=$(curl -kLfsm 3 https://cdn.jsdelivr.net/gh/kiddin9/china_ip_list@main/china_ip_list.txt || curl -kLfsm 3 https://op.supes.top/all_cn.txt) fi [ -n "$B" ] && echo "$B" > /tmp/china.txt - - if ! cmp -s /tmp/china.txt $TMP/china.txt;then + if ! cmp -s /tmp/china.txt $T_FILE/china.txt;then log "Update China IP List!" - cp -f /tmp/china.txt $TMP/china.txt - [ $A = N ] && ipset list china_v4 >/dev/null 2>&1 && $DIR/chinaipset + cp -f /tmp/china.txt $T_FILE/china.txt else log "China IPv4 List is up to date!" fi + ipset list china_v4 >/dev/null 2>&1 && $DIR/chinaipset - if [ $A = Y ];then - while ! D=$(curl -kLfsm 5 https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 5 https://op.supes.top/all_cn_ipv6.txt);do + if [ ! -f $T_FILE/china_v6.txt ];then + while ! D=$(curl -kLfsm 3 https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 https://op.supes.top/all_cn_ipv6.txt);do sleep 2 done + else + D=$(curl -kLfsm 3 https://ispip.clang.cn/all_cn_ipv6.txt || curl -kLfsm 3 https://op.supes.top/all_cn_ipv6.txt) fi [ -n "$D" ] && echo "$D" > /tmp/china_v6.txt - - if ! cmp -s /tmp/china_v6.txt $TMP/china_v6.txt;then + if ! cmp -s /tmp/china_v6.txt $T_FILE/china_v6.txt;then log "Update China IPv6 List!" - cp -f /tmp/china_v6.txt $TMP/china_v6.txt - [ $A = N ] && ipset list china_v6 >/dev/null 2>&1 && $DIR/chinaipset v6 + cp -f /tmp/china_v6.txt $T_FILE/china_v6.txt else log "China IPv6 List is up to date!" fi + ipset list china_v6 >/dev/null 2>&1 && $DIR/chinaipset v6 fi if [ "$C" = gfw -o "$(uci -q get bypass.@global[0].gfw_mode)" = 1 ];then - if [ $A = Y ];then - while ! (curl -kLfsm 5 -o /tmp/gfw.b64 https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt || curl -Lfso /tmp/gfw.b64 https://op.supes.top/gfwlist.txt);do + if [ ! -f $T_FILE/gfw.txt ];then + while ! (curl -kLfsm 5 -o /tmp/gfw.b64 https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt || curl -kLfsm 3 -o /tmp/gfw.b64 https://op.supes.top/gfwlist.txt);do sleep 2 done + elif [ "$C" = gfw ];then + curl -kLfsm 5 -o /tmp/gfw.b64 https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt || curl -kLfsm 3 -o /tmp/gfw.b64 https://op.supes.top/gfwlist.txt fi $DIR/by-gfw - if ! cmp -s /tmp/gfwnew.txt $TMP/gfw.list;then - cp -f /tmp/gfwnew.txt $TMP/gfw.list + if ! cmp -s /tmp/gfwnew.txt $T_FILE/gfw.list;then + cp -f /tmp/gfwnew.txt $T_FILE/gfw.list log "Update GFW List!" - [ $A = N ] && /etc/init.d/bypass restart >/dev/null 2>&1 else log "GFW List is up to date!" fi fi + rm -f $LOCK /tmp/china*.txt /tmp/gfwnew.txt -[ $A = Y ] && /etc/init.d/bypass start & + +[ "$1" == "restart" ] && /etc/init.d/bypass restart || /etc/init.d/bypass updated \ No newline at end of file diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt index 7c25bd2a5..5d9055544 100644 --- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt @@ -8135,6 +8135,7 @@ diguver.com dihutyaiafuhr.cloudfront.net diitlm.com dikeletwhelk.cam +dikematou.com dikkoplida.cam dilateneedybeyond.com dilemmaemergencyleisure.com @@ -9191,6 +9192,7 @@ emodoinc.com emolah.com emolapnay.com emotersjervina.com +emotionally.wang emotionpiousconformity.com empirelayer.club empiremoney.com @@ -12075,6 +12077,7 @@ hnwjlhg.cn hnxahz.com hnxbls.cn hnxinkejg.com +hnycwh.cn hnyczs.club hnyishidengbao.com hnylb8.cn @@ -16721,6 +16724,7 @@ netmera.com netmng.com netpatas.com netpool.netbookia.net +netshare.ltd netshelter.net netund.com networkdarling.com @@ -27337,7 +27341,6 @@ znaptag.com znazlahbcu.com zncat.cn zndsssp.dangbei.net -znqip.net znurmlkkeltsb.com znznrccyrcr.com zo7gihmry2.com @@ -27355,6 +27358,7 @@ zonealta.com zoneletbinned.com zongjiangc.top zongjiangd.top +zonmxej.cn zooahm2fx2v1.com zoologicalavid.com zoom.zshu.net diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 746b743a3..0d86e6c29 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=185 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ diff --git a/luci-app-ssr-plus/root/etc/ssrplus/white.list b/luci-app-ssr-plus/root/etc/ssrplus/white.list index e69de29bb..9055fcb91 100644 --- a/luci-app-ssr-plus/root/etc/ssrplus/white.list +++ b/luci-app-ssr-plus/root/etc/ssrplus/white.list @@ -0,0 +1,7 @@ +bilibili.com +bilibili.cn +bilivideo.com +bilivideo.cn +biliapi.com +biliapi.net +apple.com \ No newline at end of file diff --git a/luci-app-v2raya/luasrc/model/cbi/v2raya.lua b/luci-app-v2raya/luasrc/model/cbi/v2raya.lua index d7cea102a..dfdc27022 100644 --- a/luci-app-v2raya/luasrc/model/cbi/v2raya.lua +++ b/luci-app-v2raya/luasrc/model/cbi/v2raya.lua @@ -6,7 +6,7 @@ local m, o, s require("nixio.fs") local v2raya_bin = "/usr/bin/v2raya" - v2raya_version=luci.sys.exec(v2raya_bin.." --version 2>/dev/null") + v2raya_version=""..luci.sys.exec(v2raya_bin.." --version 2>/dev/null").."" m = Map("v2raya") m.title = translate("v2rayA Client") diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile index 17c65ae40..6784b4fa8 100644 --- a/my-default-settings/Makefile +++ b/my-default-settings/Makefile @@ -24,7 +24,8 @@ define Package/$(PKG_NAME) endef define Package/$(PKG_NAME)/conffiles -/etc/config/base_config +/etc/config/ +/etc/nginx/ endef define Build/Prepare