Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewall4: bump to latest git HEAD

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-08-08 19:09:52 +08:00
parent 8b416b0a1b
commit f8dd73ce33
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/config/firewall4/Makefile
View File

@@ -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 <jo@mein.io>
PKG_LICENSE:=ISC

12
package/network/config/firewall4/patches/001-firewall4-add-support-for-fullcone-nat.patch
View File

@@ -118,7 +118,7 @@ Renew: ZiMing Mo <msylgj@immortalwrt.org>
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 <msylgj@immortalwrt.org>
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 <msylgj@immortalwrt.org>
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 <msylgj@immortalwrt.org>
"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 <msylgj@immortalwrt.org>
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 <msylgj@immortalwrt.org>
this.state.defaults = defs;
},
@@ -2182,10 +2238,23 @@ return {
@@ -2205,10 +2261,23 @@ return {
zone.related_subnets = related_subnets;
zone.related_physdevs = related_physdevs;

13
package/network/config/firewall4/patches/002-fix-adding-offloading-device.patch
View File

@@ -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 || []));
}