jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-03 16:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpa_supplicant: bump to 0.7.3

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2010-10-06 14:35:20 -03:00 committed by Peter Korsgaard
parent daff8f47ab
commit d73efad3fe
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/wpa_supplicant/Config.in
View File

@ -6,17 +6,10 @@ config BR2_PACKAGE_WPA_SUPPLICANT
http://hostap.epitest.fi/wpa_supplicant/ http://hostap.epitest.fi/wpa_supplicant/
config BR2_PACKAGE_WPA_SUPPLICANT_EAP config BR2_PACKAGE_WPA_SUPPLICANT_EAP
bool "Enable WPA with EAP" bool "Enable EAP"
depends on BR2_PACKAGE_WPA_SUPPLICANT depends on BR2_PACKAGE_WPA_SUPPLICANT
help help
Enable WPA with EAP (IEEE 802.1X) Enable support for EAP.
config BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL
bool "Use openssl TLS (recommended)"
depends on BR2_PACKAGE_WPA_SUPPLICANT && BR2_PACKAGE_WPA_SUPPLICANT_EAP
select BR2_PACKAGE_OPENSSL
help
Use OpenSSL's TLS implementation instead of internal libtommath.
config BR2_PACKAGE_WPA_SUPPLICANT_CLI config BR2_PACKAGE_WPA_SUPPLICANT_CLI
bool "Install wpa_cli binary" bool "Install wpa_cli binary"

34
package/wpa_supplicant/wpa_supplicant.mk
View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
WPA_SUPPLICANT_VERSION = 0.6.10 WPA_SUPPLICANT_VERSION = 0.7.3
WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
WPA_SUPPLICANT_LIBTOOL_PATCH = NO WPA_SUPPLICANT_LIBTOOL_PATCH = NO
WPA_SUPPLICANT_DEPENDENCIES = WPA_SUPPLICANT_DEPENDENCIES =
@ -16,28 +16,34 @@ WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant
ifeq ($(BR2_PACKAGE_LIBNL),y) ifeq ($(BR2_PACKAGE_LIBNL),y)
WPA_SUPPLICANT_DEPENDENCIES += libnl WPA_SUPPLICANT_DEPENDENCIES += libnl
define WPA_SUPPLICANT_LIBNL_CONFIG define WPA_SUPPLICANT_LIBNL_CONFIG
echo "CONFIG_DRIVER_NL80211=y" >>$(WPA_SUPPLICANT_CONFIG) $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
endef endef
endif endif
ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
define WPA_SUPPLICANT_CRYPTO_CONFIG define WPA_SUPPLICANT_EAP_CONFIG
$(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG) $(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG)
echo "CONFIG_TLS=none" >>$(WPA_SUPPLICANT_CONFIG)
endef endef
else endif
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL),y)
WPA_SUPPLICANT_DEPENDENCIES += openssl
define WPA_SUPPLICANT_CRYPTO_CONFIG define WPA_SUPPLICANT_CRYPTO_CONFIG
echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG)
echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG)
endef
# Try to use openssl for TLS if it's already available
# gnutls is also supported for TLS
ifeq ($(BR2_PACKAGE_OPENSSL),y)
WPA_SUPPLICANT_DEPENDENCIES += openssl
define WPA_SUPPLICANT_TLS_CONFIG
echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG) echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG)
endef endef
else else
define WPA_SUPPLICANT_CRYPTO_CONFIG define WPA_SUPPLICANT_TLS_CONFIG
echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG) echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG)
echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
endef endef
endif endif
endif
ifeq ($(BR2_PACKAGE_DBUS),y) ifeq ($(BR2_PACKAGE_DBUS),y)
WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus
@ -45,7 +51,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
define WPA_SUPPLICANT_DBUS_CONFIG define WPA_SUPPLICANT_DBUS_CONFIG
echo "CONFIG_CTRL_IFACE_DBUS=y" >>$(WPA_SUPPLICANT_CONFIG) $(SED) "s/^#CONFIG_CTRL_IFACE_DBUS/CONFIG_CTRL_IFACE_DBUS/" $(WPA_SUPPLICANT_CONFIG)
endef endef
endif endif
@ -54,8 +60,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG) echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG) echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
$(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG)
$(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG)
$(SED) "s/^CONFIG_SMARTCARD/#CONFIG_SMARTCARD/" $(WPA_SUPPLICANT_CONFIG)
$(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile $(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile
$(WPA_SUPPLICANT_CRYPTO_CONFIG) $(WPA_SUPPLICANT_CRYPTO_CONFIG)
$(WPA_SUPPLICANT_TLS_CONFIG)
$(WPA_SUPPLICANT_EAP_CONFIG)
$(WPA_SUPPLICANT_LIBNL_CONFIG) $(WPA_SUPPLICANT_LIBNL_CONFIG)
$(WPA_SUPPLICANT_DBUS_CONFIG) $(WPA_SUPPLICANT_DBUS_CONFIG)
endef endef