diff --git a/7z/Makefile b/7z/Makefile index 38915a9c..34e1ba11 100644 --- a/7z/Makefile +++ b/7z/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=7z -PKG_VERSION:=25.01 -PKG_RELEASE:=1 +PKG_VERSION:=26.01 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)$(subst .,,$(PKG_VERSION))-src.tar.xz PKG_SOURCE_URL:=https://7-zip.org/a/ diff --git a/7z/patches/020-musl.patch b/7z/patches/020-musl.patch index 1a7a5c30..b36f8361 100644 --- a/7z/patches/020-musl.patch +++ b/7z/patches/020-musl.patch @@ -1,6 +1,6 @@ --- a/C/Threads.c +++ b/C/Threads.c -@@ -472,7 +472,7 @@ WRes Thread_Create_With_CpuSet(CThread * +@@ -486,7 +486,7 @@ WRes Thread_Create_With_CpuSet(CThread * */ // ret2 = @@ -9,7 +9,7 @@ // if (ret2) ret = ret2; #endif } -@@ -482,14 +482,12 @@ WRes Thread_Create_With_CpuSet(CThread * +@@ -496,14 +496,12 @@ WRes Thread_Create_With_CpuSet(CThread * if (!ret) { p->_created = 1; diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index a9f7fb58..2c85b109 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.5.20 -PKG_RELEASE:=131 +PKG_RELEASE:=132 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua index f61af239..36f5a646 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua @@ -222,6 +222,14 @@ if #hysteria2_type > 0 then for key, value in pairs(hysteria2_type) do o:value(value) end + + o = s:option(Value, "hysteria_up_mbps", "Hy/Hy2 " .. translate("Max upload Mbps")) + o.datatype = "uinteger" + o.default = "100" + + o = s:option(Value, "hysteria_down_mbps", "Hy/Hy2 " .. translate("Max download Mbps")) + o.datatype = "uinteger" + o.default = "100" end o = s:option(Flag, "boot_update", translate("Update Once on Boot"), translate("Updates the subscription the first time PassWall runs automatically after each system boot.")) diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 83dbdd2d..9e9e527a 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -505,6 +505,7 @@ local function processData(szType, content, add_mode, group, sub_cfg) local sub_vmess_type = DEFAULT_VMESS_TYPE local sub_vless_type = DEFAULT_VLESS_TYPE local sub_hysteria2_type = DEFAULT_HYSTERIA2_TYPE + local sub_hy_up_mbps, sub_hy_down_mbps = 1000, 1000 if sub_cfg then if sub_cfg.allowInsecure and sub_cfg.allowInsecure ~= "1" then sub_allowinsecure = nil @@ -529,6 +530,8 @@ local function processData(szType, content, add_mode, group, sub_cfg) if hysteria2_type ~= "global" and core_has[hysteria2_type] then sub_hysteria2_type = hysteria2_type end + sub_hy_up_mbps = sub_cfg.hysteria_up_mbps + sub_hy_down_mbps = sub_cfg.hysteria_down_mbps end local result = { timeout = 60, @@ -1351,8 +1354,8 @@ local function processData(szType, content, add_mode, group, sub_cfg) local insecure = params.allowinsecure or params.allowInsecure or params.insecure result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0") result.alpn = params.alpn - result.hysteria_up_mbps = params.upmbps - result.hysteria_down_mbps = params.downmbps + result.hysteria_up_mbps = params.upmbps or sub_hy_up_mbps + result.hysteria_down_mbps = params.downmbps or sub_hy_down_mbps result.hysteria_hop = params.mport elseif szType == 'hysteria2' or szType == 'hy2' then @@ -1396,8 +1399,8 @@ local function processData(szType, content, add_mode, group, sub_cfg) result.tls_CertByName = params.vcn local insecure = params.allowinsecure or params.insecure result.tls_allowInsecure = (insecure == "1" or insecure == "0") and insecure or (sub_allowinsecure and "1" or "0") - result.hysteria2_up_mbps = params.upmbps - result.hysteria2_down_mbps = params.downmbps + result.hysteria2_up_mbps = params.upmbps or sub_hy_up_mbps + result.hysteria2_down_mbps = params.downmbps or sub_hy_down_mbps result.hysteria2_hop = params.mport if params["obfs-password"] or params["obfs_password"] then result.hysteria2_obfs_type = "salamander" diff --git a/mlvpn/Makefile b/mlvpn/Makefile index 7de47a87..60088e11 100644 --- a/mlvpn/Makefile +++ b/mlvpn/Makefile @@ -9,22 +9,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mlvpn PKG_VERSION:=2.6.5.20211028 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git -PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df +PKG_SOURCE_VERSION:= PKG_SOURCE_DATE:=2021-10-28 #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git -#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df +#PKG_SOURCE_VERSION:= #PKG_SOURCE_DATE:=2018-09-03 #PKG_SOURCE_URL:=https://github.com/flohoff/MLVPN.git -#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df +#PKG_SOURCE_VERSION:= #PKG_SOURCE_DATE:=2019-05-31 #PKG_SOURCE_URL:=https://github.com/link4all/MLVPN.git -#PKG_SOURCE_VERSION:=b934d4953d480cbbd43128d01150b829fa8839df +#PKG_SOURCE_VERSION:= #PKG_SOURCE_DATE:=2019-07-13 diff --git a/teleproxy/Makefile b/teleproxy/Makefile index b88c3d9a..69ca78f0 100644 --- a/teleproxy/Makefile +++ b/teleproxy/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=teleproxy -PKG_VERSION:=4.12.2 -PKG_RELEASE:=12 +PKG_VERSION:=4.13.0 +PKG_RELEASE:=13 PKG_MAINTAINER:=Kosntantine Shevlakov PKG_LICENSE:=GPLv2 @@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/teleproxy/teleproxy.git -PKG_SOURCE_VERSION:=56cb55858444d5e767d5cd753f31cef5c331d264 +PKG_SOURCE_VERSION:=04001477b210d82fe73037b8878e72c8d1d7c373 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz