From 310a0b77892a0b3395807e9f7914ca33352f4469 Mon Sep 17 00:00:00 2001 From: piernov Date: Sun, 20 May 2012 01:01:41 +0000 Subject: wpa_supplicant 1.0-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wpa_supplicant/.md5sum.i686 | 6 +- wpa_supplicant/.md5sum.x86_64 | 6 +- wpa_supplicant/Pkgfile | 12 +- wpa_supplicant/bss-changed-prop-notify.patch | 61 --- wpa_supplicant/config | 473 +++++++++++++++++++-- wpa_supplicant/dbus-null-error.patch | 47 -- wpa_supplicant/dbus-service-file-args.patch | 20 - .../hostap_allow-linking-with-libnl-3.2.patch | 53 +-- 8 files changed, 470 insertions(+), 208 deletions(-) delete mode 100644 wpa_supplicant/bss-changed-prop-notify.patch delete mode 100644 wpa_supplicant/dbus-null-error.patch delete mode 100644 wpa_supplicant/dbus-service-file-args.patch (limited to 'wpa_supplicant') diff --git a/wpa_supplicant/.md5sum.i686 b/wpa_supplicant/.md5sum.i686 index 84582aadb..5457aee4b 100644 --- a/wpa_supplicant/.md5sum.i686 +++ b/wpa_supplicant/.md5sum.i686 @@ -1,7 +1,7 @@ 51f2a016daddf7f2a70f39b4194a05c5 WEP232.patch 6973ebe2c2c7b44c938737971c7bd641 bss-changed-prop-notify.patch -2a936c34f5f9c7e5264e3299699acb4f config +380d8d1fe24bccb2a2636cb2a6038c39 config 398a05a0c957073500a571bac154cb05 dbus-null-error.patch 0518c80f93dd601e923a3fed72d14b99 dbus-service-file-args.patch -d0b1e55e44ea45f1661be563d02ab493 hostap_allow-linking-with-libnl-3.2.patch -f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz +473fb6b77909ec5a50b6f4d91370e86b hostap_allow-linking-with-libnl-3.2.patch +8650f6aa23646ef634402552d0669640 wpa_supplicant-1.0.tar.gz diff --git a/wpa_supplicant/.md5sum.x86_64 b/wpa_supplicant/.md5sum.x86_64 index 84582aadb..5457aee4b 100644 --- a/wpa_supplicant/.md5sum.x86_64 +++ b/wpa_supplicant/.md5sum.x86_64 @@ -1,7 +1,7 @@ 51f2a016daddf7f2a70f39b4194a05c5 WEP232.patch 6973ebe2c2c7b44c938737971c7bd641 bss-changed-prop-notify.patch -2a936c34f5f9c7e5264e3299699acb4f config +380d8d1fe24bccb2a2636cb2a6038c39 config 398a05a0c957073500a571bac154cb05 dbus-null-error.patch 0518c80f93dd601e923a3fed72d14b99 dbus-service-file-args.patch -d0b1e55e44ea45f1661be563d02ab493 hostap_allow-linking-with-libnl-3.2.patch -f516f191384a9a546e3f5145c08addda wpa_supplicant-0.7.3.tar.gz +473fb6b77909ec5a50b6f4d91370e86b hostap_allow-linking-with-libnl-3.2.patch +8650f6aa23646ef634402552d0669640 wpa_supplicant-1.0.tar.gz diff --git a/wpa_supplicant/Pkgfile b/wpa_supplicant/Pkgfile index 8f969bb36..b92159b21 100644 --- a/wpa_supplicant/Pkgfile +++ b/wpa_supplicant/Pkgfile @@ -6,21 +6,15 @@ # Run on: libnl,dbus,openssl name=wpa_supplicant -version=0.7.3 -release=2 -source=(http://hostap.epitest.fi/releases/$name-$version.tar.gz \ +version=1.0 +release=1 +source=(http://w1.fi/releases/$name-$version.tar.gz config - dbus-service-file-args.patch - dbus-null-error.patch WEP232.patch - bss-changed-prop-notify.patch hostap_allow-linking-with-libnl-3.2.patch) build() { cd $name-$version - patch -p1 < $SRC/bss-changed-prop-notify.patch - patch -p1 < $SRC/dbus-service-file-args.patch - patch -p1 < $SRC/dbus-null-error.patch patch -p1 < $SRC/WEP232.patch patch -p1 < $SRC/hostap_allow-linking-with-libnl-3.2.patch diff --git a/wpa_supplicant/bss-changed-prop-notify.patch b/wpa_supplicant/bss-changed-prop-notify.patch deleted file mode 100644 index 4c5002003..000000000 --- a/wpa_supplicant/bss-changed-prop-notify.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Fri, 17 Dec 2010 15:56:01 +0200 -Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes - -The supplicant was not emitting property changed events when the BSSs -property changed. - -Signed-off-by: Dan Williams -(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) ---- - wpa_supplicant/dbus/dbus_new.c | 6 ++++++ - wpa_supplicant/dbus/dbus_new.h | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c -index bdfbbac..c66640a 100644 ---- a/wpa_supplicant/dbus/dbus_new.c -+++ b/wpa_supplicant/dbus/dbus_new.c -@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, - wpas_dbus_getter_current_network; - prop = "CurrentNetwork"; - break; -+ case WPAS_DBUS_PROP_BSSS: -+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; -+ prop = "BSSs"; -+ break; - default: - wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", - __func__, property); -@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - } -@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - -diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h -index 80ea98c..9cdefcb 100644 ---- a/wpa_supplicant/dbus/dbus_new.h -+++ b/wpa_supplicant/dbus/dbus_new.h -@@ -30,6 +30,7 @@ enum wpas_dbus_prop { - WPAS_DBUS_PROP_STATE, - WPAS_DBUS_PROP_CURRENT_BSS, - WPAS_DBUS_PROP_CURRENT_NETWORK, -+ WPAS_DBUS_PROP_BSSS, - }; - - enum wpas_dbus_bss_prop { --- -1.7.4-rc1 - diff --git a/wpa_supplicant/config b/wpa_supplicant/config index 80bf6cb4b..59da1e27e 100644 --- a/wpa_supplicant/config +++ b/wpa_supplicant/config @@ -1,43 +1,468 @@ -CONFIG_DRIVER_HOSTAP=y -CONFIG_DRIVER_PRISM54=y +# Example wpa_supplicant build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cases, these lines should use += in order not +# to override previous values of the variables. + + +# Uncomment following two lines and fix the paths if you have installed OpenSSL +# or GnuTLS in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Some Red Hat versions seem to include kerberos header files from OpenSSL, but +# the kerberos files are not in the default include path. Following line can be +# used to fix build issues on such systems (krb5.h not found). +#CFLAGS += -I/usr/include/kerberos + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + + +# Driver interface for Host AP driver +#CONFIG_DRIVER_HOSTAP=y + +# Driver interface for Agere driver #CONFIG_DRIVER_HERMES=y -CONFIG_DRIVER_ATMEL=y -CONFIG_DRIVER_WEXT=y -CONFIG_DRIVER_NDISWRAPPER=y +# Change include directories to match with the local setup +#CFLAGS += -I../../hcf -I../../include -I../../include/hcf +#CFLAGS += -I../../include/wireless + +# Driver interface for madwifi driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_MADWIFI=y +# Set include directory to the madwifi source tree +#CFLAGS += -I../../madwifi + +# Driver interface for ndiswrapper +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_NDISWRAPPER=y + +# Driver interface for Atmel driver +#CONFIG_DRIVER_ATMEL=y + +# Driver interface for old Broadcom driver +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports +# Linux wireless extensions and does not need (or even work) with the old +# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. #CONFIG_DRIVER_BROADCOM=y -CONFIG_DRIVER_IPW=y -CONFIG_DRIVER_RALINK=y -CONFIG_DRIVER_WIRED=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include + +# Driver interface for Intel ipw2100/2200 driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_IPW=y + +# Driver interface for Ralink driver +#CONFIG_DRIVER_RALINK=y + +# Driver interface for generic Linux wireless extensions +# Note: WEXT is deprecated in the current Linux kernel version and no new +# functionality is added to it. nl80211-based interface is the new +# replacement for WEXT and its use allows wpa_supplicant to properly control +# the driver to improve existing functionality like roaming and to support new +# functionality. +CONFIG_DRIVER_WEXT=y + +# Driver interface for Linux drivers using the nl80211 kernel interface CONFIG_DRIVER_NL80211=y -CONFIG_WIRELESS_EXTENSION=y +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc +# By default, driver_ndis uses WinPcap for low-level operations. This can be +# replaced with the following option which replaces WinPcap calls with NDISUIO. +# However, this requires that WZC is disabled (net stop wzcsvc) before starting +# wpa_supplicant. +# CONFIG_USE_NDISUIO=y + +# Driver interface for development testing +#CONFIG_DRIVER_TEST=y + +# Driver interface for wired Ethernet drivers +CONFIG_DRIVER_WIRED=y + +# Driver interface for the Broadcom RoboSwitch family +#CONFIG_DRIVER_ROBOSWITCH=y + +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is +# included) CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 CONFIG_EAP_MD5=y -CONFIG_MSCHAPV2=y + +# EAP-MSCHAPv2 +CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS CONFIG_EAP_TLS=y + +# EAL-PEAP CONFIG_EAP_PEAP=y -CONFIG_EAP_FAST=y + +# EAP-TTLS CONFIG_EAP_TTLS=y + +# EAP-FAST +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# EAP-GTC CONFIG_EAP_GTC=y + +# EAP-OTP CONFIG_EAP_OTP=y -CONFIG_EAP_SIM=y -CONFIG_EAP_AKA=y -CONFIG_EAP_PSK=y -CONFIG_EAP_PAX=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-pwd (secure authentication using only a password) +#CONFIG_EAP_PWD=y + +# EAP-PAX +#CONFIG_EAP_PAX=y + +# LEAP CONFIG_EAP_LEAP=y -CONFIG_EAP_SAKE=y -CONFIG_EAP_GPSK=y -CONFIG_EAP_GPSK_SHA256=y -CONFIG_EAP_TNC=y -CONFIG_EAP_IKEV2=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +#CONFIG_EAP_AKA=y + +# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# Enable USIM simulator (Milenage) for EAP-AKA +#CONFIG_USIM_SIMULATOR=y + +# EAP-SAKE +#CONFIG_EAP_SAKE=y + +# EAP-GPSK +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-TNC and related Trusted Network Connect support (experimental) +#CONFIG_EAP_TNC=y + +# Wi-Fi Protected Setup (WPS) CONFIG_WPS=y -CONFIG_SMARTCARD=y -CONFIG_BACKEND=file +# Enable WSC 2.0 support +#CONFIG_WPS2=y +# Enable WPS external registrar functionality +#CONFIG_WPS_ER=y +# Disable credentials for an open network by default when acting as a WPS +# registrar. +#CONFIG_WPS_REG_DISABLE_OPEN=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y -CONFIG_EAPOL_TEST=y +# Smartcard support (i.e., private key on a smartcard), e.g., with openssl +# engine. +CONFIG_SMARTCARD=y + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Select control interface backend for external programs, e.g, wpa_cli: +# unix = UNIX domain sockets (default for Linux/*BSD) +# udp = UDP sockets using localhost (127.0.0.1) +# named_pipe = Windows Named Pipe (default for Windows) +# y = use default (backwards compatibility) +# If this option is commented out, control interface is not included in the +# build. CONFIG_CTRL_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +CONFIG_READLINE=y + +# Include internal line edit mode in wpa_cli. This can be used as a replacement +# for GNU Readline to provide limited command line editing and history support. +#CONFIG_WPA_CLI_EDIT=y + +# Remove debugging code that is printing out debug message to stdout. +# This can be used to reduce the size of the wpa_supplicant considerably +# if debugging code is not needed. The size reduction can be around 35% +# (e.g., 90 kB). +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save +# 35-50 kB in code size. +#CONFIG_NO_WPA=y + +# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to +# save about 1 kB in code size when building only WPA-Personal (no EAP support) +# or 6 kB if building for WPA-Enterprise. +#CONFIG_NO_WPA2=y + +# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support +# This option can be used to reduce code size by removing support for +# converting ASCII passphrases into PSK. If this functionality is removed, the +# PSK can only be configured as the 64-octet hexstring (e.g., from +# wpa_passphrase). This saves about 0.5 kB in code size. +#CONFIG_NO_WPA_PASSPHRASE=y + +# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# This can be used if ap_scan=1 mode is never enabled. +#CONFIG_NO_SCAN_PROCESSING=y + +# Select configuration backend: +# file = text file (e.g., wpa_supplicant.conf; note: the configuration file +# path is given on command line, not here; this option is just used to +# select the backend that allows configuration files to be used) +# winreg = Windows registry (see win_example.reg for an example) +CONFIG_BACKEND=file + +# Remove configuration write functionality (i.e., to allow the configuration +# file to be updated based on runtime configuration changes). The runtime +# configuration can still be changed, the changes are just not going to be +# persistent over restarts. This option can be used to reduce code size by +# about 3.5 kB. +#CONFIG_NO_CONFIG_WRITE=y + +# Remove support for configuration blobs to reduce code size by about 1.5 kB. +#CONFIG_NO_CONFIG_BLOBS=y + +# Select program entry point implementation: +# main = UNIX/POSIX like main() function (default) +# main_winsvc = Windows service (read parameters from registry) +# main_none = Very basic example (development use only) +#CONFIG_MAIN=main + +# Select wrapper for operatins system and C library specific functions +# unix = UNIX/POSIX like systems (default) +# win32 = Windows systems +# none = Empty template +#CONFIG_OS=unix + +# Select event loop implementation +# eloop = select() loop (default) +# eloop_win = Windows events and WaitForMultipleObject() loop +# eloop_none = Empty template +#CONFIG_ELOOP=eloop + +# Select layer 2 packet implementation +# linux = Linux packet socket (default) +# pcap = libpcap/libdnet/WinPcap +# freebsd = FreeBSD libpcap +# winpcap = WinPcap with receive thread +# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) +# none = Empty template +#CONFIG_L2_PACKET=linux + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. It should be noted that some existing TLS v1.0 -based +# implementation may not be compatible with TLS v1.1 message (ClientHello is +# sent prior to negotiating which version will be used) +#CONFIG_TLSV11=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. +# This is only for Windows builds and requires WMI-related header files and +# WbemUuid.Lib from Platform SDK even when building with MinGW. +#CONFIG_NDIS_EVENTS_INTEGRATED=y +#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" + +# Add support for old DBus control interface +# (fi.epitest.hostap.WPASupplicant) CONFIG_CTRL_IFACE_DBUS=y + +# Add support for new DBus control interface +# (fi.w1.hostap.wpa_supplicant1) CONFIG_CTRL_IFACE_DBUS_NEW=y -CONFIG_BGSCAN_SIMPLE=y + +# Add introspection support for new DBus control interface +CONFIG_CTRL_IFACE_DBUS_INTRO=y + +# Add support for loading EAP methods dynamically as shared libraries. +# When this option is enabled, each EAP method can be either included +# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). +# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to +# be loaded in the beginning of the wpa_supplicant configuration file +# (see load_dynamic_eap parameter in the example file) before being used in +# the network blocks. +# +# Note that some shared parts of EAP methods are included in the main program +# and in order to be able to use dynamic EAP methods using these parts, the +# main program must have been build with the EAP method enabled (=y or =dyn). +# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries +# unless at least one of them was included in the main build to force inclusion +# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included +# in the main build to be able to load these methods dynamically. +# +# Please also note that using dynamic libraries will increase the total binary +# size. Thus, it may not be the best option for targets that have limited +# amount of memory/flash. +#CONFIG_DYNAMIC_EAP_METHODS=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) +#CONFIG_IEEE80211R=y + +# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) +CONFIG_DEBUG_FILE=y + +# Send debug messages to syslog instead of stdout +#CONFIG_DEBUG_SYSLOG=y +# Set syslog facility for debug messages +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + +# Enable privilege separation (see README 'Privilege separation' for details) +#CONFIG_PRIVSEP=y + +# Enable mitigation against certain attacks against TKIP by delaying Michael +# MIC error reports by a random amount of time between 0 and 60 seconds +#CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, uncomment these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, uncomment these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +# wpa_supplicant depends on strong random number generation being available +# from the operating system. os_get_random() function is used to fetch random +# data when needed, e.g., for key generation. On Linux and BSD systems, this +# works by reading /dev/urandom. It should be noted that the OS entropy pool +# needs to be properly initialized before wpa_supplicant is started. This is +# important especially on embedded devices that do not have a hardware random +# number generator and may by default start up with minimal entropy available +# for random number generation. +# +# As a safety net, wpa_supplicant is by default trying to internally collect +# additional entropy for generating random data to mix in with the data fetched +# from the OS. This by itself is not considered to be very strong, but it may +# help in cases where the system pool is not initialized properly. However, it +# is very strongly recommended that the system pool is initialized with enough +# entropy either by using hardware assisted random number generator or by +# storing state over device reboots. +# +# wpa_supplicant can be configured to maintain its own entropy store over +# restarts to enhance random number generation. This is not perfect, but it is +# much more secure than using the same sequence of random numbers after every +# reboot. This can be enabled with -e command line option. The +# specified file needs to be readable and writable by wpa_supplicant. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal wpa_supplicant random pool can be +# disabled. This will save some in binary size and CPU use. However, this +# should only be considered for builds that are known to be used on devices +# that meet the requirements described above. +CONFIG_NO_RANDOM_POOL=y + +# IEEE 802.11n (High Throughput) support (mainly for AP mode) +#CONFIG_IEEE80211N=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks (GAS/ANQP to learn more about the networks and network +# selection based on available credentials). +#CONFIG_INTERWORKING=y + CONFIG_LIBNL32=y diff --git a/wpa_supplicant/dbus-null-error.patch b/wpa_supplicant/dbus-null-error.patch deleted file mode 100644 index 5ca070d3d..000000000 --- a/wpa_supplicant/dbus-null-error.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 8ee69e06336d65b15364f4db82d91775d0fe47c6 -Author: Paul Stewart -Date: Sat Oct 9 17:29:51 2010 +0300 - - dbus_new_handlers: Don't send NULL to dbus_message_new_error - - The new DBus API helper function wpas_dbus_error_unknown_error - function can be called as a result of a failure within internal - getter calls, which will call this function with a NULL message - parameter. However, dbus_message_new_error looks very unkindly - (i.e, abort()) on a NULL message, so in this case, we should not - call it. - - I've observed this course of events during a call to - wpas_dbus_getter_bss_wpa with a faileld parse of the IE parameter. - We got here through a call to fill_dict_with_properties which - explicitly calls getters with a NULL message parameter. Judging - from the way it is called, this could easily occur if an AP sends - out a malformed (or mis-received) probe response. I usually run - into this problem while driving through San Francisco, so I'm - exposed to any number of base stations along this path. - -Index: wpa_supplicant/dbus/dbus_new_handlers.c -=================================================================== ---- a/wpa_supplicant/dbus/dbus_new_handlers.c -+++ b/wpa_supplicant/dbus/dbus_new_handlers.c 2011-06-19 22:42:06.912577474 -0300 -@@ -117,6 +117,20 @@ - DBusMessage * wpas_dbus_error_unknown_error(DBusMessage *message, - const char *arg) - { -+ /* -+ * This function can be called as a result of a failure -+ * within internal getter calls, which will call this function -+ * with a NULL message parameter. However, dbus_message_new_error -+ * looks very unkindly (i.e, abort()) on a NULL message, so -+ * in this case, we should not call it. -+ */ -+ if (message == NULL) { -+ wpa_printf(MSG_INFO, "dbus: wpas_dbus_error_unknown_error " -+ "called with NULL message (arg=%s)", -+ arg ? arg : "N/A"); -+ return NULL; -+ } -+ - return dbus_message_new_error(message, WPAS_DBUS_ERROR_UNKNOWN_ERROR, - arg); - } diff --git a/wpa_supplicant/dbus-service-file-args.patch b/wpa_supplicant/dbus-service-file-args.patch deleted file mode 100644 index e18b9abcf..000000000 --- a/wpa_supplicant/dbus-service-file-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service -=================================================================== ---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service -+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-06-21 08:27:46.286668386 -0300 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=/sbin/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u -P /var/run/wpa_supplicant.pid - User=root -Index: wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service -=================================================================== ---- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service -+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-06-21 08:27:58.906008351 -0300 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=/sbin/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -c /etc/wpa_supplicant.conf -u -P /var/run/wpa_supplicant.pid - User=root diff --git a/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch index 9111f6c42..5d8903906 100644 --- a/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch +++ b/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -1,41 +1,12 @@ -Subject: [RFC] hostap: Allow linking with libnl-3. -Date: Tue, 15 Nov 2011 14:30:04 -0000 -From: Ben Greear - -I needed this patch to compile against the latest -libnl code. I added this to my config file: - -CONFIG_LIBNL32=y - -Signed-hostap: Ben Greear -rediffed against 0.7.3 by Stefan Lippers-Hollmann - ---- -:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak - src/drivers/drivers.mak | 21 ++++++++++++++------- - 2 files changed, 29 insertions(+), 14 deletions(-) - ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -31,11 +31,18 @@ NEED_SME=y - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+ifdef CONFIG_LIBNL32 -+ DRV_LIBS += -lnl-3 -+ DRV_LIBS += -lnl-genl-3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -I/usr/include/libnl3/ -+else -+ DRV_LIBS += -lnl - --ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl --DRV_CFLAGS += -DCONFIG_LIBNL20 -+ ifdef CONFIG_LIBNL20 -+ DRV_LIBS += -lnl-genl -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ endif - endif - endif +diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak +--- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 ++++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 +@@ -48,7 +48,7 @@ NEED_RFKILL=y + ifdef CONFIG_LIBNL32 + DRV_LIBS += -lnl-3 + DRV_LIBS += -lnl-genl-3 +- DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` + else + ifdef CONFIG_LIBNL_TINY + DRV_LIBS += -lnl-tiny -- cgit v1.2.3-54-g00ecf