[pkg-wpa-devel] r1444 - in /wpasupplicant/trunk/debian: changelog control patches/19_kfreebsd.patch patches/series

Sun Nov 22 03:29:33 UTC 2009

Author: kelmo-guest
Date: Sun Nov 22 03:29:33 2009
New Revision: 1444

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1444
Log:
Add debian/patches/19_kfreebsd.patch to fix FTBFS on kfreebsd,
contributed by Petr Salinger based on work by Emmanuel Bouthenot.
Modify build-dependencies so that libnl-dev is used on all archs
except kfreebsd and libbsd-dev on kfreebsd.

Added:
    wpasupplicant/trunk/debian/patches/19_kfreebsd.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/control
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1444&op=diff
==============================================================================

--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Nov 22 03:29:33 2009
@@ -54,8 +54,12 @@
   * Add debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch to stop
     notifying about WPS_EVENT_AP_* events via wpa_gui tray status
     bubbles - they are too frequent.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 22 Nov 2009 11:09:33 +1000
+  * Add debian/patches/19_kfreebsd.patch to fix FTBFS on kfreebsd,
+    contributed by Petr Salinger based on work by Emmanuel Bouthenot.
+    Modify build-dependencies so that libnl-dev is used on all archs
+    except kfreebsd and libbsd-dev on kfreebsd.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 22 Nov 2009 13:24:20 +1000
 
 wpasupplicant (0.6.9-3) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1444&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Sun Nov 22 03:29:33 2009
@@ -11,12 +11,12 @@
  libreadline-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.3
 Vcs-Svn: svn://svn.debian.org/pkg-wpa/wpasupplicant/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/

Added: wpasupplicant/trunk/debian/patches/19_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/19_kfreebsd.patch?rev=1444&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/19_kfreebsd.patch (added)
+++ wpasupplicant/trunk/debian/patches/19_kfreebsd.patch Sun Nov 22 03:29:33 2009
@@ -1,0 +1,110 @@
+From: Petr Salinger <Petr.Salinger at seznam.cz>
+Reference: http://bugs.debian.org/480572
+Description: fix FTBFS on kfreebsd-*
+
+---
+--- a/src/drivers/driver_bsd.c
++++ b/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 @@ wpa_driver_bsd_scan(void *priv, const u8
+ }
+ 
+ #include <net/route.h>
+-#if __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <net80211/ieee80211_freebsd.h>
+ #endif
+ #if __NetBSD__
+--- a/src/drivers/driver_wired.c
++++ b/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 @@ static int wpa_driver_wired_multi(const 
+ 	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;
+--- a/src/l2_packet/l2_packet_freebsd.c
++++ b/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>
+--- a/src/utils/common.h
++++ b/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__ */
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -832,7 +832,7 @@ fail:
+ }
+ 
+ 
+-#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 @@ static int get_netif_info(const char *ne
+ 		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;
+--- a/wpa_supplicant/ctrl_iface_unix.c
++++ b/wpa_supplicant/ctrl_iface_unix.c
+@@ -345,7 +345,7 @@ wpa_supplicant_ctrl_iface_init(struct wp
+ 	}
+ 
+ 	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 @@ wpa_supplicant_global_ctrl_iface_init(st
+ 	}
+ 
+ 	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;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1444&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Nov 22 03:29:33 2009
@@ -11,3 +11,4 @@
 16_wpa_msg_ctrl.patch
 17_wpa_msg_ctrl_wps_ap_avail.patch
 18_wpa_gui_wps_ap_avail_annoyance.patch
+19_kfreebsd.patch


