From: Phil Sutter <phil@nwl.cc>
To: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 01/12] Makefile: Install arptables-translate link and man page
Date: Wed, 22 Nov 2023 14:02:11 +0100 [thread overview]
Message-ID: <20231122130222.29453-2-phil@nwl.cc> (raw)
In-Reply-To: <20231122130222.29453-1-phil@nwl.cc>
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 <phil@nwl.cc>
---
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 8a7227024987f..0f8b430c20213 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 ba16c5257c4a5..fe1278874b4da 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
--
2.41.0
next prev parent reply other threads:[~2023-11-22 12:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 13:02 [iptables PATCH 00/12] Misc fixes (more or less) Phil Sutter
2023-11-22 13:02 ` Phil Sutter [this message]
2023-11-22 13:02 ` [iptables PATCH 02/12] nft-bridge: nft_bridge_add() uses wrong flags Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 03/12] xshared: struct xt_cmd_parse::xlate is unused Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 04/12] xshared: All variants support -v Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 05/12] xshared: Drop needless assignment in --help case Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 06/12] xshared: Drop pointless CMD_REPLACE check Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 07/12] tests: xlate: Print failing command line Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 08/12] ebtables: Drop append_entry() wrapper Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 09/12] ebtables: Make ebt_load_match_extensions() static Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 10/12] ebtables: Align line number formatting with legacy Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 11/12] xshared: do_parse: Ignore '-j CONTINUE' Phil Sutter
2023-11-22 13:02 ` [iptables PATCH 12/12] ebtables: Implement --change-counters command Phil Sutter
2023-11-23 16:55 ` [iptables PATCH 00/12] Misc fixes (more or less) Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231122130222.29453-2-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).