From 8b98292d0006b547875a9d0cc945bede87c95846 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Mon, 27 Mar 2006 19:06:52 +0000
Subject: [PATCH] - Add patch to make orinoco happy with WEP keys - Enable
 Prism54-specific driver - Disable ipw-specific driver; ipw2x00 should be
 using WEXT instead

---
 wpa_supplicant-wep-key-fix.patch | 13 +++++++++++++
 wpa_supplicant.config            |  3 ++-
 wpa_supplicant.spec              |  9 ++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 wpa_supplicant-wep-key-fix.patch

diff --git a/wpa_supplicant-wep-key-fix.patch b/wpa_supplicant-wep-key-fix.patch
new file mode 100644
index 0000000..7d64814
--- /dev/null
+++ b/wpa_supplicant-wep-key-fix.patch
@@ -0,0 +1,13 @@
+Index: wpa_supplicant-0.4.8/driver_wext.c
+===================================================================
+--- wpa_supplicant-0.4.8.orig/driver_wext.c
++++ wpa_supplicant-0.4.8/driver_wext.c
+@@ -1415,7 +1415,7 @@ int wpa_driver_wext_set_key(void *priv, 
+ 		memset(&iwr, 0, sizeof(iwr));
+ 		strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
+ 		iwr.u.encoding.flags = key_idx + 1;
+-		iwr.u.encoding.pointer = (caddr_t) key;
++		iwr.u.encoding.pointer = (caddr_t) NULL;
+ 		iwr.u.encoding.length = 0;
+ 		if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
+ 			perror("ioctl[SIOCSIWENCODE] (set_tx)");
diff --git a/wpa_supplicant.config b/wpa_supplicant.config
index dbd2dd9..270e8a4 100644
--- a/wpa_supplicant.config
+++ b/wpa_supplicant.config
@@ -5,8 +5,9 @@ CONFIG_DRIVER_MADWIFI=y
 CONFIG_DRIVER_ATMEL=y
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NDISWRAPPER=y
+CONFIG_DRIVER_PRISM54=y
 //CONFIG_DRIVER_BROADCOM=y
-CONFIG_DRIVER_IPW=y
+//CONFIG_DRIVER_IPW=y
 //CONFIG_DRIVER_BSD=y
 //CONFIG_DRIVER_NDIS=y
 CONFIG_WIRELESS_EXTENSION=y
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index b0e405d..ee3f3a4 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -2,7 +2,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 5
+Release: 6.fc6
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
 Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch
 Patch3: wpa_supplicant-assoc-timeout.patch
 Patch4: wpa_supplicant-driver-wext-debug.patch
+Patch5: wpa_supplicant-wep-key-fix.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +47,7 @@ Graphical User Interface for wpa_supplicant written using QT3
 %patch2 -p1 -b .ctrl-iface-hide-keys
 %patch3 -p1 -b .assoc-timeout
 %patch4 -p1 -b .driver-wext-debug
+%patch5 -p1 -b .wep-key-fix
 
 %build
 cp %{SOURCE1} ./.config
@@ -123,6 +125,11 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Mon Mar 27 2006 Dan Williams <dcbw@redhat.com> - 0.4.8-6
+- Add patch to make orinoco happy with WEP keys
+- Enable Prism54-specific driver
+- Disable ipw-specific driver; ipw2x00 should be using WEXT instead
+
 * Fri Mar  3 2006 Dan Williams <dcbw@redhat.com> - 0.4.8-5
 - Increase association timeout, mainly for drivers that don't
 	fully support WPA ioctls yet