Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
commit 631f0893038743cebd2def39df61aceb48bd43a9
|
||||
Author: David du Colombier <0intro@gmail.com>
|
||||
Date: Sun Sep 13 23:40:43 2015 +0200
|
||||
|
||||
wpa_supplicant: fix static link with readline
|
||||
|
||||
The readline library depends on ncurses, so
|
||||
it should be set before ncurses on the linker
|
||||
command line to be able to be statically linked
|
||||
successfully.
|
||||
|
||||
Signed-off-by: David du Colombier <0intro@gmail.com>
|
||||
|
||||
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||||
index 1597412..581db02 100644
|
||||
--- a/wpa_supplicant/Makefile
|
||||
+++ b/wpa_supplicant/Makefile
|
||||
@@ -1408,7 +1408,7 @@ LIBS += $(DBUS_LIBS)
|
||||
|
||||
ifdef CONFIG_READLINE
|
||||
OBJS_c += ../src/utils/edit_readline.o
|
||||
-LIBS_c += -lncurses -lreadline
|
||||
+LIBS_c += -lreadline -lncurses
|
||||
else
|
||||
ifdef CONFIG_WPA_CLI_EDIT
|
||||
OBJS_c += ../src/utils/edit.o
|
||||
@@ -0,0 +1,32 @@
|
||||
From 6b12d93d2c7428a34bfd4b3813ba339ed57b698a Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Sun, 25 Oct 2015 15:45:50 +0200
|
||||
Subject: [PATCH] WNM: Ignore Key Data in WNM Sleep Mode Response frame if no
|
||||
PMF in use
|
||||
|
||||
WNM Sleep Mode Response frame is used to update GTK/IGTK only if PMF is
|
||||
enabled. Verify that PMF is in use before using this field on station
|
||||
side to avoid accepting unauthenticated key updates. (CVE-2015-5310)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
wpa_supplicant/wnm_sta.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
|
||||
index 954de67..7d79499 100644
|
||||
--- a/wpa_supplicant/wnm_sta.c
|
||||
+++ b/wpa_supplicant/wnm_sta.c
|
||||
@@ -187,6 +187,12 @@ static void wnm_sleep_mode_exit_success(struct wpa_supplicant *wpa_s,
|
||||
end = ptr + key_len_total;
|
||||
wpa_hexdump_key(MSG_DEBUG, "WNM: Key Data", ptr, key_len_total);
|
||||
|
||||
+ if (key_len_total && !wpa_sm_pmf_enabled(wpa_s->wpa)) {
|
||||
+ wpa_msg(wpa_s, MSG_INFO,
|
||||
+ "WNM: Ignore Key Data in WNM-Sleep Mode Response - PMF not enabled");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
while (ptr + 1 < end) {
|
||||
if (ptr + 2 + ptr[1] > end) {
|
||||
wpa_printf(MSG_DEBUG, "WNM: Invalid Key Data element "
|
||||
@@ -0,0 +1,54 @@
|
||||
From 8057821706784608b828e769ccefbced95591e50 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Sun, 1 Nov 2015 18:18:17 +0200
|
||||
Subject: [PATCH] EAP-pwd peer: Fix last fragment length validation
|
||||
|
||||
All but the last fragment had their length checked against the remaining
|
||||
room in the reassembly buffer. This allowed a suitably constructed last
|
||||
fragment frame to try to add extra data that would go beyond the buffer.
|
||||
The length validation code in wpabuf_put_data() prevents an actual
|
||||
buffer write overflow from occurring, but this results in process
|
||||
termination. (CVE-2015-5315)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/eap_peer/eap_pwd.c | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
|
||||
index 1f78544..75ceef1 100644
|
||||
--- a/src/eap_peer/eap_pwd.c
|
||||
+++ b/src/eap_peer/eap_pwd.c
|
||||
@@ -903,7 +903,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
|
||||
/*
|
||||
* buffer and ACK the fragment
|
||||
*/
|
||||
- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
|
||||
+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
|
||||
data->in_frag_pos += len;
|
||||
if (data->in_frag_pos > wpabuf_size(data->inbuf)) {
|
||||
wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack "
|
||||
@@ -916,7 +916,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
|
||||
return NULL;
|
||||
}
|
||||
wpabuf_put_data(data->inbuf, pos, len);
|
||||
-
|
||||
+ }
|
||||
+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
|
||||
resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD,
|
||||
EAP_PWD_HDR_SIZE,
|
||||
EAP_CODE_RESPONSE, eap_get_id(reqData));
|
||||
@@ -930,10 +931,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
|
||||
* we're buffering and this is the last fragment
|
||||
*/
|
||||
if (data->in_frag_pos) {
|
||||
- wpabuf_put_data(data->inbuf, pos, len);
|
||||
wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
|
||||
(int) len);
|
||||
- data->in_frag_pos += len;
|
||||
pos = wpabuf_head_u8(data->inbuf);
|
||||
len = data->in_frag_pos;
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
From bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Sun, 1 Nov 2015 18:24:16 +0200
|
||||
Subject: [PATCH] EAP-pwd server: Fix last fragment length validation
|
||||
|
||||
All but the last fragment had their length checked against the remaining
|
||||
room in the reassembly buffer. This allowed a suitably constructed last
|
||||
fragment frame to try to add extra data that would go beyond the buffer.
|
||||
The length validation code in wpabuf_put_data() prevents an actual
|
||||
buffer write overflow from occurring, but this results in process
|
||||
termination. (CVE-2015-5314)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/eap_server/eap_server_pwd.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
|
||||
index cb83ff7..9f787ab 100644
|
||||
--- a/src/eap_server/eap_server_pwd.c
|
||||
+++ b/src/eap_server/eap_server_pwd.c
|
||||
@@ -970,7 +970,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
|
||||
/*
|
||||
* the first and all intermediate fragments have the M bit set
|
||||
*/
|
||||
- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
|
||||
+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
|
||||
if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) {
|
||||
wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow "
|
||||
"attack detected! (%d+%d > %d)",
|
||||
@@ -981,6 +981,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
|
||||
}
|
||||
wpabuf_put_data(data->inbuf, pos, len);
|
||||
data->in_frag_pos += len;
|
||||
+ }
|
||||
+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
|
||||
wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment",
|
||||
(int) len);
|
||||
return;
|
||||
@@ -990,8 +992,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
|
||||
* buffering fragments so that's how we know it's the last)
|
||||
*/
|
||||
if (data->in_frag_pos) {
|
||||
- wpabuf_put_data(data->inbuf, pos, len);
|
||||
- data->in_frag_pos += len;
|
||||
pos = wpabuf_head_u8(data->inbuf);
|
||||
len = data->in_frag_pos;
|
||||
wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 95577884ca4fa76be91344ff7a8d5d1e6dc3da61 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <j@w1.fi>
|
||||
Date: Sun, 1 Nov 2015 19:35:44 +0200
|
||||
Subject: [PATCH] EAP-pwd peer: Fix error path for unexpected Confirm message
|
||||
|
||||
If the Confirm message is received from the server before the Identity
|
||||
exchange has been completed, the group has not yet been determined and
|
||||
data->grp is NULL. The error path in eap_pwd_perform_confirm_exchange()
|
||||
did not take this corner case into account and could end up
|
||||
dereferencing a NULL pointer and terminating the process if invalid
|
||||
message sequence is received. (CVE-2015-5316)
|
||||
|
||||
Signed-off-by: Jouni Malinen <j@w1.fi>
|
||||
---
|
||||
src/eap_peer/eap_pwd.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
|
||||
index 75ceef1..892b590 100644
|
||||
--- a/src/eap_peer/eap_pwd.c
|
||||
+++ b/src/eap_peer/eap_pwd.c
|
||||
@@ -774,7 +774,8 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
|
||||
wpabuf_put_data(data->outbuf, conf, SHA256_MAC_LEN);
|
||||
|
||||
fin:
|
||||
- bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
|
||||
+ if (data->grp)
|
||||
+ bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
|
||||
BN_clear_free(x);
|
||||
BN_clear_free(y);
|
||||
if (data->outbuf == NULL) {
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 6f7e0354a9035ce33742a5f869f817a6b39b2f31 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Thu, 29 Oct 2015 11:39:03 +0100
|
||||
Subject: [PATCH 1/1] wpa_supplicant/Makefile: fix libwpa_client
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Building libwpa_client requires src/utils/common.c for bin_clear_free() else
|
||||
loading the library fails with:
|
||||
|
||||
Error relocating /usr/lib/libwpa_client.so: bin_clear_free: symbol not found
|
||||
|
||||
Backported from: 736b7cb2daf877a0cb9ad42ff15a2efbbd65fa42
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
wpa_supplicant/Makefile | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||||
index 61f8f18..0c444b0 100644
|
||||
--- a/wpa_supplicant/Makefile
|
||||
+++ b/wpa_supplicant/Makefile
|
||||
@@ -1706,9 +1706,11 @@ wpa_cli: $(OBJS_c)
|
||||
|
||||
LIBCTRL += ../src/common/wpa_ctrl.o
|
||||
LIBCTRL += ../src/utils/os_$(CONFIG_OS).o
|
||||
+LIBCTRL += ../src/utils/common.c
|
||||
LIBCTRL += ../src/utils/wpa_debug.o
|
||||
LIBCTRLSO += ../src/common/wpa_ctrl.c
|
||||
LIBCTRLSO += ../src/utils/os_$(CONFIG_OS).c
|
||||
+LIBCTRLSO += ../src/utils/common.c
|
||||
LIBCTRLSO += ../src/utils/wpa_debug.c
|
||||
|
||||
libwpa_client.a: $(LIBCTRL)
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT
|
||||
bool "wpa_supplicant"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
WPA supplicant for secure wireless networks
|
||||
|
||||
http://hostap.epitest.fi/wpa_supplicant/
|
||||
|
||||
if BR2_PACKAGE_WPA_SUPPLICANT
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_NL80211
|
||||
bool "Enable nl80211 support"
|
||||
default y
|
||||
select BR2_PACKAGE_LIBNL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
|
||||
help
|
||||
Enable support for nl80211. This is the current wireless
|
||||
API for Linux, supported by all wireless drivers in vanilla
|
||||
Linux, but may not be supported by some out-of-tree Linux
|
||||
wireless drivers. wpa_supplicant will still fall back to
|
||||
using the Wireless Extensions (wext) API with these drivers.
|
||||
|
||||
If this option is disabled, then only the deprecated wext
|
||||
API will be supported, with far less features. Linux may
|
||||
supports using wext with modern drivers using a
|
||||
compatibility layer, but it must be enabled in the kernel
|
||||
configuration.
|
||||
|
||||
comment "nl80211 support needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
|
||||
bool "Enable AP mode"
|
||||
help
|
||||
With this option enabled, wpa_supplicant can act as an
|
||||
access point much like hostapd does with a limited feature set.
|
||||
This links in parts of hostapd functionality into wpa_supplicant,
|
||||
making it bigger but dispensing the need for a separate hostapd
|
||||
binary in some applications hence being smaller overall.
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_EAP
|
||||
bool "Enable EAP"
|
||||
help
|
||||
Enable support for EAP.
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT
|
||||
bool "Enable HS20"
|
||||
help
|
||||
Enable Hotspot 2.0 and IEEE 802.11u interworking functionality.
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
|
||||
bool "Enable syslog support"
|
||||
help
|
||||
Enable support for sending debug messages to syslog.
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_WPS
|
||||
bool "Enable WPS"
|
||||
help
|
||||
Enable support for Wi-Fi Protected Setup (WPS).
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_CLI
|
||||
bool "Install wpa_cli binary"
|
||||
help
|
||||
Install wpa_cli command line utility
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO
|
||||
depends on !BR2_STATIC_LIBS
|
||||
bool "Install wpa_client shared library"
|
||||
help
|
||||
Install libwpa_client.so.
|
||||
|
||||
comment "wpa_client library needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE
|
||||
bool "Install wpa_passphrase binary"
|
||||
help
|
||||
Install wpa_passphrase command line utility.
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD
|
||||
bool "Enable support for old DBus control interface"
|
||||
depends on BR2_PACKAGE_DBUS
|
||||
help
|
||||
Enable support for old DBus control interface
|
||||
(fi.epitest.hostap.WPASupplicant).
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
|
||||
bool "Enable support for new DBus control interface"
|
||||
depends on BR2_PACKAGE_DBUS
|
||||
help
|
||||
Enable support for new DBus control interface (fi.w1.wpa_supplicant1).
|
||||
|
||||
config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION
|
||||
bool "Introspection support"
|
||||
depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
|
||||
help
|
||||
Add introspection support for new DBus control interface.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,6 @@
|
||||
ctrl_interface=/var/run/wpa_supplicant
|
||||
ap_scan=1
|
||||
|
||||
network={
|
||||
key_mgmt=NONE
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316 wpa_supplicant-2.5.tar.gz
|
||||
@@ -0,0 +1,207 @@
|
||||
################################################################################
|
||||
#
|
||||
# wpa_supplicant
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WPA_SUPPLICANT_VERSION = 2.5
|
||||
WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
|
||||
WPA_SUPPLICANT_LICENSE = BSD-3c
|
||||
WPA_SUPPLICANT_LICENSE_FILES = README
|
||||
WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
|
||||
WPA_SUPPLICANT_SUBDIR = wpa_supplicant
|
||||
WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant
|
||||
WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1
|
||||
WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
|
||||
WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
# install the wpa_client library
|
||||
WPA_SUPPLICANT_INSTALL_STAGING = YES
|
||||
|
||||
WPA_SUPPLICANT_CONFIG_EDITS =
|
||||
|
||||
WPA_SUPPLICANT_CONFIG_SET =
|
||||
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE = \
|
||||
CONFIG_IEEE80211AC \
|
||||
CONFIG_IEEE80211N \
|
||||
CONFIG_IEEE80211R \
|
||||
CONFIG_INTERNAL_LIBTOMMATH \
|
||||
CONFIG_DEBUG_FILE
|
||||
|
||||
WPA_SUPPLICANT_CONFIG_DISABLE = \
|
||||
CONFIG_SMARTCARD
|
||||
|
||||
# libnl-3 needs -lm (for rint) and -lpthread if linking statically
|
||||
# And library order matters hence stick -lnl-3 first since it's appended
|
||||
# in the wpa_supplicant Makefiles as in LIBS+=-lnl-3 ... thus failing
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_NL80211),y)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
WPA_SUPPLICANT_LIBS += -lnl-3 -lm -lpthread
|
||||
endif
|
||||
WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libnl
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_LIBNL32
|
||||
else
|
||||
WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_NL80211
|
||||
endif
|
||||
|
||||
# Trailing underscore on purpose to not enable CONFIG_EAPOL_TEST
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_EAP_
|
||||
# uses dlopen()
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_TNC
|
||||
endif
|
||||
else
|
||||
WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_HS20 \
|
||||
CONFIG_INTERWORKING
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += \
|
||||
CONFIG_AP \
|
||||
CONFIG_P2P
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS
|
||||
endif
|
||||
|
||||
# Try to use openssl if it's already available
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
WPA_SUPPLICANT_DEPENDENCIES += openssl
|
||||
WPA_SUPPLICANT_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
|
||||
WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
|
||||
else
|
||||
WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD
|
||||
WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/'
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
|
||||
WPA_SUPPLICANT_MAKE_ENV = \
|
||||
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
|
||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS=
|
||||
define WPA_SUPPLICANT_INSTALL_DBUS_OLD
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service \
|
||||
$(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW
|
||||
define WPA_SUPPLICANT_INSTALL_DBUS_NEW
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \
|
||||
$(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_INTRO
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y)
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_DEBUG_SYSLOG
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
WPA_SUPPLICANT_DEPENDENCIES += readline
|
||||
WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y)
|
||||
WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO
|
||||
define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \
|
||||
$(TARGET_DIR)/usr/lib/libwpa_client.so
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \
|
||||
$(TARGET_DIR)/usr/include/wpa_ctrl.h
|
||||
endef
|
||||
define WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \
|
||||
$(STAGING_DIR)/usr/lib/libwpa_client.so
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \
|
||||
$(STAGING_DIR)/usr/include/wpa_ctrl.h
|
||||
endef
|
||||
endif
|
||||
|
||||
define WPA_SUPPLICANT_CONFIGURE_CMDS
|
||||
cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
|
||||
sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \
|
||||
$(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \
|
||||
$(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \
|
||||
$(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \
|
||||
$(WPA_SUPPLICANT_CONFIG)
|
||||
endef
|
||||
|
||||
# LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase
|
||||
define WPA_SUPPLICANT_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" BINDIR=/usr/sbin \
|
||||
LIBS="$(WPA_SUPPLICANT_LIBS)" LIBS_c="$(WPA_SUPPLICANT_LIBS)" \
|
||||
LIBS_p="$(WPA_SUPPLICANT_LIBS)" \
|
||||
$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y)
|
||||
define WPA_SUPPLICANT_INSTALL_CLI
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \
|
||||
$(TARGET_DIR)/usr/sbin/wpa_cli
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y)
|
||||
define WPA_SUPPLICANT_INSTALL_PASSPHRASE
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \
|
||||
$(TARGET_DIR)/usr/sbin/wpa_passphrase
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
define WPA_SUPPLICANT_INSTALL_DBUS
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
|
||||
$(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
|
||||
$(WPA_SUPPLICANT_INSTALL_DBUS_OLD)
|
||||
$(WPA_SUPPLICANT_INSTALL_DBUS_NEW)
|
||||
endef
|
||||
endif
|
||||
|
||||
define WPA_SUPPLICANT_INSTALL_STAGING_CMDS
|
||||
$(WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO)
|
||||
endef
|
||||
|
||||
define WPA_SUPPLICANT_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \
|
||||
$(TARGET_DIR)/usr/sbin/wpa_supplicant
|
||||
$(INSTALL) -m 644 -D package/wpa_supplicant/wpa_supplicant.conf \
|
||||
$(TARGET_DIR)/etc/wpa_supplicant.conf
|
||||
$(WPA_SUPPLICANT_INSTALL_CLI)
|
||||
$(WPA_SUPPLICANT_INSTALL_PASSPHRASE)
|
||||
$(WPA_SUPPLICANT_INSTALL_DBUS)
|
||||
$(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO)
|
||||
endef
|
||||
|
||||
define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant.service
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant@.service
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-nl80211@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service
|
||||
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user