Hi,
 
> I will submit you a cleaner one soon :)
Attached is an updated patch which works with version 0.6.9-3. This
one should be ok to be sent upstream.

Regards,  

-- 
Emmanuel Bouthenot
--- wpasupplicant-0.6.9/debian/control	2009-09-06 12:16:07.000000000 +0200
+++ wpasupplicant-0.6.9.new/debian/control	2009-09-06 03:32:08.000000000 +0200
@@ -11,12 +11,13 @@
  libreadline5-dev,
  libqt4-dev,
  libdbus-1-dev,
- libnl-dev,
+ libnl-dev [!kfreebsd-i386 !kfreebsd-amd64],
  docbook,
  docbook-utils,
  pkg-config,
  libpcap-dev [kfreebsd-i386 kfreebsd-amd64],
- libbsd [kfreebsd-i386 kfreebsd-amd64]
+ libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
+ kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64]
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/
--- wpasupplicant-0.6.9/debian/patches/20_kfreebsd_support	1970-01-01 01:00:00.000000000 +0100
+++ wpasupplicant-0.6.9.new/debian/patches/20_kfreebsd_support	2009-09-06 04:05:25.000000000 +0200
@@ -0,0 +1,54 @@
+--- a/src/drivers/driver_bsd.c
++++ b/src/drivers/driver_bsd.c
+@@ -22,6 +22,22 @@
+ 
+ #include <net/if.h>
+ 
++/* systems based on GNU libc like kfreebsd-gnu */
++#ifdef __GLIBC__
++#include <netinet/ether.h>
++#endif
++
++/* on systems based on GNU libc, some functions like strlcpy
++   or strlcat are missing and provided by the libbsd */
++#ifdef __GLIBC__
++#include "bsd/string.h"
++#endif
++
++/* kfreebsd-gnu */
++#ifdef __FreeBSD_kernel__
++#include <net80211/ieee80211_freebsd.h>
++#endif
++
+ #ifdef __NetBSD__
+ #include <net/if_ether.h>
+ #define COMPAT_FREEBSD_NET80211
+--- a/src/l2_packet/l2_packet_freebsd.c
++++ b/src/l2_packet/l2_packet_freebsd.c
+@@ -14,9 +14,9 @@
+  */
+ 
+ #include "includes.h"
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #include <net/bpf.h>
+-#endif /* __APPLE__ */
++#endif /* __APPLE__ / __FreeBSD_kernel__ */
+ #include <pcap.h>
+ 
+ #include <sys/ioctl.h>
+--- a/src/utils/common.h
++++ b/src/utils/common.h
+@@ -17,10 +17,10 @@
+ 
+ #include "os.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD_kernel__)
+ #include <endian.h>
+ #include <byteswap.h>
+-#endif /* __linux__ */
++#endif /* __linux__ / __FreeBSD_kernel__ */
+ 
+ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <sys/types.h>
--- wpasupplicant-0.6.9/debian/patches/series	2009-09-06 12:16:07.000000000 +0200
+++ wpasupplicant-0.6.9.new/debian/patches/series	2009-09-06 12:25:32.000000000 +0200
@@ -5,3 +5,4 @@
 07_dbus_service_syslog.patch
 10_multi_driver.patch
 11_syslog.patch
+20_kfreebsd_support

Reply via email to