ebtables: Rename ebtables.8 to ebtables-legacy.8

The implementation of ebtables was changed to nftable-based
and the man page of the legacy implementation was renamed to
ebtables-legacy.8 in the recent ebtables release (2.0.11).
Recent distributions like Ubuntu 20.04 already contains
the newer implementation and both of ebtables-nft.8 and
ebtables-legacy.8 are available. Considering this,
it is confusing to provide ebtables.8.

This commit updates the version of ebtables to 2.0.11 and
renames JM deliverable ebtables.8 to ebtables-legacy.8.
Texts added in 2.0.11 are added as-is (without translating them).

diff --git a/manual/ebtables/README b/manual/ebtables/README
index fc2ffa0..6abea77 100644 (file)
--- a/manual/ebtables/README
+++ b/manual/ebtables/README
@@ -1 +1 @@
-http://ebtables.sourceforge.net/
+http://ebtables.netfilter.org/

diff --git a/manual/ebtables/draft/man8/ebtables.8 b/manual/ebtables/draft/man8/ebtables-legacy.8
similarity index 98%
rename from manual/ebtables/draft/man8/ebtables.8
rename to manual/ebtables/draft/man8/ebtables-legacy.8
index bb8ce04..ce9f8a3 100644 (file)
--- a/manual/ebtables/draft/man8/ebtables.8
+++ b/manual/ebtables/draft/man8/ebtables-legacy.8
@@ -28,8 +28,8 @@
 .\"
 .\"O .SH NAME
 .SH 名前
-.\"O ebtables (v2.0.10-4) \- Ethernet bridge frame table administration
-ebtables (v2.0.10-4) \- Ethernet bridge frame table の管理
+.\"O ebtables-legacy (2.0.11@) \- Ethernet bridge frame table administration (legacy)
+ebtables-legacy (2.0.11@) \- Ethernet bridge frame table の管理 (legacy)
 .\"O .SH SYNOPSIS
 .SH 書式
 .BR "ebtables " [ -t " table ] " - [ ACDI "] chain rule specification [match extensions] [watcher extensions] target"
@@ -56,6 +56,18 @@ ebtables (v2.0.10-4) \- Ethernet bridge frame table の管理
 .br
 .BR "ebtables " [ -t " table ] [" --atomic-file " file] " --atomic-save
 .br
+
+.SH LEGACY
+This tool uses the old xtables/setsockopt framework, and is a legacy version
+of ebtables. That means that a new, more modern tool exists with the same
+functionality using the nf_tables framework and you are encouraged to migrate now.
+The new binaries (known as ebtables-nft and formerly known as ebtables-compat)
+uses the same syntax and semantics than this legacy one.
+
+You can still use this legacy tool. You should probably get some specific
+information from your Linux distribution or vendor.
+More docs are available at https://wiki.nftables.org
+
 .\"O .SH DESCRIPTION
 .SH 説明
 .B ebtables
@@ -1497,6 +1509,26 @@ hello time timer の範囲 (0-65535)。
 .BR "--stp-forward-delay " "[!] [\fIdelay\fP][:\fIdelay\fP]"
 .\"O The forward delay timer (0-65535) range.
 forward delay timer の範囲 (0-65535)。
+.SS string
+This module matches on a given string using some pattern matching strategy.
+.TP
+.BR "--string-algo " "\fIalgorithm\fP"
+The pattern matching strategy. (bm = Boyer-Moore, kmp = Knuth-Pratt-Morris)
+.TP
+.BR "--string-from " "\fIoffset\fP"
+The lowest offset from which a match can start. (default: 0)
+.TP
+.BR "--string-to " "\fIoffset\fP"
+The highest offset from which a match can start. (default: size of frame)
+.TP
+.BR "--string " "[!] \fIpattern\fP"
+Matches the given pattern.
+.TP
+.BR "--string-hex " "[!] \fIpattern\fP"
+Matches the given pattern in hex notation, e.g. '|0D 0A|', '|0D0A|', 'www|09|netfilter|03|org|00|'
+.TP
+.BR "--string-icase"
+Ignore case when searching.
 .SS vlan
 .\"O Specify 802.1Q Tag Control Information fields.
 .\"O The protocol must be specified as

diff --git a/manual/ebtables/original/man8/ebtables.8 b/manual/ebtables/original/man8/ebtables-legacy.8
similarity index 96%
rename from manual/ebtables/original/man8/ebtables.8
rename to manual/ebtables/original/man8/ebtables-legacy.8
index 45a88b2..68ff930 100644 (file)
--- a/manual/ebtables/original/man8/ebtables.8
+++ b/manual/ebtables/original/man8/ebtables-legacy.8
@@ -24,7 +24,7 @@
 .\"     
 .\"
 .SH NAME
-ebtables (v2.0.10-4) \- Ethernet bridge frame table administration
+ebtables-legacy (2.0.11@) \- Ethernet bridge frame table administration (legacy)
 .SH SYNOPSIS
 .BR "ebtables " [ -t " table ] " - [ ACDI "] chain rule specification [match extensions] [watcher extensions] target"
 .br
@@ -50,6 +50,18 @@ ebtables (v2.0.10-4) \- Ethernet bridge frame table administration
 .br
 .BR "ebtables " [ -t " table ] [" --atomic-file " file] " --atomic-save
 .br
+
+.SH LEGACY
+This tool uses the old xtables/setsockopt framework, and is a legacy version
+of ebtables. That means that a new, more modern tool exists with the same
+functionality using the nf_tables framework and you are encouraged to migrate now.
+The new binaries (known as ebtables-nft and formerly known as ebtables-compat)
+uses the same syntax and semantics than this legacy one.
+
+You can still use this legacy tool. You should probably get some specific
+information from your Linux distribution or vendor.
+More docs are available at https://wiki.nftables.org
+
 .SH DESCRIPTION
 .B ebtables
 is an application program used to set up and maintain the
@@ -810,6 +822,26 @@ The hello time timer (0-65535) range.
 .TP
 .BR "--stp-forward-delay " "[!] [\fIdelay\fP][:\fIdelay\fP]"
 The forward delay timer (0-65535) range.
+.SS string
+This module matches on a given string using some pattern matching strategy.
+.TP
+.BR "--string-algo " "\fIalgorithm\fP"
+The pattern matching strategy. (bm = Boyer-Moore, kmp = Knuth-Pratt-Morris)
+.TP
+.BR "--string-from " "\fIoffset\fP"
+The lowest offset from which a match can start. (default: 0)
+.TP
+.BR "--string-to " "\fIoffset\fP"
+The highest offset from which a match can start. (default: size of frame)
+.TP
+.BR "--string " "[!] \fIpattern\fP"
+Matches the given pattern.
+.TP
+.BR "--string-hex " "[!] \fIpattern\fP"
+Matches the given pattern in hex notation, e.g. '|0D 0A|', '|0D0A|', 'www|09|netfilter|03|org|00|'
+.TP
+.BR "--string-icase"
+Ignore case when searching.
 .SS vlan
 Specify 802.1Q Tag Control Information fields.
 The protocol must be specified as

diff --git a/manual/ebtables/release/man8/ebtables.8 b/manual/ebtables/release/man8/ebtables-legacy.8
similarity index 97%
rename from manual/ebtables/release/man8/ebtables.8
rename to manual/ebtables/release/man8/ebtables-legacy.8
index 2904d29..facdf01 100644 (file)
--- a/manual/ebtables/release/man8/ebtables.8
+++ b/manual/ebtables/release/man8/ebtables-legacy.8
@@ -27,7 +27,7 @@
 .\"
 .\"
 .SH 名前
-ebtables (v2.0.10-4) \- Ethernet bridge frame table の管理
+ebtables-legacy (2.0.11@) \- Ethernet bridge frame table の管理 (legacy)
 .SH 書式
 .BR "ebtables " [ -t " table ] " - [ ACDI "] chain rule specification [match extensions] [watcher extensions] target"
 .br
@@ -53,6 +53,18 @@ ebtables (v2.0.10-4) \- Ethernet bridge frame table の管理
 .br
 .BR "ebtables " [ -t " table ] [" --atomic-file " file] " --atomic-save
 .br
+
+.SH LEGACY
+This tool uses the old xtables/setsockopt framework, and is a legacy version
+of ebtables. That means that a new, more modern tool exists with the same
+functionality using the nf_tables framework and you are encouraged to migrate now.
+The new binaries (known as ebtables-nft and formerly known as ebtables-compat)
+uses the same syntax and semantics than this legacy one.
+
+You can still use this legacy tool. You should probably get some specific
+information from your Linux distribution or vendor.
+More docs are available at https://wiki.nftables.org
+
 .SH 説明
 .B ebtables
 は (Linux カーネル内にある) Ethernet フレームの検査ルールを設定管理するプロ
@@ -915,6 +927,26 @@ hello time timer の範囲 (0-65535)。
 .TP
 .BR "--stp-forward-delay " "[!] [\fIdelay\fP][:\fIdelay\fP]"
 forward delay timer の範囲 (0-65535)。
+.SS string
+This module matches on a given string using some pattern matching strategy.
+.TP
+.BR "--string-algo " "\fIalgorithm\fP"
+The pattern matching strategy. (bm = Boyer-Moore, kmp = Knuth-Pratt-Morris)
+.TP
+.BR "--string-from " "\fIoffset\fP"
+The lowest offset from which a match can start. (default: 0)
+.TP
+.BR "--string-to " "\fIoffset\fP"
+The highest offset from which a match can start. (default: size of frame)
+.TP
+.BR "--string " "[!] \fIpattern\fP"
+Matches the given pattern.
+.TP
+.BR "--string-hex " "[!] \fIpattern\fP"
+Matches the given pattern in hex notation, e.g. '|0D 0A|', '|0D0A|', 'www|09|netfilter|03|org|00|'
+.TP
+.BR "--string-icase"
+Ignore case when searching.
 .SS vlan
 802.1Q タグ制御情報フィールドを指定する。プロトコルは
 .I 802_1Q

diff --git a/manual/ebtables/translation_list b/manual/ebtables/translation_list
index 8c58f33..f2d5d10 100644 (file)
--- a/manual/ebtables/translation_list
+++ b/manual/ebtables/translation_list
@@ -1 +1 @@
-â\97\8b::2.0.10-4:2011/12/15:ebtables:8:2014/02/27::kawai@stratosphere.co.jp:Hiroaki KAWAI:
+â\98\86:ebtables:2.0.10-4=>2.0.11:2019/12/03:ebtables-legacy:8:2014/02/27::kawai@stratosphere.co.jp:Hiroaki KAWAI: