diff --git a/.gitignore b/.gitignore index 2ef56ed..f1ff417 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ net-tools-1.60.tar.bz2 /net-tools-2.0.20130425git.tar.xz /net-tools-2.0.20130607git.tar.xz /net-tools-2.0.20130910git.tar.xz +/net-tools-2.0.20131004git.tar.xz diff --git a/net-tools-inet6-lookup.patch b/net-tools-inet6-lookup.patch deleted file mode 100644 index 21b9c37..0000000 --- a/net-tools-inet6-lookup.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -up net-tools-2.0/lib/inet6.c.inet6-lookup net-tools-2.0/lib/inet6.c ---- net-tools-2.0/lib/inet6.c.inet6-lookup 2013-06-07 11:56:33.463094292 +0200 -+++ net-tools-2.0/lib/inet6.c 2013-06-07 11:57:31.732330709 +0200 -@@ -149,33 +149,9 @@ static const char *INET6_sprint(struct s - } - - --static int INET6_getsock(char *bufp, struct sockaddr *sap) --{ -- struct sockaddr_in6 *sin6; -- char *p; -- -- sin6 = (struct sockaddr_in6 *) sap; -- sin6->sin6_family = AF_INET6; -- sin6->sin6_port = 0; -- sin6->sin6_scope_id = 0; -- sin6->sin6_flowinfo = 0; -- -- if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) -- return (-1); -- p = fix_v4_address(bufp, &sin6->sin6_addr); -- if (p != bufp) -- memcpy(bufp, p, strlen(p)+1); -- return 16; /* ?;) */ --} -- - static int INET6_input(int type, char *bufp, struct sockaddr *sap) - { -- switch (type) { -- case 1: -- return (INET6_getsock(bufp, sap)); -- default: -- return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap)); -- } -+ return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap)); - } - - -diff -up net-tools-2.0/lib/inet6_gr.c.inet6-lookup net-tools-2.0/lib/inet6_gr.c ---- net-tools-2.0/lib/inet6_gr.c.inet6-lookup 2013-05-23 05:27:34.000000000 +0200 -+++ net-tools-2.0/lib/inet6_gr.c 2013-06-07 11:56:33.464094279 +0200 -@@ -108,7 +108,7 @@ int rprint_fib6(int ext, int numeric) - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); - inet6_aftype.input(1, addr6, (struct sockaddr *) &saddr6); - snprintf(addr6, sizeof(addr6), "%s/%d", -- inet6_aftype.sprint((struct sockaddr *) &saddr6, 1), -+ inet6_aftype.sprint((struct sockaddr *) &saddr6, numeric), - prefix_len); - - /* Fetch and resolve the nexthop address. */ -@@ -117,7 +117,7 @@ int rprint_fib6(int ext, int numeric) - naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7]); - inet6_aftype.input(1, naddr6, (struct sockaddr *) &snaddr6); - snprintf(naddr6, sizeof(naddr6), "%s", -- inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); -+ inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric)); - - /* Decode the flags. */ - diff --git a/net-tools.spec b/net-tools.spec index 55caf82..333739a 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -1,9 +1,9 @@ -%global checkout 20130910git +%global checkout 20131004git Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.13.%{checkout}%{?dist} +Release: 0.14.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -26,32 +26,29 @@ Patch1: net-tools-cycle.patch # Fixed incorrect address display for ipx (#46434) Patch2: net-tools-ipx.patch -# hostname lookup problems with route --inet6 (#84108) -Patch3: net-tools-inet6-lookup.patch - # various man page fixes merged into one patch -Patch4: net-tools-man.patch +Patch3: net-tools-man.patch # netstat: interface option now works as described in the man page (#61113, #115987) -Patch5: net-tools-interface.patch +Patch4: net-tools-interface.patch # filter out duplicate tcp entries (#139407) -Patch6: net-tools-duplicate-tcp.patch +Patch5: net-tools-duplicate-tcp.patch # don't report statistics for virtual devices (#143981) -Patch7: net-tools-statalias.patch +Patch6: net-tools-statalias.patch # clear static buffers in interface.c by Ulrich Drepper (#176714) -Patch8: net-tools-interface_stack.patch +Patch7: net-tools-interface_stack.patch # statistics for SCTP -Patch9: net-tools-sctp-statistics.patch +Patch8: net-tools-sctp-statistics.patch # ifconfig crash when interface name is too long (#190703) -Patch10: net-tools-ifconfig-long-iface-crasher.patch +Patch9: net-tools-ifconfig-long-iface-crasher.patch # fixed tcp timers info in netstat (#466845) -Patch11: net-tools-netstat-probe.patch +Patch10: net-tools-netstat-probe.patch # use all interfaces instead of default (#1003875) Patch20: ether-wake-interfaces.patch @@ -70,15 +67,14 @@ Most of them are obsolete. For replacement check iproute package. %setup -q -c %patch1 -p1 -b .cycle %patch2 -p1 -b .ipx -%patch3 -p1 -b .inet6-lookup -%patch4 -p1 -b .man -%patch5 -p1 -b .interface -%patch6 -p1 -b .dup-tcp -%patch7 -p1 -b .statalias -%patch8 -p1 -b .stack -%patch9 -p1 -b .sctp -%patch10 -p1 -b .long_iface -%patch11 -p1 -b .probe +%patch3 -p1 -b .man +%patch4 -p1 -b .interface +%patch5 -p1 -b .dup-tcp +%patch6 -p1 -b .statalias +%patch7 -p1 -b .stack +%patch8 -p1 -b .sctp +%patch9 -p1 -b .long_iface +%patch10 -p1 -b .probe cp %SOURCE1 ./config.h cp %SOURCE2 ./config.make @@ -166,6 +162,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Fri Oct 04 2013 Jiri Popelka - 2.0-0.14.20131004git +- latest snapshot + * Mon Sep 23 2013 Jiri Popelka - 2.0-0.13.20130910git - remove %%ifarch alpha condition from %%prep - improve sctp-statistics.patch (#982638#c10) diff --git a/sources b/sources index 95b39a8..5aceac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76422813e587dc82da0183bfb814d584 net-tools-2.0.20130910git.tar.xz +724447c8f64c1226afdd88fd5e9a4057 net-tools-2.0.20131004git.tar.xz