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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-19 16:51:25 +0000 (Thu, 19 Dec 2013)
New Revision: 5253

Added:
   trunk/freebsd-utils/debian/patches/netstat_numeric_default.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
netstat_numeric_default.diff: Honor -n flag when listing the default route (for compatibility with Linux route(8)).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-19 16:24:23 UTC (rev 5252)
+++ trunk/freebsd-utils/debian/changelog	2013-12-19 16:51:25 UTC (rev 5253)
@@ -12,6 +12,8 @@
       prevent dh_install from mistakenly installing source directories as
       if they were executable files.
   * Leave -lbsdxml untouched (latest freebsd-glue supports it).
+  * netstat_numeric_default.diff: Honor -n flag when listing the default
+    route (for compatibility with Linux route(8)).
 
  -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 20:31:39 +0100
 

Added: trunk/freebsd-utils/debian/patches/netstat_numeric_default.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_numeric_default.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/netstat_numeric_default.diff	2013-12-19 16:51:25 UTC (rev 5253)
@@ -0,0 +1,23 @@
+
+Do not hardcode "default". Instead, let netname() handle this. This makes
+"netstat -n" a print numeric address as requested.
+
+Note: it relies on /etc/networks defining "default", which FreeBSD's
+currently doesn't.
+
+--- a/src/usr.bin/netstat/route.c
++++ b/src/usr.bin/netstat/route.c
+@@ -616,12 +616,7 @@
+ 	    {
+ 		struct sockaddr_in *sockin = (struct sockaddr_in *)sa;
+ 
+-		if ((sockin->sin_addr.s_addr == INADDR_ANY) &&
+-			mask &&
+-			ntohl(((struct sockaddr_in *)mask)->sin_addr.s_addr)
+-				==0L)
+-				cp = "default" ;
+-		else if (flags & RTF_HOST)
++		if (flags & RTF_HOST)
+ 			cp = routename(sockin->sin_addr.s_addr);
+ 		else if (mask)
+ 			cp = netname(sockin->sin_addr.s_addr,

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-12-19 16:24:23 UTC (rev 5252)
+++ trunk/freebsd-utils/debian/patches/series	2013-12-19 16:51:25 UTC (rev 5253)
@@ -9,6 +9,7 @@
 pf_regex_followup.diff
 mount_cli_compat.diff
 ppp_macros.diff
+netstat_numeric_default.diff
 
 # Other patches that might or might not be mergeable
 001_dmesg.diff