4 files changed, 15 insertions, 58 deletions
diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
deleted file mode 100644
index b0044856a..000000000
--- a/package/wpa_supplicant/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config ADK_PACKAGE_WPA_SUPPLICANT
-	prompt "wpa_supplicant.................... WPA Supplicant with support for WPA and WPA2"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	help
-	  WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN).
-	  Supplicant is the IEEE 802.1X/WPA component that is used in the client
-	  stations. It implements key negotiation with a WPA Authenticator and it
-	  controls the roaming and IEEE 802.11 authentication/association.
-
-	  http://hostap.epitest.fi/wpa_supplicant/
-
-choice
-prompt "SSL/TLS Configuration"
-depends on ADK_PACKAGE_WPA_SUPPLICANT
-default ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
-
-config ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
-	bool "enable openssl encryption support"
-	depends on ADK_PACKAGE_WPA_SUPPLICANT
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-
-config ADK_COMPILE_WPA_SUPPLICANT_WITH_INCLUDED
-	bool "enable included encryption support"
-	depends on ADK_PACKAGE_WPA_SUPPLICANT
-	help
-
-endchoice
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index d1f8fd190..a5b906c62 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -4,12 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wpa_supplicant
-PKG_VERSION:=		0.6.9
+PKG_VERSION:=		0.7.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0efb8fcedf0a8acf6f423dfdb0658fdd
+PKG_MD5SUM:=		02c475f949e5c131856915bbb87fa55d
 PKG_DESCR:=		WPA Supplicant with support for WPA and WPA2
 PKG_SECTION:=		net
+ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
 PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
@@ -18,7 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CPPFLAGS='${TCPPFLAGS}' \
 			LDFLAGS='${TLDFLAGS}' \
 			OPT_FLAGS='${TCFLAGS}' \
@@ -29,8 +34,11 @@ do-configure:
 
 do-install:
 	${INSTALL_DIR} ${IDIR_WPA_SUPPLICANT}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/wpa_cli ${IDIR_WPA_SUPPLICANT}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/wpa_passphrase ${IDIR_WPA_SUPPLICANT}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/wpa_supplicant ${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_cli \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_passphrase \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_supplicant \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wpa_supplicant/files/config b/package/wpa_supplicant/files/config
index b800b2fc5..c3f85d9c2 100644
--- a/package/wpa_supplicant/files/config
+++ b/package/wpa_supplicant/files/config
@@ -1,16 +1,8 @@
 # rather important
-#CONFIG_DRIVER_MADWIFI=y
-CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_NL80211=y
 CONFIG_IEEE8021X_EAPOL=y
 CONFIG_CTRL_IFACE=y
 
 # default
 CONFIG_EAP_PSK=y
 CONFIG_EAP_MD5=y
-
-# optional
-CONFIG_MSCHAPV2=y
-CONFIG_EAP_TLS=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_TTLS=y
-
diff --git a/package/wpa_supplicant/patches/patch-Makefile b/package/wpa_supplicant/patches/patch-Makefile
deleted file mode 100644
index 6b33a653d..000000000
--- a/package/wpa_supplicant/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
---- wpa_supplicant-0.5.8.orig/Makefile	Tue May 29 02:08:25 2007
-+++ wpa_supplicant-0.5.8/Makefile	Sun Oct 21 20:55:37 2007
-@@ -3,7 +3,8 @@ CC=gcc
- endif
- 
- ifndef CFLAGS
--CFLAGS = -MMD -O2 -Wall -g
-+OPT_FLAGS = -O2 -g
-+CFLAGS = -MMD $(OPT_FLAGS) -Wall
- endif
- 
- # Include directories for CVS version