From ed38cb214d47412825731b73d364cbecdce7ba0c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 13 2021 08:11:26 +0000 Subject: import iproute-5.9.0-4.el8 --- diff --git a/SOURCES/0010-iplink_bareudp-cleanup-help-message-and-man-page.patch b/SOURCES/0010-iplink_bareudp-cleanup-help-message-and-man-page.patch new file mode 100644 index 0000000..a0ca03e --- /dev/null +++ b/SOURCES/0010-iplink_bareudp-cleanup-help-message-and-man-page.patch @@ -0,0 +1,104 @@ +From e5143d1e2787fca4ea365c4010e0da5bcbbbba36 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: Andrea Claudi +Date: Mon, 8 Mar 2021 12:52:23 +0100 +Subject: [PATCH] iplink_bareudp: cleanup help message and man page + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1912412 +Upstream Status: unknown commit 86d9660d + +commit 86d9660dc1805be4435497ff194f618535e8fc97 +Author: Guillaume Nault +Date: Mon Feb 1 18:44:07 2021 +0100 + + iplink_bareudp: cleanup help message and man page + + * Fix PROTO description in help message (mpls isn't a valid argument). + + * Remove SRCPORTMIN description from help message since it doesn't + appear in the syntax string. + + * Use same keywords in help message and in man page. + + * Use the "ethertype" option name (.B ethertype) rather than the + option value (.I ETHERTYPE) in the man page description of + [no]multiproto. + + Signed-off-by: Guillaume Nault + Signed-off-by: Stephen Hemminger +--- + ip/iplink_bareudp.c | 8 +++++--- + man/man8/ip-link.8.in | 15 +++++++++------ + 2 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/ip/iplink_bareudp.c b/ip/iplink_bareudp.c +index 860ec699..aa311106 100644 +--- a/ip/iplink_bareudp.c ++++ b/ip/iplink_bareudp.c +@@ -22,9 +22,11 @@ static void print_explain(FILE *f) + " [ srcportmin PORT ]\n" + " [ [no]multiproto ]\n" + "\n" +- "Where: PORT := 0-65535\n" +- " PROTO := NUMBER | ip | mpls\n" +- " SRCPORTMIN := 0-65535\n" ++ "Where: PORT := UDP_PORT\n" ++ " PROTO := ETHERTYPE\n" ++ "\n" ++ "Note: ETHERTYPE can be given as number or as protocol name (\"ipv4\", \"ipv6\",\n" ++ " \"mpls_uc\", etc.).\n" + ); + } + +diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in +index f451ecf3..ce3c8636 100644 +--- a/man/man8/ip-link.8.in ++++ b/man/man8/ip-link.8.in +@@ -1304,9 +1304,9 @@ For a link of type + the following additional arguments are supported: + + .BI "ip link add " DEVICE +-.BI type " bareudp " dstport " PORT " ethertype " ETHERTYPE" ++.BI type " bareudp " dstport " PORT " ethertype " PROTO" + [ +-.BI srcportmin " SRCPORTMIN " ++.BI srcportmin " PORT " + ] [ + .RB [ no ] multiproto + ] +@@ -1317,11 +1317,14 @@ the following additional arguments are supported: + - specifies the destination port for the UDP tunnel. + + .sp +-.BI ethertype " ETHERTYPE" ++.BI ethertype " PROTO" + - specifies the ethertype of the L3 protocol being tunnelled. ++.B ethertype ++can be given as plain Ethernet protocol number or using the protocol name ++("ipv4", "ipv6", "mpls_uc", etc.). + + .sp +-.BI srcportmin " SRCPORTMIN" ++.BI srcportmin " PORT" + - selects the lowest value of the UDP tunnel source port range. + + .sp +@@ -1329,11 +1332,11 @@ the following additional arguments are supported: + - activates support for protocols similar to the one + .RB "specified by " ethertype . + When +-.I ETHERTYPE ++.B ethertype + is "mpls_uc" (that is, unicast MPLS), this allows the tunnel to also handle + multicast MPLS. + When +-.I ETHERTYPE ++.B ethertype + is "ipv4", this allows the tunnel to also handle IPv6. This option is disabled + by default. + +-- +2.30.2 + diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec index 641bf33..6ef0b52 100644 --- a/SPECS/iproute.spec +++ b/SPECS/iproute.spec @@ -1,5 +1,5 @@ %define rpmversion 5.9.0 -%define specrelease 3%{?dist} +%define specrelease 4%{?dist} %define pkg_release %{specrelease}%{?buildid} Summary: Advanced IP routing and network device configuration tools @@ -19,6 +19,7 @@ Patch5: 0006-tc-vlan-fix-help-and-error-message-strings.patch Patch6: 0007-tc-mpls-fix-manpage-example-and-help-message-string.patch Patch7: 0008-tc-flower-fix-json-output-with-mpls-lse.patch Patch8: 0009-iproute-force-rtm_dst_len-to-32-128.patch +Patch9: 0010-iplink_bareudp-cleanup-help-message-and-man-page.patch License: GPLv2+ and Public Domain BuildRequires: bison BuildRequires: elfutils-libelf-devel @@ -151,6 +152,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Fri Mar 12 2021 Andrea Claudi [5.9.0-4.el8] +- iplink_bareudp: cleanup help message and man page (Andrea Claudi) [1912412] + * Tue Feb 09 2021 Andrea Claudi [5.9.0-3.el8] - iproute: force rtm_dst_len to 32/128 (Andrea Claudi) [1852038]