From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4g0GtM63hLz2ysm for ; Tue, 21 Apr 2026 09:15:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4g0GtM5fGjz2xSM for ; Tue, 21 Apr 2026 09:15:55 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4g0GtK6PCTz1PK for ; Tue, 21 Apr 2026 09:15:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1776762953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=NiZJGhjJmyu0qUz0OcP5ewqZvFtMrS1PPSnxYzfMGnA=; b=WpGxYrZyxlxn+6uO8urZs3cA+wIjUpCJCEmTecHr9s4mTG9CO5SCm7jU9JtGXV/3ij+iaW yvu47IuNaNOXDbAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1776762953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=NiZJGhjJmyu0qUz0OcP5ewqZvFtMrS1PPSnxYzfMGnA=; b=BKGANtz3J/8lecS2J1+juNh8aU9ZF+enw4cSFVFDQpffTuwY8dXThhg3SHRHUbC2Z1PYb6 FnRIuwZvp31hLOyY1QrZTx2TZwIhxkezT7bXDEFTahSgyEwlxqaq+ACrWWeu6JFyz9qDax Hsp1HrwW6ag5yJ/2AhRRfcpj4jfwSgk/JBs5jv6tJgzasN0iaLvpR0196TW6mmqHjxCkoa Ks4SZtB2HJlgROMf7gPZUNG2QRbTIHGK0i674gM4n6fmyf81tW0mywkjCNPgE94P8nu7f5 1OEkhLvNRPuU48iFL+NdYWqHeh7inVK7MxMQiwNoSsWuhgpgs/g/92c0rYNpiQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4g0GtK5NSrz2xTH; Tue, 21 Apr 2026 09:15:53 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 818a2094757986540f3366c79f46e1409b2b4151 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 5b3743a80347aa83f6773c2955428a90afe65978 X-Git-Newrev: 818a2094757986540f3366c79f46e1409b2b4151 Message-Id: <4g0GtK5NSrz2xTH@people01.haj.ipfire.org> Date: Tue, 21 Apr 2026 09:15:53 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 818a2094757986540f3366c79f46e1409b2b4151 (commit) via 60f540bfe8aa68f0367f57e41831410d288120a7 (commit) from 5b3743a80347aa83f6773c2955428a90afe65978 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 818a2094757986540f3366c79f46e1409b2b4151 Author: Michael Tremer Date: Tue Apr 21 09:15:40 2026 +0000 core202: Ship rules.pl Signed-off-by: Michael Tremer commit 60f540bfe8aa68f0367f57e41831410d288120a7 Author: Michael Tremer Date: Mon Apr 20 12:44:36 2026 +0100 firewall: Fix multiple ports in comma-separated list Fixes: #13959 - iptables error on boot with multiport Reported-by: Dieter Schütze Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/firewall/rules.pl | 26 ++++++++++++++++---------- config/rootfiles/core/202/filelists/files | 1 + 2 files changed, 17 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index c414f172c..1cd0dd446 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -923,22 +923,28 @@ sub format_ports { my $ports = shift; my $type = shift; - my $arg; - if ($type eq "src") { - $arg = "--sport"; - } elsif ($type eq "dst") { - $arg = "--dport"; - } - my @options = (); + # Handle multiple ports if ($ports =~ /\|/) { $ports =~ s/\|/,/g; + + # Enable multiport match push(@options, ("-m", "multiport")); - } - if ($ports) { - push(@options, ($arg, $ports)); + if ($type eq "src") { + push(@options, "--source-ports", ${ports}); + } elsif ($type eq "dst") { + push(@options, "--destination-ports", ${ports}); + } + + # Handle single ports + } else { + if ($type eq "src") { + push(@options, "--sport", ${ports}); + } elsif ($type eq "dst") { + push(@options, "--dport", ${ports}); + } } return @options; diff --git a/config/rootfiles/core/202/filelists/files b/config/rootfiles/core/202/filelists/files index 1c4795ebc..ebaef1717 100644 --- a/config/rootfiles/core/202/filelists/files +++ b/config/rootfiles/core/202/filelists/files @@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/lib/firewall/rules.pl var/ipfire/dns/dnsbl.json var/ipfire/general-functions.pl var/ipfire/network-functions.pl hooks/post-receive -- IPFire 2.x development tree