update 2022-07-01 20:17:58

aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aliyundrive-webdav
-PKG_VERSION:=1.5.0
+PKG_VERSION:=1.5.1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_LICENSE:=MIT

luci-app-aliyundrive-webdav/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-aliyundrive-webdav
-PKG_VERSION:=1.5.0
+PKG_VERSION:=1.5.1
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
 

luci-app-passwall2/luasrc/model/cbi/passwall2/client/rule.lua

@@ -31,6 +31,16 @@ o = s:option(Value, "v2ray_location_asset", translate("Location of V2ray/Xray as
 o.default = "/usr/share/v2ray/"
 o.rmempty = false
 
+---- Custom geo file url
+o = s:option(Value, "geoip_url", translate("Custom geoip URL"))
+o.default = "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest"
+o.rmempty = false
+
+o = s:option(Value, "geosite_url", translate("Custom geosite URL"))
+o.default = "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest"
+o.rmempty = false
+----
+
 s = m:section(TypedSection, "shunt_rules", "V2ray/Xray " .. translate("Shunt Rule"), "<a style='color: red'>" .. translate("Please note attention to the priority, the higher the order, the higher the priority.") .. "</a>")
 s.template = "cbi/tblsection"
 s.anonymous = false

luci-app-passwall2/luasrc/model/cbi/passwall2/server/user.lua

@@ -12,7 +12,7 @@ local ss_encrypt_method_list = {
 local ss_rust_encrypt_method_list = {
     "plain", "none",
     "aes-128-gcm", "aes-256-gcm", "chacha20-ietf-poly1305",
-    "2022-blake3-aes-128-gcm","2022-blake3-aes-256-gcm","2022-blake3-chacha8-poly1305","2022-blake3-chacha20-poly1305"
+    "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha8-poly1305", "2022-blake3-chacha20-poly1305"
 }
 
 local ssr_encrypt_method_list = {

luci-app-passwall2/po/zh-cn/passwall2.po

@@ -845,10 +845,10 @@ msgid "IV Check"
 msgstr "IV 检查"
 
 msgid "UDP over TCP"
-msgstr "TCP封装UDP"
+msgstr "TCP 封装 UDP"
 
 msgid "Need Xray server side with Shadowsocks-2022 protocol"
-msgstr "需要Xray作服务器端的Shadowsocks-2022协议"
+msgstr "需要 Xray 作服务器端的 Shadowsocks-2022 协议"
 
 msgid "Connection Timeout"
 msgstr "连接超时时间"
@@ -1130,7 +1130,7 @@ msgid "Early data length"
 msgstr "前置数据最大长度"
 
 msgid "Early data header name"
-msgstr "前置数据HTTP头名"
+msgstr "前置数据 HTTP 头名"
 
 msgid "Recommended value: Sec-WebSocket-Protocol"
 msgstr "推荐值：Sec-WebSocket-Protocol"
@@ -1161,3 +1161,6 @@ msgstr "缓冲区大小（Xray）"
 
 msgid "Buffer size for every connection (kB)"
 msgstr "每一个连接的缓冲区大小（kB）"
+
+msgid "Custom geoip URL"
+msgstr "自定义geo文件更新链接"

luci-app-passwall2/root/usr/share/passwall2/rule_update.lua

@@ -11,10 +11,13 @@ local arg1 = arg[1]
 local reboot = 0
 local geoip_update = 0
 local geosite_update = 0
-local geoip_api =  "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest"
-local geosite_api =  "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest"
 local v2ray_asset_location = ucic:get_first(name, 'global_rules', "v2ray_location_asset", "/usr/share/v2ray/")
 
+-- Custom geo file
+local geoip_api = ucic:get_first(name, 'global_rules', "geoip_url", "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest")
+local geosite_api = ucic:get_first(name, 'global_rules', "geosite_url", "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest")
+--
+
 local log = function(...)
     if arg1 then
         local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")

luci-app-store/Makefile

@@ -10,13 +10,13 @@ LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
 LUCI_DEPENDS:=+curl +opkg +luci-base +tar +coreutils +coreutils-stat +libuci-lua +mount-utils
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.10-4
+PKG_VERSION:=0.1.10-5
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 
 ISTORE_UI_VERSION:=0.1.10
-ISTORE_UI_RELEASE:=4
+ISTORE_UI_RELEASE:=5
-PKG_HASH:=acebe1f8b445e26f44334dcbd904c002354a4b419f7e6bfbb9aef0cb9ca0571c
+PKG_HASH:=edfc68554ae00c33bdee54abdbb93f4355747e8896117aed7671f89852dcc21e
 
 PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz
 PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE)