diff --git a/net-tools-sctp-statistics.patch b/net-tools-sctp-statistics.patch index d764f2a..d0ffd2d 100644 --- a/net-tools-sctp-statistics.patch +++ b/net-tools-sctp-statistics.patch @@ -1,6 +1,6 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c ---- net-tools-2.0/netstat.c.sctp 2013-06-07 12:01:24.868249557 +0200 -+++ net-tools-2.0/netstat.c 2013-06-07 12:11:20.789262337 +0200 +--- net-tools-2.0/netstat.c.sctp 2013-09-23 15:14:59.524866201 +0200 ++++ net-tools-2.0/netstat.c 2013-09-23 15:24:20.259143969 +0200 @@ -115,7 +115,7 @@ #endif @@ -10,7 +10,7 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c void inittab(void); int parsesnmp6(int, int, int); void inittab6(void); -@@ -888,161 +888,261 @@ static int igmp_info(void) +@@ -888,161 +888,271 @@ static int igmp_info(void) igmp_do_one, "igmp", "igmp6"); } @@ -206,6 +206,10 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c + inode_str = strtok(0," \t\n"); + laddrs_str=strtok(0,"\t\n"); + ++ if (!sst_str || !lport_str || !uid_str || !inode_str) { ++ fprintf(stderr, _("warning, got bogus sctp eps line.\n")); ++ return; ++ } + state = atoi(sst_str); + port = atoi(lport_str); + uid = atoi(uid_str); @@ -286,6 +290,12 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c + laddrs_str = strtok(0,"<->\t\n"); + raddrs_str = strtok(0,"<->\t\n"); + ++ if (!sst_str || !txqueue_str || !rxqueue_str || !uid_str || ++ !inode_str || !lport_str || !rport_str) { ++ fprintf(stderr, _("warning, got bogus sctp assoc line.\n")); ++ return; ++ } ++ + state = atoi(sst_str); + txqueue = atoi(txqueue_str); + rxqueue = atoi(rxqueue_str); @@ -412,7 +422,7 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c } static void addr_do_one(char *buf, size_t buf_len, size_t short_len, struct aftype *ap, -@@ -2234,7 +2334,7 @@ int main +@@ -2234,7 +2344,7 @@ int main if (!strcmp(afname, "inet")) { #if HAVE_AFINET inittab(); @@ -422,8 +432,8 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c ENOSUPP("netstat", "AF INET"); #endif diff -up net-tools-2.0/statistics.c.sctp net-tools-2.0/statistics.c ---- net-tools-2.0/statistics.c.sctp 2013-06-07 12:01:24.849249810 +0200 -+++ net-tools-2.0/statistics.c 2013-06-07 12:28:00.804733500 +0200 +--- net-tools-2.0/statistics.c.sctp 2013-09-23 15:14:59.501866518 +0200 ++++ net-tools-2.0/statistics.c 2013-09-23 15:14:59.534866063 +0200 @@ -21,7 +21,7 @@ #define UFWARN(x) #endif diff --git a/net-tools.spec b/net-tools.spec index 612b84e..55caf82 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 2.0 -Release: 0.12.%{checkout}%{?dist} +Release: 0.13.%{checkout}%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://sourceforge.net/projects/net-tools/ @@ -91,10 +91,6 @@ cp %SOURCE8 ./man/en_US %patch20 -p1 -b .interfaces -%ifarch alpha -perl -pi -e "s|-O2||" Makefile -%endif - touch ./config.h %build @@ -170,6 +166,10 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir} %attr(0644,root,root) %{_unitdir}/arp-ethers.service %changelog +* Mon Sep 23 2013 Jiri Popelka - 2.0-0.13.20130910git +- remove %%ifarch alpha condition from %%prep +- improve sctp-statistics.patch (#982638#c10) + * Tue Sep 10 2013 Jiri Popelka - 2.0-0.12.20130910git - latest snapshot