summaryrefslogtreecommitdiff
path: root/extra/source/wicd
diff options
context:
space:
mode:
Diffstat (limited to 'extra/source/wicd')
-rw-r--r--extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff23
-rw-r--r--extra/source/wicd/wicd-1.7.0-fix_script_bug.diff30
-rwxr-xr-xextra/source/wicd/wicd.SlackBuild23
3 files changed, 71 insertions, 5 deletions
diff --git a/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff b/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff
new file mode 100644
index 00000000..d479b29c
--- /dev/null
+++ b/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff
@@ -0,0 +1,23 @@
+revno: 554
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Mon 2010-03-29 13:19:08 -0400
+message:
+ Fixed typo in EAP-fast template, re-resolving bug 261804.
+
+=== modified file 'encryption/templates/eap'
+--- encryption/templates/eap 2009-03-01 02:52:27 +0000
++++ encryption/templates/eap 2010-03-29 17:19:08 +0000
+@@ -11,10 +11,10 @@
+ proto=RSN WPA
+ pairwise=CCMP TKIP
+ group=CCMP TKIP
+- key-mgmt=WPA-EAP
++ key_mgmt=WPA-EAP
+ eap=FAST
+ identity="$_USERNAME"
+ password="$_PASSWORD"
+ phase1="fast_provisioning=1"
+- pac-file="$_PAC_FILE"
++ pac_file="$_PAC_FILE"
+ }
diff --git a/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff b/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff
new file mode 100644
index 00000000..dc3ace60
--- /dev/null
+++ b/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff
@@ -0,0 +1,30 @@
+revno: 553
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Wed 2010-01-27 14:06:21 -0500
+message:
+ Fixed bug in script macro expansion.
+
+=== modified file 'wicd/networking.py'
+--- wicd/networking.py 2010-01-15 04:02:10 +0000
++++ wicd/networking.py 2010-01-27 19:06:21 +0000
+@@ -215,8 +215,8 @@
+ if self.pre_disconnect_script:
+ print 'Running pre-disconnect script'
+ misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script,
+- 'pre-disconnection', (mac,
+- name)),
++ 'pre-disconnection',
++ mac, name),
+ self.debug)
+ iface.ReleaseDHCP()
+ iface.SetAddress('0.0.0.0')
+@@ -229,7 +229,7 @@
+ print 'Running post-disconnect script'
+ misc.ExecuteScript(expand_script_macros(self.post_disconnect_script,
+ 'post-disconnection',
+- (mac, name)),
++ mac, name),
+ self.debug)
+
+ def ReleaseDHCP(self):
diff --git a/extra/source/wicd/wicd.SlackBuild b/extra/source/wicd/wicd.SlackBuild
index 21d6d454..20dcd393 100755
--- a/extra/source/wicd/wicd.SlackBuild
+++ b/extra/source/wicd/wicd.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008,2009 Robby Workman Northport, AL, USA
+# Copyright 2008-2010 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,17 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wicd
-VERSION=${VERSION:-1.6.2.1}
-ARCH=${ARCH:-x86_64} # This should be the same as the python package
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.7.0}
+BUILD=${BUILD:-2}
+
+# Automatically determine architecture for build & packaging:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
@@ -35,6 +43,8 @@ elif [ "$ARCH" = "s390" ]; then
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
fi
rm -rf $PKG
@@ -45,11 +55,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
cd $PRGNAM-$VERSION || exit 1
chown -R root:root .
+# Fix a couple of bugs that are addressed in the upstream bzr repo
+zcat $CWD/wicd-1.7.0-fix_EAP_fast_typo.diff.gz | patch -p0 --verbose || exit 1
+zcat $CWD/wicd-1.7.0-fix_script_bug.diff.gz | patch -p0 --verbose || exit 1
+
python setup.py configure \
--lib=/usr/lib${LIBDIRSUFFIX}/wicd \
--kdedir=/usr/share/autostart \
--backends=/usr/lib${LIBDIRSUFFIX}/wicd/backends \
- --wicdgroup=netdev \
|| exit 1
python setup.py install --root=$PKG || exit 1