Date: Saturday, August 20, 2011 @ 07:35:33 Author: ronald Revision: 135932
upgpkg: wicd 1.7.0-11 add patch to be able to extract ip address from new ifconfig output in net-tools 1.60.20110819cvs Added: wicd/trunk/net-tools.patch Modified: wicd/trunk/PKGBUILD -----------------+ PKGBUILD | 12 ++++++++---- net-tools.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-20 10:15:17 UTC (rev 135931) +++ PKGBUILD 2011-08-20 11:35:33 UTC (rev 135932) @@ -5,7 +5,7 @@ pkgbase=wicd pkgname=('wicd' 'wicd-gtk') pkgver=1.7.0 -pkgrel=10 +pkgrel=11 arch=(any) url="http://wicd.sourceforge.net/" license=('GPL2') @@ -15,23 +15,27 @@ wicd-daemon wicd.desktop wicd-scripts-execution.patch - deepcopy+python27-fixes.patch) + deepcopy+python27-fixes.patch + net-tools.patch) makedepends=('python2') options=('emptydirs') md5sums=('003d2e67240989db55934553437ba32a' 'f40e5f59998d0829707a7c9976afa8f8' '326df163a5732d38741371baa4fce9e5' 'f4c377a25aa077cb76955124adfcc03f' - '1b7ec95efcb8dc0fe48111da19b395b6') + '1b7ec95efcb8dc0fe48111da19b395b6' + '6cfa7abede7e85248c2305481601d68f') build() { cd $srcdir/$pkgbase-$pkgver patch -p0 <$srcdir/wicd-scripts-execution.patch patch -p1 -i $srcdir/deepcopy+python27-fixes.patch + patch -p0 -i $srcdir/net-tools.patch + find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \; export PYTHON=python2 python2 setup.py configure --no-install-init \ - --resume=/usr/share/wicd/scripts/ \ + --resume=/usr/share/wicd/scripts/ \ --suspend=/usr/share/wicd/scripts/ \ --verbose \ --python=/usr/bin/python2 Added: net-tools.patch =================================================================== --- net-tools.patch (rev 0) +++ net-tools.patch 2011-08-20 11:35:33 UTC (rev 135932) @@ -0,0 +1,11 @@ +--- wicd/wnettools.py.bak 2011-08-20 12:55:32.898673334 +0200 ++++ wicd/wnettools.py 2011-08-20 12:55:56.608671946 +0200 +@@ -58,7 +58,7 @@ + wpa2_pattern = re.compile('(WPA2)', _re_mode) + + #iwconfig-only regular expressions. +-ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) ++ip_pattern = re.compile(r'inet ([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) + bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode) + bitrate_pattern = re.compile('.*Bit Rate[=:](.*?/s)', _re_mode) + opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode)