From d01bd30c32ba8c39b281995471616a09182f599d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 18 Oct 2024 08:03:21 +0200 Subject: [PATCH] firewall: update to Git HEAD (2024-10-18) ffba75c9cd8f iptables: free xtables_match if found in need_protomatch bf1d5fdf6234 iptables: fix regression with unintended free in need_protomatch 1aef9791a21e defaults.c: fix ipv6 flow offloading Signed-off-by: Felix Fietkau --- package/network/config/firewall/Makefile | 8 ++++---- .../config/firewall/patches/0001-fullconenat.patch | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/network/config/firewall/Makefile b/package/network/config/firewall/Makefile index 220d30496..8b7cb1df6 100644 --- a/package/network/config/firewall/Makefile +++ b/package/network/config/firewall/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall -PKG_RELEASE:=1.1 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git -PKG_SOURCE_DATE:=2022-02-17 -PKG_SOURCE_VERSION:=4cd7d4f36bea731bf901cb067456f1d460294926 -PKG_MIRROR_HASH:=ce9e8ac1bcf22afbb0a80c3da1a8e8e887851299681097e3dfbfc347f2c4c80f +PKG_SOURCE_DATE:=2024-10-18 +PKG_SOURCE_VERSION:=1aef9791a21e3d15d4357060f09a7bb9ed3d6e4e +PKG_MIRROR_HASH:=520f4df86f13694170cb8b7aa747660918aaef2b939ef77d6d119ac692841301 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC diff --git a/package/network/config/firewall/patches/0001-fullconenat.patch b/package/network/config/firewall/patches/0001-fullconenat.patch index fc9434598..d115f3d12 100644 --- a/package/network/config/firewall/patches/0001-fullconenat.patch +++ b/package/network/config/firewall/patches/0001-fullconenat.patch @@ -11,7 +11,7 @@ struct list_head cthelpers; --- a/zones.c +++ b/zones.c -@@ -77,6 +77,8 @@ const struct fw3_option fw3_zone_opts[] = { +@@ -77,6 +77,8 @@ const struct fw3_option fw3_zone_opts[] FW3_LIST("masq_src", network, zone, masq_src), FW3_LIST("masq_dest", network, zone, masq_dest), @@ -20,7 +20,7 @@ FW3_OPT("extra", string, zone, extra_src), FW3_OPT("extra_src", string, zone, extra_src), FW3_OPT("extra_dest", string, zone, extra_dest), -@@ -752,7 +754,16 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, +@@ -752,7 +754,16 @@ print_zone_rule(struct fw3_ipt_handle *h (mdest = next_addr(mdest, &zone->masq_dest, handle->family, false)) || first_dest; first_dest = false)