From be7d744ccf40df672a6fe90eee7fdf2209d7d3fa Mon Sep 17 00:00:00 2001 From: gitea-action Date: Tue, 18 Mar 2025 00:00:43 +0800 Subject: [PATCH] nikki: sync upstream last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/4bc36f86a4017a1694fef759c8323fe825223a23 --- nikki/Makefile | 8 ++++---- nikki/files/nikki.conf | 2 -- nikki/files/uci-defaults/migrate.sh | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nikki/Makefile b/nikki/Makefile index e27916fed..64ad9219f 100644 --- a/nikki/Makefile +++ b/nikki/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git -PKG_SOURCE_DATE:=2025-03-14 -PKG_SOURCE_VERSION:=1e22f4daa964c54abea4c8b0f09f8171398a2821 -PKG_MIRROR_HASH:=0b65cd12cb6927b118d3802303b97dbc3299db1b3e6d8a849dedb32a276c30ff +PKG_SOURCE_DATE:=2025-03-17 +PKG_SOURCE_VERSION:=e3d4ec247670dc88f8a3410e9bca2c69ca053f32 +PKG_MIRROR_HASH:=ab8e39fec0675a77d575acf5ed705bb327a5f9f2b8d72792896e884e491b25e6 PKG_LICENSE:=GPL3.0+ PKG_MAINTAINER:=Joseph Mory @@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 -PKG_BUILD_VERSION:=alpha-1e22f4d +PKG_BUILD_VERSION:=alpha-e3d4ec2 PKG_BUILD_TIME:=$(shell date -u -Iseconds) GO_PKG:=github.com/metacubex/mihomo diff --git a/nikki/files/nikki.conf b/nikki/files/nikki.conf index 3e378d2c0..f323e6bd0 100644 --- a/nikki/files/nikki.conf +++ b/nikki/files/nikki.conf @@ -41,10 +41,8 @@ config proxy 'proxy' list 'bypass_cgroup' 'aria2' list 'bypass_cgroup' 'dnsmasq' list 'bypass_cgroup' 'netbird' - list 'bypass_cgroup' 'nginx' list 'bypass_cgroup' 'qbittorrent' list 'bypass_cgroup' 'tailscale' - list 'bypass_cgroup' 'uhttpd' list 'bypass_cgroup' 'zerotier' list 'bypass_dscp' '4' option 'bypass_china_mainland_ip' '0' diff --git a/nikki/files/uci-defaults/migrate.sh b/nikki/files/uci-defaults/migrate.sh index e4a2a365a..42635387b 100644 --- a/nikki/files/uci-defaults/migrate.sh +++ b/nikki/files/uci-defaults/migrate.sh @@ -70,10 +70,8 @@ proxy_bypass_cgroup=$(uci -q get nikki.proxy.bypass_cgroup); [ -z "$proxy_bypass uci add_list nikki.proxy.bypass_cgroup=aria2 uci add_list nikki.proxy.bypass_cgroup=dnsmasq uci add_list nikki.proxy.bypass_cgroup=netbird - uci add_list nikki.proxy.bypass_cgroup=nginx uci add_list nikki.proxy.bypass_cgroup=qbittorrent uci add_list nikki.proxy.bypass_cgroup=tailscale - uci add_list nikki.proxy.bypass_cgroup=uhttpd uci add_list nikki.proxy.bypass_cgroup=zerotier }