diff --git a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua index 6e0d694e..a0136cb5 100644 --- a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua +++ b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/api.lua @@ -9,7 +9,7 @@ curl = "/usr/bin/curl" curl_args = {"-skfL", "--connect-timeout 3", "--retry 3"} wget = "/usr/bin/wget" wget_args = {"--quiet", "--connect-timeout=3", "--timeout=6", "--tries=2"} -command_timeout = 60 +command_timeout = 90 LEDE_BOARD = nil DISTRIB_TARGET = nil diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index e5ecc723..b78a1118 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.4.15 -PKG_RELEASE:=95 +PKG_RELEASE:=96 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/view/passwall/global/footer.htm b/luci-app-passwall/luasrc/view/passwall/global/footer.htm index 97176c65..7aee20c2 100644 --- a/luci-app-passwall/luasrc/view/passwall/global/footer.htm +++ b/luci-app-passwall/luasrc/view/passwall/global/footer.htm @@ -228,7 +228,7 @@ local appname = api.appname }; })(); - document.addEventListener("DOMContentLoaded", function () { + document.addEventListener("DOMContentLoaded", () => setTimeout(() => { const hiddenSelect = document.getElementById("cbid.<%=appname%>.<%=self.global_cfgid%>.tcp_node"); let o_val = hiddenSelect.value const o_hasItem = shunt_list.find(element => element.id == o_val); @@ -268,6 +268,6 @@ local appname = api.appname shunt_taboption.appendChild(shunt_option_list); } } - }); + }, 100)); //]]> diff --git a/luci-app-passwall/luasrc/view/passwall/include/shunt_options.htm b/luci-app-passwall/luasrc/view/passwall/include/shunt_options.htm index 96440b59..7f5e4439 100644 --- a/luci-app-passwall/luasrc/view/passwall/include/shunt_options.htm +++ b/luci-app-passwall/luasrc/view/passwall/include/shunt_options.htm @@ -53,7 +53,7 @@ } } } - document.addEventListener("DOMContentLoaded", function () { + document.addEventListener("DOMContentLoaded", () => setTimeout(() => { refresh_depends(); const table_dom = document.getElementById("cbi-passwall-shunt_option_list"); if (table_dom) { @@ -71,6 +71,6 @@ } } } - }); + }, 100)); //]]> \ No newline at end of file diff --git a/teleproxy/Makefile b/teleproxy/Makefile index bf34382a..6b7d7bd9 100644 --- a/teleproxy/Makefile +++ b/teleproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=teleproxy PKG_VERSION:=4.11.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Kosntantine Shevlakov PKG_LICENSE:=GPLv2 @@ -18,6 +18,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) include $(INCLUDE_DIR)/package.mk +MAKE_VARS += EXTRA_VERSION=$(PKG_VERSION) + define Package/$(PKG_NAME) SUBMENU:=Web Servers/Proxies SECTION:=net diff --git a/teleproxy/files/teleproxy.defaults b/teleproxy/files/teleproxy.defaults index 291b40e6..585f301e 100644 --- a/teleproxy/files/teleproxy.defaults +++ b/teleproxy/files/teleproxy.defaults @@ -1,7 +1,8 @@ #!/bin/sh # generate secret key if uci -q get teleproxy.default.secret >/dev/null || [ -z "$(uci get teleproxy.default.secret)" ]; then - SECRET=$(dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -v -e '16/1 "%02x"') + #SECRET=$(dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -v -e '16/1 "%02x"') + SECRET=$(/usr/bin/teleproxy generate-secret) uci set teleproxy.default.secret="$SECRET" uci commit teleproxy fi