[Glibc-bsd-commits] r5535 - in trunk/freebsd-utils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-16 23:05:28 +0000 (Tue, 16 Sep 2014)
New Revision: 5535

Added:
   trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Temporarily remove netstat -d feature showing dropped packet counters.

struct if_data in GNU libc net/if.h doesn't have an ifi_oqdrops member
yet


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-09-16 20:44:12 UTC (rev 5534)
+++ trunk/freebsd-utils/debian/changelog	2014-09-16 23:05:28 UTC (rev 5535)
@@ -16,6 +16,8 @@
       to version >> 10.1~
     - netstat_maddrs.diff:  don't print multicast addresses;  requires
       getifmaddrs and freeifaddrs functions of FreeBSD libc
+    - netstat_oqdrops.diff:  don't print dropped packet counters;
+      requires a new struct if_data member not in GNU libc
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Tue, 16 Sep 2014 11:29:52 +0100
 

Modified: trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_maddrs.diff	2014-09-16 20:44:12 UTC (rev 5534)
+++ trunk/freebsd-utils/debian/patches/netstat_maddrs.diff	2014-09-16 23:05:28 UTC (rev 5535)
@@ -41,7 +41,19 @@
  
  	if (!pfunc) {
  		if (Wflag)
-@@ -452,8 +458,10 @@
+@@ -390,6 +396,7 @@
+ 		if (!aflag)
+ 			continue;
+ 
++#if 0
+ 		/*
+ 		 * Print family's multicast addresses.
+ 		 */
+@@ -449,11 +456,14 @@
+ 
+ 			ifma = ifma->ifma_next;
+ 		}
++#endif
  	}
  
  	freeifaddrs(ifap);

Added: trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff	2014-09-16 23:05:28 UTC (rev 5535)
@@ -0,0 +1,28 @@
+Temporarily remove netstat -d feature showing dropped packet counters.
+
+struct if_data in GNU libc net/if.h doesn't have an ifi_oqdrops member
+yet
+
+--- a/src/usr.bin/netstat/if.c
++++ b/src/usr.bin/netstat/if.c
+@@ -389,8 +389,10 @@
+ 		if (bflag)
+ 			show_stat("lu", 10, IFA_STAT(obytes), link|network);
+ 		show_stat("NRSlu", 5, IFA_STAT(collisions), link);
++#if 0
+ 		if (dflag)
+ 			show_stat("LSlu", 5, IFA_STAT(oqdrops), link);
++#endif
+ 		putchar('\n');
+ 
+ 		if (!aflag)
+@@ -508,7 +510,9 @@
+ 		st->ift_ib += IFA_STAT(ibytes);
+ 		st->ift_op += IFA_STAT(opackets);
+ 		st->ift_oe += IFA_STAT(oerrors);
++#if 0
+ 		st->ift_od += IFA_STAT(oqdrops);
++#endif
+ 		st->ift_ob += IFA_STAT(obytes);
+  		st->ift_co += IFA_STAT(collisions);
+ 	}

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-09-16 20:44:12 UTC (rev 5534)
+++ trunk/freebsd-utils/debian/patches/series	2014-09-16 23:05:28 UTC (rev 5535)
@@ -38,3 +38,4 @@
 makefiles.diff
 mk_tests.diff
 netstat_maddrs.diff
+netstat_oqdrops.diff