diff --git a/luci-app-temp-status/Makefile b/luci-app-temp-status/Makefile index bd20cb73..97f6b814 100644 --- a/luci-app-temp-status/Makefile +++ b/luci-app-temp-status/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-temp-status PKG_VERSION:=0.8.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 LUCI_TITLE:=Temperature sensors data for the LuCI status page LUCI_DEPENDS:=+ucode +ucode-mod-fs LUCI_PKGARCH:=all diff --git a/luci-app-temp-status/po/zh-cn b/luci-app-temp-status/po/zh-cn new file mode 120000 index 00000000..8d69574d --- /dev/null +++ b/luci-app-temp-status/po/zh-cn @@ -0,0 +1 @@ +zh_Hans \ No newline at end of file diff --git a/luci-app-temp-status/po/zh_Hans b/luci-app-temp-status/po/zh_Hans deleted file mode 120000 index 41451e4a..00000000 --- a/luci-app-temp-status/po/zh_Hans +++ /dev/null @@ -1 +0,0 @@ -zh-cn \ No newline at end of file diff --git a/luci-app-temp-status/po/zh-cn/temp-status.po b/luci-app-temp-status/po/zh_Hans/temp-status.po similarity index 94% rename from luci-app-temp-status/po/zh-cn/temp-status.po rename to luci-app-temp-status/po/zh_Hans/temp-status.po index 5a08275d..13198dbd 100644 --- a/luci-app-temp-status/po/zh-cn/temp-status.po +++ b/luci-app-temp-status/po/zh_Hans/temp-status.po @@ -10,7 +10,7 @@ msgstr "" "X-Generator: Poedit 2.3\n" "Last-Translator: \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" -"Language: zh-cn\n" +"Language: zh_Hans\n" msgid "(%d minute window, %d second interval)" msgstr "(最近 %d 分钟信息,每 %d 秒刷新)" @@ -42,6 +42,9 @@ msgstr "传感器" msgid "Show hidden sensors" msgstr "显示已隐藏的传感器" +msgid "Switch view" +msgstr "切换视图" + msgid "Temperature" msgstr "温度" diff --git a/mptcp/Makefile b/mptcp/Makefile index 1828317a..127e4b61 100644 --- a/mptcp/Makefile +++ b/mptcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mptcp PKG_VERSION:=6.1 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index 27b0692c..9cec61af 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -140,6 +140,9 @@ interface_multipath_settings() { local mode iface proto metric ip4table qdisc local config="$1" local intf="$2" + # DHCPv6 companion interfaces (_6) share the parent's device: + # processing them here would clobber the parent's multipath state + case "$config" in *_6) return 0 ;; esac local enabled uci_route uci_route=$(uci -q get openmptcprouter.settings.uci_route) @@ -435,6 +438,8 @@ interface_multipath_settings() { [ -z "$gateway6" ] && gateway6=$(ip -6 r list dev $iface | grep -v default | awk '/proto static/ {print $1; exit}' | tr -d "\n") [ -z "$gateway6" ] && gateway6=$(uci -q get "network.$config.ip6gw") [ -z "$gateway6" ] && gateway6=$(ubus call network.interface.$config status | jsonfilter -q -l 1 -e '@.inactive.route[@.target="::"].nexthop' | tr -d "\n") + [ -z "$gateway6" ] && gateway6=$(ubus call network.interface.${config}_6 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="::"].nexthop' | tr -d "\n") + [ -z "$gateway6" ] && gateway6=$(ubus call network.interface.${config}_6 status 2>/dev/null | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n") #if [ -z "$gateway6" ] || [ "$( valid_subnet6 $gateway6 )" != "ok" ]; then # gateway6=$(ubus call network.interface.$config status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n") #fi diff --git a/msd_lite/Makefile b/msd_lite/Makefile index 739944f0..770be5af 100644 --- a/msd_lite/Makefile +++ b/msd_lite/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=msd_lite -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rozhuk-im/msd_lite.git PKG_SOURCE_DATE:=2025-05-02 -PKG_SOURCE_VERSION:=79a6c62c8fced6128a5e445ee110709b3b51bb78 +PKG_SOURCE_VERSION:=fa68e131343fb58c67ad77b2d26f2cb7c49a2c95 PKG_MIRROR_HASH:=skip PKG_MAINTAINER:=Tianling Shen diff --git a/qBittorrent-Enhanced-Edition/Makefile b/qBittorrent-Enhanced-Edition/Makefile index ec423006..a848382d 100644 --- a/qBittorrent-Enhanced-Edition/Makefile +++ b/qBittorrent-Enhanced-Edition/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qBittorrent-Enhanced-Edition -PKG_VERSION:=5.2.3.10 -PKG_RELEASE:=10 +PKG_VERSION:=5.2.1.10 +PKG_RELEASE:=11 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/c0re100/qBittorrent-Enhanced-Edition/tar.gz/release-$(PKG_VERSION)?