Add patch from bug #157677 to fix cipher none issues. Thanks to Jon Howell for the patch and reporting the bug. Will be in upstream 0.9.3 release.

Package-Manager: portage-2.1.2-r9

4 files changed, 42 insertions, 20 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index c627007983f6..4cf41e223729 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.24 2007/02/10 00:48:41 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.25 2007/02/10 06:38:59 steev Exp $
+
+  10 Feb 2007; Steev Klimaszewski <steev@gentoo.org>
+  +files/madwifi-ng-0.9.2-allow-cipher-none.diff, madwifi-ng-0.9.2.1.ebuild:
+  Add patch from bug #157677 to fix cipher none issues.  Thanks to Jon Howell
+  for the patch.  Will be in upstream 0.9.3 release.
 
   10 Feb 2007; Mike Auty <ikelos@gentoo.org>
   files/madwifi-ng-0.9.2.1-linux-2.6.20.patch:
diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest
index 7bc08f4e6583..e8d7051b6c88 100644
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 SHA1 c4d67684238c51a4632ae9e01caabe9750f705fa SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff
 MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530
 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530
 SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff files/madwifi-association-fix.patch 2530
+AUX madwifi-ng-0.9.2-allow-cipher-none.diff 614 RMD160 f8b403b928b1aab8d9f2b872bb1645a15f398558 SHA1 f710b51f751830e8c79916a4da96c99b519b86a9 SHA256 ba2b44da10dba227e322d08d4158cb70034752b278589fa4f4cc68802360ebe8
+MD5 b947a80849881d72353cc51378582634 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
+RMD160 f8b403b928b1aab8d9f2b872bb1645a15f398558 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
+SHA256 ba2b44da10dba227e322d08d4158cb70034752b278589fa4f4cc68802360ebe8 files/madwifi-ng-0.9.2-allow-cipher-none.diff 614
 AUX madwifi-ng-0.9.2-ath_intr.diff 1020 RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 SHA1 b154f9d9c1a2e0f9e57d8d60a8c624b86b4716a3 SHA256 3f87b4bf731c1b9e22b8e6ec5b9d630235e76c6b0f89d6511a05d513df75fc0e
 MD5 a450776510e9dfb027100a9477aea1e1 files/madwifi-ng-0.9.2-ath_intr.diff 1020
 RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 files/madwifi-ng-0.9.2-ath_intr.diff 1020
@@ -31,18 +32,18 @@ RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-f
 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d files/madwifi-ng-uudecode-gcda-fix.patch 328
 DIST madwifi-0.9.2.1.tar.bz2 3476892 RMD160 ccbe1d7ae262286a147b37bda960d74284e4af3e SHA1 6606291b6facc299203158bfaa1bde09219459db SHA256 38f1c9980b473a52f11b63981d68326e3706c41f0ca4ba5da90d38bbd6870843
 DIST madwifi-0.9.2.tar.bz2 3476735 RMD160 e24ce96ab7ebcd12e71755c89882a90161a6a15a SHA1 6d6b9d2419e45a940d156b928401b5c688c40844 SHA256 b6edd998fa5e5927f9e42e0470f6f4e0bec1b8a41658eec5595ceea01c787153
-EBUILD madwifi-ng-0.9.2.1.ebuild 4113 RMD160 890b16385bd90a9deb92a832e24da60925fa7b4c SHA1 271db1ccd9fdc205a3a6798ab84d7b915ed5a9ff SHA256 a0ccf6d36b3932e78a238dd70c46b4e0a757192a79ef69e49331eb0d44dd5ede
-MD5 b6b8e0be9647156a4af1bf35c252d74a madwifi-ng-0.9.2.1.ebuild 4113
-RMD160 890b16385bd90a9deb92a832e24da60925fa7b4c madwifi-ng-0.9.2.1.ebuild 4113
-SHA256 a0ccf6d36b3932e78a238dd70c46b4e0a757192a79ef69e49331eb0d44dd5ede madwifi-ng-0.9.2.1.ebuild 4113
+EBUILD madwifi-ng-0.9.2.1.ebuild 4284 RMD160 385eb6a8f20e65598025ac2c7d78b515b6049020 SHA1 3d841a7c908ebae0b013fa678a49ee16af16b18c SHA256 09dee1ffdd0cc5e8454d7a25080c112e25006a8eccca8eeed54cf7d0f4a027f0
+MD5 eec4accadbfd860b00ef5efb3c09c387 madwifi-ng-0.9.2.1.ebuild 4284
+RMD160 385eb6a8f20e65598025ac2c7d78b515b6049020 madwifi-ng-0.9.2.1.ebuild 4284
+SHA256 09dee1ffdd0cc5e8454d7a25080c112e25006a8eccca8eeed54cf7d0f4a027f0 madwifi-ng-0.9.2.1.ebuild 4284
 EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a SHA1 3b8378b22791ac5a529e8aca0727ccd79ef790c1 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6
 MD5 82d58a8bcb92317ce472b3ef6cf4e717 madwifi-ng-0.9.2.ebuild 3979
 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a madwifi-ng-0.9.2.ebuild 3979
 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 madwifi-ng-0.9.2.ebuild 3979
-MISC ChangeLog 13793 RMD160 7ae1c2c90e00ac277819bf59822ddca0f2062be1 SHA1 40f949cf5dc030f68ae24e88f0b78241aac77c37 SHA256 1ec8ab976101058be01e150d12df185e48a204ca163ef90f493c900721d1568d
-MD5 340713835a3473bb85892172240dd68f ChangeLog 13793
-RMD160 7ae1c2c90e00ac277819bf59822ddca0f2062be1 ChangeLog 13793
-SHA256 1ec8ab976101058be01e150d12df185e48a204ca163ef90f493c900721d1568d ChangeLog 13793
+MISC ChangeLog 14054 RMD160 e99369ceb7bacf521847567915da2adc2e390b41 SHA1 9c20075a96b746b906812597467274825e9e38d1 SHA256 c7ff81247269d05aac3254c2c4e50b8d4a870019388dc27fd76b39216941ae5e
+MD5 4c97dc9130867d7e3f4a3a21895e589b ChangeLog 14054
+RMD160 e99369ceb7bacf521847567915da2adc2e390b41 ChangeLog 14054
+SHA256 c7ff81247269d05aac3254c2c4e50b8d4a870019388dc27fd76b39216941ae5e ChangeLog 14054
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256
@@ -53,10 +54,3 @@ SHA256 21c57d899d4e2d74e3c820476f60b36c356764e54fe6f3be3acc69d663a0eb8d files/di
 MD5 4759e10919b6002661f86f34d4d1bc7b files/digest-madwifi-ng-0.9.2.1 253
 RMD160 2e13cbbae0eb8588a73d66fd4760e0c2dcd3f077 files/digest-madwifi-ng-0.9.2.1 253
 SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/digest-madwifi-ng-0.9.2.1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzRZ7u7rWomwgFXoRAuOqAJ4nwa+LiqPJLy3HX7nnVKbb0TR5lACfaDYO
-ykltrux0FfXj8+M7lHxm660=
-=QvEu
------END PGP SIGNATURE-----
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff
new file mode 100644
index 000000000000..ed4af2bc1138
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff
@@ -0,0 +1,20 @@
+*** net80211/ieee80211_wireless.c.orig	Sat Jan 13 07:14:39 2007
+--- net80211/ieee80211_wireless.c	Sat Jan 13 07:15:19 2007
+***************
+*** 2079,2085 ****
+  			retv = ENETRESET;
+  		break;
+  	case IEEE80211_PARAM_UCASTCIPHER:
+! 		if ((rsn->rsn_ucastcipherset & cipher2cap(value)) == 0)
+  			return -EINVAL;
+  		rsn->rsn_ucastcipher = value;
+  		break;
+--- 2079,2086 ----
+  			retv = ENETRESET;
+  		break;
+  	case IEEE80211_PARAM_UCASTCIPHER:
+! 		if ((value != IEEE80211_CIPHER_NONE)
+! 			&& ((rsn->rsn_ucastcipherset & cipher2cap(value)) == 0))
+  			return -EINVAL;
+  		rsn->rsn_ucastcipher = value;
+  		break;
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
index cb79f2e0d73b..2e2537fe57dd 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.6 2007/02/05 20:16:44 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild,v 1.7 2007/02/10 06:38:59 steev Exp $
 
 inherit linux-mod
 
@@ -78,6 +78,9 @@ src_unpack() {
 #	epatch ${FILESDIR}/madwifi-association-fix.patch
 
 	epatch ${FILESDIR}/${P}-linux-2.6.20.patch
+	# Fix for madwifi bug 1016 and gentoo bug 157677.
+	# Thanks got Jon Howell for the patch and reporting upstream.
+	epatch ${FILESDIR}/${PN}-0.9.2-allow-cipher-none.diff
 }
 
 src_compile() {