From f8dd73ce3360bbf1c0e72ed5c1c0f8cff02f3046 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 8 Aug 2024 19:09:52 +0800 Subject: [PATCH] firewall4: bump to latest git HEAD Signed-off-by: Tianling Shen --- package/network/config/firewall4/Makefile | 6 +++--- ...001-firewall4-add-support-for-fullcone-nat.patch | 12 ++++++------ .../patches/002-fix-adding-offloading-device.patch | 13 ------------- 3 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 package/network/config/firewall4/patches/002-fix-adding-offloading-device.patch diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile index 7d34924f48..c7224baa04 100644 --- a/package/network/config/firewall4/Makefile +++ b/package/network/config/firewall4/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git -PKG_SOURCE_DATE:=2024-05-21 -PKG_SOURCE_VERSION:=4c01d1ebf99e8ecfa69758a9b4f450ecef7b93cd -PKG_MIRROR_HASH:=bbc5622bc03e3b43116fcc86e3fa2d2372bfc07b3a00d2b3a6efac4f7454a403 +PKG_SOURCE_DATE:=2024-06-03 +PKG_SOURCE_VERSION:=dfbcc1cd127c78fc61bb870d36d2512b571d223b +PKG_MIRROR_HASH:=b391798c6c96dbe987481cde4111fb92ace3fa245ef9201f681d5b5045350f64 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch index 9a80563be4..9f34b1eefd 100644 --- a/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch +++ b/package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch @@ -118,7 +118,7 @@ Renew: ZiMing Mo return { read_kernel_version: function() { -@@ -832,6 +853,18 @@ return { +@@ -855,6 +876,18 @@ return { warn(`[!] ${msg}\n`); }, @@ -137,7 +137,7 @@ Renew: ZiMing Mo get: function(sid, opt) { return this.cursor.get("firewall", sid, opt); }, -@@ -1013,6 +1046,21 @@ return { +@@ -1036,6 +1069,21 @@ return { } }, @@ -159,7 +159,7 @@ Renew: ZiMing Mo parse_policy: function(val) { return this.parse_enum(val, [ "accept", -@@ -1452,6 +1500,7 @@ return { +@@ -1475,6 +1523,7 @@ return { "dnat", "snat", "masquerade", @@ -167,7 +167,7 @@ Renew: ZiMing Mo "accept", "reject", "drop" -@@ -1923,6 +1972,8 @@ return { +@@ -1946,6 +1995,8 @@ return { } let defs = this.parse_options(data, { @@ -176,7 +176,7 @@ Renew: ZiMing Mo input: [ "policy", "drop" ], output: [ "policy", "drop" ], forward: [ "policy", "drop" ], -@@ -1957,6 +2008,11 @@ return { +@@ -1980,6 +2031,11 @@ return { delete defs.syn_flood; @@ -188,7 +188,7 @@ Renew: ZiMing Mo this.state.defaults = defs; }, -@@ -2182,10 +2238,23 @@ return { +@@ -2205,10 +2261,23 @@ return { zone.related_subnets = related_subnets; zone.related_physdevs = related_physdevs; diff --git a/package/network/config/firewall4/patches/002-fix-adding-offloading-device.patch b/package/network/config/firewall4/patches/002-fix-adding-offloading-device.patch deleted file mode 100644 index 5da456ae1c..0000000000 --- a/package/network/config/firewall4/patches/002-fix-adding-offloading-device.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/root/usr/share/ucode/fw4.uc -+++ b/root/usr/share/ucode/fw4.uc -@@ -2101,8 +2101,8 @@ return { - }); - } - -- if (net.physdev && !e.invert) -- push(related_physdevs, net.physdev); -+ if (net.up && net.device && !e.invert) -+ push(related_physdevs, net.device); - - push(related_subnets, ...(net.ipaddrs || [])); - }