From 1b3b4aee09c0365fe539d941a67fb7f49e717c33 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sep 19 2018 18:06:59 +0000 Subject: man: ip-route: Clarify referenced versions are Linux ones --- diff --git a/0009-man-ip-route-Clarify-referenced-versions-are-Linux-o.patch b/0009-man-ip-route-Clarify-referenced-versions-are-Linux-o.patch new file mode 100644 index 0000000..a2ff88f --- /dev/null +++ b/0009-man-ip-route-Clarify-referenced-versions-are-Linux-o.patch @@ -0,0 +1,132 @@ +From 100905845b930a10174cc239895858a534c10906 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Wed, 15 Aug 2018 11:18:26 +0200 +Subject: [PATCH] man: ip-route: Clarify referenced versions are Linux ones + +Versioning scheme of Linux and iproute2 is similar, therefore the +referenced kernel versions are likely to confuse readers. Clarify this +by prefixing each kernel version by 'Linux' prefix. + +Signed-off-by: Phil Sutter +Signed-off-by: Stephen Hemminger +(cherry picked from commit 8a03a2f36f767bd36b22929c78a370bd43059aee) +Signed-off-by: Phil Sutter +--- + man/man8/ip-route.8.in | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in +index b21a847241427..a33ce1f0f4006 100644 +--- a/man/man8/ip-route.8.in ++++ b/man/man8/ip-route.8.in +@@ -483,43 +483,43 @@ seconds and ms, msec or msecs to specify milliseconds. + + + .TP +-.BI rttvar " TIME " "(2.3.15+ only)" ++.BI rttvar " TIME " "(Linux 2.3.15+ only)" + the initial RTT variance estimate. Values are specified as with + .BI rtt + above. + + .TP +-.BI rto_min " TIME " "(2.6.23+ only)" ++.BI rto_min " TIME " "(Linux 2.6.23+ only)" + the minimum TCP Retransmission TimeOut to use when communicating with this + destination. Values are specified as with + .BI rtt + above. + + .TP +-.BI ssthresh " NUMBER " "(2.3.15+ only)" ++.BI ssthresh " NUMBER " "(Linux 2.3.15+ only)" + an estimate for the initial slow start threshold. + + .TP +-.BI cwnd " NUMBER " "(2.3.15+ only)" ++.BI cwnd " NUMBER " "(Linux 2.3.15+ only)" + the clamp for congestion window. It is ignored if the + .B lock + flag is not used. + + .TP +-.BI initcwnd " NUMBER " "(2.5.70+ only)" ++.BI initcwnd " NUMBER " "(Linux 2.5.70+ only)" + the initial congestion window size for connections to this destination. + Actual window size is this value multiplied by the MSS + (``Maximal Segment Size'') for same connection. The default is + zero, meaning to use the values specified in RFC2414. + + .TP +-.BI initrwnd " NUMBER " "(2.6.33+ only)" ++.BI initrwnd " NUMBER " "(Linux 2.6.33+ only)" + the initial receive window size for connections to this destination. + Actual window size is this value multiplied by the MSS of the connection. + The default value is zero, meaning to use Slow Start value. + + .TP +-.BI features " FEATURES " (3.18+ only) ++.BI features " FEATURES " (Linux 3.18+ only) + Enable or disable per-route features. Only available feature at this + time is + .B ecn +@@ -531,17 +531,17 @@ also be used even if the + sysctl is set to 0. + + .TP +-.BI quickack " BOOL " "(3.11+ only)" ++.BI quickack " BOOL " "(Linux 3.11+ only)" + Enable or disable quick ack for connections to this destination. + + .TP +-.BI fastopen_no_cookie " BOOL " "(4.15+ only)" ++.BI fastopen_no_cookie " BOOL " "(Linux 4.15+ only)" + Enable TCP Fastopen without a cookie for connections to this destination. + + .TP +-.BI congctl " NAME " "(3.20+ only)" ++.BI congctl " NAME " "(Linux 3.20+ only)" + .TP +-.BI "congctl lock" " NAME " "(3.20+ only)" ++.BI "congctl lock" " NAME " "(Linux 3.20+ only)" + Sets a specific TCP congestion control algorithm only for a given destination. + If not specified, Linux keeps the current global default TCP congestion control + algorithm, or the one set from the application. If the modifier +@@ -554,14 +554,14 @@ control algorithm for that destination, thus it will be enforced/guaranteed to + use the proposed algorithm. + + .TP +-.BI advmss " NUMBER " "(2.3.15+ only)" ++.BI advmss " NUMBER " "(Linux 2.3.15+ only)" + the MSS ('Maximal Segment Size') to advertise to these + destinations when establishing TCP connections. If it is not given, + Linux uses a default value calculated from the first hop device MTU. + (If the path to these destination is asymmetric, this guess may be wrong.) + + .TP +-.BI reordering " NUMBER " "(2.3.15+ only)" ++.BI reordering " NUMBER " "(Linux 2.3.15+ only)" + Maximal reordering on the path to this destination. + If it is not given, Linux uses the value selected with + .B sysctl +@@ -782,7 +782,7 @@ is a set of encapsulation attributes specific to the + .IR SEG6_ACTION " [ " + .IR SEG6_ACTION_PARAM " ] " + - Operation to perform on matching packets. +-The following actions are currently supported (\fB4.14+ only\fR). ++The following actions are currently supported (\fBLinux 4.14+ only\fR). + .in +2 + + .B End +@@ -830,7 +830,7 @@ address is set as described in \fBip-sr\fR(8). + .in -8 + + .TP +-.BI expires " TIME " "(4.4+ only)" ++.BI expires " TIME " "(Linux 4.4+ only)" + the route will be deleted after the expires time. + .B Only + support IPv6 at present. +-- +2.18.0 + diff --git a/iproute.spec b/iproute.spec index 1c37fba..415fdfa 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 4.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/System URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -23,6 +23,8 @@ Patch6: 0006-Make-colored-output-configurable.patch Patch7: 0007-lib-Make-check_enable_color-return-boolean.patch # Fix for bz#1623488 Patch8: 0008-iprule-Fix-destination-prefix-output.patch +# Fix for bz#1391099 +Patch9: 0009-man-ip-route-Clarify-referenced-versions-are-Linux-o.patch License: GPLv2+ and Public Domain BuildRequires: gcc @@ -169,6 +171,9 @@ rm -rf '%{buildroot}%{_docdir}' %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Sep 19 2018 Phil Sutter - 4.18.0-5 +- man: ip-route: Clarify referenced versions are Linux ones + * Fri Aug 31 2018 Phil Sutter - 4.18.0-4 - iprule: Fix destination prefix output