From 56c59212ff88239847a02736fbf4dc5b5b7ed913 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:35:53 +0800 Subject: [PATCH] update 2023-12-14 23:35:53 --- luci-app-amlogic/Makefile | 2 +- .../root/usr/share/amlogic/amlogic_check_firmware.sh | 4 ++-- .../root/usr/share/amlogic/amlogic_check_kernel.sh | 2 +- .../root/usr/share/amlogic/amlogic_check_plugin.sh | 2 +- luci-app-xray/core/root/usr/share/xray/default_gateway.uc | 4 +++- natflow/Makefile | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index e53dad600..414d35a03 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.213 +PKG_VERSION:=3.1.214 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh index 730ee7ab6..17b87ab8c 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh @@ -142,7 +142,7 @@ check_updated() { firmware_tags_array+=("${firmware_tags_name}") fi done < <( - curl -fsSL \ + curl -fsSL -m 10 \ https://github.com/${server_firmware_url}/releases?page=${i} | grep -oE 'releases/tag/([^" ]+)' ) @@ -173,7 +173,7 @@ check_updated() { # Retrieve the HTML code of the tags list page html_code="$( - curl -fsSL \ + curl -fsSL -m 10 \ https://github.com/${server_firmware_url}/releases/expanded_assets/${firmware_releases_tag} )" diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh index cbf55b974..5c3fdcf8d 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh @@ -142,7 +142,7 @@ check_kernel() { # Check the version on the server latest_version="$( - curl -fsSL \ + curl -fsSL -m 10 \ ${kernel_api}/releases/expanded_assets/kernel_${kernel_tag} | grep -oE "${main_line_version}.[0-9]+.tar.gz" | sed 's/.tar.gz//' | sort -urV | head -n 1 diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh index a73ecf149..577f4d67e 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh @@ -102,7 +102,7 @@ tolog "02. Start querying plugin version..." # Get the latest version latest_version="$( - curl -fsSL \ + curl -fsSL -m 10 \ https://github.com/ophub/luci-app-amlogic/releases | grep -oE 'expanded_assets/[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?' | sed 's|expanded_assets/||' | sort -urV | head -n 1 diff --git a/luci-app-xray/core/root/usr/share/xray/default_gateway.uc b/luci-app-xray/core/root/usr/share/xray/default_gateway.uc index f3b0f4eb1..10ebd0c83 100644 --- a/luci-app-xray/core/root/usr/share/xray/default_gateway.uc +++ b/luci-app-xray/core/root/usr/share/xray/default_gateway.uc @@ -22,7 +22,9 @@ function get_default_gateway(dump) { for (let j in i["route"] || []) { if (j["target"] == "0.0.0.0") { dgs[j["nexthop"]] = true; - dgs[j["source"]] = true; + if (j["source"] != "0.0.0.0/0") { + dgs[j["source"]] = true; + } } } }; diff --git a/natflow/Makefile b/natflow/Makefile index ddf461a25..9fc45b7aa 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow -PKG_VERSION:=20231214 +PKG_VERSION:=20231217 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)? -PKG_HASH:=4fc87666ea3c951e4fdfa94efa168090da1b8d9748cea5ff38f1302b3b05d9d4 +PKG_HASH:=9d5abfe4714763664514517f89cec3415b76401c5dd7251948343044992abca3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MAINTAINER:=Chen Minqiang