diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index ddeac08..686b569 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,4 +1,4 @@
-if [[ $WPA_RELEASE == devel ]]; then
+if [[ $WPA_RELEASE != old ]]; then
cd "$SOURCE_DIRECTORY/wpa_supplicant"
fi &&
@@ -16,9 +16,7 @@ local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP CONFIG_L2_PACKET
CONFIG_NO_WPA2 \
CONFIG_EAP_LEAP CONFIG_EAP_SAKE CONFIG_EAP_GPSK \
CONFIG_EAP_GPSK_SHA256 CONFIG_PKCS12 CONFIG_SMARTCARD" var
&&
-if [[ $WPA_RELEASE != old ]]; then
- VARS="$VARS CONFIG_TLS"
-fi &&
+VARS="$VARS CONFIG_TLS" &&
for var in $VARS $OPTS; do
if [[ ${!var} && ${!var} != n ]]; then
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 5aee521..7a2c1a4 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -4,40 +4,26 @@
config_query CONFIG_NO_WPA "Build without WPA support?" n &&
-if [[ $WPA_RELEASE == old ]]; then
- if [[ $CONFIG_CTRL_IFACE == unix || $CONFIG_CTRL_IFACE == udp ]]; then
- CONFIG_CTRL_IFACE=y &&
- persistent_add CONFIG_CTRL_IFACE
- fi &&
- if [[ -z $CONFIG_DNET_PCAP ]] && [[ $CONFIG_L2_PACKET == pcap ]]; then
- CONFIG_DNET_PCAP=y &&
- persistent_add CONFIG_DNET_PCAP
- fi &&
-
- config_query CONFIG_CTRL_IFACE "Build external control interface?" y &&
- config_query CONFIG_DNET_PCAP "Use libpcap/libdnet instead of native Linux
packet socket interface?" n
-else
- config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
-
- if [[ $CONFIG_CTRL_IFACE == y ]]; then
- CONFIG_CTRL_IFACE=unix &&
- persistent_add CONFIG_CTRL_IFACE
- fi &&
- if [[ -z $CONFIG_L2_PACKET ]] && [[ $CONFIG_DNET_PCAP == y ]]; then
- CONFIG_L2_PACKET=pcap &&
- persistent_add CONFIG_L2_PACKET
- fi &&
-
- config_query_list CONFIG_CTRL_IFACE "Select control interface to build (n
is none):" \
- unix \
- udp \
- n &&
-
- config_query_list CONFIG_L2_PACKET "Select layer2 packet processing
implementation:" \
- linux \
- pcap
+config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
+
+if [[ $CONFIG_CTRL_IFACE == y ]]; then
+ CONFIG_CTRL_IFACE=unix &&
+ persistent_add CONFIG_CTRL_IFACE
+fi &&
+if [[ -z $CONFIG_L2_PACKET ]] && [[ $CONFIG_DNET_PCAP == y ]]; then
+ CONFIG_L2_PACKET=pcap &&
+ persistent_add CONFIG_L2_PACKET
fi &&
+config_query_list CONFIG_CTRL_IFACE "Select control interface to build (n is
none):" \
+ unix \
+ udp \
+ n &&
+
+config_query_list CONFIG_L2_PACKET "Select layer2 packet processing
implementation:" \
+ linux \
+ pcap &&
+
config_query CONFIG_NO_STDOUT_DEBUG "Remove debugging code?" n &&
message "${MESSAGE_COLOR}Hardware driver options:${DEFAULT_COLOR}" &&
@@ -70,13 +56,11 @@ config_query CONFIG_EAP_PSK "EAP-PSK support?" n
&&
config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
config_query CONFIG_EAP_LEAP "LEAP support?" y &&
-if [[ $WPA_RELEASE != old ]]; then
- config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
- config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
+config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
+config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
- if [[ $CONFIG_EAP_GPSK == y ]]; then
- config_query CONFIG_EAP_GPSK_SHA256 "Build SHA256 cipher suite for
EAP-GPSK?" n
- fi
+if [[ $CONFIG_EAP_GPSK == y ]]; then
+ config_query CONFIG_EAP_GPSK_SHA256 "Build SHA256 cipher suite for
EAP-GPSK?" n
fi &&
if [[ $CONFIG_EAP_TLS == y ||
@@ -84,15 +68,10 @@ if [[ $CONFIG_EAP_TLS == y ||
$CONFIG_EAP_TTLS == y ]]; then
message "${MESSAGE_COLOR}Crypto options:${DEFAULT_COLOR}" &&
- if [[ $WPA_RELEASE == old ]]; then
- CONFIG_TLS=openssl &&
- persistent_add CONFIG_TLS
- else
- config_query_list CONFIG_TLS "Select TLS library to use:" \
- openssl \
- gnutls \
- internal
- fi &&
+ config_query_list CONFIG_TLS "Select TLS library to use:" \
+ openssl \
+ gnutls \
+ internal &&
config_query CONFIG_PKCS12 "Enable PKCS#12 certificate support?" y &&
config_query CONFIG_SMARTCARD "Enable smartcard support?" y
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index b6628e0..358ac8d 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -22,9 +22,7 @@ if [[ $CONFIG_CTRL_IFACE != n ]]; then
optional_depends qt-x11 "" "" "to build wpa_gui, a Qt-based GUI frontend"
fi &&
-if [[ $WPA_RELEASE != old ]]; then
- optional_depends dbus \
- CONFIG_CTRL_IFACE_DBUS=y \
- CONFIG_CTRL_IFACE_DBUS=n \
- "to enable D-Bus control interface"
-fi
+optional_depends dbus \
+ CONFIG_CTRL_IFACE_DBUS=y \
+ CONFIG_CTRL_IFACE_DBUS=n \
+ "to enable D-Bus control interface"
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 1afb1ff..80c3fc5 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -1,14 +1,14 @@
SPELL=wpa_supplicant
if [[ $WPA_RELEASE == old ]]; then
- VERSION=0.4.11
+ VERSION=0.5.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
elif [[ $WPA_RELEASE == devel ]]; then
- VERSION=0.6.0
+ VERSION=0.6.8
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:ee852d0fd9e47a2c249da365d90dc4bddb60bed059feacf9f05b270e18472ab2c634e4b7010e2edb9703d4f0b4c3e700255f7ffa3f797fca7f4ffd5b5035427e
+
SOURCE_HASH=sha512:622fe55b5c15d0ebef2c24d46ea5db3dc9d99b61be63c8e930301a336448aeee12e3f2eec02630279389081a4860173264056969f87cd0613e73bdd63f83a1a7
else
- VERSION=0.5.10
+ VERSION=0.6.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
fi
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 8e59079..9d2697c 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2009-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated stable & devel to 0.6.8, old -- to 0.5.11
+ * gcc43.patch: removed
+
2008-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* init.d/wpa_supplicant: fixed wpa_cli usage and off state detection;
cleaned up
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 5f44ac5..1569b72 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,4 +1,4 @@
-message "${MESSAGE_COLOR}Latest stable is 0.5.10, latest old is 0.4.11." \
+message "${MESSAGE_COLOR}Latest stable is 0.6.8, latest old is 0.5.11." \
"${DEFAULT_COLOR}" &&
config_query_list WPA_RELEASE "Select which release to build:" \
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 8b7ed43..cebc898 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,19 +1,15 @@
default_pre_build &&
-if [[ $WPA_RELEASE == devel ]]; then
+if [[ $WPA_RELEASE != old ]]; then
cd "$SOURCE_DIRECTORY/wpa_supplicant"
else
cd "$SOURCE_DIRECTORY"
fi &&