Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e53542c25f035d5a0db5d6c4d1dedf235db9f46e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e53542c25f035d5a0db5d6c4d1dedf235db9f46e)
  • Date: Wed, 3 Jan 2007 06:55:05 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

net/wpa_supplicant/BUILD | 25 +++++++++++++------------
net/wpa_supplicant/CONFIGURE | 33
+++++++++++++++++++++++++++++----
net/wpa_supplicant/DEPENDS | 2 +-
net/wpa_supplicant/DETAILS | 8 ++++----
net/wpa_supplicant/HISTORY | 9 +++++++++
net/wpa_supplicant/INSTALL | 3 +++
net/wpa_supplicant/PREPARE | 12 +++++++++++-
net/wpa_supplicant/PRE_BUILD | 2 +-
net/wpa_supplicant/wpa_supplicant.conf | 2 +-
9 files changed, 72 insertions(+), 24 deletions(-)

New commits:
commit e53542c25f035d5a0db5d6c4d1dedf235db9f46e
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wpa_supplicant: Added cross-version var compatibility code.

commit bbac6b3a8b215eaefb2c0945933a0a20668b9f72
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wpa_supplicant: Added code to gracefully convert devel version to stable
(stable is now newer than the previous devel option).

commit 923902b43c6bd8685ac387ed312206e4f42f2d83
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

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

commit 44522288cf5e5ce605cc3136b24e20bd8acb66f1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wpa_supplicant: Install example config file.

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index b430049..900e7cc 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 069d2b2..70a4a2a 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -4,8 +4,20 @@

config_query CONFIG_NO_WPA "Build without WPA support?" n &&

-if [[ $WPA_RELEASE != devel ]]
+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 &&
@@ -14,7 +26,20 @@ then
interface?" \
n
else
- config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
+ 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 \
@@ -58,7 +83,7 @@ config_query CONFIG_EAP_PSK "EAP-PSK s
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 +102,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 446ef2e..0e35c96 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 f7afe16..0ecdca5 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 544e820..0a8b1f0 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,12 @@
+2007-01-03 Juuso Alasuutari <iuso AT sourcemage.org>
+ * 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.
+ * CONFIGURE: Added cross-version var compatibility code.
+
2006-12-23 Juuso Alasuutari <iuso AT sourcemage.org>
* CONFIGURE: Added query for making config file optional.
* INSTALL: Only install config file if selected or if init
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 188369c..bf3fdba 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -3,6 +3,9 @@ make DESTDIR="$INSTALL_ROOT" install &&
cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" &&
cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" &&

+mkdir -p "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
+cp wpa_supplicant.conf "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
+
if is_depends_enabled $SPELL qt-x11
then
cp wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin/"
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 5366138..bbc2636 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,4 +1,14 @@
+# devel version was removed, stable is now latest
+if [[ $WPA_RELEASE == devel ]]
+then
+ WPA_RELEASE=stable &&
+ persistent_add WPA_RELEASE
+fi &&
+
+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 3bc919a..8149cb2 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
diff --git a/net/wpa_supplicant/wpa_supplicant.conf
b/net/wpa_supplicant/wpa_supplicant.conf
index 6201004..25bea70 100644
--- a/net/wpa_supplicant/wpa_supplicant.conf
+++ b/net/wpa_supplicant/wpa_supplicant.conf
@@ -1,7 +1,7 @@
#
# wpa_supplicant default config for Source Mage GNU/Linux.
#
-# See 'man wpa_supplicant.conf' for more info.
+# See /usr/share/wpa_supplicant/wpa_supplicant.conf for more info.
#

# Control interface



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (e53542c25f035d5a0db5d6c4d1dedf235db9f46e), Juuso Alasuutari, 01/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page