From 04a1bac482e1301a90b0b395fae9dd9b9d1b2c88 Mon Sep 17 00:00:00 2001
From: Tianhe Y <10704839+nftbty@users.noreply.github.com>
Date: Sun, 10 Mar 2024 11:24:18 +0800
Subject: [PATCH] luci: app_update continue adapt chinadns-ng new release
 (#3012)

---
 luci-app-passwall/luasrc/passwall/com.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/luci-app-passwall/luasrc/passwall/com.lua b/luci-app-passwall/luasrc/passwall/com.lua
index 1d431417d..b53a1dd78 100644
--- a/luci-app-passwall/luasrc/passwall/com.lua
+++ b/luci-app-passwall/luasrc/passwall/com.lua
@@ -60,17 +60,17 @@ _M["chinadns-ng"] = {
 	cmd_version = "-V | awk '{print $2}'",
 	zipped = false,
 	default_path = "/usr/bin/chinadns-ng",
-	match_fmt_str = "%s$",
+	match_fmt_str = "%s",
 	file_tree = {
-		x86_64  = "@x86_64@",
-		x86     = "@i686@",
-		mips    = "mips-linux-musl@mips32@",
-		mipsel  = "mipsel-linux-musl@mips32@",
-		aarch64 = "aarch64-linux-musl@generic+v8a",
-		armv5   = "arm-linux-musleabi@generic+v5te",
-		armv6   = "arm-linux-musleabi@generic+v6t2",
-		armv7   = "arm-linux-musleabihf@generic+v7a",
-		armv8   = "aarch64-linux-musl@generic+v8a"
+		x86_64  = "x86_64_v4",
+		x86     = "i686",
+		mips    = "mips%-.*mips32@",
+		mipsel  = "mipsel.*mips32@",
+		aarch64 = "aarch64.*v8a",
+		armv5   = "arm.*v5te",
+		armv6   = "arm.*v6t2",
+		armv7   = "eabihf.*v7a",
+		armv8   = "aarch64.*v8a"
 	}
 }