diff --git a/.github/diy/patches/firewall.patch b/.github/diy/patches/firewall.patch index 19faf7a34..13a345b6f 100644 --- a/.github/diy/patches/firewall.patch +++ b/.github/diy/patches/firewall.patch @@ -2,15 +2,15 @@ +++ b/firewall4/Makefile @@ -25,7 +25,8 @@ define Package/firewall4 +kmod-nft-core +kmod-nft-fib +kmod-nft-offload \ - +kmod-nft-nat \ + +kmod-nft-nat +kmod-nft-fullcone \ +nftables-json \ - +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci + +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci \ + +iptables +ip6tables +kmod-nft-fullcone +kmod-nft-socket +kmod-nft-tproxy EXTRA_DEPENDS:=ucode (>=2022.03.22) PROVIDES:=uci-firewall - endef -@@ -38,6 +39,7 @@ endef + DEFAULT_VARIANT:=1 +@@ -39,6 +40,7 @@ endef define Package/firewall4/conffiles /etc/config/firewall /etc/nftables.d/ @@ -21,12 +21,12 @@ --- a/firewall/Makefile +++ b/firewall/Makefile -@@ -30,9 +30,10 @@ define Package/firewall - SECTION:=net +@@ -31,9 +31,10 @@ define Package/firewall CATEGORY:=Base system TITLE:=OpenWrt C Firewall -- DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat -+ DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat \ + DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 \ +- +libxtables +kmod-ipt-core +kmod-ipt-conntrack +kmod-ipt-nat +iptables-mod-fullconenat ++ +libxtables +kmod-ipt-core +kmod-ipt-conntrack +kmod-ipt-nat +iptables-mod-fullconenat \ + +iptables-mod-fullconenat +ip6tables-mod-fullconenat +iptables-legacy +ip6tables-legacy +kmod-ipt-nat6 +kmod-ipt-offload \ + +ipset +iptables-mod-conntrack-extra +iptables-mod-iprange +iptables-mod-socket +iptables-mod-tproxy PROVIDES:=uci-firewall @@ -34,6 +34,3 @@ endef define Package/firewall/description - - - define Package/package/network/config/firewall/description