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

[Robert Millan]

Author: rmh
Date: 2013-11-01 13:13:12 +0000 (Fri, 01 Nov 2013)
New Revision: 5120

Added:
   trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/002_ifconfig.diff
   trunk/freebsd-utils/debian/patches/series
Log:
Enable ifmac.c, iffib.c and ifpfsync.c in ifconfig. (Closes: #728374)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-11-01 13:10:44 UTC (rev 5119)
+++ trunk/freebsd-utils/debian/changelog	2013-11-01 13:13:12 UTC (rev 5120)
@@ -2,6 +2,8 @@
 
   [ Robert Millan ]
   * Simplify 031_savecore.diff by using zopen() from freebsd-glue.
+  * Enable ifmac.c, iffib.c and ifpfsync.c in ifconfig.
+    (Closes: #728374)
 
   [ Guillem Jover ]
   * Remove myself from Uploaders.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-11-01 13:10:44 UTC (rev 5119)
+++ trunk/freebsd-utils/debian/control	2013-11-01 13:13:12 UTC (rev 5120)
@@ -8,8 +8,8 @@
 Build-Depends: debhelper (>= 7), po-debconf, sharutils,
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.1.9~),
- kfreebsd-kernel-headers (>= 9.1-3~),
+ freebsd-glue (>= 0.1.15~),
+ kfreebsd-kernel-headers (>= 9.2-5~),
  libc0.1-dev (>= 2.13-26),
  libbsd-dev (>= 0.3.0), pkg-config,
 # zlib1g-dev: savecore

Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-11-01 13:10:44 UTC (rev 5119)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-11-01 13:13:12 UTC (rev 5120)
@@ -1,16 +1,7 @@
 --- a/sbin/ifconfig/Makefile
 +++ b/sbin/ifconfig/Makefile
-@@ -27,20 +27,17 @@
- .endif
+@@ -36,7 +36,7 @@
  
- SRCS+=	ifclone.c		# clone device support
--SRCS+=	ifmac.c			# MAC support
- SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
--SRCS+=	iffib.c			# non-default FIB support
- SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
- SRCS+=	ifgre.c			# GRE keys etc
- SRCS+=	ifgif.c			# GIF reversed header workaround
- 
  SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
  DPADD+=	${LIBBSDXML} ${LIBSBUF}
 -LDADD+=	-lbsdxml -lsbuf
@@ -18,10 +9,6 @@
  
  SRCS+=	ifcarp.c		# SIOC[GS]VH support
  SRCS+=	ifgroup.c		# ...
--SRCS+=	ifpfsync.c		# pfsync(4) support
- 
- SRCS+=	ifbridge.c		# bridge support
- SRCS+=	iflagg.c		# lagg support
 --- a/sbin/ifconfig/ifconfig.c
 +++ b/sbin/ifconfig/ifconfig.c
 @@ -76,6 +76,13 @@

Added: trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff	2013-11-01 13:13:12 UTC (rev 5120)
@@ -0,0 +1,26 @@
+--- a/sbin/ifconfig/iffib.c
++++ b/sbin/ifconfig/iffib.c
+@@ -43,6 +43,14 @@
+ 
+ #include "ifconfig.h"
+ 
++/* Since there's no ifr_fib field yet, we abuse another member of the
++   union which has the same size (but not the same signedness). */
++#ifdef ifr_fib
++#error "Please remove this kludge! Build-Depend on suitable libc0.1-dev instead"
++#else
++#define ifr_fib		ifr_media
++#endif
++
+ static void
+ fib_status(int s)
+ {
+@@ -58,7 +66,7 @@
+ 	if (ifr.ifr_fib == 0)
+ 		return;
+ 
+-	printf("\tfib: %u\n", ifr.ifr_fib);
++	printf("\tfib: %u\n", (unsigned) ifr.ifr_fib);
+ }
+ 
+ static void

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2013-11-01 13:10:44 UTC (rev 5119)
+++ trunk/freebsd-utils/debian/patches/series	2013-11-01 13:13:12 UTC (rev 5120)
@@ -46,3 +46,4 @@
 rpc.lockd-startup-fix.diff
 
 # Patches that are likely to be Debian-specific
+ifr_fib_kludge.diff