Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2eab64cd73d645ff58b3d00ec03fd3dc2dde2677)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2eab64cd73d645ff58b3d00ec03fd3dc2dde2677)
  • Date: Sat, 22 Jan 2011 14:16:22 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
net/wpa_supplicant/BUILD | 9 ++++----
net/wpa_supplicant/DEPENDS | 1
net/wpa_supplicant/DETAILS | 8 +++----
net/wpa_supplicant/HISTORY | 8 +++++++
net/wpa_supplicant/INSTALL | 11 ++++++++--
net/wpa_supplicant/PREPARE | 5 ----
net/wpa_supplicant/PRE_BUILD | 21
+++++++++-----------
net/wpa_supplicant/wpa_supplicant-0.5.11.tar.gz.sig | 0
net/wpa_supplicant/wpa_supplicant-0.7.3.tar.gz.sig |binary
10 files changed, 38 insertions(+), 25 deletions(-)

New commits:
commit 2eab64cd73d645ff58b3d00ec03fd3dc2dde2677
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wpa_supplicant: => 0.7.3

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 29bee7b..b4e55b0 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,6 +1,4 @@
-if [[ $WPA_RELEASE != old ]]; then
- cd "$SOURCE_DIRECTORY/wpa_supplicant"
-fi &&
+cd "$SOURCE_DIRECTORY/wpa_supplicant"

# 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
@@ -25,7 +23,10 @@ for var in $VARS $OPTS; do
done &&

make &&
-
+
+if is_depends_enabled $SPELL qt4; then
+ make wpa_gui-qt4
+fi &&

if is_depends_enabled $SPELL qt-x11; then
make wpa_gui
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index e9a308d..be0d89d 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -19,6 +19,7 @@ if [[ $CONFIG_CTRL_IFACE != n ]]; then
"" \
"for Readline support in CLI frontend" &&

+ optional_depends qt4 "" "" "to build wpa_gui, a Qt4-based GUI frontend" &&
optional_depends qt-x11 "" "" "to build wpa_gui, a Qt-based GUI frontend"
fi &&

diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 83a4de4..ff9bd63 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.5.11
+if [[ $WPA_RELEASE == legacy ]]; then
+ VERSION=0.6.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
elif [[ $WPA_RELEASE == devel ]]; then
- VERSION=0.6.10
+ VERSION=0.7.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:f5d51354d0361f5757627a9b76ed35059c159edafcf449d368c3ae1877660410d376866f0d4a7fb8be05a771205145ed941b394bb1bcc5508f73c919b2c0a2e2
else
- VERSION=0.6.10
+ VERSION=0.7.3
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 42f9f93..6b8d76d 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,11 @@
+2011-01-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.3
+ * DEPENDS: added qt4 dependency
+ * INSTALL: fixed bug of previous commit about dbus dir
+ * PREPARE: old -> legacy
+ * PRE_BUILD: removed unneeded hacks; added INSTALL_ROOT to seds
+ * BUILD: removed unneeded hacks, added qt4 selection
+
2010-09-25 Finn Haedicke <finn AT sourcemage.org>
* PRE_BUILD,INSTALL: install dbus service file

diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 71b276a..07cd6b7 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -10,9 +10,16 @@ if is_depends_enabled $SPELL qt-x11; then
install -vm 755 wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin"
fi &&

-
if is_depends_enabled $SPELL dbus; then
- install -Tvm 644 dbus-wpa_supplicant.service
"$INSTALL_ROOT/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
+ install -vm 755 -d "$INSTALL_ROOT/usr/share/dbus-1/system-services" &&
+
+
DBUS_FILE="$INSTALL_ROOT/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service"
&&
+
+ if [[ $WPA_RELEASE == legacy ]]; then
+ install -Tvm 644 dbus-wpa_supplicant.service "$DBUS_FILE"
+ else
+ install -Tvm 644 dbus/fi.epitest.hostap.WPASupplicant.service
"$DBUS_FILE"
+ fi
fi &&

if [[ $WPA_CONFIG_FILE == y ]] || list_find "$INIT_INSTALLED"
wpa_supplicant; then
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 1569b72..163a08e 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,7 +1,4 @@
-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:" \
stable \
- old \
+ legacy \
devel
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index f2929ca..536430b 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,17 +1,16 @@
default_pre_build &&
+cd "$SOURCE_DIRECTORY/wpa_supplicant" &&

-if [[ $WPA_RELEASE != old ]]; then
- cd "$SOURCE_DIRECTORY/wpa_supplicant"
-else
- cd "$SOURCE_DIRECTORY"
-fi &&
-
-sed -i "s|/local||g" Makefile &&
+sed -i "s|/usr/local|$INSTALL_ROOT/usr|g" Makefile &&

-sed -i "s|=/sbin|=/usr/sbin|g" dbus-wpa_supplicant.service &&
-
-# Dynamic EAP target borks install.
-sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile &&
+if is_depends_enabled $SPELL dbus; then
+ if [[ $WPA_RELEASE == legacy ]]; then
+ sed -i "s|=/sbin|=$INSTALL_ROOT/usr/sbin|g" dbus-wpa_supplicant.service
+ else
+ sed -i "s|=/sbin|=$INSTALL_ROOT/usr/sbin|g" \
+ dbus/fi.epitest.hostap.WPASupplicant.service
+ fi
+fi &&

if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11; then
. "$INSTALL_ROOT/etc/profile.d/qt.sh"
diff --git a/net/wpa_supplicant/wpa_supplicant-0.5.11.tar.gz.sig
b/net/wpa_supplicant/wpa_supplicant-0.5.11.tar.gz.sig
deleted file mode 100644
index cf2f9f7..0000000
Binary files a/net/wpa_supplicant/wpa_supplicant-0.5.11.tar.gz.sig and
/dev/null differ
diff --git a/net/wpa_supplicant/wpa_supplicant-0.7.3.tar.gz.sig
b/net/wpa_supplicant/wpa_supplicant-0.7.3.tar.gz.sig
new file mode 100644
index 0000000..a25ef4d
Binary files /dev/null and
b/net/wpa_supplicant/wpa_supplicant-0.7.3.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2eab64cd73d645ff58b3d00ec03fd3dc2dde2677), Vlad Glagolev, 01/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page