wpa_supplicant: New stable 0.5.7, 0.4.9 becomes old, devel removed.

7 files changed, 29 insertions, 22 deletions

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index b43004930c..900e7cc964 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,18 +1,18 @@
 # Create .config file for make (this is here instead of PRE_BUILD because
 # OPTS isn't available there, and this is equivalent to running ./configure
 # anyway).
-local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP CONFIG_L2_PACKET CONFIG_NO_WPA2   \
-            CONFIG_NO_STDOUT_DEBUG CONFIG_CTRL_IFACE CONFIG_DRIVER_HOSTAP    \
-            CONFIG_DRIVER_HERMES CONFIG_DRIVER_MADWIFI CONFIG_DRIVER_ATMEL   \
-            CONFIG_DRIVER_WEXT CONFIG_DRIVER_NDISWRAPPER                     \
-            CONFIG_DRIVER_BROADCOM CONFIG_DRIVER_IPW CONFIG_DRIVER_WIRED     \
-            CONFIG_EAP_MD5 CONFIG_EAP_MSCHAPV2 CONFIG_EAP_TLS                \
-            CONFIG_EAP_PEAP CONFIG_EAP_TTLS CONFIG_EAP_GTC CONFIG_EAP_OTP    \
-            CONFIG_EAP_SIM CONFIG_EAP_AKA CONFIG_EAP_PSK CONFIG_EAP_PAX      \
-            CONFIG_EAP_LEAP CONFIG_EAP_SAKE CONFIG_EAP_GPSK                  \
-            CONFIG_EAP_GPSK_SHA256 CONFIG_PKCS12 CONFIG_SMARTCARD"  var      &&
+local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP CONFIG_L2_PACKET CONFIG_NO_WPA2  \
+            CONFIG_NO_STDOUT_DEBUG CONFIG_CTRL_IFACE CONFIG_DRIVER_HOSTAP   \
+            CONFIG_DRIVER_HERMES CONFIG_DRIVER_MADWIFI CONFIG_DRIVER_ATMEL  \
+            CONFIG_DRIVER_WEXT CONFIG_DRIVER_NDISWRAPPER                    \
+            CONFIG_DRIVER_BROADCOM CONFIG_DRIVER_IPW CONFIG_DRIVER_WIRED    \
+            CONFIG_EAP_MD5 CONFIG_EAP_MSCHAPV2 CONFIG_EAP_TLS               \
+            CONFIG_EAP_PEAP CONFIG_EAP_TTLS CONFIG_EAP_GTC CONFIG_EAP_OTP   \
+            CONFIG_EAP_SIM CONFIG_EAP_AKA CONFIG_EAP_PSK CONFIG_EAP_PAX     \
+            CONFIG_EAP_LEAP CONFIG_EAP_SAKE CONFIG_EAP_GPSK                 \
+            CONFIG_EAP_GPSK_SHA256 CONFIG_PKCS12 CONFIG_SMARTCARD"  var     &&
 
-if [[ $WPA_RELEASE == devel ]]
+if [[ $WPA_RELEASE != old ]]
 then
   VARS="$VARS CONFIG_TLS"
 fi  &&
@@ -27,7 +27,8 @@ done  &&
 
 make  &&
 
-source  "$GRIMOIRE/is_depends_enabled.function"  &&
+.  "$GRIMOIRE/is_depends_enabled.function"  &&
+
 if is_depends_enabled $SPELL qt-x11
 then
   make  wpa_gui
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 069d2b22e1..17b73af7dd 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -4,7 +4,7 @@
 
 config_query  CONFIG_NO_WPA  "Build without WPA support?"  n  &&
 
-if [[ $WPA_RELEASE != devel ]]
+if [[ $WPA_RELEASE == old ]]
 then
   config_query  CONFIG_CTRL_IFACE                                          \
                 "Build external control interface?"                        \
@@ -58,7 +58,7 @@ 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 == devel ]]
+if [[ $WPA_RELEASE != old ]]
 then
   config_query  CONFIG_EAP_SAKE  "EAP-SAKE support?"  n  &&
   config_query  CONFIG_EAP_GPSK  "EAP-GPSK support?"  n  &&
@@ -77,7 +77,7 @@ if [[ $CONFIG_EAP_TLS  == y ||
 then
   message "${MESSAGE_COLOR}Crypto options:${DEFAULT_COLOR}"  &&
 
-  if [[ $WPA_RELEASE != devel ]]
+  if [[ $WPA_RELEASE == old ]]
   then
     CONFIG_TLS=openssl          &&
     persistent_add  CONFIG_TLS
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index 446ef2e934..0e35c96401 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -32,7 +32,7 @@ then
                     "to build wpa_gui, a Qt-based GUI frontend"
 fi  &&
 
-if [[ $WPA_RELEASE == devel ]]
+if [[ $WPA_RELEASE != old ]]
 then
   optional_depends  dbus                                 \
                     CONFIG_CTRL_IFACE_DBUS=y             \
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index f7afe16f55..0ecdca5cec 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wpa_supplicant
-if [[ $WPA_RELEASE == devel ]]
+if [[ $WPA_RELEASE == old ]]
 then
-         VERSION=0.5.6
-     SOURCE_HASH=sha512:d7188c911ba2d075831e6a949f099d5bf22ccee926398ebc2456d9572578dce7dd07ea10282e0401a38481d6d26f49a449de6b1de96b3aef79f7a4f87c1706e3
-else
          VERSION=0.4.9
      SOURCE_HASH=sha512:9b4e2a0a36ca1dfc247393c5765a3461ed1341a5a008d5d50aaec1db9ca4742a83fb4f37a9685281b37924a47071460a6b0388fc9c71aa0e18a7445296c02d4c
+else
+         VERSION=0.5.7
+     SOURCE_HASH=sha512:e4cbde18d749bbeaa3c64801c74fa7cd95266b6b980387c6258e6d5d7e85a039b9a35fdc0e9ceb4c00393f943ecc3a571c55419e45cbcbc3f1cc7b59c8614a4f
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index bfedbd6b38..7963c67240 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -2,6 +2,9 @@
 	* INSTALL: Install example config file to /usr/share/wpa_supplicant/
 	  (this is not the same as the default config file).
 	* wpa_supplicant.conf: Changed help info to mention example config.
+	* PREPARE, DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD: New
+	  stable is 0.5.7, previous stable 0.4.9 becomes old, devel not
+	  available yet.
 
 2006-12-23 Juuso Alasuutari <iuso@sourcemage.org>
 	* CONFIGURE: Added query for making config file optional.
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 5366138c0a..0861780f02 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,4 +1,7 @@
+message  "${MESSAGE_COLOR}Latest stable is 0.5.7, latest old is 0.4.9."  \
+         "${DEFAULT_COLOR}"                                              &&
+
 config_query_list  WPA_RELEASE                       \
                    "Select which release to build:"  \
                    stable                            \
-                   devel
+                   old
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 3bc919a057..8149cb2076 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -4,7 +4,7 @@ cd  "$SOURCE_DIRECTORY"  &&
 sed -i  "s|/local||g"  Makefile  &&
 
 # Dynamic EAP target borks install.
-if [[ $WPA_RELEASE == devel ]]
+if [[ $WPA_RELEASE != old ]]
 then
   sed -i  "s/wpa_cli dynamic_eap_methods/wpa_cli/"  Makefile
 fi