diff --git a/net-tools-1.60-netstat_retval.diff b/net-tools-1.60-netstat_retval.diff deleted file mode 100644 index 9a02d29..0000000 --- a/net-tools-1.60-netstat_retval.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- netstat.c 2009-12-21 15:28:40.000000000 +0530 -+++ netstat.c 2009-12-21 15:59:54.000000000 +0530 -@@ -2190,6 +2190,7 @@ int main - if (!afname[0]) { - inittab(); - parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); -+ return 0; - } else { - safe_strncpy(buf, afname, sizeof(buf)); - tmp1 = buf; -@@ -2199,9 +2200,14 @@ int main - #if HAVE_AFINET6 - inittab6(); - parsesnmp6(flag_raw, flag_tcp, flag_udp, flag_sctp); -+ return 0; - #else - printf("Address type not supported for stats\n"); - #endif -+ } else if(!strncmp(buf,"inet",4)) { -+ inittab(); -+ parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); -+ return 0; - } else { - printf("Address type not supported for stats\n"); - } diff --git a/net-tools.changes b/net-tools.changes index 47dd93a..122369b 100644 --- a/net-tools.changes +++ b/net-tools.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Jan 1 21:07:12 CET 2010 - ms@suse.de - -- fixed return value of netstat -s call (bnc #566946) - ------------------------------------------------------------------- Wed Dec 16 11:49:33 CET 2009 - ms@suse.de diff --git a/net-tools.spec b/net-tools.spec index 6f84208..ecb8916 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -77,7 +77,6 @@ Patch42: net-tools-1.60-ifindex.diff Patch43: net-tools-1.60-infiniband.diff Patch44: net-tools-1.60-netrom-fopen.diff Patch45: net-tools-1.60-doc.dif -Patch46: net-tools-1.60-netstat_retval.diff %description This package contains essential programs for network administration and @@ -141,7 +140,6 @@ cd .. %patch43 %patch44 %patch45 -%patch46 %build make config