summaryrefslogtreecommitdiff
path: root/package/wpa_supplicant
diff options
context:
space:
mode:
Diffstat (limited to 'package/wpa_supplicant')
-rw-r--r--package/wpa_supplicant/Makefile21
-rw-r--r--package/wpa_supplicant/files/config5
2 files changed, 21 insertions, 5 deletions
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index dc1658999..b46e31db6 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -4,19 +4,29 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= wpa_supplicant
-PKG_VERSION:= 0.7.1
+PKG_VERSION:= 0.7.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 02c475f949e5c131856915bbb87fa55d
+PKG_MD5SUM:= 0e2cb7e4c35667351d8b7ec28c783e6a
PKG_DESCR:= WPA Supplicant with support for WPA and WPA2
PKG_SECTION:= wifi
-ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
-PKG_DEPENDS:= libopenssl
+PKG_DEPENDS:= libnl
+PKG_BUILDDEP+= libnl
+ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL},y)
PKG_BUILDDEP+= openssl
endif
+ifeq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},y)
+PKG_BUILDDEP+= gnutls
+endif
PKG_SITES:= http://hostap.epitest.fi/releases/
WRKSRC= ${WRKDIST}/${PKG_NAME}
+PKG_CHOICES:= WITH_OPENSSL WITH_GNUTLS
+PKGCD_WITH_OPENSSL:= use OpenSSL for crypto
+PKGCS_WITH_OPENSSL:= libopenssl
+PKGCD_WITH_GNUTLS:= use GnuTLS for crypto
+PKGCS_WITH_GNUTLS:= libgnutls
+
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,6 +41,9 @@ MAKE_FLAGS+= CPPFLAGS='${TCPPFLAGS}' \
do-configure:
${CP} files/config ${WRKBUILD}/.config
+ifneq (${ADK_PACKAGE_WPA_SUPPLICANT_WITH_GNUTLS},)
+ ${SED} "s#openssl#gnutls#" ${WRKBUILD}/.config
+endif
do-install:
${INSTALL_DIR} ${IDIR_WPA_SUPPLICANT}/usr/sbin
diff --git a/package/wpa_supplicant/files/config b/package/wpa_supplicant/files/config
index c3f85d9c2..aa0ee6b17 100644
--- a/package/wpa_supplicant/files/config
+++ b/package/wpa_supplicant/files/config
@@ -1,8 +1,11 @@
# rather important
CONFIG_DRIVER_NL80211=y
-CONFIG_IEEE8021X_EAPOL=y
+CONFIG_DRIVER_WEXT=y
+#CONFIG_IEEE8021X_EAPOL=y
CONFIG_CTRL_IFACE=y
# default
CONFIG_EAP_PSK=y
CONFIG_EAP_MD5=y
+# tls implementation
+CONFIG_TLS=openssl