V1 was a tad too simple: The revert is fine, but the (now) third patch changes iptables-save output and thus potentially breaks test cases. To avoid that, add patch 2 which enables "dccp" and "ipcomp" protocol names in output. Apart from that, a single shell test case expected '-p gre' in the dump. Replace the actually printed '-p 47' using sed in there. Phil Sutter (3): Revert "xshared: Print protocol numbers if --numeric was given" libxtables: Add dccp and ipcomp to xtables_chain_protos iptables-save: Avoid /etc/protocols lookups .../shell/testcases/ip6tables/0002-verbose-output_0 | 10 +++++----- .../testcases/ipt-restore/0011-noflush-empty-line_0 | 2 +- .../tests/shell/testcases/ipt-save/0001load-dumps_0 | 1 + .../shell/testcases/iptables/0002-verbose-output_0 | 4 ++-- iptables/xshared.c | 8 ++++---- libxtables/xtables.c | 2 ++ 6 files changed, 15 insertions(+), 12 deletions(-) -- 2.43.0
