update 2023-06-01 10:03:23

homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js

@@ -1150,7 +1150,7 @@ return view.extend({
 		o.default = o.disabled;
 		o.rmempty = false;
 
-		o = s.taboption('subscription', form.ListValue, 'auto_update_time', 'Update time');
+		o = s.taboption('subscription', form.ListValue, 'auto_update_time', _('Update time'));
 		for (var i = 0; i < 24; i++)
 			o.value(i, i + ':00');
 		o.default = '2';

homeproxy/po/templates/homeproxy.pot

@@ -1897,6 +1897,10 @@ msgstr ""
 msgid "Update subscriptions via proxy."
 msgstr ""
 
+#: htdocs/luci-static/resources/view/homeproxy/node.js:1153
+msgid "Update time"
+msgstr ""
+
 #: htdocs/luci-static/resources/view/homeproxy/node.js:1159
 msgid "Update via proxy"
 msgstr ""

homeproxy/po/zh_Hans/homeproxy.po

@@ -1945,6 +1945,10 @@ msgstr "从订阅更新节点"
 msgid "Update subscriptions via proxy."
 msgstr "使用代理更新订阅。"
 
+#: htdocs/luci-static/resources/view/homeproxy/node.js:1153
+msgid "Update time"
+msgstr "更新时间"
+
 #: htdocs/luci-static/resources/view/homeproxy/node.js:1159
 msgid "Update via proxy"
 msgstr "使用代理更新"

homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc

@@ -512,7 +512,7 @@ function main() {
 			added++;
 			log(sprintf('Adding node: %s.', node.label));
 		});
-	uci.commit();
+	uci.commit(uciconfig);
 
 	let need_restart = (via_proxy !== '1');
 	if (!isEmpty(main_node)) {
@@ -520,7 +520,7 @@ function main() {
 		if (first_server) {
 			if (!uci.get(uciconfig, main_node)) {
 				uci.set(uciconfig, ucimain, 'main_node', first_server);
-				uci.commit();
+				uci.commit(uciconfig);
 				need_restart = true;
 
 				log('Main node is gone, switching to the first node.');
@@ -529,7 +529,7 @@ function main() {
 			if (!isEmpty(main_udp_node) && main_udp_node !== 'same') {
 				if (!uci.get(uciconfig, main_udp_node)) {
 					uci.set(uciconfig, ucimain, 'main_udp_node', first_server);
-					uci.commit();
+					uci.commit(uciconfig);
 					need_restart = true;
 
 					log('Main UDP node is gone, switching to the first node.');
@@ -538,7 +538,7 @@ function main() {
 		} else {
 			uci.set(uciconfig, ucimain, 'main_node', 'nil');
 			uci.set(uciconfig, ucimain, 'main_udp_node', 'nil');
-			uci.commit();
+			uci.commit(uciconfig);
 			need_restart = true;
 
 			log('No available node, disable tproxy.');

v2ray-core/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-core
-PKG_VERSION:=5.6.0
+PKG_VERSION:=5.7.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6a4a6112c0eca66d6e78b97840baadbc5d44ce4307f7506ccf59a39b45573592
+PKG_HASH:=599fcd264537e39178b6008a11af68816dfd1609e19a9cf8adc8b2a4240ee370
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE