[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#601803: patch for wireless support



Hi Timo,

Here's a backport of the wireless patch to freebsd-utils 8.1 (version used
in squeeze).  Hopefully this helps you getting it tested.

-- 
Robert Millan
Index: debian/control
===================================================================
--- debian/control	(revision 3465)
+++ debian/control	(working copy)
@@ -7,7 +7,7 @@
  libkvm-dev (>= 8.1), libbsd-dev (>= 0.2.0), libc0.1-dev (>= 2.11.2),
  flex | flex-old, kfreebsd-kernel-headers (>= 0.51), libmemstat-dev, libnetgraph-dev,
  libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev, libcam-dev (>= 8.1),
- libedit-dev, sharutils
+ libedit-dev, sharutils, libexpat1-dev
 # libkvm-dev: dmesg
 # libgeom-dev : ccdconfig
 # libipx-dev: ifconfig
@@ -17,6 +17,7 @@
 # libsbuf-dev: mdconfig
 # libcam-dev: camcontrol
 # libedit-dev: pppctl
+# libexpat1-dev: ifconfig
 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.1
Index: debian/patches/002_ifconfig.diff
===================================================================
--- debian/patches/002_ifconfig.diff	(revision 3465)
+++ debian/patches/002_ifconfig.diff	(working copy)
@@ -29,21 +29,21 @@
 +#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
--
--SRCS+=	ifcarp.c		# SIOC[GS]VH support
--SRCS+=	ifgroup.c		# ...
--SRCS+=	ifpfsync.c		# pfsync(4) 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		# ...
 +#SRCS+=	ifpfsync.c		# pfsync(4) support
  
+-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
 +#SRCS+=	ifbridge.c		# bridge support
Index: debian/rules
===================================================================
--- debian/rules	(revision 3465)
+++ debian/rules	(working copy)
@@ -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 to: