diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2011-09-13 19:25:14 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2011-09-13 19:25:14 +0000 |
| commit | fbdab5e5d7c872307e07d36587dc9d1bd31d7cbf (patch) | |
| tree | 1748f0d95196916a9455b2be15a2d4dacbabd26f /net-misc/wicd/files | |
| parent | Drop maintainer due retirement, bug #353756 (diff) | |
| download | historical-fbdab5e5d7c872307e07d36587dc9d1bd31d7cbf.tar.gz historical-fbdab5e5d7c872307e07d36587dc9d1bd31d7cbf.tar.bz2 historical-fbdab5e5d7c872307e07d36587dc9d1bd31d7cbf.zip | |
Fix bugs 351337 (ad-hoc-net), 306423 (wpa-hex-template)
Package-Manager: portage-2.1.10.15/cvs/Linux i686
Diffstat (limited to 'net-misc/wicd/files')
| -rw-r--r-- | net-misc/wicd/files/add-wpa-psk-hex-template.patch | 29 | ||||
| -rw-r--r-- | net-misc/wicd/files/fix-ad-hoc-networking.patch | 11 |
2 files changed, 40 insertions, 0 deletions
diff --git a/net-misc/wicd/files/add-wpa-psk-hex-template.patch b/net-misc/wicd/files/add-wpa-psk-hex-template.patch new file mode 100644 index 000000000000..21daaf3e5091 --- /dev/null +++ b/net-misc/wicd/files/add-wpa-psk-hex-template.patch @@ -0,0 +1,29 @@ +diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/active wicd-1.7.1b2.new/encryption/templates/active +--- wicd-1.7.1b2/encryption/templates/active 2010-10-29 16:36:55.000000000 +0100 ++++ wicd-1.7.1b2.new/encryption/templates/active 2011-09-13 19:58:54.000000000 +0100 +@@ -1,5 +1,6 @@ + wpa + wpa-psk ++wpa-psk-hex + wep-hex + wep-passphrase + wep-shared +diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/wpa-psk-hex wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex +--- wicd-1.7.1b2/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.000000000 +0100 ++++ wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex 2011-09-13 19:59:11.000000000 +0100 +@@ -0,0 +1,15 @@ ++name = WPA 1/2 (Preshared Hex Key) ++author = Thomas Kahle ++version = 1 ++require apsk *Preshared_Key ++----- ++ctrl_interface=/var/run/wpa_supplicant ++network={ ++ ssid="$_ESSID" ++ scan_ssid=$_SCAN ++ proto=WPA RSN ++ key_mgmt=WPA-PSK ++ pairwise=CCMP TKIP ++ group=CCMP TKIP ++ psk=$_APSK ++} diff --git a/net-misc/wicd/files/fix-ad-hoc-networking.patch b/net-misc/wicd/files/fix-ad-hoc-networking.patch new file mode 100644 index 000000000000..344e51a6cb8c --- /dev/null +++ b/net-misc/wicd/files/fix-ad-hoc-networking.patch @@ -0,0 +1,11 @@ +--- wicd-1.7.0/wicd/wnettools.py 2010-01-15 12:49:11.000000000 +0800 ++++ wicd-1.7.0.patched/wicd/wnettools.py 2010-12-12 03:50:31.000000000 +0800 +@@ -59,7 +59,7 @@ wpa2_pattern = re.compile('(WPA2)', _re_ + + #iwconfig-only regular expressions. + ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) +-bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode) ++bssid_pattern = re.compile('.*[(Access Point)|(Cell)]: (([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) + authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', _re_mode) |