[traceroute] describe more long options

Mon Apr 15 17:10:15 UTC 2013

commit 37b5722dfeb65d526b944b66841e6ee74a8bc8b9
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Mon Apr 15 21:09:52 2013 +0400

    describe more long options

 traceroute-2.0.19-man.patch |  168 +++++++++++++++++++++++++++++++++++++++++++
 traceroute.spec             |    7 ++-
 2 files changed, 174 insertions(+), 1 deletions(-)
---

diff --git a/traceroute-2.0.19-man.patch b/traceroute-2.0.19-man.patch
new file mode 100644
index 0000000..cafb5cb
--- /dev/null
+++ b/traceroute-2.0.19-man.patch
@@ -0,0 +1,168 @@
+diff -Nrbu traceroute-2.0.19/traceroute/traceroute.8 traceroute-2.0.19-OK/traceroute/traceroute.8
+--- traceroute-2.0.19/traceroute/traceroute.8	2012-11-19 20:48:30.000000000 +0400
++++ traceroute-2.0.19-OK/traceroute/traceroute.8	2013-04-15 21:03:29.353822260 +0400
+@@ -115,16 +115,16 @@
+ .I traceroute
+ will use IPv4.
+ .TP
+-.B \-I
++.B \-I, \-\-icmp
+ Use ICMP ECHO for probes
+ .TP
+-.B \-T
++.B \-T, \-\-tcp
+ Use TCP SYN for probes
+ .TP
+-.B \-d
++.B \-d, --debug
+ Enable socket level debugging (when the Linux kernel supports it)
+ .TP
+-.B \-F
++.B \-F, --dont-fragment
+ Do not fragment probe packets. (For IPv4 it also sets DF bit, which tells
+ intermediate routers not to fragment remotely as well).
+ .br
+@@ -148,10 +148,10 @@
+ the once the discovered final mtu only (from the route cache), which can be
+ less than the actual mtu of a device.
+ .TP
+-.BI \-f " first_ttl
++.BI \-f " first_ttl" ", --first=" first_ttl
+ Specifies with what TTL to start. Defaults to 1.
+ .TP
+-.BI \-g " gateway
++.BI \-g " gateway" ", --gateway=" gateway
+ Tells traceroute to add an IP source routing option to the outgoing
+ packet that tells the network to route the packet through the
+ specified
+@@ -166,18 +166,18 @@
+ is a route header type (default is type 2). Note the type 0 route header
+ is now deprecated (rfc5095).
+ .TP
+-.BI \-i " interface
++.BI \-i " interface" ", --interface=" interface
+ Specifies the interface through which
+ .I traceroute
+ should send packets. By default, the interface is selected
+ according to the routing table.
+ .TP
+-.BI \-m " max_ttl
++.BI \-m " max_ttl" ", --max-hops=" max_ttl
+ Specifies the maximum number of hops (max time-to-live value)
+ .I traceroute
+ will probe. The default is 30.
+ .TP
+-.BI \-N " squeries
++.BI \-N " squeries" ", --sim-queries=" squeries
+ Specifies the number of probe packets sent out simultaneously.
+ Sending several probes concurrently can speed up
+ .I traceroute
+@@ -189,7 +189,7 @@
+ .BI \-n
+ Do not try to map IP addresses to host names when displaying them.
+ .TP
+-.BI \-p " port
++.BI \-p " port" ", --port=" port
+ For UDP tracing, specifies the destination port base
+ .I traceroute
+ will use (the destination port number will be incremented by each probe).
+@@ -200,20 +200,20 @@
+ For TCP and others specifies just the (constant) destination
+ port to connect.
+ .TP
+-.BI \-t " tos
++.BI \-t " tos" ", --tos=" tos
+ For IPv4, set the Type of Service (TOS) and Precedence value. Useful values
+ are 16 (low delay) and 8 (high throughput). Note that in order to use
+ some TOS precedence values, you have to be super user.
+ .br
+ For IPv6, set the Traffic Control value.
+ .TP
+-.BI \-l " flow_label
++.BI \-l " flow_label" ", --flowlabel=" flow_label
+ Use specified flow_label for IPv6 packets.
+ .TP
+-.BI \-w " waittime
++.BI \-w " waittime" ", --wait=" waittime
+ Set the time (in seconds) to wait for a response to a probe (default 5.0 sec).
+ .TP
+-.BI \-q " nqueries
++.BI \-q " nqueries" ", --queries=" nqueries
+ Sets the number of probe packets per hop. The default is 3.
+ .TP
+ .BI \-r
+@@ -222,18 +222,18 @@
+ network, an error is returned.  This option can be used to ping a
+ local host through an interface that has no route through it.
+ .TP
+-.BI \-s " source_addr
++.BI \-s " source_addr" ", --source=" source_addr
+ Chooses an alternative source address. Note that you must select the
+ address of one of the interfaces.
+ By default, the address of the outgoing interface is used.
+ .TP
+-.BI \-z " sendwait
++.BI \-z " sendwait" ", --sendwait=" sendwait
+ Minimal time interval between probes (default 0).
+ If the value is more than 10, then it specifies a number in milliseconds,
+ else it is a number of seconds (float point values allowed too).
+ Useful when some routers use rate-limit for ICMP messages.
+ .TP
+-.BI \-e
++.B \-e, \-\-extensions
+ Show ICMP extensions (rfc4884). The general form is
+ .I CLASS\fB/\fITYPE\fB:
+ followed by a hexadecimal dump.
+@@ -243,11 +243,11 @@
+ .B /
+ ).
+ .TP
+-.BI \-A
++.B \-A, \-\-as\-path\-lookups
+ Perform AS path lookups in routing registries and print results
+ directly after the corresponding addresses.
+ .TP
+-.BI \-V
++.B \-V, \-\-version
+ Print the version and exit.
+ .br
+ .P
+@@ -262,7 +262,7 @@
+ .B \--fwmark\fR=\fImark
+ Set the firewall mark for outgoing packets (since the Linux kernel 2.6.25).
+ .TP
+-.BI \-M " method
++.BI \-M " method" ", --module=" name
+ Use specified method for traceroute operations. Default traditional udp method
+ has name
+ .IR default ,
+@@ -282,7 +282,7 @@
+ .BR "" ( "-I " means " -M icmp" ,
+ etc).
+ .TP
+-.BI \-O " option
++.BI \-O " option" ", --options=" options
+ Specifies some method-specific option. Several options are separated by comma (or use several
+ .B \-O
+ on cmdline).
+@@ -290,17 +290,17 @@
+ To print information about available options, use
+ .BR \-O\ help .
+ .TP
+-.BI \-U
++.B \-U, \-\-udp
+ Use UDP to particular destination port for tracerouting (instead of increasing
+ the port per each probe). Default port is 53 (dns).
+ .TP
+ .BI \-UL
+ Use UDPLITE for tracerouting (default port is 53).
+ .TP
+-.BI \-D
++.B \-D, \-\-dccp
+ Use DCCP Requests for probes.
+ .TP
+-.BI \-P " protocol
++.BI \-P " protocol" ", --protocol=" protocol
+ Use raw packet of specified protocol for tracerouting. Default protocol is
+ 253 (rfc3692).
+ .TP
diff --git a/traceroute.spec b/traceroute.spec
index 6e5a472..221723c 100644
--- a/traceroute.spec
+++ b/traceroute.spec
@@ -2,11 +2,12 @@ Summary: Traces the route taken by packets over an IPv4/IPv6 network
 Name: traceroute
 Epoch: 3
 Version: 2.0.19
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Internet
 License: GPLv2+
 URL:  http://traceroute.sourceforge.net
 Source0: http://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
+Patch0: traceroute-2.0.19-man.patch
 
 Provides: tcptraceroute = 1.5-1
 Obsoletes: tcptraceroute < 1.5-1
@@ -26,6 +27,7 @@ problems.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -59,6 +61,9 @@ popd
 
 
 %changelog
+* Mon Apr 15 2013 Dmitry Butskoy <Dmitry at Butskoy.name>  - 3:2.0.19-3
+- describe all long options in man page (<jsynacek at redhat.com>, #950356)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3:2.0.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
