From 68276da6dda3f73dfed5e6758675a5148ac77271 Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Tue, 5 Jul 2022 14:38:34 -0400
Subject: [PATCH 3/3] test(functions): normalize iptables ipv6-icmp/icmpv6

The output changed in iptables 1.8.8. Specifically commit b6196c7504d4
("xshared: Prefer xtables_chain_protos lookup over getprotoent").

Fixes: #982
Fixes: rhbz2100881
(cherry picked from commit c54ea7b5e492b3aae631dc71579afc24d713401f)
---
 src/tests/functions.at | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tests/functions.at b/src/tests/functions.at
index 481c94017f15..a38ae9005ea2 100644
--- a/src/tests/functions.at
+++ b/src/tests/functions.at
@@ -395,7 +395,10 @@ m4_define([EBTABLES_LIST_RULES], [
 
 m4_define([IPXTABLES_LIST_RULES_NORMALIZE], [dnl
     TRIM_WHITESPACE | dnl
-    tail -n +3 dnl
+    tail -n +3 | dnl
+    dnl iptables-1.8.8 changed output of some protocols
+    dnl commit b6196c7504d4 ("xshared: Prefer xtables_chain_protos lookup over getprotoent")
+    sed -e ['s/[ ]ipv6-icmp\([ -]\)/ icmpv6\1/g'] dnl
 ])
 
 m4_define([IPTABLES_LIST_RULES_NORMALIZE], [dnl
-- 
2.31.1