[Glibc-bsd-commits] r5410 - in trunk/freebsd-utils/debian: . local/include local/include/net

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-02-03 22:24:42 +0000 (Mon, 03 Feb 2014)
New Revision: 5410

Added:
   trunk/freebsd-utils/debian/local/include/net/
   trunk/freebsd-utils/debian/local/include/net/if.h
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
Consistently use the new SIOCAIFADDR ABI in ifconfig.  (Closes: #736238)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-02-03 22:05:08 UTC (rev 5409)
+++ trunk/freebsd-utils/debian/changelog	2014-02-03 22:24:42 UTC (rev 5410)
@@ -5,6 +5,7 @@
     kdump is now using headers from kfreebsd-headers-10.0-1).
   * Remove kludge that allowed auto-detected macros to be missing when
     building kdump. (Closes: #736202)
+  * Consistently use the new SIOCAIFADDR ABI in ifconfig. (Closes: #736238)
 
  -- Robert Millan <rmh at debian.org>  Tue, 21 Jan 2014 12:38:27 +0100
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2014-02-03 22:05:08 UTC (rev 5409)
+++ trunk/freebsd-utils/debian/control	2014-02-03 22:24:42 UTC (rev 5410)
@@ -9,7 +9,7 @@
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),
  freebsd-glue (>= 0.2.17~),
- kfreebsd-kernel-headers (>= 10.0~3),
+ kfreebsd-kernel-headers (>= 10.0~4),
 # for kdump
  kfreebsd-headers-10.0-1,
  libc0.1-dev (>= 2.13-26),
@@ -145,7 +145,12 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
 Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<< 7), net-tools
 Provides: net-tools
-Breaks: ifupdown (<< 0.7~alpha5+really0.6.16~), isc-dhcp-client (<< 4.2.2-2~)
+Breaks:
+ ifupdown (<< 0.7~alpha5+really0.6.16~),
+ isc-dhcp-client (<< 4.2.2-2~),
+# ifconfig requires kfreebsd >= 10 due to new SIOCAIFADDR ABI
+# (see r228768 in upstream svn)
+ kfreebsd-image-8, kfreebsd-image-9,
 Description: FreeBSD networking tools
  This package provides the FreeBSD tools needed to manage networking on
  GNU/kFreeBSD.

Added: trunk/freebsd-utils/debian/local/include/net/if.h
===================================================================
--- trunk/freebsd-utils/debian/local/include/net/if.h	                        (rev 0)
+++ trunk/freebsd-utils/debian/local/include/net/if.h	2014-02-03 22:24:42 UTC (rev 5410)
@@ -0,0 +1,11 @@
+/* Disable structs provided by <sys/kglue/net/if.h>. */
+#define ifaliasreq	gnu_ifaliasreq
+#define ifmediareq	gnu_ifmediareq
+#define ifdrv		gnu_ifdrv
+#include_next <net/if.h>
+#undef ifaliasreq
+#undef ifmediareq
+#undef ifdrv
+
+/* Include kernel header with FreeBSD version of the structs. */
+#include <sys/kglue/net/if.h>