Use built-in copy if TLS library for wpa_supplicant

openssl is not yet installed at this stage.

Also remove D-BUS support (installed at stage 4).

diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 5e476c7..3313249 100644 (file)
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -11,29 +11,19 @@ CONFIG_DEBUG_FILE=y
 CONFIG_DEBUG_SYSLOG=y
 CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
 CONFIG_DRIVER_NL80211=y
-CONFIG_DRIVER_WEXT=y
-CONFIG_DRIVER_WIRED=y
-CONFIG_EAP_GTC=y
-CONFIG_EAP_LEAP=y
-CONFIG_EAP_MD5=y
-CONFIG_EAP_MSCHAPV2=y
-CONFIG_EAP_OTP=y
-CONFIG_EAP_PEAP=y
-CONFIG_EAP_TLS=y
-CONFIG_EAP_TTLS=y
-CONFIG_IEEE8021X_EAPOL=y
+
+# Because openssl is not installed at this point,
+# use bundled library versions:
+CONFIG_TLS=internal
+CONFIG_EAP_TLS=internal
+CONFIG_INTERNAL_LIBTOMMATH=y
+
 CONFIG_LIBNL32=y
-CONFIG_PEERKEY=y
-CONFIG_PKCS12=y
 CONFIG_READLINE=y
-CONFIG_SMARTCARD=y
 CONFIG_WPS=y
 CFLAGS += -I/usr/include/libnl3
 
-CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
+CONFIG_DRIVER_WEXT=n
 CONFIG_IPV6=n
 EOF
 
@@ -43,13 +33,6 @@ EOF
     install -v -m644 doc/docbook/wpa_supplicant.conf.5 /usr/share/man/man5
     install -v -m644 doc/docbook/wpa_{cli,passphrase,supplicant}.8 \
         /usr/share/man/man8
-
-    # If D-BUS support:
-    install -v -m644 \
-        dbus/fi.{epitest.hostap.WPASupplicant,w1.wpa_supplicant1}.service \
-        /usr/share/dbus-1/system-services/
-    install -v -m644 dbus/dbus-wpa_supplicant.conf \
-        /etc/dbus-1/system.d/wpa_supplicant.conf
 }
 
 hvbuild_post()
@@ -59,6 +42,13 @@ hvbuild_post()
         cat > /etc/wpa_supplicant.conf << EOF
 ctrl_interface=/var/run/wpa_supplicant
 
+# Allow wpa_cli to edit this configuration:
+update_config=1
+
+eapol_version=2
+ap_scan=1
+fast_reauth=1
+
 # Use wpa_passphrase to insert new network entries
 
 network={