Hi,
attached please find enhanced version of a patch.
Petr
diff -u wpasupplicant-0.6.9/debian/control wpasupplicant-0.6.9/debian/control
--- wpasupplicant-0.6.9/debian/control
+++ wpasupplicant-0.6.9/debian/control
@@ -11,12 +11,12 @@
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]
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/
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/wpa_supplicant/ctrl_iface_unix.c
+++ wpasupplicant-0.6.9/wpa_supplicant/ctrl_iface_unix.c
@@ -345,7 +345,7 @@
}
os_memset(&addr, 0, sizeof(addr));
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
addr.sun_len = sizeof(addr);
#endif /* __FreeBSD__ */
addr.sun_family = AF_UNIX;
@@ -649,7 +649,7 @@
}
os_memset(&addr, 0, sizeof(addr));
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
addr.sun_len = sizeof(addr);
#endif /* __FreeBSD__ */
addr.sun_family = AF_UNIX;
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/src/utils/common.h
+++ wpasupplicant-0.6.9/src/utils/common.h
@@ -17,7 +17,7 @@
#include "os.h"
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
#include <endian.h>
#include <byteswap.h>
#endif /* __linux__ */
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/src/wps/wps_upnp.c
+++ wpasupplicant-0.6.9/src/wps/wps_upnp.c
@@ -832,7 +832,7 @@
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/sysctl.h>
#include <net/route.h>
#include <net/if_dl.h>
@@ -922,7 +922,7 @@
goto fail;
}
os_memcpy(mac, req.ifr_addr.sa_data, 6);
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (eth_get(net_if, mac) < 0) {
wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address");
goto fail;
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/src/l2_packet/l2_packet_freebsd.c
+++ wpasupplicant-0.6.9/src/l2_packet/l2_packet_freebsd.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__GLIBC__)
#include <net/bpf.h>
#endif /* __APPLE__ */
#include <pcap.h>
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/src/drivers/driver_bsd.c
+++ wpasupplicant-0.6.9/src/drivers/driver_bsd.c
@@ -29,6 +29,11 @@
#include <net/ethernet.h>
#endif
+#ifdef __GLIBC__
+#include <netinet/ether.h>
+#include <bsd/string.h>
+#endif
+
#include <net80211/ieee80211.h>
#include <net80211/ieee80211_crypto.h>
#include <net80211/ieee80211_ioctl.h>
@@ -455,7 +460,7 @@
}
#include <net/route.h>
-#if __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <net80211/ieee80211_freebsd.h>
#endif
#if __NetBSD__
only in patch2:
unchanged:
--- wpasupplicant-0.6.9.orig/src/drivers/driver_wired.c
+++ wpasupplicant-0.6.9/src/drivers/driver_wired.c
@@ -18,7 +18,7 @@
#ifdef __linux__
#include <netpacket/packet.h>
#endif /* __linux__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_dl.h>
#endif /* __FreeBSD__ */
@@ -118,7 +118,7 @@
ifr.ifr_hwaddr.sa_family = AF_UNSPEC;
os_memcpy(ifr.ifr_hwaddr.sa_data, addr, ETH_ALEN);
#endif /* __linux__ */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
{
struct sockaddr_dl *dlp;
dlp = (struct sockaddr_dl *) &ifr.ifr_addr;
