Bump to 0.6.7 and enable all the build time options we can.

Provide an option knob for building against dbus.

New features in 0.6.7
 * added support for Wi-Fi Protected Setup (WPS)
 * added support for EAP-AKA
 * added support for using driver_test over UDP socket
 * updated management frame protection to use IEEE 802.11w/D7.0

4 files changed, 41 insertions, 10 deletions

diff --git a/net/wpa_supplicant/Makefile b/net/wpa_supplicant/Makefile
index 4449ee16d5b..71bdea646d1 100644
--- a/net/wpa_supplicant/Makefile
+++ b/net/wpa_supplicant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/12/28 12:49:25 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/22 21:19:17 roy Exp $
 #
 
-DISTNAME=	wpa_supplicant-0.6.6
+DISTNAME=	wpa_supplicant-0.6.7
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
@@ -18,8 +18,18 @@ BUILD_DIRS=	wpa_supplicant
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wpa_supplicant
+PKG_SUPPORTED_OPTIONS=	dbus
+PKG_SUGGESTED_OPTIONS=	dbus
+
+.include "../../mk/bsd.options.mk"
+
 post-extract:
-	cp ${FILESDIR}/defconfig.${OPSYS} ${WRKSRC}/wpa_supplicant/.config
+	${CP} ${FILESDIR}/defconfig ${WRKSRC}/wpa_supplicant/.config
+	${CAT} ${FILESDIR}/defconfig.${OPSYS} >> ${WRKSRC}/wpa_supplicant/.config
+.if !empty(PKG_OPTIONS:Mdbus)
+	${ECHO} xxCONFIG_CTRL_IFACE_DBUS=y >> ${WRKSRC}/wpa_supplicant/.config
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wpa_supplicant/wpa_cli \
@@ -37,6 +47,10 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/wpa_supplicant/doc/docbook/wpa_supplicant.8 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 
-.include "../../net/libpcap/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+.endif
 
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wpa_supplicant/distinfo b/net/wpa_supplicant/distinfo
index 65558d6aaf2..a8ec8c36c7c 100644
--- a/net/wpa_supplicant/distinfo
+++ b/net/wpa_supplicant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/11 21:18:41 reed Exp $
+$NetBSD: distinfo,v 1.2 2009/01/22 21:19:17 roy Exp $
 
-SHA1 (wpa_supplicant-0.6.6.tar.gz) = 28109b6ec134a846cba87b3a57145ac3ec63dc57
-RMD160 (wpa_supplicant-0.6.6.tar.gz) = 30c23fac6e553193817fbf0a48d25da28bf8eb09
-Size (wpa_supplicant-0.6.6.tar.gz) = 1024724 bytes
+SHA1 (wpa_supplicant-0.6.7.tar.gz) = 8db7f95f700c942bb8f74d0e6e3c65bccaebd8a5
+RMD160 (wpa_supplicant-0.6.7.tar.gz) = a6850d2ae9823bba3dd93979a788d505477157bc
+Size (wpa_supplicant-0.6.7.tar.gz) = 1121560 bytes
 SHA1 (patch-aa) = fe22c4096983f7ab3f9e690abb69e324c228fb6c
diff --git a/net/wpa_supplicant/files/defconfig b/net/wpa_supplicant/files/defconfig
new file mode 100644
index 00000000000..3fed36960aa
--- /dev/null
+++ b/net/wpa_supplicant/files/defconfig
@@ -0,0 +1,19 @@
+# Enable these default wpa_supplicant build options
+CONFIG_CTRL_IFACE=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_PAX=y
+CONFIG_EAP_PSK=y
+CONFIG_EAP_TLV=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_PKCS12=y
+CONFIG_PEERKEY=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_TTLS=y
+CONFIG_TLS=openssl
+CONFIG_SMARTCARD=y
diff --git a/net/wpa_supplicant/files/defconfig.NetBSD b/net/wpa_supplicant/files/defconfig.NetBSD
index cff99a53e86..7e209c7b83a 100644
--- a/net/wpa_supplicant/files/defconfig.NetBSD
+++ b/net/wpa_supplicant/files/defconfig.NetBSD
@@ -1,4 +1,2 @@
 # for NetBSD
 CONFIG_DRIVER_BSD=y
-CONFIG_DRIVER_WIRED=y
-CONFIG_CTRL_IFACE=y