From ca759022a8cf2cdefd3982c39a42a52a16701aad Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Tue, 28 Jan 2025 09:30:19 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/cda277e8710cbef7ffaef528b52238383fdb6772
---
 luci-app-passwall/Makefile                            | 2 +-
 luci-app-passwall/root/usr/share/passwall/iptables.sh | 2 ++
 luci-app-passwall/root/usr/share/passwall/nftables.sh | 2 ++
 patch-luci-app-passwall.patch                         | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index b68474a47..4f42c004b 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=25.1.15
+PKG_VERSION:=25.1.28
 PKG_RELEASE:=1
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh
index d10d526f2..b8ced0e23 100755
--- a/luci-app-passwall/root/usr/share/passwall/iptables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh
@@ -1383,6 +1383,8 @@ gen_include() {
 		${__ipt}
 		
 		${__ip6t}
+
+		return 0
 	EOF
 	return 0
 }
diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh
index 7bdf9631f..15a438b54 100755
--- a/luci-app-passwall/root/usr/share/passwall/nftables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh
@@ -1394,6 +1394,8 @@ gen_include() {
 
 	cat <<-EOF >> $FWI
 	${__nft}
+
+	return 0
 	EOF
 	return 0
 }
diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch
index d710bfe59..57dab64ca 100644
--- a/patch-luci-app-passwall.patch
+++ b/patch-luci-app-passwall.patch
@@ -1,5 +1,5 @@
 diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
-index 5bc28f0..b68474a 100644
+index 6c16b44..4f42c00 100644
 --- a/luci-app-passwall/Makefile
 +++ b/luci-app-passwall/Makefile
 @@ -67,7 +67,7 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy