diff --git a/.gitignore b/.gitignore index 0280799..3a4c9fa 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ net-tools-1.60.tar.bz2 /net-tools-2.0.20130910git.tar.xz /net-tools-2.0.20131004git.tar.xz /net-tools-2.0.20131119git.tar.xz +/net-tools-2.0.20140707git.tar.xz diff --git a/net-tools-cycle.patch b/net-tools-cycle.patch index a70408b..7b98d1c 100644 --- a/net-tools-cycle.patch +++ b/net-tools-cycle.patch @@ -1,6 +1,6 @@ diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c ---- net-tools-2.0/lib/interface.c.cycle 2013-08-30 14:30:25.000000000 +0200 -+++ net-tools-2.0/lib/interface.c 2013-09-10 12:31:03.930309225 +0200 +--- net-tools-2.0/lib/interface.c.cycle 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/lib/interface.c 2014-07-07 14:41:47.304361493 +0200 @@ -93,6 +93,7 @@ int if_list_all = 0; /* do we have reque static struct interface *int_list, *int_last; @@ -68,9 +68,9 @@ diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c int if_readlist(void) { diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.cycle 2013-08-30 14:30:25.000000000 +0200 -+++ net-tools-2.0/man/en_US/netstat.8 2013-09-10 12:31:03.930309225 +0200 -@@ -33,6 +33,7 @@ netstat \- Print network connections, ro +--- net-tools-2.0/man/en_US/netstat.8.cycle 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/netstat.8 2014-07-07 14:50:03.018957435 +0200 +@@ -34,6 +34,7 @@ netstat \- Print network connections, ro .RB [ \-\-verbose | \-v ] .RB [ \-\-continuous | \-c] .RB [ \-\-wide | \-W] @@ -78,7 +78,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat .P .B netstat .RB { \-\-route | \-r } -@@ -42,6 +43,7 @@ netstat \- Print network connections, ro +@@ -43,6 +44,7 @@ netstat \- Print network connections, ro .RB [ \-\-numeric | \-n ] .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] .RB [ \-\-continuous | \-c] @@ -86,7 +86,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat .P .B netstat .RB { \-\-interfaces | \-i } -@@ -52,12 +54,14 @@ netstat \- Print network connections, ro +@@ -53,12 +55,14 @@ netstat \- Print network connections, ro .RB [ \-\-numeric | \-n ] .RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ] .RB [ \-\-continuous | \-c] @@ -101,7 +101,7 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat .P .B netstat .RB { \-\-masquerade | \-M } -@@ -65,6 +69,7 @@ netstat \- Print network connections, ro +@@ -66,6 +70,7 @@ netstat \- Print network connections, ro .RB [ \-\-numeric | \-n ] .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ] .RB [ \-\-continuous | \-c] @@ -109,15 +109,15 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat .P .B netstat .RB { \-\-statistics | -s } -@@ -72,6 +77,7 @@ netstat \- Print network connections, ro - .RB [ \-\-udp | \-u ] +@@ -74,6 +79,7 @@ netstat \- Print network connections, ro .RB [ \-\-udplite | \-U ] + .RB [ \-\-sctp | \-S ] .RB [ \-\-raw | \-w ] +.RB [delay] .P .B netstat .RB { \-\-version | \-V } -@@ -197,6 +203,10 @@ option, show interfaces that are not up +@@ -199,6 +205,10 @@ option, show interfaces that are not up Print routing information from the FIB. (This is the default.) .SS "\-C" Print routing information from the route cache. @@ -129,8 +129,8 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat .SH OUTPUT .P diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.cycle 2013-08-30 14:30:25.000000000 +0200 -+++ net-tools-2.0/netstat.c 2013-09-10 12:32:32.460124531 +0200 +--- net-tools-2.0/netstat.c.cycle 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/netstat.c 2014-07-07 14:41:47.305361476 +0200 @@ -115,9 +115,9 @@ #endif @@ -291,8 +291,8 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c } return (i); diff -up net-tools-2.0/statistics.c.cycle net-tools-2.0/statistics.c ---- net-tools-2.0/statistics.c.cycle 2013-08-30 14:30:25.000000000 +0200 -+++ net-tools-2.0/statistics.c 2013-09-10 12:31:03.932309198 +0200 +--- net-tools-2.0/statistics.c.cycle 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/statistics.c 2014-07-07 14:41:47.306361459 +0200 @@ -502,7 +502,7 @@ void process6_fd(FILE *f) } diff --git a/net-tools-man.patch b/net-tools-man.patch index b40e1a9..1a33a1e 100644 --- a/net-tools-man.patch +++ b/net-tools-man.patch @@ -1,6 +1,6 @@ diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8 ---- net-tools-2.0/man/en_US/arp.8.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/arp.8 2013-04-25 10:52:01.704114832 +0200 +--- net-tools-2.0/man/en_US/arp.8.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/arp.8 2014-07-07 14:51:31.378459439 +0200 @@ -63,6 +63,10 @@ arp \- manipulate the system ARP cache .B \-f .RI [ filename ] @@ -21,8 +21,8 @@ diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8 .SH AUTHORS Fred N. van Kempen , Bernd Eckenfels . diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5 ---- net-tools-2.0/man/en_US/ethers.5.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/ethers.5 2013-04-25 10:52:01.704114832 +0200 +--- net-tools-2.0/man/en_US/ethers.5.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/ethers.5 2014-07-07 14:51:31.378459439 +0200 @@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate .SH FILES \"{{{ /etc/ethers @@ -31,8 +31,8 @@ diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5 -rarp(8) -.\"}}} diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8 ---- net-tools-2.0/man/en_US/ifconfig.8.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/ifconfig.8 2013-04-25 10:52:01.704114832 +0200 +--- net-tools-2.0/man/en_US/ifconfig.8.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/ifconfig.8 2014-07-07 14:51:31.379459422 +0200 @@ -5,6 +5,13 @@ ifconfig \- configure a network interfac .B "ifconfig [-v] [-a] [-s] [interface]" .br @@ -58,8 +58,8 @@ diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples .SH AUTHORS diff -up net-tools-2.0/man/en_US/mii-tool.8.man net-tools-2.0/man/en_US/mii-tool.8 ---- net-tools-2.0/man/en_US/mii-tool.8.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/mii-tool.8 2013-04-25 10:52:52.198414912 +0200 +--- net-tools-2.0/man/en_US/mii-tool.8.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/mii-tool.8 2014-07-07 14:51:31.379459422 +0200 @@ -18,6 +18,10 @@ mii\-tool \- view, manipulate media-inde [\fB\-p\fR, \fB\-\-phy=\fIaddr\fR] .RI "interface\ ..." @@ -82,8 +82,8 @@ diff -up net-tools-2.0/man/en_US/mii-tool.8.man net-tools-2.0/man/en_US/mii-tool David Hinds \- dhinds@pcmcia.sourceforge.org .br diff -up net-tools-2.0/man/en_US/nameif.8.man net-tools-2.0/man/en_US/nameif.8 ---- net-tools-2.0/man/en_US/nameif.8.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/nameif.8 2013-04-25 10:52:01.705114818 +0200 +--- net-tools-2.0/man/en_US/nameif.8.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/nameif.8 2014-07-07 14:51:31.379459422 +0200 @@ -5,6 +5,12 @@ nameif \- name network interfaces based .B "nameif [\-c configfile] [\-s]" .br @@ -109,9 +109,9 @@ diff -up net-tools-2.0/man/en_US/nameif.8.man net-tools-2.0/man/en_US/nameif.8 .SH BUGS Only works for Ethernet currently. diff -up net-tools-2.0/man/en_US/netstat.8.man net-tools-2.0/man/en_US/netstat.8 ---- net-tools-2.0/man/en_US/netstat.8.man 2013-04-25 10:52:01.693114984 +0200 -+++ net-tools-2.0/man/en_US/netstat.8 2013-04-25 10:52:01.705114818 +0200 -@@ -196,7 +196,8 @@ Show the PID and name of the program to +--- net-tools-2.0/man/en_US/netstat.8.man 2014-07-07 14:51:31.370459575 +0200 ++++ net-tools-2.0/man/en_US/netstat.8 2014-07-07 14:51:31.380459405 +0200 +@@ -198,7 +198,8 @@ Show the PID and name of the program to .SS "\-l, \-\-listening" Show only listening sockets. (These are omitted by default.) .SS "\-a, \-\-all" @@ -122,9 +122,9 @@ diff -up net-tools-2.0/man/en_US/netstat.8.man net-tools-2.0/man/en_US/netstat.8 option, show interfaces that are not up .SS "\-F" diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8 ---- net-tools-2.0/man/en_US/route.8.man 2013-02-19 10:28:11.000000000 +0100 -+++ net-tools-2.0/man/en_US/route.8 2013-04-25 10:52:01.706114804 +0200 -@@ -52,6 +52,11 @@ If] +--- net-tools-2.0/man/en_US/route.8.man 2014-04-26 02:45:16.000000000 +0200 ++++ net-tools-2.0/man/en_US/route.8 2014-07-07 14:52:58.766977905 +0200 +@@ -57,6 +57,11 @@ family .RB [ \-\-version ] .RB [ \-h ] .RB [ \-\-help ] @@ -136,12 +136,14 @@ diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8 .SH DESCRIPTION .B Route manipulates the kernel's IP routing tables. Its primary use is to set -@@ -314,7 +319,7 @@ Whether or not the hardware address for +@@ -330,10 +335,6 @@ Whether or not the hardware address for .I /proc/net/rt_cache .LP - .SH SEE ALSO --.I ifconfig(8), netstat(8), arp(8), rarp(8) -+.BR ip(8) + .SH "SEE ALSO" +-.IR ifconfig (8), +-.IR netstat (8), +-.IR arp (8), +-.IR rarp (8), + .IR ip (8) .LP .SH HISTORY - .B Route diff --git a/net-tools.spec b/net-tools.spec index 46a84ed..f26f09c 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%global checkout 20131119git +%global checkout 20140707git Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.24.%{checkout}%{?dist} +Release: 0.25.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -166,6 +166,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Mon Jul 07 2014 Jiri Popelka - 2.0-0.25.20140707git +- latest upstream snapshot + * Tue Jun 10 2014 Jiri Popelka - 2.0-0.24.20131119git - __global_ldflags -> RPM_LD_FLAGS, optflags -> RPM_OPT_FLAGS diff --git a/sources b/sources index d749c0f..7d9ace3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acad71c8039aca7db548396475a3f681 net-tools-2.0.20131119git.tar.xz +e63b4ba3b2f79d95819568578475c709 net-tools-2.0.20140707git.tar.xz