iputils: update to 20161105.

This commit is contained in:
Leah Neukirchen 2017-06-21 16:24:07 +02:00
parent 95459e5781
commit f5b4927496
8 changed files with 355 additions and 595 deletions

View File

@ -1,6 +1,5 @@
case "${ACTION}" in
post)
setcap CAP_NET_RAW+ep usr/bin/iputils-ping
setcap CAP_NET_RAW+ep usr/bin/iputils-ping6
;;
esac

View File

@ -0,0 +1,3 @@
Since iputils-20161105,
ping and ping6 as well as tracepath and tracepath6 have been unified.
Use ping -4 or tracepath -4 to force ICMPv4.

View File

@ -1,17 +1,18 @@
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/arping.8 2011-01-19 04:10:18.000000000 -0500
@@ -0,0 +1,110 @@
diff -Naur iputils-s20161105/olddoc/arping.8 iputils-s20161105/doc/arping.8
--- iputils-s20161105/olddoc/arping.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/arping.8 2017-06-21 15:56:04.129435678 +0200
@@ -0,0 +1,109 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "ARPING" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "ARPING" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+arping \- send ARP REQUEST to a neighbour host
+.SH SYNOPSIS
+
+\fBarping\fR [ \fB-AbDfhqUV\fR] [ \fB-c \fIcount\fB\fR] [ \fB-w \fIdeadline\fB\fR] [ \fB-s \fIsource\fB\fR] \fB-I \fIinterface\fB\fR \fB\fIdestination\fB\fR
+\fBarping\fR [\fB-AbDfhqUV\fR] [\fB-c \fIcount\fB\fR] [\fB-w \fIdeadline\fB\fR] [\fB-s \fIsource\fB\fR] [\fB-I \fIinterface\fB\fR] \fB\fIdestination\fB\fR
+
+.SH "DESCRIPTION"
+.PP
@ -31,8 +32,8 @@
+Stop after sending \fIcount\fR ARP REQUEST
+packets. With
+\fIdeadline\fR
+option, \fBarping\fR waits for
+\fIcount\fR ARP REPLY packets, until the timeout expires.
+option, instead wait for
+\fIcount\fR ARP REPLY packets, or until the timeout expires.
+.TP
+\fB-D\fR
+Duplicate address detection mode (DAD). See
@ -43,8 +44,7 @@
+Finish after the first reply confirming that target is alive.
+.TP
+\fB-I \fIinterface\fB\fR
+Name of network device where to send ARP REQUEST packets. This option
+is required.
+Name of network device where to send ARP REQUEST packets.
+.TP
+\fB-h\fR
+Print help page and exit.
@ -103,7 +103,7 @@
+<yoshfuji@skbuff.net>.
+.SH "SECURITY"
+.PP
+\fBarping\fR requires CAP_NET_RAWIO capability
+\fBarping\fR requires CAP_NET_RAW capability
+to be executed. It is not recommended to be used as set-uid root,
+because it allows user to modify ARP caches of neighbour hosts.
+.SH "AVAILABILITY"
@ -111,20 +111,21 @@
+\fBarping\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/clockdiff.8 2011-01-19 04:10:19.000000000 -0500
diff -Naur iputils-s20161105/olddoc/clockdiff.8 iputils-s20161105/doc/clockdiff.8
--- iputils-s20161105/olddoc/clockdiff.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/clockdiff.8 2017-06-21 15:56:04.138435725 +0200
@@ -0,0 +1,81 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "CLOCKDIFF" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "CLOCKDIFF" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+clockdiff \- measure clock difference between hosts
+.SH SYNOPSIS
+
+\fBclockdiff\fR [ \fB-o\fR] [ \fB-o1\fR] \fB\fIdestination\fB\fR
+\fBclockdiff\fR [\fB-o\fR] [\fB-o1\fR] \fB\fIdestination\fB\fR
+
+.SH "DESCRIPTION"
+.PP
@ -188,27 +189,28 @@
+<yoshfuji@skbuff.net>.
+.SH "SECURITY"
+.PP
+\fBclockdiff\fR requires CAP_NET_RAWIO capability
+\fBclockdiff\fR requires CAP_NET_RAW capability
+to be executed. It is safe to be used as set-uid root.
+.SH "AVAILABILITY"
+.PP
+\fBclockdiff\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/ping.8 2011-01-19 04:10:19.000000000 -0500
@@ -0,0 +1,408 @@
diff -Naur iputils-s20161105/olddoc/ping.8 iputils-s20161105/doc/ping.8
--- iputils-s20161105/olddoc/ping.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/ping.8 2017-06-21 15:56:04.156435818 +0200
@@ -0,0 +1,447 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "PING" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "PING" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+ping, ping6 \- send ICMP ECHO_REQUEST to network hosts
+ping \- send ICMP ECHO_REQUEST to network hosts
+.SH SYNOPSIS
+
+\fBping\fR [ \fB-LRUbdfnqrvVaAB\fR] [ \fB-c \fIcount\fB\fR] [ \fB-m \fImark\fB\fR] [ \fB-i \fIinterval\fB\fR] [ \fB-l \fIpreload\fB\fR] [ \fB-p \fIpattern\fB\fR] [ \fB-s \fIpacketsize\fB\fR] [ \fB-t \fIttl\fB\fR] [ \fB-w \fIdeadline\fB\fR] [ \fB-F \fIflowlabel\fB\fR] [ \fB-I \fIinterface\fB\fR] [ \fB-M \fIhint\fB\fR] [ \fB-N \fInioption\fB\fR] [ \fB-Q \fItos\fB\fR] [ \fB-S \fIsndbuf\fB\fR] [ \fB-T \fItimestamp option\fB\fR] [ \fB-W \fItimeout\fB\fR] [ \fB\fIhop\fB\fR\fI ...\fR] \fB\fIdestination\fB\fR
+\fBping\fR [\fB-aAbBdDfhLnOqrRUvV46\fR] [\fB-c \fIcount\fB\fR] [\fB-F \fIflowlabel\fB\fR] [\fB-i \fIinterval\fB\fR] [\fB-I \fIinterface\fB\fR] [\fB-l \fIpreload\fB\fR] [\fB-m \fImark\fB\fR] [\fB-M \fIpmtudisc_option\fB\fR] [\fB-N \fInodeinfo_option\fB\fR] [\fB-w \fIdeadline\fB\fR] [\fB-W \fItimeout\fB\fR] [\fB-p \fIpattern\fB\fR] [\fB-Q \fItos\fB\fR] [\fB-s \fIpacketsize\fB\fR] [\fB-S \fIsndbuf\fB\fR] [\fB-t \fIttl\fB\fR] [\fB-T \fItimestamp option\fB\fR] [\fB\fIhop\fB\fR\fI ...\fR] \fB\fIdestination\fB\fR
+
+.SH "DESCRIPTION"
+.PP
@ -218,16 +220,26 @@
+header, followed by a struct timeval and then an arbitrary
+number of ``pad'' bytes used to fill out the packet.
+.PP
+\fBping6\fR can also send Node Information Queries (RFC4620).
+\fBping\fR works with both IPv4 and IPv6. Using only one of them
+explicitly can be enforced by specifying \fB-4\fR or \fB-6\fR.
+.PP
+\fBping\fR can also send IPv6 Node Information Queries (RFC4620).
+Intermediate \fIhop\fRs may not be allowed, because IPv6 source routing was deprecated (RFC5095).
+.SH "OPTIONS"
+.TP
+\fB-4\fR
+Use IPv4 only.
+.TP
+\fB-6\fR
+Use IPv6 only.
+.TP
+\fB-a\fR
+Audible ping.
+.TP
+\fB-A\fR
+Adaptive ping. Interpacket interval adapts to round-trip time, so that
+effectively not more than one (or more, if preload is set) unanswered probes
+present in the network. Minimal interval is 200msec for not super-user.
+effectively not more than one (or more, if preload is set) unanswered probe
+is present in the network. Minimal interval is 200msec for not super-user.
+On networks with low rtt this mode is essentially equivalent to flood mode.
+.TP
+\fB-b\fR
@ -237,11 +249,6 @@
+Do not allow \fBping\fR to change source address of probes.
+The address is bound to one selected when \fBping\fR starts.
+.TP
+\fB-m \fImark\fB\fR
+use \fImark\fR to tag the packets going out. This is useful
+for variety of reasons within the kernel such as using policy
+routing to select specific outbound processing.
+.TP
+\fB-c \fIcount\fB\fR
+Stop after sending \fIcount\fR ECHO_REQUEST
+packets. With
@ -253,9 +260,9 @@
+Set the SO_DEBUG option on the socket being used.
+Essentially, this socket option is not used by Linux kernel.
+.TP
+\fB-F \fIflow label\fB\fR
+Allocate and set 20 bit flow label on echo request packets.
+(Only \fBping6\fR). If value is zero, kernel allocates random flow label.
+\fB-D\fR
+Print timestamp (unix time + microseconds as in gettimeofday) before
+each line.
+.TP
+\fB-f\fR
+Flood ping. For every ECHO_REQUEST sent a period ``.'' is printed,
@ -266,16 +273,29 @@
+whichever is more.
+Only the super-user may use this option with zero interval.
+.TP
+\fB-F \fIflow label\fB\fR
+IPv6 only.
+Allocate and set 20 bit flow label (in hex) on echo request packets.
+If value is zero, kernel allocates random flow label.
+.TP
+\fB-h\fR
+Show help.
+.TP
+\fB-i \fIinterval\fB\fR
+Wait \fIinterval\fR seconds between sending each packet.
+The default is to wait for one second between each packet normally,
+or not to wait in flood mode. Only super-user may set interval
+to values less 0.2 seconds.
+to values less than 0.2 seconds.
+.TP
+\fB-I \fIinterface address\fB\fR
+Set source address to specified interface address. Argument
+may be numeric IP address or name of device. When pinging IPv6
+link-local address this option is required.
+\fB-I \fIinterface\fB\fR
+\fIinterface\fR is either an address, or an interface name.
+If \fIinterface\fR is an address, it sets source address
+to specified interface address.
+If \fIinterface\fR in an interface name, it sets
+source interface to specified interface.
+For IPv6, when doing ping to a link-local scope
+address, link specification (by the '%'-notation in
+\fIdestination\fR, or by this option) is required.
+.TP
+\fB-l \fIpreload\fB\fR
+If \fIpreload\fR is specified,
@ -286,8 +306,27 @@
+Suppress loopback of multicast packets. This flag only applies if the ping
+destination is a multicast address.
+.TP
+\fB-N \fInioption\fB\fR
+\fB-m \fImark\fB\fR
+use \fImark\fR to tag the packets going out. This is useful
+for variety of reasons within the kernel such as using policy
+routing to select specific outbound processing.
+.TP
+\fB-M \fIpmtudisc_opt\fB\fR
+Select Path MTU Discovery strategy.
+\fIpmtudisc_option\fR may be either \fIdo\fR
+(prohibit fragmentation, even local one),
+\fIwant\fR (do PMTU discovery, fragment locally when packet size
+is large), or \fIdont\fR (do not set DF flag).
+.TP
+\fB-N \fInodeinfo_option\fB\fR
+IPv6 only.
+Send ICMPv6 Node Information Queries (RFC4620), instead of Echo Request.
+CAP_NET_RAW capability is required.
+.RS
+.TP
+\fBhelp\fR
+Show help for NI support.
+.RE
+.RS
+.TP
+\fBname\fR
@ -355,44 +394,35 @@
+Numeric output only.
+No attempt will be made to lookup symbolic names for host addresses.
+.TP
+\fB-O\fR
+Report outstanding ICMP ECHO reply before sending next packet.
+This is useful together with the timestamp \fB-D\fR to
+log output to a diagnostic file and search for missing answers.
+.TP
+\fB-p \fIpattern\fB\fR
+You may specify up to 16 ``pad'' bytes to fill out the packet you send.
+This is useful for diagnosing data-dependent problems in a network.
+For example, \fB-p ff\fR will cause the sent packet
+to be filled with all ones.
+.TP
+\fB-D\fR
+Print timestamp (unix time + microseconds as in gettimeofday) before
+each line.
+.TP
+\fB-Q \fItos\fB\fR
+Set Quality of Service -related bits in ICMP datagrams.
+\fItos\fR can be either decimal or hex number.
+Traditionally (RFC1349), these have been interpreted as: 0 for reserved
+(currently being redefined as congestion control), 1-4 for Type of Service
+and 5-7 for Precedence.
+Possible settings for Type of Service are: minimal cost: 0x02,
+reliability: 0x04, throughput: 0x08, low delay: 0x10. Multiple TOS bits
+should not be set simultaneously. Possible settings for
+special Precedence range from priority (0x20) to net control (0xe0). You
+must be root (CAP_NET_ADMIN capability) to use Critical or
+higher precedence value. You cannot set
+bit 0x01 (reserved) unless ECN has been enabled in the kernel.
+In RFC2474, these fields has been redefined as 8-bit Differentiated
+Services (DS), consisting of: bits 0-1 of separate data (ECN will be used,
+here), and bits 2-7 of Differentiated Services Codepoint (DSCP).
+.TP
+\fB-q\fR
+Quiet output.
+Nothing is displayed except the summary lines at startup time and
+when finished.
+.TP
+\fB-R\fR
+Record route.
+Includes the RECORD_ROUTE option in the ECHO_REQUEST
+packet and displays the route buffer on returned packets.
+Note that the IP header is only large enough for nine such routes.
+Many hosts ignore or discard this option.
+\fB-Q \fItos\fB\fR
+Set Quality of Service -related bits in ICMP datagrams.
+\fItos\fR can be decimal (\fBping\fR only) or hex number.
+
+In RFC2474, these fields are interpreted as 8-bit Differentiated
+Services (DS), consisting of: bits 0-1 (2 lowest bits) of separate
+data, and bits 2-7 (highest 6 bits) of Differentiated Services
+Codepoint (DSCP). In RFC2481 and RFC3168, bits 0-1 are used for ECN.
+
+Historically (RFC1349, obsoleted by RFC2474), these were interpreted
+as: bit 0 (lowest bit) for reserved (currently being redefined as
+congestion control), 1-4 for Type of Service and bits 5-7
+(highest bits) for Precedence.
+.TP
+\fB-r\fR
+Bypass the normal routing tables and send directly to a host on an attached
@ -402,6 +432,14 @@
+that has no route through it provided the option \fB-I\fR is also
+used.
+.TP
+\fB-R\fR
+\fBping\fR only.
+Record route.
+Includes the RECORD_ROUTE option in the ECHO_REQUEST
+packet and displays the route buffer on returned packets.
+Note that the IP header is only large enough for nine such routes.
+Many hosts ignore or discard this option.
+.TP
+\fB-s \fIpacketsize\fB\fR
+Specifies the number of data bytes to be sent.
+The default is 56, which translates into 64 ICMP
@ -412,6 +450,7 @@
+not more than one packet.
+.TP
+\fB-t \fIttl\fB\fR
+\fBping\fR only.
+Set the IP Time to Live.
+.TP
+\fB-T \fItimestamp option\fB\fR
@ -422,13 +461,6 @@
+\fItsprespec host1 [host2 [host3 [host4]]]\fR
+(timestamp prespecified hops).
+.TP
+\fB-M \fIhint\fB\fR
+Select Path MTU Discovery strategy.
+\fIhint\fR may be either \fIdo\fR
+(prohibit fragmentation, even local one),
+\fIwant\fR (do PMTU discovery, fragment locally when packet size
+is large), or \fIdont\fR (do not set DF flag).
+.TP
+\fB-U\fR
+Print full user-to-user latency (the old behaviour). Normally
+\fBping\fR
@ -457,7 +489,7 @@
+.TP
+\fB-W \fItimeout\fB\fR
+Time to wait for a response, in seconds. The option affects only timeout
+in absense of any responses, otherwise \fBping\fR waits for two RTTs.
+in absence of any responses, otherwise \fBping\fR waits for two RTTs.
+.PP
+When using \fBping\fR for fault isolation, it should first be run
+on the local host, to verify that the local network interface is up
@ -556,7 +588,7 @@
+or
+\fBftp\fR(1).
+.PP
+In normal operation ping prints the ttl value from the packet it receives.
+In normal operation ping prints the TTL value from the packet it receives.
+When a remote system receives a ping packet, it can do one of three things
+with the TTL field in its response:
+.TP 0.2i
@ -583,7 +615,7 @@
+\(bu
+The maximum IP header length is too small for options like
+RECORD_ROUTE to be completely useful.
+There's not much that that can be done about this, however.
+There's not much that can be done about this, however.
+.TP 0.2i
+\(bu
+Flood pinging is not recommended in general, and flood pinging the
@ -597,238 +629,34 @@
+The \fBping\fR command appeared in 4.3BSD.
+.PP
+The version described here is its descendant specific to Linux.
+.PP
+As of version s20150815, the \fBping6\fR binary doesn't exist anymore.
+It has been merged into \fBping\fR. Creating a symlink named
+\fBping6\fR pointing to \fBping\fR will result in the same
+funcionality as before.
+.SH "SECURITY"
+.PP
+\fBping\fR requires CAP_NET_RAWIO capability
+to be executed. It may be used as set-uid root.
+\fBping\fR requires CAP_NET_RAW capability
+to be executed 1) if the program is used for non-echo queries
+(See \fB-N\fR option), or 2) if kernel does not
+support non-raw ICMP sockets, or 3) if the user is not allowed
+to create an ICMP echo socket. The program may be used as
+set-uid root.
+.SH "AVAILABILITY"
+.PP
+\fBping\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/rdisc.8 2011-01-19 04:10:20.000000000 -0500
@@ -0,0 +1,110 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "RDISC" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.SH NAME
+rdisc \- network router discovery daemon
+.SH SYNOPSIS
+
+\fBrdisc\fR [ \fB-abdfstvV\fR] [ \fB\fIsend_address\fB\fR] [ \fB\fIreceive_address\fB\fR]
+
+.SH "DESCRIPTION"
+.PP
+\fBrdisc\fR implements client side of the ICMP router discover protocol.
+\fBrdisc\fR is invoked at boot time to populate the network
+routing tables with default routes.
+.PP
+\fBrdisc\fR listens on the ALL_HOSTS (224.0.0.1) multicast address
+(or \fIreceive_address\fR provided it is given)
+for ROUTER_ADVERTISE messages from routers. The received
+messages are handled by first ignoring those listed router addresses
+with which the host does not share a network. Among the remaining addresses
+the ones with the highest preference are selected as default routers
+and a default route is entered in the kernel routing table
+for each one of them.
+.PP
+Optionally, \fBrdisc\fR can avoid waiting for routers to announce
+themselves by sending out a few ROUTER_SOLICITATION messages
+to the ALL_ROUTERS (224.0.0.2) multicast address
+(or \fIsend_address\fR provided it is given)
+when it is started.
+.PP
+A timer is associated with each router address and the address will
+no longer be considered for inclusion in the the routing tables if the
+timer expires before a new
+\fBadvertise\fR message is received from the router.
+The address will also be excluded from consideration if the host receives an
+\fBadvertise\fR
+message with the preference being maximally negative.
+.PP
+Server side of router discovery protocol is supported by Cisco IOS
+and by any more or less complete UNIX routing daemon, f.e \fBgated\fR.
+.SH "OPTIONS"
+.TP
+\fB-a\fR
+Accept all routers independently of the preference they have in their
+\fBadvertise\fR messages.
+Normally \fBrdisc\fR only accepts (and enters in the kernel routing
+tables) the router or routers with the highest preference.
+.TP
+\fB-b\fR
+Opposite to \fB-a\fR, i.e. install only router with the best
+preference value. It is default behaviour.
+.TP
+\fB-d\fR
+Send debugging messages to syslog.
+.TP
+\fB-f\fR
+Run \fBrdisc\fR forever even if no routers are found.
+Normally \fBrdisc\fR gives up if it has not received any
+\fBadvertise\fR message after after soliciting three times,
+in which case it exits with a non-zero exit code.
+If \fB-f\fR is not specified in the first form then
+\fB-s\fR must be specified.
+.TP
+\fB-s\fR
+Send three \fBsolicitation\fR messages initially to quickly discover
+the routers when the system is booted.
+When \fB-s\fR is specified \fBrdisc\fR
+exits with a non-zero exit code if it can not find any routers.
+This can be overridden with the \fB-f\fR option.
+.TP
+\fB-t\fR
+Test mode. Do not go to background.
+.TP
+\fB-v\fR
+Be verbose i.e. send lots of debugging messages to syslog.
+.TP
+\fB-V\fR
+Print version and exit.
+.SH "HISTORY"
+.PP
+This program was developed by Sun Microsystems (see copyright
+notice in source file). It was ported to Linux by
+Alexey Kuznetsov
+<kuznet@ms2.inr.ac.ru>.
+It is now maintained by
+YOSHIFUJI Hideaki
+<yoshfuji@skbuff.net>.
+.SH "SEE ALSO"
+.PP
+\fBicmp\fR(7),
+\fBinet\fR(7),
+\fBping\fR(8).
+.SH "REFERENCES"
+.PP
+Deering, S.E.,ed "ICMP Router Discovery Messages",
+RFC1256, Network Information Center, SRI International,
+Menlo Park, Calif., September 1991.
+.SH "SECURITY"
+.PP
+\fBrdisc\fR requires CAP_NET_RAWIO to listen
+and send ICMP messages and capability CAP_NET_ADMIN
+to update routing tables.
+.SH "AVAILABILITY"
+.PP
+\fBrdisc\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/tracepath.8 2011-01-19 04:10:20.000000000 -0500
@@ -0,0 +1,97 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "TRACEPATH" "8" "19 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.SH NAME
+tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
+.SH SYNOPSIS
+
+\fBtracepath\fR [ \fB-n\fR] [ \fB-b\fR] [ \fB-l \fIpktlen\fB\fR] \fB\fIdestination\fB\fR [ \fB\fIport\fB\fR]
+
+.SH "DESCRIPTION"
+.PP
+It traces path to \fIdestination\fR discovering MTU along this path.
+It uses UDP port \fIport\fR or some random port.
+It is similar to \fBtraceroute\fR, only does not require superuser
+privileges and has no fancy options.
+.PP
+\fBtracepath6\fR is good replacement for \fBtraceroute6\fR
+and classic example of application of Linux error queues.
+The situation with IPv4 is worse, because commercial
+IP routers do not return enough information in icmp error messages.
+Probably, it will change, when they will be updated.
+For now it uses Van Jacobson's trick, sweeping a range
+of UDP ports to maintain trace history.
+.SH "OPTIONS"
+.TP
+\fB-n\fR
+Print primarily IP addresses numerically.
+.TP
+\fB-b\fR
+Print both of host names and IP addresses.
+.TP
+\fB-l\fR
+Sets the initial packet length to \fIpktlen\fR instead of
+65536 for \fBtracepath\fR or 128000 for \fBtracepath6\fR.
+.SH "OUTPUT"
+.PP
+
+.nf
+root@mops:~ # tracepath6 3ffe:2400:0:109::2
+ 1?: [LOCALHOST] pmtu 1500
+ 1: dust.inr.ac.ru 0.411ms
+ 2: dust.inr.ac.ru asymm 1 0.390ms pmtu 1480
+ 2: 3ffe:2400:0:109::2 463.514ms reached
+ Resume: pmtu 1480 hops 2 back 2
+.fi
+.PP
+The first column shows TTL of the probe, followed by colon.
+Usually value of TTL is obtained from reply from network,
+but sometimes reply does not contain necessary information and
+we have to guess it. In this case the number is followed by ?.
+.PP
+The second column shows the network hop, which replied to the probe.
+It is either address of router or word [LOCALHOST], if
+the probe was not sent to the network.
+.PP
+The rest of line shows miscellaneous information about path to
+the correspinding hetwork hop. As rule it contains value of RTT.
+Additionally, it can show Path MTU, when it changes.
+If the path is asymmetric
+or the probe finishes before it reach prescribed hop, difference
+between number of hops in forward and backward direction is shown
+following keyword async. This information is not reliable.
+F.e. the third line shows asymmetry of 1, it is because the first probe
+with TTL of 2 was rejected at the first hop due to Path MTU Discovery.
+.PP
+The last line summarizes information about all the path to the destination,
+it shows detected Path MTU, amount of hops to the destination and our
+guess about amount of hops from the destination to us, which can be
+different when the path is asymmetric.
+.SH "SEE ALSO"
+.PP
+\fBtraceroute\fR(8),
+\fBtraceroute6\fR(8),
+\fBping\fR(8).
+.SH "AUTHOR"
+.PP
+\fBtracepath\fR was written by
+Alexey Kuznetsov
+<kuznet@ms2.inr.ac.ru>.
+.SH "SECURITY"
+.PP
+No security issues.
+.PP
+This lapidary deserves to be elaborated.
+\fBtracepath\fR is not a privileged program, unlike
+\fBtraceroute\fR, \fBping\fR and other beasts of this kind.
+\fBtracepath\fR may be executed by everyone who has some access
+to network, enough to send UDP datagrams to investigated destination
+using given port.
+.SH "AVAILABILITY"
+.PP
+\fBtracepath\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
diff -Naur /dev/null iputils-s20101006/doc/rarpd.8
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/rarpd.8 2011-01-08 20:09:51.270811811 -0500
diff -Naur iputils-s20161105/olddoc/rarpd.8 iputils-s20161105/doc/rarpd.8
--- iputils-s20161105/olddoc/rarpd.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/rarpd.8 2017-06-21 15:56:04.164435860 +0200
@@ -0,0 +1,84 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "RARPD" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "RARPD" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+rarpd \- answer RARP REQUESTs
+.SH SYNOPSIS
@ -895,7 +723,7 @@ diff -Naur /dev/null iputils-s20101006/doc/rarpd.8
+<yoshfuji@skbuff.net>.
+.SH "SECURITY"
+.PP
+\fBrarpd\fR requires CAP_NET_RAWIO capability
+\fBrarpd\fR requires CAP_NET_RAW capability
+to listen and send RARP and ARP packets. It also needs CAP_NET_ADMIN
+to give to kernel hint for ARP resolution; this is not strictly required,
+but some (most of, to be more exact) clients are so badly broken that
@ -907,16 +735,142 @@ diff -Naur /dev/null iputils-s20101006/doc/rarpd.8
+\fBrarpd\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
diff -Naur /dev/null iputils-s20101006/doc/tftpd.8
--- /dev/null 2011-01-26 09:02:28.396666668 -0500
+++ iputils-s20101006/doc/tftpd.8 2011-01-08 20:09:51.723407498 -0500
diff -Naur iputils-s20161105/olddoc/rdisc.8 iputils-s20161105/doc/rdisc.8
--- iputils-s20161105/olddoc/rdisc.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/rdisc.8 2017-06-21 15:56:04.174435911 +0200
@@ -0,0 +1,122 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "RDISC" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+rdisc \- network router discovery daemon
+.SH SYNOPSIS
+
+\fBrdisc\fR [\fB-abdfrstvV\fR] [\fB-p \fIpreference\fB\fR] [\fB-T \fImax_interval\fB\fR] [\fB\fIsend_address\fB\fR] [\fB\fIreceive_address\fB\fR]
+
+.SH "DESCRIPTION"
+.PP
+\fBrdisc\fR implements client side of the ICMP router discover protocol.
+\fBrdisc\fR is invoked at boot time to populate the network
+routing tables with default routes.
+.PP
+\fBrdisc\fR listens on the ALL_HOSTS (224.0.0.1) multicast address
+(or \fIreceive_address\fR provided it is given)
+for ROUTER_ADVERTISE messages from routers. The received
+messages are handled by first ignoring those listed router addresses
+with which the host does not share a network. Among the remaining addresses
+the ones with the highest preference are selected as default routers
+and a default route is entered in the kernel routing table
+for each one of them.
+.PP
+Optionally, \fBrdisc\fR can avoid waiting for routers to announce
+themselves by sending out a few ROUTER_SOLICITATION messages
+to the ALL_ROUTERS (224.0.0.2) multicast address
+(or \fIsend_address\fR provided it is given)
+when it is started.
+.PP
+A timer is associated with each router address and the address will
+no longer be considered for inclusion in the the routing tables if the
+timer expires before a new
+\fBadvertise\fR message is received from the router.
+The address will also be excluded from consideration if the host receives an
+\fBadvertise\fR
+message with the preference being maximally negative.
+.PP
+Server side of router discovery protocol is supported by Cisco IOS
+and by any more or less complete UNIX routing daemon, f.e \fBgated\fR.
+Or, \fBrdisc\fR can act as responder, if compiled with -DRDISC_SERVER.
+.SH "OPTIONS"
+.TP
+\fB-a\fR
+Accept all routers independently of the preference they have in their
+\fBadvertise\fR messages.
+Normally \fBrdisc\fR only accepts (and enters in the kernel routing
+tables) the router or routers with the highest preference.
+.TP
+\fB-b\fR
+Opposite to \fB-a\fR, i.e. install only router with the best
+preference value. It is default behaviour.
+.TP
+\fB-d\fR
+Send debugging messages to syslog.
+.TP
+\fB-f\fR
+Run \fBrdisc\fR forever even if no routers are found.
+Normally \fBrdisc\fR gives up if it has not received any
+\fBadvertise\fR message after after soliciting three times,
+in which case it exits with a non-zero exit code.
+If \fB-f\fR is not specified in the first form then
+\fB-s\fR must be specified.
+.TP
+\fB-r\fR
+Responder mode, available only if compiled with -DRDISC_SERVER.
+.TP
+\fB-s\fR
+Send three \fBsolicitation\fR messages initially to quickly discover
+the routers when the system is booted.
+When \fB-s\fR is specified \fBrdisc\fR
+exits with a non-zero exit code if it can not find any routers.
+This can be overridden with the \fB-f\fR option.
+.TP
+\fB-p \fIpreference\fB\fR
+Set preference in advertisement.
+Available only with -r option.
+.TP
+\fB-T \fImax_interval\fB\fR
+Set maximum advertisement interval in seconds. Default is 600 secs.
+Available only with -r option.
+.TP
+\fB-t\fR
+Test mode. Do not go to background.
+.TP
+\fB-v\fR
+Be verbose i.e. send lots of debugging messages to syslog.
+.TP
+\fB-V\fR
+Print version and exit.
+.SH "HISTORY"
+.PP
+This program was developed by Sun Microsystems (see copyright
+notice in source file). It was ported to Linux by
+Alexey Kuznetsov
+<kuznet@ms2.inr.ac.ru>.
+It is now maintained by
+YOSHIFUJI Hideaki
+<yoshfuji@skbuff.net>.
+.SH "SEE ALSO"
+.PP
+\fBicmp\fR(7),
+\fBinet\fR(7),
+\fBping\fR(8).
+.SH "REFERENCES"
+.PP
+Deering, S.E.,ed "ICMP Router Discovery Messages",
+RFC1256, Network Information Center, SRI International,
+Menlo Park, Calif., September 1991.
+.SH "SECURITY"
+.PP
+\fBrdisc\fR requires CAP_NET_RAW to listen
+and send ICMP messages and capability CAP_NET_ADMIN
+to update routing tables.
+.SH "AVAILABILITY"
+.PP
+\fBrdisc\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
diff -Naur iputils-s20161105/olddoc/tftpd.8 iputils-s20161105/doc/tftpd.8
--- iputils-s20161105/olddoc/tftpd.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/tftpd.8 2017-06-21 15:56:04.184435963 +0200
@@ -0,0 +1,85 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "TFTPD" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "TFTPD" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+tftpd \- Trivial File Transfer Protocol server
+.SH SYNOPSIS
@ -996,49 +950,111 @@ diff -Naur /dev/null iputils-s20101006/doc/tftpd.8
+\fBtftpd\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.
diff -Naur /dev/null iputils-s20101006/doc/traceroute6.8
--- /dev/null 1969-12-31 19:00:00.000000000 -0500
+++ iputils-s20101006/doc/traceroute6.8 2011-01-08 20:09:52.114781859 -0500
@@ -0,0 +1,42 @@
diff -Naur iputils-s20161105/olddoc/tracepath.8 iputils-s20161105/doc/tracepath.8
--- iputils-s20161105/olddoc/tracepath.8 1970-01-01 01:00:00.000000000 +0100
+++ iputils-s20161105/doc/tracepath.8 2017-06-21 15:56:04.192436005 +0200
@@ -0,0 +1,104 @@
+.\" This manpage has been automatically generated by docbook2man
+.\" from a DocBook document. This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "TRACEROUTE6" "8" "08 January 2011" "iputils-101006" "System Manager's Manual: iputils"
+.TH "TRACEPATH" "8" "" "iputils-161105" "System Manager's Manual: iputils"
+.SH NAME
+traceroute6 \- traces path to a network host
+tracepath, tracepath6 \- traces path to a network host discovering MTU along this path
+.SH SYNOPSIS
+
+\fBtraceroute6\fR [\fB-dnrvV\fR] [\fB-i \fIinterface\fB\fR] [\fB-m \fImax_ttl\fB\fR] [\fB-p \fIport\fB\fR] [\fB-q \fImax_probes\fB\fR] [\fB-s \fIsource\fB\fR] [\fB-w \fIwait time\fB\fR] \fB\fIdestination\fB\fR [\fB\fIsize\fB\fR]
+\fBtracepath\fR [\fB-n\fR] [\fB-b\fR] [\fB-l \fIpktlen\fB\fR] [\fB-m \fImax_hops\fB\fR] [\fB-p \fIport\fB\fR] \fB\fIdestination\fB\fR
+
+.SH "DESCRIPTION"
+.PP
+Description can be found in
+\fBtraceroute\fR(8),
+all the references to IP replaced to IPv6. It is needless to copy
+the description from there.
+It traces path to \fIdestination\fR discovering MTU along this path.
+It uses UDP port \fIport\fR or some random port.
+It is similar to \fBtraceroute\fR, only does not require superuser
+privileges and has no fancy options.
+.PP
+\fBtracepath6\fR is good replacement for \fBtraceroute6\fR
+and classic example of application of Linux error queues.
+The situation with IPv4 is worse, because commercial
+IP routers do not return enough information in ICMP error messages.
+Probably, it will change, when they will be updated.
+For now it uses Van Jacobson's trick, sweeping a range
+of UDP ports to maintain trace history.
+.SH "OPTIONS"
+.TP
+\fB-n\fR
+Print primarily IP addresses numerically.
+.TP
+\fB-b\fR
+Print both of host names and IP addresses.
+.TP
+\fB-l\fR
+Sets the initial packet length to \fIpktlen\fR instead of
+65535 for \fBtracepath\fR or 128000 for \fBtracepath6\fR.
+.TP
+\fB-m\fR
+Set maximum hops (or maximum TTLs) to \fImax_hops\fR
+instead of 30.
+.TP
+\fB-p\fR
+Sets the initial destination port to use.
+.SH "OUTPUT"
+.PP
+
+.nf
+root@mops:~ # tracepath6 3ffe:2400:0:109::2
+ 1?: [LOCALHOST] pmtu 1500
+ 1: dust.inr.ac.ru 0.411ms
+ 2: dust.inr.ac.ru asymm 1 0.390ms pmtu 1480
+ 2: 3ffe:2400:0:109::2 463.514ms reached
+ Resume: pmtu 1480 hops 2 back 2
+.fi
+.PP
+The first column shows TTL of the probe, followed by colon.
+Usually value of TTL is obtained from reply from network,
+but sometimes reply does not contain necessary information and
+we have to guess it. In this case the number is followed by ?.
+.PP
+The second column shows the network hop, which replied to the probe.
+It is either address of router or word [LOCALHOST], if
+the probe was not sent to the network.
+.PP
+The rest of line shows miscellaneous information about path to
+the correspinding network hop. As rule it contains value of RTT.
+Additionally, it can show Path MTU, when it changes.
+If the path is asymmetric
+or the probe finishes before it reach prescribed hop, difference
+between number of hops in forward and backward direction is shown
+following keyword async. This information is not reliable.
+F.e. the third line shows asymmetry of 1, it is because the first probe
+with TTL of 2 was rejected at the first hop due to Path MTU Discovery.
+.PP
+The last line summarizes information about all the path to the destination,
+it shows detected Path MTU, amount of hops to the destination and our
+guess about amount of hops from the destination to us, which can be
+different when the path is asymmetric.
+.SH "SEE ALSO"
+.PP
+\fBtraceroute\fR(8),
+\fBtracepath\fR(8),
+\fBtraceroute6\fR(8),
+\fBping\fR(8).
+.SH "HISTORY"
+.SH "AUTHOR"
+.PP
+This program has long history. Author of \fBtraceroute\fR
+is Van Jacobson and it first appeared in 1988. This clone is
+based on a port of \fBtraceroute\fR to IPv6 published
+in NRL IPv6 distribution in 1996. In turn, it was ported
+to Linux by Pedro Roque. After this it was kept in sync by
+\fBtracepath\fR was written by
+Alexey Kuznetsov
+<kuznet@ms2.inr.ac.ru>. And eventually entered
+\fBiputils\fR package.
+<kuznet@ms2.inr.ac.ru>.
+.SH "SECURITY"
+.PP
+\fBtracepath6\fR requires CAP_NET_RAWIO capability
+to be executed. It is safe to be used as set-uid root.
+No security issues.
+.PP
+This lapidary deserves to be elaborated.
+\fBtracepath\fR is not a privileged program, unlike
+\fBtraceroute\fR, \fBping\fR and other beasts of this kind.
+\fBtracepath\fR may be executed by everyone who has some access
+to network, enough to send UDP datagrams to investigated destination
+using given port.
+.SH "AVAILABILITY"
+.PP
+\fBtraceroute6\fR is part of \fIiputils\fR package
+\fBtracepath\fR is part of \fIiputils\fR package
+and the latest versions are available in source form at
+http://www.skbuff.net/iputils/iputils-current.tar.bz2.

View File

@ -1,94 +0,0 @@
diff -Naur iputils-s20121221.orig/clockdiff.c iputils-s20121221/clockdiff.c
--- iputils-s20121221.orig/clockdiff.c 2014-01-24 15:32:49.111934548 +0000
+++ iputils-s20121221/clockdiff.c 2014-01-24 15:32:14.438932610 +0000
@@ -23,6 +23,8 @@
#include <sys/capability.h>
#endif
+#include "types.h"
+
void usage(void) __attribute__((noreturn));
#define MAX_HOSTNAMELEN NI_MAXHOST
diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
--- iputils-s20121221.orig/ping.c 2014-01-24 15:32:49.111934548 +0000
+++ iputils-s20121221/ping.c 2014-01-24 15:32:14.459932611 +0000
@@ -59,6 +59,7 @@
*/
#include "ping_common.h"
+#include "types.h"
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
--- iputils-s20121221.orig/ping6.c 2014-01-24 15:32:49.112934549 +0000
+++ iputils-s20121221/ping6.c 2014-01-24 15:32:14.439932610 +0000
@@ -67,6 +67,7 @@
* This program has to run SUID to ROOT to access the ICMP socket.
*/
#include "ping_common.h"
+#include "types.h"
#include <linux/filter.h>
#include <netinet/ip6.h>
diff -Naur iputils-s20121221.orig/ping_common.c iputils-s20121221/ping_common.c
--- iputils-s20121221.orig/ping_common.c 2014-01-24 15:32:49.112934549 +0000
+++ iputils-s20121221/ping_common.c 2014-01-24 15:32:14.439932610 +0000
@@ -1,4 +1,5 @@
#include "ping_common.h"
+#include "types.h"
#include <ctype.h>
#include <sched.h>
#include <math.h>
diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
--- iputils-s20121221.orig/ping_common.h 2014-01-24 15:32:14.419932609 +0000
+++ iputils-s20121221/ping_common.h 2014-01-24 15:33:08.206935616 +0000
@@ -35,6 +35,7 @@
#include <linux/errqueue.h>
#include "SNAPSHOT.h"
+#include "types.h"
#define DEFDATALEN (64 - 8) /* default data length */
diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
--- iputils-s20121221.orig/rdisc.c 2014-01-24 15:32:49.113934549 +0000
+++ iputils-s20121221/rdisc.c 2014-01-24 15:32:14.450932610 +0000
@@ -62,6 +62,7 @@
#include <syslog.h>
#include "SNAPSHOT.h"
+#include "types.h"
struct interface
{
diff -Naur iputils-s20121221.orig/traceroute6.c iputils-s20121221/traceroute6.c
--- iputils-s20121221.orig/traceroute6.c 2014-01-24 15:32:49.113934549 +0000
+++ iputils-s20121221/traceroute6.c 2014-01-24 15:32:14.440932610 +0000
@@ -267,6 +267,7 @@
#include <string.h>
#include <unistd.h>
+#include "types.h"
#include "SNAPSHOT.h"
#ifndef SOL_IPV6
diff -Naur iputils-s20121221.orig/types.h iputils-s20121221/types.h
--- iputils-s20121221.orig/types.h 1970-01-01 00:00:00.000000000 +0000
+++ iputils-s20121221/types.h 2014-01-24 15:32:14.440932610 +0000
@@ -0,0 +1,14 @@
+/* This is a small version of <bits/types.h> from glibc
+ * to take care of type u_char.
+ *
+ * Anthony G. Basile <blueness@gentoo.org>
+ */
+#ifndef _BITS_TYPES_H
+#define _BITS_TYPES_H 1
+
+typedef unsigned char u_char;
+typedef unsigned short int u_short;
+typedef unsigned int u_int;
+typedef unsigned long int u_long;
+
+#endif /* mini <bits/types.h> */

View File

@ -1,23 +0,0 @@
diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
--- iputils-s20121221.orig/ping.c 2014-01-24 15:05:02.082841335 +0000
+++ iputils-s20121221/ping.c 2014-01-24 15:17:12.975882203 +0000
@@ -774,9 +774,16 @@
do {
static struct iovec iov = {outpack, 0};
- static struct msghdr m = { &whereto, sizeof(whereto),
- &iov, 1, &cmsg, 0, 0 };
- m.msg_controllen = cmsg_len;
+ static struct msghdr m;
+
+ m.msg_name = &whereto;
+ m.msg_namelen = sizeof(whereto);
+ m.msg_iov = &iov;
+ m.msg_iovlen = 1;
+ m.msg_control = &cmsg;
+ m.msg_controllen = sizeof(cmsg);
+ m.msg_flags = 0;
+
iov.iov_len = cc;
i = sendmsg(icmp_sock, &m, confirm);

View File

@ -1,108 +0,0 @@
diff -Naur iputils-s20121221.orig/arping.c iputils-s20121221/arping.c
--- iputils-s20121221.orig/arping.c 2012-12-21 14:01:07.000000000 +0000
+++ iputils-s20121221/arping.c 2014-01-23 21:19:57.091268011 +0000
@@ -16,7 +16,7 @@
#include <linux/sockios.h>
#include <sys/file.h>
#include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <linux/if_packet.h>
--- iputils-s20121221.orig/clockdiff.c 2012-12-21 14:01:07.000000000 +0000
+++ iputils-s20121221/clockdiff.c 2014-01-23 21:19:57.093268011 +0000
@@ -14,7 +14,6 @@
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#define TSPTYPES
-#include <protocols/timed.h>
#include <fcntl.h>
#include <netdb.h>
#include <arpa/inet.h>
diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
--- iputils-s20121221.orig/ping_common.h 2012-12-21 14:01:07.000000000 +0000
+++ iputils-s20121221/ping_common.h 2014-01-23 21:27:07.677292088 +0000
@@ -7,16 +7,17 @@
#include <linux/sockios.h>
#include <sys/file.h>
#include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <sys/uio.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <ctype.h>
#include <errno.h>
#include <string.h>
#include <netdb.h>
#include <setjmp.h>
+#include <asm-generic/param.h>
#ifdef CAPABILITIES
#include <sys/prctl.h>
--- iputils-s20121221.orig/rarpd.c 2014-01-24 13:38:46.816551953 +0000
+++ iputils-s20121221/rarpd.c 2014-01-24 13:36:51.833545524 +0000
@@ -19,16 +19,17 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/errno.h>
-#include <sys/fcntl.h>
+#include <poll.h>
+#include <errno.h>
+#include <fcntl.h>
#include <sys/socket.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <netinet/in.h>
#include <linux/if_packet.h>
#include <linux/filter.h>
+#include <sys/types.h>
int do_reload = 1;
--- iputils-s20121221.orig/tracepath.c 2014-01-24 13:38:46.865551956 +0000
+++ iputils-s20121221/tracepath.c 2014-01-23 21:19:57.109268012 +0000
@@ -23,6 +23,8 @@
#include <sys/time.h>
#include <sys/uio.h>
#include <arpa/inet.h>
+#include <sys/types.h>
+#include <limits.h>
#ifdef USE_IDN
#include <idna.h>
#include <locale.h>
--- iputils-s20121221.orig/tracepath6.c 2014-01-24 13:38:46.865551956 +0000
+++ iputils-s20121221/tracepath6.c 2014-01-23 21:20:40.316270428 +0000
@@ -25,6 +25,7 @@
#include <sys/time.h>
#include <sys/uio.h>
#include <arpa/inet.h>
+#include <limits.h>
#ifdef USE_IDN
#include <idna.h>
--- a/tracepath.c.orig 2014-11-10 16:57:16.549029140 +0100
+++ b/tracepath.c 2014-11-10 16:57:37.996240185 +0100
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/socket.h>
+#include <sys/types.h>
#include <linux/types.h>
#include <linux/errqueue.h>
#include <errno.h>
@@ -23,7 +24,6 @@
#include <sys/time.h>
#include <sys/uio.h>
#include <arpa/inet.h>
-#include <sys/types.h>
#include <limits.h>
#ifdef USE_IDN
#include <idna.h>

View File

@ -1,30 +0,0 @@
diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
--- iputils-s20121221.orig/rdisc.c 2014-01-24 14:59:29.937822762 +0000
+++ iputils-s20121221/rdisc.c 2014-01-23 21:25:58.760288234 +0000
@@ -115,26 +114,7 @@
#define MAXIFS 32
-#if !defined(__GLIBC__) || __GLIBC__ < 2
-/* For router advertisement */
-struct icmp_ra
-{
- u_char icmp_type; /* type of message, see below */
- u_char icmp_code; /* type sub code */
- u_short icmp_cksum; /* ones complement cksum of struct */
- u_char icmp_num_addrs;
- u_char icmp_wpa; /* Words per address */
- short icmp_lifetime;
-};
-
-struct icmp_ra_addr
-{
- __u32 ira_addr;
- __u32 ira_preference;
-};
-#else
#define icmp_ra icmp
-#endif
/* Router constants */
#define MAX_INITIAL_ADVERT_INTERVAL 16

View File

@ -1,41 +1,38 @@
# Template file for 'iputils'
pkgname=iputils
version=20151218
revision=3
version=20161105
revision=1
patch_args="-Np1"
wrksrc="${pkgname}-s${version}"
makedepends="libressl-devel libcap-devel"
makedepends="libcap-devel libressl-devel"
depends="libcap-progs"
short_desc="IP Configuration Utilities (and ping)"
short_desc="Useful utilities for Linux networking (including ping)"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, BSD"
homepage="http://www.skbuff.net/iputils"
distfiles="http://www.skbuff.net/iputils/${pkgname}-s${version}.tar.bz2"
checksum=549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1
homepage="https://github.com/iputils/iputils"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/s${version}.tar.gz"
checksum=f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a
alternatives="
ping:ping:/usr/bin/${pkgname}-ping
ping:ping.8:/usr/share/man/man8/${pkgname}-ping.8
ping6:ping6:/usr/bin/${pkgname}-ping6
ping6:ping6.8:/usr/share/man/man8/${pkgname}-ping6.8"
ping6:ping6:/usr/bin/${pkgname}-ping
ping6:ping6.8:/usr/share/man/man8/${pkgname}-ping.8"
do_build() {
make CC="$CC" LD="$LD" CCOPTOPT="$CFLAGS" LDFLAGS="$LDFLAGS" \
USE_GNUTLS=no USE_GCRYPT=no ${makejobs} \
arping clockdiff ping ping6 rdisc tracepath tracepath6
USE_NETTLE=no USE_GNUTLS=no USE_GCRYPT=no USE_IDN=no \
${makejobs} \
arping clockdiff ping rdisc tracepath
}
do_install() {
for f in ping ping6; do
vbin ${f} ${pkgname}-${f}
done
for f in clockdiff arping rdisc tracepath tracepath6; do
vbin ping ${pkgname}-ping
for f in clockdiff arping rdisc tracepath; do
vbin ${f}
done
for f in clockdiff arping ping rdisc tracepath; do
vman doc/${f}.8
done
mv ${DESTDIR}/usr/share/man/man8/{ping,${pkgname}-ping}.8
ln -s ${pkgname}-ping.8 ${DESTDIR}/usr/share/man/man8/${pkgname}-ping6.8
ln -s tracepath.8 ${DESTDIR}/usr/share/man/man8/tracepath6.8
}