|
 |
1dc35b |
From 77749e43ced473de311d8407f352009cc5b073a2 Mon Sep 17 00:00:00 2001
|
|
|
1dc35b |
From: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Date: Tue, 23 Jul 2019 15:24:41 +0200
|
|
|
1dc35b |
Subject: [PATCH] doc: Install ip{6,}tables-restore-translate.8 man pages
|
|
|
1dc35b |
|
|
|
1dc35b |
Just like in b738ca3677785 ("doc: Install ip{6,}tables-translate.8
|
|
|
1dc35b |
manpages"), create man pages for *-restore-translate tools as semantic
|
|
|
1dc35b |
links to xtables-translate.8.
|
|
|
1dc35b |
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
1dc35b |
(cherry picked from commit 3dfb01cf14d72c21a15ab69a2767280223b7e3cb)
|
|
|
1dc35b |
|
|
|
1dc35b |
Conflicts:
|
|
|
1dc35b |
iptables/Makefile.am
|
|
|
1dc35b |
-> Patch applied manually, multiple context changes.
|
|
|
1dc35b |
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
1dc35b |
---
|
|
|
1dc35b |
iptables/.gitignore | 2 ++
|
|
|
1dc35b |
iptables/Makefile.am | 3 ++-
|
|
|
1dc35b |
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
1dc35b |
|
|
|
1dc35b |
diff --git a/iptables/.gitignore b/iptables/.gitignore
|
|
|
1dc35b |
index c638139b8a1d0..d46adc8a32f02 100644
|
|
|
1dc35b |
--- a/iptables/.gitignore
|
|
|
1dc35b |
+++ b/iptables/.gitignore
|
|
|
1dc35b |
@@ -3,6 +3,7 @@
|
|
|
1dc35b |
/ip6tables-restore
|
|
|
1dc35b |
/ip6tables-static
|
|
|
1dc35b |
/ip6tables-translate.8
|
|
|
1dc35b |
+/ip6tables-restore-translate.8
|
|
|
1dc35b |
/iptables
|
|
|
1dc35b |
/iptables.8
|
|
|
1dc35b |
/iptables-extensions.8
|
|
|
1dc35b |
@@ -13,6 +14,7 @@
|
|
|
1dc35b |
/iptables-restore.8
|
|
|
1dc35b |
/iptables-static
|
|
|
1dc35b |
/iptables-translate.8
|
|
|
1dc35b |
+/iptables-restore-translate.8
|
|
|
1dc35b |
/iptables-xml
|
|
|
1dc35b |
/iptables-xml.1
|
|
|
1dc35b |
/xtables-multi
|
|
|
1dc35b |
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
|
|
|
1dc35b |
index 8e902ef369b8e..74bc2bf98ef8c 100644
|
|
|
1dc35b |
--- a/iptables/Makefile.am
|
|
|
1dc35b |
+++ b/iptables/Makefile.am
|
|
|
1dc35b |
@@ -63,6 +63,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
|
|
|
1dc35b |
ip6tables-save.8 iptables-extensions.8 \
|
|
|
1dc35b |
xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
|
|
|
1dc35b |
iptables-translate.8 ip6tables-translate.8 \
|
|
|
1dc35b |
+ iptables-restore-translate.8 ip6tables-restore-translate.8 \
|
|
|
1dc35b |
xtables-monitor.8
|
|
|
1dc35b |
CLEANFILES = iptables.8 xtables-monitor.8 \
|
|
|
1dc35b |
iptables-translate.8 ip6tables-translate.8 \
|
|
|
1dc35b |
@@ -96,7 +97,7 @@ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../e
|
|
|
1dc35b |
-e '/@MATCH@/ r ../extensions/matches.man' \
|
|
|
1dc35b |
-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;
|
|
|
1dc35b |
|
|
|
1dc35b |
-iptables-translate.8 ip6tables-translate.8:
|
|
|
1dc35b |
+iptables-translate.8 ip6tables-translate.8 iptables-restore-translate.8 ip6tables-restore-translate.8:
|
|
|
1dc35b |
${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@
|
|
|
1dc35b |
|
|
|
1dc35b |
pkgconfig_DATA = xtables.pc
|
|
|
1dc35b |
--
|
|
|
1dc35b |
2.22.0
|
|
|
1dc35b |
|