From: Thomas Kahle <tomka@gentoo.org>
Date: Tue, 13 Sep 2011 19:25:14 +0000 (+0000)
Subject: Fix bugs 351337 (ad-hoc-net), 306423 (wpa-hex-template)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fbdab5e5d7c872307e07d36587dc9d1bd31d7cbf;p=gentoo.git

Fix bugs 351337 (ad-hoc-net), 306423 (wpa-hex-template)

Package-Manager: portage-2.1.10.15/cvs/Linux i686
---

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index daa489219347..9c1c734cbbf9 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.93 2011/09/09 11:18:41 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.94 2011/09/13 19:25:14 tomka Exp $
+
+*wicd-1.7.1_beta2-r6 (13 Sep 2011)
+
+  13 Sep 2011; Thomas Kahle <tomka@gentoo.org> -wicd-1.7.1_beta2-r5.ebuild,
+  +wicd-1.7.1_beta2-r6.ebuild, +files/add-wpa-psk-hex-template.patch,
+  +files/fix-ad-hoc-networking.patch:
+  Fix bugs 351337 (ad-hoc-net), 306423 (wpa-hex-template)
 
 *wicd-1.7.1_beta2-r5 (09 Sep 2011)
 
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)
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
similarity index 93%
rename from net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild
rename to net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
index f99ffbe176b2..6e639d27a432 100644
--- a/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r5.ebuild,v 1.1 2011/09/09 11:18:41 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.1 2011/09/13 19:25:14 tomka Exp $
 
 EAPI=3
 
@@ -63,6 +63,10 @@ DOCS="CHANGES NEWS AUTHORS README"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-init.patch
 	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Fix ad-hoc networking (bug 351337)
+	epatch "${FILESDIR}"/fix-ad-hoc-networking.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch
 	# get rid of opts variable to fix bug 381885
 	sed -i "/opts/d" "in/init=gentoo=wicd.in"
 	# Need to ensure that generated scripts use Python 2 at run time.