iptables-1.8.10-13.el10

* Sat Sep 21 2024 Phil Sutter <psutter@redhat.com> [1.8.10-13.el10]
- extensions: recent: New kernels support 999 hits (Phil Sutter) [RHEL-34919]
Resolves: RHEL-34919
This commit is contained in:
Phil Sutter 2024-09-21 02:06:04 +02:00
parent 524857af77
commit e0fbb2b104
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From 9dbd643945ba560e7fbb7aa2d4711bf14dd3452d Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Sat, 21 Sep 2024 02:04:54 +0200
Subject: [PATCH] extensions: recent: New kernels support 999 hits
JIRA: https://issues.redhat.com/browse/RHEL-34919
Upstream Status: iptables commit d859b91e6f3ed055c22ee7b984b481c5b518d9e1
commit d859b91e6f3ed055c22ee7b984b481c5b518d9e1
Author: Phil Sutter <phil@nwl.cc>
Date: Sat Jul 20 02:23:28 2024 +0200
extensions: recent: New kernels support 999 hits
Since kernel commit f4ebd03496f6 ("netfilter: xt_recent: Lift
restrictions on max hitcount value"), the max supported hitcount value
has increased significantly. Adjust the test to use a value which fails
on old as well as new kernels.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Phil Sutter <psutter@redhat.com>
---
extensions/libxt_recent.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/libxt_recent.t b/extensions/libxt_recent.t
index cf23aab..3b0dd9f 100644
--- a/extensions/libxt_recent.t
+++ b/extensions/libxt_recent.t
@@ -4,7 +4,7 @@
-m recent --rcheck --hitcount 12 --name foo --mask 255.255.255.255 --rsource;=;OK
-m recent --update --rttl;-m recent --update --rttl --name DEFAULT --mask 255.255.255.255 --rsource;OK
-m recent --set --rttl;;FAIL
--m recent --rcheck --hitcount 999 --name foo --mask 255.255.255.255 --rsource;;FAIL
+-m recent --rcheck --hitcount 65536 --name foo --mask 255.255.255.255 --rsource;;FAIL
# nonsensical, but all should load successfully:
-m recent --rcheck --hitcount 3 --name foo --mask 255.255.255.255 --rsource -m recent --rcheck --hitcount 4 --name foo --mask 255.255.255.255 --rsource;=;OK
-m recent --rcheck --hitcount 4 --name foo --mask 255.255.255.255 --rsource -m recent --rcheck --hitcount 4 --name foo --mask 255.255.255.255 --rsource;=;OK

View File

@ -1,5 +1,5 @@
%define iptables_rpmversion 1.8.10 %define iptables_rpmversion 1.8.10
%define iptables_specrelease 12 %define iptables_specrelease 13
# install init scripts to /usr/libexec with systemd # install init scripts to /usr/libexec with systemd
%global script_path %{_libexecdir}/iptables %global script_path %{_libexecdir}/iptables
@ -38,6 +38,7 @@ Patch2: 0002-extensions-SECMARK-Use-a-better-context-in-test-case.pa
Patch3: 0003-ebtables-Fix-corner-case-noflush-restore-bug.patch Patch3: 0003-ebtables-Fix-corner-case-noflush-restore-bug.patch
Patch4: 0004-nft-Fix-for-broken-recover_rule_compat.patch Patch4: 0004-nft-Fix-for-broken-recover_rule_compat.patch
Patch5: 0005-extensions-libxt_sctp-Add-an-extra-assert.patch Patch5: 0005-extensions-libxt_sctp-Add-an-extra-assert.patch
Patch6: 0006-extensions-recent-New-kernels-support-999-hits.patch
# pf.os: ISC license # pf.os: ISC license
# iptables-apply: Artistic Licence 2.0 # iptables-apply: Artistic Licence 2.0
@ -472,6 +473,9 @@ fi
%ghost %{_mandir}/man8/ebtables{,-translate}.8.gz %ghost %{_mandir}/man8/ebtables{,-translate}.8.gz
%changelog %changelog
* Sat Sep 21 2024 Phil Sutter <psutter@redhat.com> [1.8.10-13.el10]
- extensions: recent: New kernels support 999 hits (Phil Sutter) [RHEL-34919]
* Fri Sep 20 2024 Phil Sutter <psutter@redhat.com> [1.8.10-12.el10] * Fri Sep 20 2024 Phil Sutter <psutter@redhat.com> [1.8.10-12.el10]
- Bump release for beta (Phil Sutter) - Bump release for beta (Phil Sutter)