diff --git a/net-tools-1.60-ifconfig_man.patch b/net-tools-1.60-ifconfig_man.patch index f3509da..dc1b1b1 100644 --- a/net-tools-1.60-ifconfig_man.patch +++ b/net-tools-1.60-ifconfig_man.patch @@ -1,13 +1,14 @@ ---- net-tools-1.60/man/en_US/ifconfig.8.addr_man 2006-03-30 12:32:56.000000000 +0200 -+++ net-tools-1.60/man/en_US/ifconfig.8 2006-03-30 12:38:43.000000000 +0200 -@@ -39,6 +39,11 @@ +diff -up net-tools-1.60/man/en_US/ifconfig.8.inet_addr net-tools-1.60/man/en_US/ifconfig.8 +--- net-tools-1.60/man/en_US/ifconfig.8.inet_addr 2010-12-16 12:18:33.000000000 +0100 ++++ net-tools-1.60/man/en_US/ifconfig.8 2010-12-16 12:20:09.000000000 +0100 +@@ -39,6 +39,11 @@ supported address families include (Novell IPX) and .B netrom (AMPR Packet radio). +All numbers supplied as parts in IPv4 dotted decimal notation may be decimal, +octal, or hexadecimal, as specified in the ISO C standard (that is, a leading 0x +or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise, -+the number is interpreted as decimal). Use of hexamedial and octal numbers ++the number is interpreted as decimal). Use of hexadecimal and octal numbers +is not RFC-compliant and therefore its use is discouraged and may go away. .SH OPTIONS .TP diff --git a/net-tools-1.60-man-obsolete.patch b/net-tools-1.60-man-obsolete.patch index 5d4bc02..c3799f0 100644 --- a/net-tools-1.60-man-obsolete.patch +++ b/net-tools-1.60-man-obsolete.patch @@ -1,6 +1,6 @@ diff -up net-tools-1.60/man/en_US/arp.8.man-obsolete net-tools-1.60/man/en_US/arp.8 ---- net-tools-1.60/man/en_US/arp.8.man-obsolete 2009-09-01 11:28:22.000000000 +0200 -+++ net-tools-1.60/man/en_US/arp.8 2009-09-01 11:28:22.000000000 +0200 +--- net-tools-1.60/man/en_US/arp.8.man-obsolete 2010-12-16 12:40:19.000000000 +0100 ++++ net-tools-1.60/man/en_US/arp.8 2010-12-16 12:43:31.000000000 +0100 @@ -1,6 +1,8 @@ .TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual" + @@ -52,14 +52,14 @@ diff -up net-tools-1.60/man/en_US/arp.8.man-obsolete net-tools-1.60/man/en_US/ar + .SH SEE ALSO -rarp(8), route(8), ifconfig(8), netstat(8) -+ip(8) ++.BR ip(8) + .SH AUTHORS Fred N. van Kempen, with a lot of improvements from net-tools Maintainer Bernd Eckenfels . diff -up net-tools-1.60/man/en_US/ethers.5.man-obsolete net-tools-1.60/man/en_US/ethers.5 --- net-tools-1.60/man/en_US/ethers.5.man-obsolete 1999-01-09 16:55:31.000000000 +0100 -+++ net-tools-1.60/man/en_US/ethers.5 2009-09-01 11:28:22.000000000 +0200 ++++ net-tools-1.60/man/en_US/ethers.5 2010-12-16 12:40:19.000000000 +0100 @@ -1,7 +1,9 @@ .TH ETHERS 5 "April 26th, 1996" "" "File formats" + @@ -86,8 +86,8 @@ diff -up net-tools-1.60/man/en_US/ethers.5.man-obsolete net-tools-1.60/man/en_US -rarp(8) -.\"}}} diff -up net-tools-1.60/man/en_US/ifconfig.8.man-obsolete net-tools-1.60/man/en_US/ifconfig.8 ---- net-tools-1.60/man/en_US/ifconfig.8.man-obsolete 2009-09-01 11:28:22.000000000 +0200 -+++ net-tools-1.60/man/en_US/ifconfig.8 2009-09-01 11:28:22.000000000 +0200 +--- net-tools-1.60/man/en_US/ifconfig.8.man-obsolete 2010-12-16 12:40:19.000000000 +0100 ++++ net-tools-1.60/man/en_US/ifconfig.8 2010-12-16 12:41:23.000000000 +0100 @@ -1,10 +1,19 @@ .TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual" + @@ -110,13 +110,13 @@ diff -up net-tools-1.60/man/en_US/ifconfig.8.man-obsolete net-tools-1.60/man/en_ is used to configure the kernel-resident network interfaces. It is @@ -44,6 +53,7 @@ octal, or hexadecimal, as specified in t or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise, - the number is interpreted as decimal). Use of hexamedial and octal numbers + the number is interpreted as decimal). Use of hexadecimal and octal numbers is not RFC-compliant and therefore its use is discouraged and may go away. + .SH OPTIONS .TP .B interface -@@ -172,6 +182,7 @@ Set the length of the transmit queue of +@@ -172,29 +182,41 @@ Set the length of the transmit queue of to small values for slower devices with a high latency (modem links, ISDN) to prevent fast bulk transfers from disturbing interactive traffic like telnet too much. @@ -124,7 +124,13 @@ diff -up net-tools-1.60/man/en_US/ifconfig.8.man-obsolete net-tools-1.60/man/en_ .SH NOTES Since kernel release 2.2 there are no explicit interface statistics for alias interfaces anymore. The statistics printed for the original address -@@ -184,17 +195,27 @@ command. + are shared with all alias addresses on the same device. If you want per-address + statistics you should add explicit accounting + rules for the address using the +-.BR ipchains(8) ++.BR iptables(8) + command. + .LP Interrupt problems with Ethernet device drivers fail with EAGAIN. See .I http://www.scyld.com/expert/irq-conflict.html for more information. @@ -148,14 +154,15 @@ diff -up net-tools-1.60/man/en_US/ifconfig.8.man-obsolete net-tools-1.60/man/en_ + .SH SEE ALSO -route(8), netstat(8), arp(8), rarp(8), ipchains(8) -+ip(8) ++.BR ip(8), ++.BR iptables(8) + .SH AUTHORS Fred N. van Kempen, .br diff -up net-tools-1.60/man/en_US/nameif.8.man-obsolete net-tools-1.60/man/en_US/nameif.8 --- net-tools-1.60/man/en_US/nameif.8.man-obsolete 2000-10-18 19:26:29.000000000 +0200 -+++ net-tools-1.60/man/en_US/nameif.8 2009-09-01 12:15:24.000000000 +0200 ++++ net-tools-1.60/man/en_US/nameif.8 2010-12-16 12:43:10.000000000 +0100 @@ -1,10 +1,18 @@ .TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual" + @@ -175,19 +182,20 @@ diff -up net-tools-1.60/man/en_US/nameif.8.man-obsolete net-tools-1.60/man/en_US .SH DESCRIPTION .B nameif renames network interfaces based on mac addresses. When no arguments are -@@ -31,5 +39,9 @@ should be run before the interface is up +@@ -31,5 +39,10 @@ should be run before the interface is up .SH FILES /etc/mactab + +.SH SEE ALSO -+ip(8), udev(7) ++.BR ip(8), ++.BR udev(7) + .SH BUGS Only works for Ethernet currently. diff -up net-tools-1.60/man/en_US/netstat.8.man-obsolete net-tools-1.60/man/en_US/netstat.8 ---- net-tools-1.60/man/en_US/netstat.8.man-obsolete 2009-09-01 11:28:22.000000000 +0200 -+++ net-tools-1.60/man/en_US/netstat.8 2009-09-01 11:28:22.000000000 +0200 +--- net-tools-1.60/man/en_US/netstat.8.man-obsolete 2010-12-16 12:40:19.000000000 +0100 ++++ net-tools-1.60/man/en_US/netstat.8 2010-12-16 12:42:07.000000000 +0100 @@ -92,6 +92,14 @@ netstat \- Print network connections, ro .RB [ \-\-netrom ] .RB [ \-\-ddp ] @@ -203,7 +211,7 @@ diff -up net-tools-1.60/man/en_US/netstat.8.man-obsolete net-tools-1.60/man/en_U .SH DESCRIPTION .B Netstat prints information about the Linux networking subsystem. The type of -@@ -438,13 +446,11 @@ status information via the following fil +@@ -439,13 +447,13 @@ status information via the following fil -- statistics .fi .P @@ -214,7 +222,9 @@ diff -up net-tools-1.60/man/en_US/netstat.8.man-obsolete net-tools-1.60/man/en_U -.BR ipchains (8), -.BR iptables (8), -.BR proc (5) -+.BR ss (8), ip(8) ++.BR ss(8), ++.BR ip(8), ++.BR iptables(8) .P + .SH BUGS @@ -222,7 +232,7 @@ diff -up net-tools-1.60/man/en_US/netstat.8.man-obsolete net-tools-1.60/man/en_U as it is viewed. This is unlikely to occur. diff -up net-tools-1.60/man/en_US/route.8.man-obsolete net-tools-1.60/man/en_US/route.8 --- net-tools-1.60/man/en_US/route.8.man-obsolete 2000-05-21 20:59:03.000000000 +0200 -+++ net-tools-1.60/man/en_US/route.8 2009-09-01 11:28:22.000000000 +0200 ++++ net-tools-1.60/man/en_US/route.8 2010-12-16 12:44:10.000000000 +0100 @@ -1,6 +1,8 @@ .TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual" + @@ -259,7 +269,7 @@ diff -up net-tools-1.60/man/en_US/route.8.man-obsolete net-tools-1.60/man/en_US/ + .SH SEE ALSO -.I ifconfig(8), netstat(8), arp(8), rarp(8) -+.I ip(8) ++.BR ip(8) .LP + .SH HISTORY diff --git a/net-tools.spec b/net-tools.spec index cad2dbf..2eb17a8 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,7 +1,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 109%{?dist} +Release: 110%{?dist} License: GPL+ Group: System Environment/Base URL: http://net-tools.berlios.de/ @@ -329,11 +329,14 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ethers %changelog +* Thu Dec 16 2010 Jiri Popelka - 1.60-110 +- fixed ifconfig(8) man page (#663469) + * Wed Nov 17 2010 Jiri Popelka - 1.60-109 -- improve netstat(8) man page (#614931) +- improved netstat(8) man page (#614931) * Mon Nov 01 2010 Jiri Popelka - 1.60-108 -- Added netstat(8) support for RcvbufErrors, SndbufErrors (BerliOS #17645) +- added netstat(8) support for RcvbufErrors, SndbufErrors (BerliOS #17645) * Wed Sep 29 2010 jkeating - 1.60-107 - Rebuilt for gcc bug 634757