rpms/iproute
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version 4.4.0

Browse Source
This commit is contained in:
Phil Sutter 2016-01-19 22:49:33 +01:00
parent dec8356d7d
commit c6b9f44817
5 changed files with 105 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.gitignore vendored
View File

@ -1,25 +1 @@
iproute2-2.6.34.tar.bz2
iproute2-2.6.35.tar.bz2
/iproute2-2.6.37.tar.bz2
/iproute2-2.6.38.tar.bz2
/iproute2-2.6.38.1.tar.bz2
/iproute2-2.6.39.tar.gz
/iproute2-3.1.0.tar.bz2
/iproute2-3.2.0.tar.bz2
/iproute2-3.3.0.tar.gz
/iproute2-3.4.0.tar.gz
/iproute2-3.5.0.tar.gz
/iproute2-3.5.1.tar.gz
/iproute2-3.6.0.tar.gz
/iproute2-3.7.0.tar.gz
/iproute2-3.8.0.tar.gz
/iproute2-3.9.0.tar.gz
/iproute2-3.10.0.tar.gz
/iproute2-3.11.0.tar.gz
/iproute2-3.12.0.tar.gz
/iproute2-3.14.0.tar.gz
/iproute2-3.15.0.tar.gz
/iproute2-3.16.0.tar.gz
/iproute2-3.19.0.tar.xz
/iproute2-4.0.0.tar.xz
/iproute2-4.1.1.tar.xz
/iproute2-4.4.0.tar.xz

97
0001-Documentation-fixes.patch Normal file
View File

@ -0,0 +1,97 @@
From 3c4b90c60ae6f48ff9cdb0603386bb2d67ab35b2 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Wed, 13 Jan 2016 18:27:59 +0100
Subject: [PATCH] Documentation fixes
These changes will either be sent upstream soon or are rather Red Hat /
Fedora specific:
* Drop note that policy rule 0 can't be deleted.
* Create cbq.8 as a link to tc-cbq.8.
* Make ip-route.8 a little more consistent.
* Drop 'Debian' from ss.8, the information applies to Red Hat / Fedora
as well.
* Refer to ss.ps instead of ss.html in ss.8, we don't ship the HTML
variants.
---
doc/ip-cref.tex | 3 ---
man/man8/cbq.8 | 1 +
man/man8/ip-route.8.in | 2 +-
man/man8/ip-rule.8 | 2 --
man/man8/ss.8 | 4 ++--
5 files changed, 4 insertions(+), 8 deletions(-)
create mode 100644 man/man8/cbq.8
diff --git a/doc/ip-cref.tex b/doc/ip-cref.tex
index 67094c95b3681..242cc266b7acd 100644
--- a/doc/ip-cref.tex
+++ b/doc/ip-cref.tex
@@ -2049,9 +2049,6 @@ table \verb|local| (ID 255).
The \verb|local| table is a special routing table containing
high priority control routes for local and broadcast addresses.
-Rule 0 is special. It cannot be deleted or overridden.
-
-
\item Priority: 32766, Selector: match anything, Action: lookup routing
table \verb|main| (ID 254).
The \verb|main| table is the normal routing table containing all non-policy
diff --git a/man/man8/cbq.8 b/man/man8/cbq.8
new file mode 100644
index 0000000000000..78940b6ac877c
--- /dev/null
+++ b/man/man8/cbq.8
@@ -0,0 +1 @@
+.so man8/tc-cbq.8
\ No newline at end of file
diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in
index 9934a1e8c6f9a..bd1bb6969172a 100644
--- a/man/man8/ip-route.8.in
+++ b/man/man8/ip-route.8.in
@@ -16,7 +16,7 @@ ip-route \- routing table management
.ti -8
.BR "ip route" " { "
-.BR list " | " flush " } "
+.BR show " | " flush " } "
.I SELECTOR
.ti -8
diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8
index b7008c6ab13d7..9b2c6b8704c36 100644
--- a/man/man8/ip-rule.8
+++ b/man/man8/ip-rule.8
@@ -111,8 +111,6 @@ The
.B local
table is a special routing table containing
high priority control routes for local and broadcast addresses.
-.sp
-Rule 0 is special. It cannot be deleted or overridden.
.TP
2.
diff --git a/man/man8/ss.8 b/man/man8/ss.8
index f4d5264f30363..1116a62646888 100644
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -131,7 +131,7 @@ Read filter information from FILE.
Each line of FILE is interpreted like single command line option. If FILE is - stdin is used.
.TP
.B FILTER := [ state STATE-FILTER ] [ EXPRESSION ]
-Please take a look at the official documentation (Debian package iproute-doc) for details regarding filters.
+Please take a look at the official documentation (package iproute\-doc) for details regarding filters.
.SH STATE-FILTER
@@ -186,7 +186,7 @@ Find all local processes connected to X server.
List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
.SH SEE ALSO
.BR ip (8),
-.BR /usr/share/doc/iproute-doc/ss.html " (package iproute­doc)",
+.BR /usr/share/doc/iproute-doc/ss.ps " (package iproute\-doc)",
.br
.BR RFC " 793 "
- https://tools.ietf.org/rfc/rfc793.txt (TCP states)
--
2.6.4

9
iproute.spec
View File

@ -1,8 +1,8 @@
%global cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools
Name: iproute
Version: 4.2.0
Release: 4%{?dist}
Version: 4.4.0
Release: 1%{?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
@ -14,7 +14,7 @@ Source2: avpkt
# * Piece by piece absorbed upstream.
#
# https://github.com/pavlix/iproute2/commits/fedora
Patch1: iproute2-3.19.0-docs.patch
Patch1: 0001-Documentation-fixes.patch
License: GPLv2+ and Public Domain
BuildRequires: bison
@ -129,6 +129,9 @@ rm -rf '%{buildroot}%{_docdir}'
%{_includedir}/libnetlink.h
%changelog
* Tue Jan 19 2016 Phil Sutter <psutter@redhat.com> - 4.4.0-1
- New version 4.4.0
* Sun Oct 04 2015 Phil Sutter <psutter@redhat.com> - 4.2.0-4
- Simplify RPM install stage by using package's install target

328
iproute2-3.19.0-docs.patch
View File

@ -1,328 +0,0 @@
diff --git a/bridge/fdb.c b/bridge/fdb.c
index bd7e4f9..5516633 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -31,7 +31,7 @@ static unsigned int filter_index;
static void usage(void)
{
- fprintf(stderr, "Usage: bridge fdb { add | append | del | replace ADDR dev DEV\n"
+ fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } LLADDR dev DEV\n"
" [ self ] [ master ] [ use ] [ router ]\n"
" [ local | temp ] [ dst IPADDR ] [ vlan VID ]\n"
" [ port PORT] [ vni VNI ] [via DEV]\n");
diff --git a/doc/ip-cref.tex b/doc/ip-cref.tex
index ea14795..58b696b 100644
--- a/doc/ip-cref.tex
+++ b/doc/ip-cref.tex
@@ -2049,9 +2049,6 @@ table \verb|local| (ID 255).
The \verb|local| table is a special routing table containing
high priority control routes for local and broadcast addresses.
-Rule 0 is special. It cannot be deleted or overridden.
-
-
\item Priority: 32766, Selector: match anything, Action: lookup routing
table \verb|main| (ID 254).
The \verb|main| table is the normal routing table containing all non-policy
diff --git a/ip/iprule.c b/ip/iprule.c
index 714278a..4402f99 100644
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -36,7 +36,7 @@ static void usage(void)
fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n");
fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
- fprintf(stderr, " [ prohibit | reject | unreachable ]\n");
+ fprintf(stderr, " [ prohibit | unreachable ]\n");
fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n");
fprintf(stderr, " [ goto NUMBER ]\n");
fprintf(stderr, " SUPPRESSOR\n");
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 5347a56..af17f7f 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -65,7 +65,7 @@ bridge \- show / manipulate bridge addresses and devices
.IR DEVICE " ]"
.ti -8
-.BR "bridge fdb" " [ " show " ] [ "
+.BR "bridge fdb show" " [ "
.B dev
.IR DEV " ]"
@@ -118,7 +118,7 @@ is given multiple times, the amount of information increases.
As a rule, the information is statistics or some time values.
.TP
-.BR "\-n" , " \-net" , " \-netns " <NETNS>
+.BR "\-n" , " \-netns " <NETNS>
switches
.B bridge
to the specified network namespace
diff --git a/man/man8/cbq.8 b/man/man8/cbq.8
new file mode 100644
index 0000000..78940b6
--- /dev/null
+++ b/man/man8/cbq.8
@@ -0,0 +1 @@
+.so man8/tc-cbq.8
\ No newline at end of file
diff --git a/man/man8/genl.8 b/man/man8/genl.8
new file mode 100644
index 0000000..b3e8f98
--- /dev/null
+++ b/man/man8/genl.8
@@ -0,0 +1,36 @@
+.TH GENL 8
+.SH NAME
+genl \- generic netlink utility frontend
+.SH SYNOPSIS
+.B genl
+.RI [ options ] { ctrl } [ help ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B genl
+command.
+.PP
+\fBgenl\fP utility provides a simple frontend to the generic netlink library.
+.SH OPTIONS
+genl supports the following options.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+.B \-V, \-Version
+Show version of program.
+.TP
+.B \-s, \-stats, \-statistics
+Show object statistics.
+.TP
+.B \-d, \-details
+Show object details.
+.TP
+.B \-r, \-raw
+Dump raw output only.
+.SH SEE ALSO
+.BR ip (8)
+.br
+.SH AUTHOR
+genl was written by Jamal Hadi Salim <hadi@cyberus.ca>.
+.PP
+This manual page was written by Petr Sabata <contyk@redhat.com>.
diff --git a/man/man8/ifcfg.8 b/man/man8/ifcfg.8
new file mode 100644
index 0000000..a6b585e
--- /dev/null
+++ b/man/man8/ifcfg.8
@@ -0,0 +1,57 @@
+.TH IFCFG 8 "September 24 2009" "iproute2" "Linux"
+.SH NAME
+ifcfg \- simplistic script which replaces ifconfig IP managment
+.SH SYNOPSIS
+.ad l
+.in +8
+.ti -8
+.B ifcfg
+.RI "[ " DEVICE " [ " :ALIAS: " ] ] [ " command " ] " ADDRESS " [ " LENGTH " ] [ " PEER " ] "
+.sp
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B ifcfg
+command.
+.PP
+This is a simplistic script replacing one option of
+.B ifconfig
+, namely, IP address management. It not only adds
+addresses, but also carries out Duplicate Address Detection RFC-DHCP,
+sends unsolicited ARP to update the caches of other hosts sharing
+the interface, adds some control routes and restarts Router Discovery
+when it is necessary.
+
+I strongly recommend using it
+.RI instead
+of
+.RI ifconfig
+both on hosts and on routers.
+
+.SH IFCONFIG - COMMAND SYNTAX
+
+.SS
+.TP
+.B DEVICE
+- it may have alias, suffix, separated by colon.
+
+.TP
+.B command
+- add, delete or stop.
+
+.TP
+.B address
+- optionally followed by prefix length.
+
+.TP
+.B peer
+- optional peer address for pointpoint interfaces.
+
+.SH EXAMPLE
+.nf ifcfg eth0 193.233.7.90/24
+.fi
+This function determines, whether this is router or host.
+It returns 0, if the host is apparently not router.
+
+.SH SEE ALSO
+.BR ip-cref.dvi
diff --git a/man/man8/ifstat.8 b/man/man8/ifstat.8
new file mode 100644
index 0000000..042dd3e
--- /dev/null
+++ b/man/man8/ifstat.8
@@ -0,0 +1,54 @@
+.TH IFSTAST 8
+.SH NAME
+ifstat \- handy utility to read net interface statistics
+.SH SYNOPSIS
+.B ifstat
+.RI [ options ]
+.RI [ interface
+.RI [ interface
+.RI [ ... ] ] ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B ifstat
+command.
+.PP
+\fBifstat\fP neatly prints out network interface statistics.
+The utility keeps records of the previous data displayed in history files and by default only shows difference between the last and the current call. Location of the history files defaults to /tmp/.ifstat.u$UID but may be overridden with the IFSTAT_HISTORY environment variable.
+.SH OPTIONS
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-V, \-\-version
+Show version of program.
+.TP
+.B \-a, \-\-ignore
+Ignore the history file.
+.TP
+.B \-d, \-\-scan=SECS
+Sample statistics every SECS second.
+.TP
+.B \-e, \-\-errors
+Show errors.
+.TP
+.B \-n, \-\-nooutput
+Don't display any output. Update the history file only.
+.TP
+.B \-r, \-\-reset
+Reset history.
+.TP
+.B \-s, \-\-noupdate
+Don't update the history file.
+.TP
+.B \-t, \-\-interval=SECS
+Report average over the last SECS seconds.
+.TP
+.B \-z, \-\-zeros
+Show entries with zero activity.
+.SH SEE ALSO
+.BR ip (8)
+.br
+.SH AUTHOR
+ifstat was written by Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>.
+.PP
+This manual page was written by Petr Sabata <contyk@redhat.com>.
diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in
index 72d8d77..9bddfb1 100644
--- a/man/man8/ip-route.8.in
+++ b/man/man8/ip-route.8.in
@@ -16,7 +16,7 @@ ip-route \- routing table management
.ti -8
.BR "ip route" " { "
-.BR list " | " flush " } "
+.BR show " | " flush " } "
.I SELECTOR
.ti -8
diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8
index dd925be..8434945 100644
--- a/man/man8/ip-rule.8
+++ b/man/man8/ip-rule.8
@@ -41,7 +41,7 @@ ip-rule \- routing policy database management
.IR TABLE_ID " ] [ "
.B nat
.IR ADDRESS " ] [ "
-.BR prohibit " | " reject " | " unreachable " ] [ " realms
+.BR prohibit " | " unreachable " ] [ " realms
.RI "[" SRCREALM "/]" DSTREALM " ]"
.I SUPPRESSOR
@@ -108,8 +108,6 @@ The
.B local
table is a special routing table containing
high priority control routes for local and broadcast addresses.
-.sp
-Rule 0 is special. It cannot be deleted or overridden.
.TP
2.
diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8
index 8b746cb..790921a 100644
--- a/man/man8/ip-tunnel.8
+++ b/man/man8/ip-tunnel.8
@@ -108,7 +108,7 @@ Modes for IPv4 encapsulation available:
.BR ipip ", " sit ", " isatap ", " vti ", and " gre "."
.br
Modes for IPv6 encapsulation available:
-.BR ip6ip6 ", " ipip6 ", " ip6gre ", " vti6 ", and " any "."
+.BR ip6ip6 ", " ipip6 ", " ip6gre " and " vti6 "
.TP
.BI remote " ADDRESS"
diff --git a/man/man8/ss.8 b/man/man8/ss.8
index 6afbabb..773a4b4 100644
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -131,7 +131,7 @@ Read filter information from FILE.
Each line of FILE is interpreted like single command line option. If FILE is - stdin is used.
.TP
.B FILTER := [ state STATE-FILTER ] [ EXPRESSION ]
-Please take a look at the official documentation (Debian package iproute-doc) for details regarding filters.
+Please take a look at the official documentation (package iproute\-doc) for details regarding filters.
.SH STATE-FILTER
@@ -186,7 +186,7 @@ Find all local processes connected to X server.
List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
.SH SEE ALSO
.BR ip (8),
-.BR /usr/share/doc/iproute-doc/ss.html " (package iproute­doc)",
+.BR /usr/share/doc/iproute-doc/ss.ps " (package iproute\-doc)",
.br
.BR RFC " 793 "
- https://tools.ietf.org/rfc/rfc793.txt (TCP states)
diff --git a/man/man8/tc.8 b/man/man8/tc.8
index feafa05..02d7997 100644
--- a/man/man8/tc.8
+++ b/man/man8/tc.8
@@ -446,7 +446,7 @@ don't terminate tc on errors in batch mode.
If there were any errors during execution of the commands, the application return code will be non zero.
.TP
-.BR "\-n" , " \-net" , " \-netns " <NETNS>
+.BR "\-n" , " \-netns " <NETNS>
switches
.B tc
to the specified network namespace
@@ -502,6 +502,9 @@ option was specified. Classes can be filtered only by
option.
.TP
+.BR "\-force"
+don't terminate tc on errors in batch mode.
+If there were any errors during execution of the commands, the application return code will be non zero.
.BR "\-nm" , " \-name"
resolve class name from
.B /etc/iproute2/tc_cls

2
sources
View File

@ -1 +1 @@
51c54cc3245eff451154938fbc0f64f5 iproute2-4.2.0.tar.xz
d762653ec3e1ab0d4a9689e169ca184f iproute2-4.4.0.tar.xz