rpms/wpa_supplicant/devel wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch, NONE, 1.1 wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wpa_supplicant.spec, 1.16, 1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 27 14:11:53 UTC 2006
Author: dcbw
Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16730
Modified Files:
.cvsignore sources wpa_supplicant.spec
Added Files:
wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch
wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch
Log Message:
* Thu Apr 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-10
- Add fix for madwifi and WEP (wpa_supplicant/hostap bud #140) (#rh190075#)
- Fix up madwifi-ng private ioctl()s for r1331 and later
- Update madwifi headers to r1475
wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch:
driver_madwifi.c | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
--- NEW FILE wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch ---
Index: wpa_supplicant-0.4.8/driver_madwifi.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver_madwifi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wpa_supplicant-0.4.8/driver_madwifi.c 27 Nov 2005 04:45:45 -0000 1.20
+++ wpa_supplicant-0.4.8/driver_madwifi.c 20 Mar 2006 01:32:27 -0000 1.21
@@ -73,26 +73,39 @@
if (show_err) {
#ifdef MADWIFI_NG
int first = IEEE80211_IOCTL_SETPARAM;
- int last = IEEE80211_IOCTL_GETMODE;
+ int last = IEEE80211_IOCTL_KICKMAC;
static const char *opnames[] = {
"ioctl[IEEE80211_IOCTL_SETPARAM]",
"ioctl[IEEE80211_IOCTL_GETPARAM]",
- "ioctl[IEEE80211_IOCTL_SETKEY]",
+ "ioctl[IEEE80211_IOCTL_SETMODE]",
+ "ioctl[IEEE80211_IOCTL_GETMODE]",
"ioctl[IEEE80211_IOCTL_SETWMMPARAMS]",
- "ioctl[IEEE80211_IOCTL_DELKEY]",
"ioctl[IEEE80211_IOCTL_GETWMMPARAMS]",
- "ioctl[IEEE80211_IOCTL_SETMLME]",
+ "ioctl[IEEE80211_IOCTL_SETCHANLIST]",
+ "ioctl[IEEE80211_IOCTL_GETCHANLIST]",
+ "ioctl[IEEE80211_IOCTL_CHANSWITCH]",
+ NULL,
+ NULL,
+ "ioctl[IEEE80211_IOCTL_GETSCANRESULTS]",
+ NULL,
"ioctl[IEEE80211_IOCTL_GETCHANINFO]",
"ioctl[IEEE80211_IOCTL_SETOPTIE]",
"ioctl[IEEE80211_IOCTL_GETOPTIE]",
+ "ioctl[IEEE80211_IOCTL_SETMLME]",
+ NULL,
+ "ioctl[IEEE80211_IOCTL_SETKEY]",
+ NULL,
+ "ioctl[IEEE80211_IOCTL_DELKEY]",
+ NULL,
"ioctl[IEEE80211_IOCTL_ADDMAC]",
NULL,
"ioctl[IEEE80211_IOCTL_DELMAC]",
- "ioctl[IEEE80211_IOCTL_GETCHANLIST]",
- "ioctl[IEEE80211_IOCTL_SETCHANLIST]",
NULL,
- "ioctl[IEEE80211_IOCTL_SETMODE]",
- "ioctl[IEEE80211_IOCTL_GETMODE]",
+ "ioctl[IEEE80211_IOCTL_WDSMAC]",
+ NULL,
+ "ioctl[IEEE80211_IOCTL_WDSDELMAC]",
+ NULL,
+ "ioctl[IEEE80211_IOCTL_KICKMAC]",
};
#else /* MADWIFI_NG */
int first = IEEE80211_IOCTL_SETPARAM;
@@ -115,8 +128,11 @@
"ioctl[IEEE80211_IOCTL_CHANLIST]",
};
#endif /* MADWIFI_NG */
- if (first <= op && op <= last)
- perror(opnames[op - first]);
+ int idx = op - first;
+ if (first <= op && op <= last &&
+ idx < sizeof(opnames) / sizeof(opnames[0]) &&
+ opnames[idx])
+ perror(opnames[idx]);
else
perror("ioctl[unknown???]");
}
wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch:
driver_wext.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch ---
wpa_supplicant/hostap bug # 140
revision 1.58
date: 2006/04/17 00:31:48; author: jm; state: Exp; lines: +4 -1
driver_wext: fixed privacy configuration for static WEP keys mode
[Bug 140]
Index: wpa_supplicant-0.4.8/driver_wext.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver_wext.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- wpa_supplicant-0.4.8/driver_wext.c 10 Apr 2006 03:00:09 -0000 1.57
+++ wpa_supplicant-0.4.8/driver_wext.c 17 Apr 2006 00:31:48 -0000 1.58
@@ -1671,7 +1671,10 @@
wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__);
ret = -1;
}
- value = params->key_mgmt_suite != KEY_MGMT_NONE;
+ value = params->key_mgmt_suite != KEY_MGMT_NONE ||
+ params->pairwise_suite != CIPHER_NONE ||
+ params->group_suite != CIPHER_NONE ||
+ params->wpa_ie_len;
if (wpa_driver_wext_set_auth_param(drv,
IW_AUTH_PRIVACY_INVOKED, value) < 0)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Feb 2006 07:46:47 -0000 1.4
+++ .cvsignore 27 Apr 2006 14:11:49 -0000 1.5
@@ -2,3 +2,4 @@
wpa_supplicant-0.4.7.tar.gz
wpa_supplicant-0.5.1.tar.gz
wpa_supplicant-0.4.8.tar.gz
+madwifi-headers-r1475.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Feb 2006 07:46:47 -0000 1.4
+++ sources 27 Apr 2006 14:11:49 -0000 1.5
@@ -1,2 +1,2 @@
-3be286e0d0f5ab5223ccfdecd3b74546 madwifi-headers.tar.bz2
765d6c70d75e88cd4dc010fa6b52c45f wpa_supplicant-0.4.8.tar.gz
+b82289b140cc1c66db11564bde248d8a madwifi-headers-r1475.tar.bz2
Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wpa_supplicant.spec 25 Apr 2006 14:17:01 -0000 1.16
+++ wpa_supplicant.spec 27 Apr 2006 14:11:49 -0000 1.17
@@ -2,7 +2,7 @@
Name: wpa_supplicant
Epoch: 1
Version: 0.4.8
-Release: 9.fc6
+Release: 10.fc6
License: GPL
Group: System Environment/Base
Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
Source2: %{name}.conf
Source3: %{name}.init.d
Source4: %{name}.sysconfig
-Source5: madwifi-headers.tar.bz2
+Source5: madwifi-headers-r1475.tar.bz2
Patch0: wpa_supplicant-auth-fallback-v4.patch
Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch
@@ -18,6 +18,8 @@
Patch4: wpa_supplicant-driver-wext-debug.patch
Patch5: wpa_supplicant-wep-key-fix.patch
Patch6: wpa_supplicant-ssid-len-fix.patch
+Patch7: wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch
+Patch8: wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch
URL: http://hostap.epitest.fi/wpa_supplicant/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +52,8 @@
%patch4 -p1 -b .driver-wext-debug
%patch5 -p1 -b .wep-key-fix
%patch6 -p1 -b .ssid-len-fix
+%patch7 -p1 -b .madwifi-privacy-invoked-fix
+%patch8 -p1 -b .madwifi-ioctl-reorder
%build
cp %{SOURCE1} ./.config
@@ -127,6 +131,11 @@
%{_bindir}/wpa_gui
%changelog
+* Thu Apr 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-10
+- Add fix for madwifi and WEP (wpa_supplicant/hostap bud #140) (#rh190075#)
+- Fix up madwifi-ng private ioctl()s for r1331 and later
+- Update madwifi headers to r1475
+
* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)
More information about the fedora-cvs-commits
mailing list