[Glibc-bsd-commits] r3442 - in trunk/freebsd-utils/debian: . local/include local/include/sys patches

[Robert Millan]

Author: rmh
Date: 2011-06-14 13:51:08 +0000 (Tue, 14 Jun 2011)
New Revision: 3442

Added:
   trunk/freebsd-utils/debian/local/include/bsdxml.h
   trunk/freebsd-utils/debian/local/include/sys/cdefs.h
   trunk/freebsd-utils/debian/patches/032_wireless.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
Enable ieee80211 (wireless) in ifconfig. Closes: #601803

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-06-14 11:18:16 UTC (rev 3441)
+++ trunk/freebsd-utils/debian/changelog	2011-06-14 13:51:08 UTC (rev 3442)
@@ -3,8 +3,11 @@
   [ Petr Salinger ]
   * Require newer eglibc, drop <net/if.h> workaround
 
- -- Guillem Jover <guillem at debian.org>  Tue, 07 Jun 2011 20:56:10 +0200
+  [ Robert Millan ]
+  * Enable ieee80211 (wireless) in ifconfig. Closes: #601803
 
+ -- Robert Millan <rmh at debian.org>  Tue, 14 Jun 2011 15:49:44 +0200
+
 freebsd-utils (8.2-2) unstable; urgency=low
 
   * Add missing zlib1g-dev to Build-Depends, needed by savecore.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2011-06-14 11:18:16 UTC (rev 3441)
+++ trunk/freebsd-utils/debian/control	2011-06-14 13:51:08 UTC (rev 3442)
@@ -28,7 +28,9 @@
 # libcam-dev: camcontrol
  libcam-dev (>= 8.2),
 # libedit-dev: pppctl
- libedit-dev
+ libedit-dev,
+# libexpat1-dev: ifconfig
+ libexpat1-dev,
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/
 Standards-Version: 3.9.2

Added: trunk/freebsd-utils/debian/local/include/bsdxml.h
===================================================================
--- trunk/freebsd-utils/debian/local/include/bsdxml.h	                        (rev 0)
+++ trunk/freebsd-utils/debian/local/include/bsdxml.h	2011-06-14 13:51:08 UTC (rev 3442)
@@ -0,0 +1 @@
+#include <expat.h>

Added: trunk/freebsd-utils/debian/local/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-utils/debian/local/include/sys/cdefs.h	                        (rev 0)
+++ trunk/freebsd-utils/debian/local/include/sys/cdefs.h	2011-06-14 13:51:08 UTC (rev 3442)
@@ -0,0 +1,3 @@
+#include_next <sys/cdefs.h>
+#include <stdint.h>
+#define __DECONST(type, var)	((type) var)

Added: trunk/freebsd-utils/debian/patches/032_wireless.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/032_wireless.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/032_wireless.diff	2011-06-14 13:51:08 UTC (rev 3442)
@@ -0,0 +1,14 @@
+--- a/sbin/ifconfig/Makefile
++++ b/sbin/ifconfig/Makefile
+@@ -27,9 +27,10 @@
+ #SRCS+=	ifgre.c			# GRE keys etc
+ SRCS+=	ifgif.c			# GIF reversed header workaround
+ 
+-#SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
++SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
+ #DPADD+=	${LIBBSDXML} ${LIBSBUF} ${LIBJAIL}
+ #LDADD+=	-lbsdxml -ljail -lsbuf
++LDADD+=	-lexpat -lsbuf
+ 
+ #SRCS+=	ifcarp.c		# SIOC[GS]VH support
+ #SRCS+=	ifgroup.c		# ...

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2011-06-14 11:18:16 UTC (rev 3441)
+++ trunk/freebsd-utils/debian/patches/series	2011-06-14 13:51:08 UTC (rev 3442)
@@ -28,3 +28,4 @@
 029_arp.diff
 030_arp_libbsd.diff
 031_savecore.diff
+032_wireless.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-06-14 11:18:16 UTC (rev 3441)
+++ trunk/freebsd-utils/debian/rules	2011-06-14 13:51:08 UTC (rev 3442)
@@ -5,8 +5,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
-CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)='
+CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CXXFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0