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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-15 22:05:24 +0000 (Mon, 15 Sep 2014)
New Revision: 5528

Added:
   trunk/freebsd-utils/debian/patches/mk_tests.diff
   trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
Workarounds:
- mk_tests.diff:  disable MK_TESTS until kfreebsd-buildutils updated
  to version >> 10.1~
- netstat_maddrs.diff:  don't print multicast addresses;  requires
  getifmaddrs and freeifaddrs functions of FreeBSD libc


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-09-15 21:54:12 UTC (rev 5527)
+++ trunk/freebsd-utils/debian/changelog	2014-09-15 22:05:24 UTC (rev 5528)
@@ -12,6 +12,11 @@
     - 007_mount.diff
     - makefiles.diff
   * Add local definition to sys/mount.h of MNT_AUTOMOUNTED, not in glibc
+  * Workarounds:
+    - mk_tests.diff:  disable MK_TESTS until kfreebsd-buildutils updated
+      to version >> 10.1~
+    - netstat_maddrs.diff:  don't print multicast addresses;  requires
+      getifmaddrs and freeifaddrs functions of FreeBSD libc
 
  -- Christoph Egger <christoph at debian.org>  Sun, 31 Aug 2014 12:37:04 -0700
 

Added: trunk/freebsd-utils/debian/patches/mk_tests.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mk_tests.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/mk_tests.diff	2014-09-15 22:05:24 UTC (rev 5528)
@@ -0,0 +1,25 @@
+Don't use MK_TESTS yet:  freebsd-buildutils >> 10.1~ will add it;
+it defaults to "no" anyway.
+
+--- a/src/sbin/devd/Makefile
++++ b/src/sbin/devd/Makefile
+@@ -30,8 +30,4 @@
+ 
+ CLEANFILES= y.output
+ 
+-.if ${MK_TESTS} != "no"
+-SUBDIR+=    tests
+-.endif
+-
+ .include <bsd.prog.mk>
+--- a/src/sbin/mdconfig/Makefile
++++ b/src/sbin/mdconfig/Makefile
+@@ -8,8 +8,4 @@
+ DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
+ LDADD=	-lgeom
+ 
+-.if ${MK_TESTS} != "no"
+-SUBDIR+=    tests
+-.endif
+-
+ .include <bsd.prog.mk>

Added: trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_maddrs.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/netstat_maddrs.diff	2014-09-15 22:05:24 UTC (rev 5528)
@@ -0,0 +1,54 @@
+Temporarily disable showing multicast addresses in netstat -a
+
+The necessary getifmaddrs and freeifaddrs functions are currently only
+available in FreeBSD libc
+
+--- a/src/usr.bin/netstat/if.c
++++ b/src/usr.bin/netstat/if.c
+@@ -202,6 +202,7 @@
+ 	}
+ }
+ 
++#if 0
+ /*
+  * Find next multiaddr for a given interface name.
+  */
+@@ -220,6 +221,7 @@
+ 
+ 	return (ifma);
+ }
++#endif
+ 
+ /*
+  * Print a description of the network interfaces.
+@@ -228,15 +230,19 @@
+ intpr(int interval, void (*pfunc)(char *), int af)
+ {
+ 	struct ifaddrs *ifap, *ifa;
++#if 0
+ 	struct ifmaddrs *ifmap, *ifma;
++#endif
+ 	
+ 	if (interval)
+ 		return sidewaysintpr(interval);
+ 
+ 	if (getifaddrs(&ifap) != 0)
+ 		err(EX_OSERR, "getifaddrs");
++#if 0
+ 	if (aflag && getifmaddrs(&ifmap) != 0)
+ 		err(EX_OSERR, "getifmaddrs");
++#endif
+ 
+ 	if (!pfunc) {
+ 		if (Wflag)
+@@ -452,8 +458,10 @@
+ 	}
+ 
+ 	freeifaddrs(ifap);
++#if 0
+ 	if (aflag)
+ 		freeifmaddrs(ifmap);
++#endif
+ }
+ 
+ struct iftot {

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-09-15 21:54:12 UTC (rev 5527)
+++ trunk/freebsd-utils/debian/patches/series	2014-09-15 22:05:24 UTC (rev 5528)
@@ -36,3 +36,5 @@
 
 # Patches that are likely to be Debian-specific
 makefiles.diff
+mk_tests.diff
+netstat_maddrs.diff