diff --git a/gowebdav/Makefile b/gowebdav/Makefile index c6e2acb8e..1509a3148 100644 --- a/gowebdav/Makefile +++ b/gowebdav/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gowebdav -PKG_VERSION:=5.11.11 -PKG_RELEASE:=14 +PKG_VERSION:=5.12.0 +PKG_RELEASE:=15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/hacdias/webdav/tar.gz/v$(PKG_VERSION)? diff --git a/hysteria/Makefile b/hysteria/Makefile index 1ef42dd69..af4a152c1 100644 --- a/hysteria/Makefile +++ b/hysteria/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hysteria -PKG_VERSION:=2.9.2 -PKG_RELEASE:=10 +PKG_VERSION:=2.9.3 +PKG_RELEASE:=11 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)? diff --git a/luci-app-run/Makefile b/luci-app-run/Makefile index 334ffed93..a90508076 100644 --- a/luci-app-run/Makefile +++ b/luci-app-run/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-run PKG_VERSION:=1.0.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 LUCI_TITLE:=LuCI support for running installers and packages LUCI_DESCRIPTION:=Upload and execute .run, .sh, .ipk and .apk files from LuCI. @@ -11,12 +11,14 @@ LUCI_PKGARCH:=all PKG_MAINTAINER:=wukongdaily -# 定义版本号用于缓存刷新 +define Build/Prepare + find $(CURDIR) -type f -name "*.o" -delete + $(call Build/Prepare/Default) +endef + define Package/luci-app-run/postinst #!/bin/sh -# 设置版本号到临时文件,用于前端资源缓存刷新 echo "$(PKG_VERSION)-$(PKG_RELEASE)" > /tmp/luci-app-run.version -# 重启 rpcd 服务以加载新插件 /etc/init.d/rpcd restart >/dev/null 2>&1 || true exit 0 endef diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 1c5f2055f..5051d0ea5 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=195 -PKG_RELEASE:=32 +PKG_RELEASE:=33 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ @@ -37,6 +37,7 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:coreutils-timeout \ +PACKAGE_$(PKG_NAME)_INCLUDE_Http_Proxy:3proxy \ +PACKAGE_$(PKG_NAME)_INCLUDE_Mihomo:mihomo \ + +PACKAGE_$(PKG_NAME)_INCLUDE_Mihomo:v2ray-geoip \ +PACKAGE_$(PKG_NAME)_INCLUDE_GeoData:v2ray-geoip \ +PACKAGE_$(PKG_NAME)_INCLUDE_GeoData:v2ray-geosite \ +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \ diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 89f44eaf8..0a59b000c 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -323,6 +323,8 @@ link_mihomo_geodata() { else [ -s /etc/openclash/geoip.dat ] && ln -sf /etc/openclash/geoip.dat "$workdir/geoip.dat" fi + + return 0 } prepare_tuic_runtime_config() { diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua index 6bf5f6422..c8c9a20af 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua @@ -2522,17 +2522,19 @@ local execute = function() local nodes, szType local is_clash_subscription = false - if isClashYAML(raw) then - is_clash_subscription = true - local result = processClashSubscription(fetch_url) - if result and not check_filer(result) and not cache[groupHash][result.hashkey] then - result.grouphashkey = groupHash - table.insert(nodeResult[index], result) - cache[groupHash][result.hashkey] = result - log('成功导入 Clash 总节点: ' .. result.alias) - else - log('丢弃无效 Clash 总节点: ' .. url) - end + if isClashYAML(raw) then + is_clash_subscription = true + local result = processClashSubscription(fetch_url) + if result and check_filer(result) then + log('过滤 Clash 总节点: ' .. result.alias) + elseif result and not cache[groupHash][result.hashkey] then + result.grouphashkey = groupHash + table.insert(nodeResult[index], result) + cache[groupHash][result.hashkey] = result + log('成功导入 Clash 总节点: ' .. result.alias) + else + log('丢弃无效 Clash 总节点: ' .. url) + end -- SSD 似乎是这种格式 ssd:// 开头的 elseif raw:find('ssd://') then szType = 'ssd' @@ -2619,20 +2621,23 @@ local execute = function() log('跳过未知类型: ' .. szType) end -- log(result) - if result then - -- 中文做地址的 也没有人拿中文域名搞,就算中文域也有Puny Code SB 机场 - if not result.server or not result.server_port + if result then + local filtered = check_filer(result) + -- 中文做地址的 也没有人拿中文域名搞,就算中文域也有Puny Code SB 机场 + local invalid = not result.server or not result.server_port or (result.type ~= "clash" and result.server == "127.0.0.1") or result.alias == "NULL" - or check_filer(result) or (result.type ~= "clash" and result.server:match("[^0-9a-zA-Z%-_%.%s]")) - or cache[groupHash][result.hashkey] then - log('丢弃无效节点: ' .. result.alias) - else - -- 暂存节点 - table.insert(groupRawNodes, result) + or cache[groupHash][result.hashkey] + if filtered then + log('过滤节点: ' .. result.alias) + elseif invalid then + log('丢弃无效节点: ' .. result.alias) + else + -- 暂存节点 + table.insert(groupRawNodes, result) + end end - end end, function(err) log(string.format("解析节点出错: %s\n原始数据: %s", tostring(err), tostring(v))) end) diff --git a/luci-app-ssw/Makefile b/luci-app-ssw/Makefile index 2da277539..724dde87e 100644 --- a/luci-app-ssw/Makefile +++ b/luci-app-ssw/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Luci app for ssw -LUCI_DEPENDS:= +luci-app-modeminfo +LUCI_DEPENDS:= +luci-app-modeminfo +ssw PKG_LICENSE:=GPLv3 PKG_VERSION:=0.0.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/modeminfo/Makefile b/modeminfo/Makefile index fd48ecb2e..182d08942 100644 --- a/modeminfo/Makefile +++ b/modeminfo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modeminfo PKG_VERSION:=0.4.7 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_MAINTAINER:=Konstantine Shevlakov include $(INCLUDE_DIR)/package.mk diff --git a/modeminfo/root/usr/share/modeminfo/scripts/INTEL b/modeminfo/root/usr/share/modeminfo/scripts/INTEL index 5d3e8d825..dc1379ce7 100644 --- a/modeminfo/root/usr/share/modeminfo/scripts/INTEL +++ b/modeminfo/root/usr/share/modeminfo/scripts/INTEL @@ -56,7 +56,7 @@ function modem_data(){ if (/\+CREG/){gsub("\"","");split($0,a,",");reg=a[2];lac=a[3];cid=a[4]} if (/\+RSCP:/){split($0,a,",");earfcn=a[2]} if (/\+XMCI: 2/) {n=split($0,a,",");sinr_raw=a[n-1]; rssi_raw=a[n-2]; sinr = sprintf("%.0f", (sinr_raw*24)/24-50); rssi = (rssi_raw*64/64-110) - csq=rssi_raw/2; csq_col = get_csq_color(csq); csq_per = (csq > 30) ? 100 : sprintf("%.0f", csq*100/31)} + csq=rssi_raw/2; csq_col = get_csq_color(csq); csq_per = (csq > 30) ? 100 : sprintf("%.0f", csq*100/31)} rsrp="" } END {print reg "|" earfcn "|" lac "|" cid "|" rssi "|" sinr "|" rsrp "|" rsrq "|" bw "|" bwc "|" pci "|" lte_ca "|" csq_col "|" csq_per "|" distance} @@ -64,10 +64,10 @@ function modem_data(){ REGST=${1}; EARFCN=${2}; LAC=${3}; CID=${4}; CSQ_RSSI=${5}; SINR=${6}; RSRP=${7}; RSRQ=${8}; BWDL=${9}; BWCx=${10} PCI=${11}; LTE_CA=${12}; CSQ_COL=${13}; CSQ_PER=${14}; DISTANCE=${15} IFS="$OIFS"; unset OIFS - if [ $MODE = LTE ]; then + if [ "$MODE" = "LTE" ]; then ENBx=$(echo $CID | sed -e 's/..$//') - CELL=$(printf %d 0x${CID: -2}) - ENBID=$(printf %d 0x$ENBx) + CELL=$(printf %d 0x${CID: -2}) + ENBID=$(printf %d 0x$ENBx) OIFS="$IFS";IFS="|" set -- $(echo "$O"| awk -F [:,] -v lte_ca=$LTE_CA -v mode="$MODE" ' # define maps and variables diff --git a/quectel_MHI/Makefile b/quectel_MHI/Makefile old mode 100755 new mode 100644 index 97d435f55..23b87f705 --- a/quectel_MHI/Makefile +++ b/quectel_MHI/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcie_mhi PKG_VERSION:=1.3.8 -PKG_RELEASE:=24 +PKG_RELEASE:=25 include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk diff --git a/ssw/Makefile b/ssw/Makefile index fd93aa03b..8124c9580 100644 --- a/ssw/Makefile +++ b/ssw/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssw PKG_VERSION:=0.0.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_MAINTAINER:=Konstantine Shevlakov include $(INCLUDE_DIR)/package.mk diff --git a/ssw/root/etc/init.d/ssw b/ssw/root/etc/init.d/ssw index 84449b495..3eba84fd7 100755 --- a/ssw/root/etc/init.d/ssw +++ b/ssw/root/etc/init.d/ssw @@ -52,7 +52,6 @@ start_service(){ if [ "$modem_value" = "$modem_cur" ] && [ "$sim_value" = "$sim_cur" ]; then logger -t "SIM SW" "Modem and SIM already in correct state. Nothing to do." - return 0 elif [ "$modem_value" = "$modem_cur" ] && [ "$modem_value" = "1" ]; then logger -t "SIM SW" "Modem already enabled on gpio $modem_gpio. Restart it." echo "0" > /sys/class/gpio/"$modem_gpio"/value diff --git a/xray-core/Makefile b/xray-core/Makefile index 90f4fde02..da218e44e 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Xray-core -PKG_VERSION:=26.6.22 -PKG_RELEASE:=17 +PKG_VERSION:=26.6.27 +PKG_RELEASE:=18 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?