diff options
| author |   Stephen Klimaszewski <steev@gentoo.org> | 2007-02-10 06:38:59 +0000 |
|---|---|---|
| committer | Stephen Klimaszewski <steev@gentoo.org> | 2007-02-10 06:38:59 +0000 |
| commit | f6c3b6771bb40ef66cb579c00a7e172e550ef361 (patch) | |
| tree | d10427e70de64dd869a66c4724af1fd8a6fab114 | |
| parent | arm//s390/sh stable (diff) | |
| download | gentoo-2-f6c3b6771bb40ef66cb579c00a7e172e550ef361.tar.gz gentoo-2-f6c3b6771bb40ef66cb579c00a7e172e550ef361.tar.bz2 gentoo-2-f6c3b6771bb40ef66cb579c00a7e172e550ef361.zip | |
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.
(Portage version: 2.1.2-r9)
| -rw-r--r-- | net-wireless/madwifi-ng/ChangeLog | 7 | ||||
| -rw-r--r-- | net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-allow-cipher-none.diff | 20 | ||||
| -rw-r--r-- | net-wireless/madwifi-ng/madwifi-ng-0.9.2.1.ebuild | 5 |
3 files changed, 30 insertions, 2 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/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() { |