tags 601803 patch
unblock 601803 by 629521
thanks

Here's a patch to enable wireless support.

As for libjail it's not really necessary; the Makefile layout
is confusing which lead Timo to think it was.

libjail is used for "ifconfig vnet" (see manpage) feature
which has nothing to do with wireless support.

Guillem, do you think either of the header kludges I'm
adding with this patch would be suitable for libbsd?

-- 
Robert Millan
diff -Nur a/freebsd-utils-8.2/debian/control b/freebsd-utils-8.2/debian/control
--- a/freebsd-utils-8.2/debian/control  2011-05-30 22:33:26.000000000 +0200
+++ b/freebsd-utils-8.2/debian/control  2011-06-08 13:19:35.632254657 +0200
@@ -26,7 +26,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
diff -Nur a/freebsd-utils-8.2/debian/local/include/bsdxml.h 
b/freebsd-utils-8.2/debian/local/include/bsdxml.h
--- a/freebsd-utils-8.2/debian/local/include/bsdxml.h   1970-01-01 
01:00:00.000000000 +0100
+++ b/freebsd-utils-8.2/debian/local/include/bsdxml.h   2011-06-08 
13:19:35.633352283 +0200
@@ -0,0 +1 @@
+#include <expat.h>
diff -Nur a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h 
b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h
--- a/freebsd-utils-8.2/debian/local/include/sys/cdefs.h        1970-01-01 
01:00:00.000000000 +0100
+++ b/freebsd-utils-8.2/debian/local/include/sys/cdefs.h        2011-06-08 
13:19:35.635216207 +0200
@@ -0,0 +1,3 @@
+#include_next <sys/cdefs.h>
+#include <stdint.h>
+#define __DECONST(type, var)   ((type) var)
diff -Nur a/freebsd-utils-8.2/debian/patches/032_wireless.diff 
b/freebsd-utils-8.2/debian/patches/032_wireless.diff
--- a/freebsd-utils-8.2/debian/patches/032_wireless.diff        1970-01-01 
01:00:00.000000000 +0100
+++ b/freebsd-utils-8.2/debian/patches/032_wireless.diff        2011-06-08 
13:18:32.259527397 +0200
@@ -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               # ...
diff -Nur a/freebsd-utils-8.2/debian/patches/series 
b/freebsd-utils-8.2/debian/patches/series
--- a/freebsd-utils-8.2/debian/patches/series   2011-05-30 22:40:51.000000000 
+0200
+++ b/freebsd-utils-8.2/debian/patches/series   2011-06-08 13:19:08.119469653 
+0200
@@ -28,3 +28,4 @@
 029_arp.diff
 030_arp_libbsd.diff
 031_savecore.diff
+032_wireless.diff
diff -Nur a/freebsd-utils-8.2/debian/rules b/freebsd-utils-8.2/debian/rules
--- a/freebsd-utils-8.2/debian/rules    2011-05-30 22:33:26.000000000 +0200
+++ b/freebsd-utils-8.2/debian/rules    2011-06-08 13:19:35.636624766 +0200
@@ -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

Reply via email to