From 68ff869e94a1b72a3952170a0d8f661069b15a59 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sun, 19 Nov 2023 11:20:55 +0100 Subject: Makefile: Install arptables-translate link and man page While at it, introduce a variable to hold the various semantic links to xtables-translate.8 man page. Fixes: 5b7324e0675e3 ("nft-arp: add arptables-translate") Signed-off-by: Phil Sutter --- iptables/Makefile.am | 11 +++++++---- iptables/xtables-translate.8 | 12 ++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 8a722702..0f8b430c 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -69,10 +69,12 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ dist_sbin_SCRIPTS = iptables-apply dist_pkgdata_DATA = iptables.xslt +xlate_man_links = iptables-translate.8 ip6tables-translate.8 \ + iptables-restore-translate.8 ip6tables-restore-translate.8 \ + ebtables-translate.8 arptables-translate.8 + if ENABLE_NFTABLES -man_MANS += iptables-translate.8 ip6tables-translate.8 \ - iptables-restore-translate.8 ip6tables-restore-translate.8 \ - xtables-monitor.8 ebtables-translate.8 +man_MANS += ${xlate_man_links} xtables-monitor.8 dist_man_MANS = xtables-nft.8 xtables-translate.8 xtables-legacy.8 \ arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \ @@ -97,6 +99,7 @@ x_sbin_links = iptables-nft iptables-nft-restore iptables-nft-save \ arptables-nft arptables \ arptables-nft-restore arptables-restore \ arptables-nft-save arptables-save \ + arptables-translate \ ebtables-nft ebtables \ ebtables-nft-restore ebtables-restore \ ebtables-nft-save ebtables-save \ @@ -108,7 +111,7 @@ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../e -e '/@MATCH@/ r ../extensions/matches.man' \ -e '/@TARGET@/ r ../extensions/targets.man' $< >$@; -iptables-translate.8 ip6tables-translate.8 iptables-restore-translate.8 ip6tables-restore-translate.8 ebtables-translate.8: +${xlate_man_links}: ${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@ ip6tables.8 ip6tables-apply.8 ip6tables-restore.8 ip6tables-save.8: diff --git a/iptables/xtables-translate.8 b/iptables/xtables-translate.8 index ba16c525..fe127887 100644 --- a/iptables/xtables-translate.8 +++ b/iptables/xtables-translate.8 @@ -30,10 +30,12 @@ iptables-translate \(em translation tool to migrate from iptables to nftables ip6tables-translate \(em translation tool to migrate from ip6tables to nftables .P ebtables-translate \(em translation tool to migrate from ebtables to nftables +.P +arptables-translate \(em translation tool to migrate from arptables to nftables .SH DESCRIPTION There is a set of tools to help the system administrator translate a given -ruleset from \fBiptables(8)\fP, \fBip6tables(8)\fP and \fBebtables(8)\fP to -\fBnftables(8)\fP. +ruleset from \fBiptables(8)\fP, \fBip6tables(8)\fP, \fBebtables(8)\fP and +\fBarptables(8)\fP to \fBnftables(8)\fP. The available commands are: @@ -47,11 +49,13 @@ ip6tables\-translate ip6tables\-restore\-translate .IP \[bu] 2 ebtables\-translate +.IP \[bu] 2 +arptables\-translate .SH USAGE They take as input the original -\fBiptables(8)\fP/\fBip6tables(8)\fP/\fBebtables(8)\fP syntax and -output the native \fBnftables(8)\fP syntax. +\fBiptables(8)\fP/\fBip6tables(8)\fP/\fBebtables(8)\fP/\fBarptables(8)\fP +syntax and output the native \fBnftables(8)\fP syntax. The \fBiptables-restore-translate\fP tool reads a ruleset in the syntax produced by \fBiptables-save(8)\fP. Likewise, the -- cgit v1.2.3