diff --git a/alist/Makefile b/alist/Makefile index 87d427d3..4032246f 100644 --- a/alist/Makefile +++ b/alist/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alist -PKG_VERSION:=3.60.0 -PKG_WEB_VERSION:=3.60.0 +PKG_VERSION:=3.61.0 +PKG_WEB_VERSION:=3.61.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AlistGo/alist/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=beccffdfba65a168e796a1789b6bea11ca225101cbc4276451e02b9ad8751a82 +PKG_HASH:=74be80f7393ebf41d9e44826068fee5b9a7c1b4dfa4edcc05dc718ca5261071c PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE @@ -23,7 +23,7 @@ define Download/$(PKG_NAME)-web FILE:=$(PKG_NAME)-web-$(PKG_WEB_VERSION).tar.gz URL_FILE:=dist.tar.gz URL:=https://github.com/AlistGo/alist-web/releases/download/$(PKG_WEB_VERSION)/ -HASH:=35c4a218fce07c9ef5113b70ec93e385c57c2910de8852b2d0973129c12b0843 +HASH:=cc873ece600b44a141fb079a38ef7123f5f3976b606bb810a988a70141e8d033 endef PKG_BUILD_DEPENDS:=golang/host diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua index b674e971..3ba5db0e 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua @@ -1684,12 +1684,13 @@ function gen_config(var) blockTypes = (api.compare_versions(xray_version, "<", "26.4.25")) and { 65 } or nil, -- Todo is to remove it rules = (api.compare_versions(xray_version, ">", "26.4.17")) and { { - qtype = "1,28", + qType = "1,28", action = "hijack" }, { - qtype = 65, - action = "reject", + qType = 65, + action = "return", + rCode = 0 }, { action = "direct" @@ -1708,11 +1709,12 @@ function gen_config(var) nonIPQuery = (api.compare_versions(xray_version, "<", "26.4.25")) and "reject" or nil, -- Todo is to remove it rules = (api.compare_versions(xray_version, ">", "26.4.17")) and { { - qtype = "1,28", + qType = "1,28", action = "hijack" }, { - action = "reject" + action = "return", + rCode = 0 } } or nil }