Backported upstream patch. Fixes bug 281099

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 104 insertions, 4 deletions

diff --git a/net-misc/cnetworkmanager/ChangeLog b/net-misc/cnetworkmanager/ChangeLog
index 7038908698c3..5a0da598366f 100644
--- a/net-misc/cnetworkmanager/ChangeLog
+++ b/net-misc/cnetworkmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/cnetworkmanager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cnetworkmanager/ChangeLog,v 1.1 2009/08/11 09:16:52 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cnetworkmanager/ChangeLog,v 1.2 2009/08/14 10:25:02 dagger Exp $
+
+*cnetworkmanager-0.21-r1 (14 Aug 2009)
+
+  14 Aug 2009; Robert Piasek <dagger@gentoo.org>
+  -cnetworkmanager-0.21.ebuild, +cnetworkmanager-0.21-r1.ebuild,
+  +files/cnetworkmanager-0.21-wepwapfix.patch:
+  fixes bug #281099. Big thank you to gbin@gootz.net for pointing it out
+  and providing patch.
 
 *cnetworkmanager-0.21 (11 Aug 2009)
 
diff --git a/net-misc/cnetworkmanager/Manifest b/net-misc/cnetworkmanager/Manifest
index ff2652ce99c5..7511721d6254 100644
--- a/net-misc/cnetworkmanager/Manifest
+++ b/net-misc/cnetworkmanager/Manifest
@@ -1,4 +1,5 @@
+AUX cnetworkmanager-0.21-wepwapfix.patch 2996 RMD160 4bf119213022141f0b5bf3575aff9885d5d89874 SHA1 afd794806b4392ec01642fe7685ed098e813b288 SHA256 f0fe7f02303a1e4324b251b8c319341702ec2e837753688b52544467290692b4
 DIST cnetworkmanager-0.21.tar.gz 28570 RMD160 3ead1733f0be9a8d161bc1518ea0c95379e6b18d SHA1 77289031a9b14cc28f5a29eb80bc59729e451352 SHA256 d59656da6e5394b5de48ea425f9623bd98f4248af23a0f808c3769076d486171
-EBUILD cnetworkmanager-0.21.ebuild 684 RMD160 b026941f43387bd865a83b1d7d27ca3b6d3bf838 SHA1 b5a58dd875b96028d7904f48c5a6e613cfb8bd5d SHA256 3ee73639defa57609e0bd23672d2c35a24c93fb4f6181d9fe0d969b7283d8623
-MISC ChangeLog 429 RMD160 febd570cb9290c45babb195ea5d8fc1f2db62919 SHA1 5f23feae0a562515815636f1bc9a60fc9c79a0e9 SHA256 94812066c8e0b54565d1e214f5df541d3d50fd48975b593759c5988d452827bd
+EBUILD cnetworkmanager-0.21-r1.ebuild 769 RMD160 ae8d103c6109865fd352a65d34ea2b0e80c71c03 SHA1 f697cd218a7307999d64a85bced60af2456414a2 SHA256 88aec05e3ad648b537c744100d92a6508681860911b86cb89ce4d1af6f0ae7cd
+MISC ChangeLog 727 RMD160 24c562a4bcaf6387d3f40f78356e107846dd5558 SHA1 51e15c98460742f4cbdac0c5a29a3062b66a6905 SHA256 a4038af94deb8d1afdf57cdc492f0e3c02baae12d9c1753a3e5b719cfbe2ef4f
 MISC metadata.xml 296 RMD160 d8f057fffd0d6d3c84b2d5481481f8848cc7f5aa SHA1 d3e950b1ca7636e89f44d3182753cb2384dcd11c SHA256 996385c7eb65b2fe398df26ebb0da85233a4f6c135a1256da9c53bd96ad450f4
diff --git a/net-misc/cnetworkmanager/cnetworkmanager-0.21.ebuild b/net-misc/cnetworkmanager/cnetworkmanager-0.21-r1.ebuild
index 9c32cdf7f262..be7c10af3530 100644
--- a/net-misc/cnetworkmanager/cnetworkmanager-0.21.ebuild
+++ b/net-misc/cnetworkmanager/cnetworkmanager-0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cnetworkmanager/cnetworkmanager-0.21.ebuild,v 1.1 2009/08/11 09:16:52 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cnetworkmanager/cnetworkmanager-0.21-r1.ebuild,v 1.1 2009/08/14 10:25:02 dagger Exp $
 
 EAPI=2
 
@@ -20,3 +20,8 @@ RDEPEND=">=dev-lang/python-2.5
 	>=net-misc/networkmanager-0.7.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+
+src_prepare() {
+	# Fixes bug 281099
+	epatch "${FILESDIR}"/${P}-wepwapfix.patch
+}
diff --git a/net-misc/cnetworkmanager/files/cnetworkmanager-0.21-wepwapfix.patch b/net-misc/cnetworkmanager/files/cnetworkmanager-0.21-wepwapfix.patch
new file mode 100644
index 000000000000..45c7870d2719
--- /dev/null
+++ b/net-misc/cnetworkmanager/files/cnetworkmanager-0.21-wepwapfix.patch
@@ -0,0 +1,86 @@
+From: Martin Vidner <martin@vidner.net>
+Date: Thu, 13 Aug 2009 21:31:51 +0000 (+0200)
+Subject: Fixed the --wep-* and --wpa-* options (Gentoo#281099).
+X-Git-Url: http://repo.or.cz/w/cnetworkmanager.git?a=commitdiff_plain
+
+Fixed the --wep-* and --wpa-* options (Gentoo#281099).
+
+The constructors had wrong super calls, duh.
+And there was a typo in "ccmp".
+http://bugs.gentoo.org/show_bug.cgi?id=281099
+---
+
+diff --git a/Makefile b/Makefile
+index 0ba0c93..5900426 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ check: check-nonm
+ 
+ check-nonm:
+ 	for T in `find . -name \*.py | xargs grep -l '>>>'`; do python $$T; done
+-	for T in test/test01*.py; do $$T; done
++	for T in test/test01*.py; do PYTHONPATH=. $$T; done
+ 
+ install:
+ 	$(SETUP) install
+diff --git a/networkmanager/applet/settings.py b/networkmanager/applet/settings.py
+index bc22291..5ceacba 100644
+--- a/networkmanager/applet/settings.py
++++ b/networkmanager/applet/settings.py
+@@ -104,7 +104,7 @@ class Wep(WiFi):
+     def __init__(self, ssid, key, hashed_key=""):
+         "One of key, hashed_key must be present"
+ 
+-        super(WiFi, self).__init__(ssid)
++        super(Wep, self).__init__(ssid)
+         self["802-11-wireless"]["security"] = "802-11-wireless-security"
+         self["802-11-wireless-security"] = {}
+         self["802-11-wireless-security"]["key-mgmt"] = "none"
+@@ -126,10 +126,10 @@ class WpaPsk(WiFi):
+     def __init__(self, ssid, key, hashed_key=""):
+         "One of key, hashed_key must be present"
+ 
+-        super(WiFi, self).__init__(ssid)
++        super(WpaPsk, self).__init__(ssid)
+         self["802-11-wireless"]["security"] = "802-11-wireless-security"
+         self["802-11-wireless-security"] = {}
+-        self["802-11-wireless-security"]["group"] =    ["tkip", "cselfp"]
++        self["802-11-wireless-security"]["group"] =    ["tkip", "ccmp"]
+         self["802-11-wireless-security"]["pairwise"] = ["tkip", "ccmp"]
+         self["802-11-wireless-security"]["key-mgmt"] = "wpa-psk"
+         if hashed_key == "":
+diff --git a/test/test01-nofail.py b/test/test01-nofail.py
+index c4ca60c..a908e5d 100755
+--- a/test/test01-nofail.py
++++ b/test/test01-nofail.py
+@@ -4,6 +4,8 @@ import subprocess
+ import sys
+ import unittest
+ 
++import networkmanager.applet.settings as settings
++
+ class NoFail(unittest.TestCase):
+   def callIt(self, params):
+     cmd = sys.path[0] + '/../cnetworkmanager'
+@@ -19,5 +21,21 @@ class NoFail(unittest.TestCase):
+   def testHelp(self):
+     self.callIt("--help")
+ 
++class SettingsFactory(unittest.TestCase):
++  def testWiFi(self):
++    ssid = "foo"
++    c = settings.WiFi(ssid)
++
++  def testWep(self):
++    ssid = "foo"
++    c1 = settings.Wep(ssid, "wep_pass")
++    c2 = settings.Wep(ssid, "", "ffffffffffffffffffffffffff")
++
++  def testWpa(self):
++    ssid = "foo"
++    c1 = settings.WpaPsk(ssid, "wep_pass")
++    c2 = settings.WpaPsk(ssid, "", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
++
++
+ if __name__ == '__main__':
+     unittest.main()