Skip to Content.
Sympa Menu

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

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 (ee2a18c0909e28016ccffa2424810233027a6d49)
  • Date: Sat, 23 Dec 2006 11:07:50 -0600

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

net/wpa_supplicant/CONFIGURE | 10 +++++++++-
net/wpa_supplicant/HISTORY | 5 +++++
net/wpa_supplicant/INSTALL | 10 +++++++---
3 files changed, 21 insertions(+), 4 deletions(-)

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

wpa_supplicant: Made config file optional

diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 1bdec9f..069d2b2 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -91,4 +91,12 @@ then

config_query CONFIG_PKCS12 "Enable PKCS#12 certificate support?" y &&
config_query CONFIG_SMARTCARD "Enable smartcard support?" y
-fi
+fi &&
+
+message "${MESSAGE_COLOR}An example config file will be installed" \
+ "in /etc if you choose to install\nthe init script." \
+ "${DEFAULT_COLOR}" &&
+
+config_query WPA_CONFIG_FILE \
+ "Install config file even without the init script?" \
+ n
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0985abc..544e820 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+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
+ script is installed.
+
2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
* wpa_supplicant.conf: Added, new name for default config file.
Added ap_scan option and comments.
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 95514cb..188369c 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,12 +1,16 @@
make DESTDIR="$INSTALL_ROOT" install &&

-install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \
- "$INSTALL_ROOT/etc/wpa_supplicant.conf" &&
-
cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" &&
cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" &&

if is_depends_enabled $SPELL qt-x11
then
cp wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin/"
+fi &&
+
+if [[ $WPA_CONFIG_FILE == y ]] ||
+ list_find "$INIT_INSTALLED" wpa_supplicant
+then
+ install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \
+ "$INSTALL_ROOT/etc/wpa_supplicant.conf"
fi



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (ee2a18c0909e28016ccffa2424810233027a6d49), Juuso Alasuutari, 12/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page