diff --git a/dae/Makefile b/dae/Makefile index 4a5c889e6..de4a4b091 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dae -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=https://github.com/daeuniverse/dae/releases/download/v$(PKG_VERSION)/dae-full-src.zip? diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4c5bf04e0..f1bd8b95d 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:=91 +PKG_RELEASE:=92 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/root/usr/share/passwall/rule_update.lua b/luci-app-passwall/root/usr/share/passwall/rule_update.lua index 95358d6da..a843cdb4b 100755 --- a/luci-app-passwall/root/usr/share/passwall/rule_update.lua +++ b/luci-app-passwall/root/usr/share/passwall/rule_update.lua @@ -440,7 +440,7 @@ local function fetch_rule(rule_name, rule_type, url, exclude_domain, max_retries line = line:gsub("full:", "") if not (is_comment_line(line) or is_ipv4(line) or has_colon(line) or (exclude_domain and check_excluded_domain(line))) then local match = extract_domain(line) - if match then + if match and not is_ipv4(match) then rule_dataset[match] = true end end @@ -451,7 +451,7 @@ local function fetch_rule(rule_name, rule_type, url, exclude_domain, max_retries line = line:gsub("full:", "") if not (is_comment_line(line) or is_ipv4(line) or has_colon(line) or (exclude_domain and check_excluded_domain(line))) then local match = extract_domain(line) - if match then + if match and not is_ipv4(match) then rule_dataset[match] = true end end diff --git a/luci-app-pingcontrol/Makefile b/luci-app-pingcontrol/Makefile index 240fda77b..ebcb60b6c 100755 --- a/luci-app-pingcontrol/Makefile +++ b/luci-app-pingcontrol/Makefile @@ -2,8 +2,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-pingcontrol LUCI_DEPENDS:=+pingcontrol + PKG_VERSION:=1 -PKG_RELEASE:=3 + +PKG_RELEASE:=4 LUCI_TITLE:=LuCI network interface control diff --git a/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js b/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js index 6228cb8f2..679f1a179 100644 --- a/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js +++ b/luci-app-pingcontrol/htdocs/luci-static/resources/view/pingcontrol/pingcontrol.js @@ -43,9 +43,6 @@ return view.extend({ o = s.taboption('general',form.DynamicList, 'testip', _('IP address or hostname of test servers')); o.datatype = 'or(hostname,ipaddr("nomask"))'; - o = s.taboption('general',form.Flag, 'ping_silent', _('Silent mode'), _('Do not log success ping')); - - o = s.taboption('general',form.Value, 'check_period', _('Period of check, sec')); o.rmempty = false; o.datatype = 'and(uinteger,min(20))'; diff --git a/luci-app-pingcontrol/po/ru/pingcontrol.po b/luci-app-pingcontrol/po/ru/pingcontrol.po index b004f13ff..dd951ee41 100755 --- a/luci-app-pingcontrol/po/ru/pingcontrol.po +++ b/luci-app-pingcontrol/po/ru/pingcontrol.po @@ -10,12 +10,6 @@ msgstr "Интерфейс для ping-запросов" msgid "IP address or hostname of test servers" msgstr "IP-адрес или имя хоста тестовых серверов" -msgid "Silent mode" -msgstr "Тихий режим" - -msgid "Do not log success ping" -msgstr "Не журналировать успешные попытки" - msgid "Failed attempts before iface up/down" msgstr "Количество неудачных попыток до переподключения интерфейса" diff --git a/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json b/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json index c024342b5..a994f5029 100644 --- a/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json +++ b/luci-app-pingcontrol/root/usr/share/luci/menu.d/luci-app-pingcontrol.json @@ -1,6 +1,7 @@ { "admin/services/pingcontrol": { "title": "Pingcontrol", + "order": 30, "action": { "type": "view", "path": "pingcontrol/pingcontrol" diff --git a/luci-theme-teleofis/Makefile b/luci-theme-teleofis/Makefile index bc2114390..8e5be1239 100644 --- a/luci-theme-teleofis/Makefile +++ b/luci-theme-teleofis/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Bootstrap Teleofis Theme -LUCI_DEPENDS:= +luci-lua-runtime +LUCI_DEPENDS:= PKG_LICENSE:=Apache-2.0 diff --git a/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css b/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css index 691ffc5c2..8a6304a63 100644 --- a/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css +++ b/luci-theme-teleofis/htdocs/luci-static/teleofis/cascade.css @@ -14,109 +14,6 @@ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ -:root { - --background-color-delta-l-sign: -1; - --background-color-h: 0; - --background-color-s: 0%; - --background-color-l: 100%; - - --background-color-high-hsl: - var(--background-color-h), - var(--background-color-s), - var(--background-color-l); - --background-color-high: hsl(var(--background-color-high-hsl)); - - --background-color-medium-hsl: - var(--background-color-h), - var(--background-color-s), - calc(var(--background-color-l) + var(--background-color-delta-l-sign) * calc(6 / 255 * 100%)); - --background-color-medium: hsl(var(--background-color-medium-hsl)); - - --background-color-low-hsl: - var(--background-color-h), - var(--background-color-s), - calc(var(--background-color-l) + var(--background-color-delta-l-sign) * calc(10 / 255 * 100%)); - --background-color-low: hsl(var(--background-color-low-hsl)); - - --text-color-delta-l-sign: 1; - --text-color-h: 0; - --text-color-s: 0%; - --text-color-l: 0%; - - --text-color-highest-hsl: - var(--text-color-h), - var(--text-color-s), - var(--text-color-l); - --text-color-highest: hsl(var(--text-color-highest-hsl)); - - --text-color-high-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(64 / 255 * 100%)); - --text-color-high: hsl(var(--text-color-high-hsl)); - - --text-color-medium-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(128 / 255 * 100%)); - --text-color-medium: hsl(var(--text-color-medium-hsl)); - - --text-color-low-hsl: - var(--text-color-h), - var(--text-color-s), - calc(var(--text-color-l) + var(--text-color-delta-l-sign) * calc(191 / 255 * 100%)); - --text-color-low: hsl(var(--text-color-low-hsl)); - - --border-color-delta-l-sign: -1; - --border-color-h: var(--background-color-h); - --border-color-s: var(--background-color-s); - --border-color-l: var(--background-color-l); - - --border-color-high-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(51 / 255 * 100%)); - --border-color-high: hsl(var(--border-color-high-hsl)); - - --border-color-medium-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(34 / 255 * 100%)); - --border-color-medium: hsl(var(--border-color-medium-hsl)); - - --border-color-low-hsl: - var(--border-color-h), - var(--border-color-s), - calc(var(--border-color-l) + var(--border-color-delta-l-sign) * calc(17 / 255 * 100%)); - --border-color-low: hsl(var(--border-color-low-hsl)); - - --primary-color-high: #1976d2; - --primary-color-medium: #1564c0; - --primary-color-low: #b00000; - --on-primary-color: var(--background-color-high); - - --error-color-high-rgb: 246, 43, 18; - --error-color-high: rgb(var(--error-color-high-rgb)); - --error-color-medium: #e8210d; - --error-color-low: #d00000; - --on-error-color: var(--background-color-high); - - --success-color-high-rgb: 0, 172, 89; - --success-color-high: rgb(var(--success-color-high-rgb)); - --success-color-medium: #009a4c; - --success-color-low: #007936; - --on-success-color: var(--background-color-high); - - --warn-color-high: #efbd0b; - --warn-color-medium: #f0c629; - --warn-color-low: #f2d24f; - --on-warn-color: var(--text-color-highest); - - --disabled-opacity: .7; - - color-scheme: light; -} - * { margin: 0; padding: 0; @@ -1760,15 +1657,14 @@ input[type="text"] + .cbi-button-remove { transition: opacity .25s ease-in; } - .cbi-progressbar { - border: 1px solid var(--border-color-high); + border: 1px solid #ccc; border-radius: 3px; position: relative; min-width: 170px; - height: 8px; - margin: 1.4em 0 4px 0; - background: #fcfcfc; + height: 20px; + margin: 4px 0; + background: #f9f9f9; } .cbi-progressbar > div { @@ -1776,13 +1672,16 @@ input[type="text"] + .cbi-button-remove { height: 100%; transition: width .25s ease-in; width: 0%; - border-radius: 2px; } -.cbi-progressbar::before { +.cbi-progressbar::after { position: absolute; - top: -1.4em; + bottom: 0; + top: 0; + right: 0; left: 0; + text-align: center; + text-shadow: 0 0 2px #fff; content: attr(title); white-space: pre; overflow: hidden; @@ -2417,7 +2316,7 @@ html body.apply-overlay-active { bottom: 0; width: 32px; content: " "; - background: url(../resources/icons/loading.svg) no-repeat center; + background: url(../resources/icons/loading.gif) no-repeat center; background-size: 16px; } diff --git a/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm b/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm index 7a6b5fadc..dbef3ac86 100644 --- a/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm +++ b/luci-theme-teleofis/luasrc/view/themes/teleofis/footer.htm @@ -8,7 +8,7 @@ <% local ver = require "luci.version" %> diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile index 33028110e..b058e3b02 100644 --- a/my-default-settings/Makefile +++ b/my-default-settings/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=my-default-settings PKG_VERSION:=2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(INCLUDE_DIR)/package.mk diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings index 6f2cc3934..6b9640d0f 100644 --- a/my-default-settings/files/etc/uci-defaults/99-default-settings +++ b/my-default-settings/files/etc/uci-defaults/99-default-settings @@ -47,9 +47,6 @@ if [[ ! "$version" || "$version" -lt 1 ]]; then uci -q set luci.main.mediaurlbase=/luci-static/argon uci commit luci - uci -q set dropbear.@dropbear[0].Interface='lan' - uci commit dropbear - if uci -q get system.@system[0] >/dev/null; then uci -q set system.@system[0].zonename='Asia/Shanghai' uci -q set system.@system[0].timezone='CST-8' diff --git a/nexttrace/Makefile b/nexttrace/Makefile index 93f92bd8a..454f418bb 100644 --- a/nexttrace/Makefile +++ b/nexttrace/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nexttrace -PKG_VERSION:=1.6.2 -PKG_RELEASE:=3 +PKG_VERSION:=1.6.4 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/nxtrace/NTrace-core/tar.gz/v$(PKG_VERSION)? diff --git a/pingcontrol/Makefile b/pingcontrol/Makefile index 80ec41179..a10886e79 100755 --- a/pingcontrol/Makefile +++ b/pingcontrol/Makefile @@ -1,9 +1,9 @@ -: + include $(TOPDIR)/rules.mk PKG_NAME:=pingcontrol PKG_VERSION:=1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_BUILD_DIR:=$(BUILD_DIR)/pingcontrol include $(INCLUDE_DIR)/package.mk diff --git a/pingcontrol/files/pingcontrol b/pingcontrol/files/pingcontrol index 63acc71d9..ece5fa195 100755 --- a/pingcontrol/files/pingcontrol +++ b/pingcontrol/files/pingcontrol @@ -10,7 +10,6 @@ SW_BEFORE_MODRES=$(uci -q get pingcontrol.$1.sw_before_modres) SW_BEFORE_SYSRES=$(uci -q get pingcontrol.$1.sw_before_sysres) PING_OK=$(uci -q get pingcontrol.$1.ping_ok) -SILENT=$(uci -q get pingcontrol.$1.ping_silent) PING_LOST=$(uci -q get pingcontrol.$1.ping_lost) PING_RESTORED=$(uci -q get pingcontrol.$1.ping_restored) BEFORE_IFACE_DOWN=$(uci -q get pingcontrol.$1.before_iface_down) @@ -35,15 +34,8 @@ done while true; do for IP in $TESTIP do - [ -n $IFNAME ] && { - /bin/ping -w5 -c1 -s8 -I $IFNAME $IP &> /dev/null - STATUS=$? - } || { - /bin/ping -w5 -c1 -s8 $IP &> /dev/null - STATUS=$? - } - - if [[ "${STATUS}" -eq "0" ]]; then + /bin/ping -w5 -c1 -s8 -I $IFNAME $IP &> /dev/null + if [[ "$?" -eq "0" ]]; then let host_up_count++ else logger -t pingcontrol "$INSTANCE: Ping to host $IP lost" @@ -58,9 +50,7 @@ while true; do done if [[ "$host_up_count" -gt "0" ]]; then - [ "${SILENT}" != "1" ] && { - logger -t pingcontrol "$INSTANCE: Ping OK, reset counters" - } + logger -t pingcontrol "$INSTANCE: Ping OK, reset counters" if [[ "$lost_flag" -eq "1" ]]; then if [[ -n "$PING_RESTORED" ]]; then logger -t pingcontrol "$INSTANCE: Execute $PING_RESTORED" @@ -68,10 +58,8 @@ while true; do fi else if [[ -n "$PING_OK" ]]; then - [ "${SILENT}" != "1" ] && { - logger -t pingcontrol "$INSTANCE: Execute $PING_OK" - } - eval $PING_OK + logger -t pingcontrol "$INSTANCE: Execute $PING_OK" + eval $PING_OK fi fi host_up_count=0 @@ -111,4 +99,4 @@ while true; do fi sleep $CHECK_PERIOD -done +done \ No newline at end of file diff --git a/pingcontrol/files/pingcontrol.config b/pingcontrol/files/pingcontrol.config index b70754edf..1ecead9c4 100644 --- a/pingcontrol/files/pingcontrol.config +++ b/pingcontrol/files/pingcontrol.config @@ -3,6 +3,5 @@ config pingcontrol 'pingcontrol' option check_period '30' option iface 'internet' option testip '8.8.8.8' - option ping_silent '1' option sw_before_modres '3' option sw_before_sysres '0' diff --git a/pingcontrol/files/pingcontrol.init b/pingcontrol/files/pingcontrol.init index 1a066cb96..217a6106f 100755 --- a/pingcontrol/files/pingcontrol.init +++ b/pingcontrol/files/pingcontrol.init @@ -42,8 +42,3 @@ service_triggers() { procd_add_reload_trigger 'pingcontrol' procd_add_validation validate_pingcontrol_section } - -reload_service() { - stop - start -} diff --git a/sing-box/Makefile b/sing-box/Makefile index 10c0954b2..c9ba45393 100644 --- a/sing-box/Makefile +++ b/sing-box/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.13.10 -PKG_RELEASE:=14 +PKG_VERSION:=1.13.11 +PKG_RELEASE:=15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?