Update wpa_supplicant and wpa_gui to 0.7.3. Fix PR/40379 (recent libpcap

ships pcap/bpf.h which does not define BIOCIMMEDIATE).

5 files changed, 31 insertions, 13 deletions

diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 1901bfe32bc..645075da0ea 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2011/01/13 13:39:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2011/09/03 10:33:12 shattered Exp $
 
-DISTNAME=	wpa_supplicant-0.6.9
+DISTNAME=	wpa_supplicant-0.7.3
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
-PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
diff --git a/net/wpa_gui/distinfo b/net/wpa_gui/distinfo
index 3b3accc2a59..b43a90d5a63 100644
--- a/net/wpa_gui/distinfo
+++ b/net/wpa_gui/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/08/22 06:33:40 dsainty Exp $
+$NetBSD: distinfo,v 1.4 2011/09/03 10:33:12 shattered Exp $
 
-SHA1 (wpa_supplicant-0.6.9.tar.gz) = 3764f7bda4e5c87caac2b9e134cb59996f073f09
-RMD160 (wpa_supplicant-0.6.9.tar.gz) = e8427935b17c354c2654250501236dcd3f239307
-Size (wpa_supplicant-0.6.9.tar.gz) = 1178238 bytes
+SHA1 (wpa_supplicant-0.7.3.tar.gz) = ca51db8931fabf386352c87422f3e62fb44c3fe3
+RMD160 (wpa_supplicant-0.7.3.tar.gz) = e22f0440d64c943e4b0886eefa3418e75ea01b60
+Size (wpa_supplicant-0.7.3.tar.gz) = 1638224 bytes
 SHA1 (patch-aa) = 82a2ae08b2d3cd2883ebcae7049825d8a9455cbd
 SHA1 (patch-ab) = 511f97805528f518822f60459f6d900f56e38eb3
diff --git a/net/wpa_supplicant/Makefile b/net/wpa_supplicant/Makefile
index 4db2e133232..307960df2ef 100644
--- a/net/wpa_supplicant/Makefile
+++ b/net/wpa_supplicant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/01/31 20:41:14 roy Exp $
+# $NetBSD: Makefile,v 1.9 2011/09/03 10:33:12 shattered Exp $
 #
 
-DISTNAME=	wpa_supplicant-0.7.1
+DISTNAME=	wpa_supplicant-0.7.3
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
diff --git a/net/wpa_supplicant/distinfo b/net/wpa_supplicant/distinfo
index f7f5a3579ab..505158378f0 100644
--- a/net/wpa_supplicant/distinfo
+++ b/net/wpa_supplicant/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2010/01/31 20:41:14 roy Exp $
+$NetBSD: distinfo,v 1.5 2011/09/03 10:33:12 shattered Exp $
 
-SHA1 (wpa_supplicant-0.7.1.tar.gz) = ea641b046a04876827b76cda246689d0de0ed94e
-RMD160 (wpa_supplicant-0.7.1.tar.gz) = 03e3adecc1754c3a6b0ecdeac13fd1a03131dd5b
-Size (wpa_supplicant-0.7.1.tar.gz) = 1604885 bytes
+SHA1 (wpa_supplicant-0.7.3.tar.gz) = ca51db8931fabf386352c87422f3e62fb44c3fe3
+RMD160 (wpa_supplicant-0.7.3.tar.gz) = e22f0440d64c943e4b0886eefa3418e75ea01b60
+Size (wpa_supplicant-0.7.3.tar.gz) = 1638224 bytes
+SHA1 (patch-aa) = d911576c67c345826888edbbbd4cf99776f896c9
diff --git a/net/wpa_supplicant/patches/patch-aa b/net/wpa_supplicant/patches/patch-aa
new file mode 100644
index 00000000000..36042a3854d
--- /dev/null
+++ b/net/wpa_supplicant/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.3 2011/09/03 10:33:12 shattered Exp $
+
+--- src/l2_packet/l2_packet_freebsd.c.orig	2010-09-07 15:43:39.000000000 +0000
++++ src/l2_packet/l2_packet_freebsd.c
+@@ -14,9 +14,12 @@
+  */
+ 
+ #include "includes.h"
+-#if defined(__APPLE__) || defined(__GLIBC__)
++#if defined(__APPLE__) || defined(__GLIBC__) || defined(__NetBSD__)
+ #include <net/bpf.h>
+ #endif /* __APPLE__ */
++#if defined(__NetBSD__)
++#define PCAP_DONT_INCLUDE_PCAP_BPF_H
++#endif
+ #include <pcap.h>
+ 
+ #include <sys/ioctl.h>