Wed Aug 27 21:15:18 UTC 2008

Author: dcbw

Update of /cvs/extras/rpms/wpa_supplicant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31038

Modified Files:
	.cvsignore sources wpa_supplicant-assoc-timeout.patch 
	wpa_supplicant.config wpa_supplicant.spec 
Removed Files:
	wpa_supplicant-0.6.3-dont-reschedule-specific-scans.patch 
	wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch 
	wpa_supplicant-0.6.3-wext-dont-overwrite-BSS-frequency.patch 
	wpa_supplicant-0.6.3-wext-handle-mac80211-mode-switches.patch 
	wpa_supplicant-0.6.3-wpa-gui-fixes.patch 
Log Message:
* Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.4-1
- Update to 0.6.4
- Remove 'hostap', 'madwifi', and 'prism54' drivers; use standard 'wext' instead
- Drop upstreamed patches




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	3 Mar 2008 17:20:11 -0000	1.8
+++ .cvsignore	27 Aug 2008 21:14:46 -0000	1.9
@@ -6,3 +6,4 @@
 wpa_supplicant-0.4.9.tar.gz
 wpa_supplicant-0.5.7.tar.gz
 wpa_supplicant-0.6.3.tar.gz
+wpa_supplicant-0.6.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Mar 2008 17:20:11 -0000	1.8
+++ sources	27 Aug 2008 21:14:46 -0000	1.9
@@ -1,2 +1 @@
-b82289b140cc1c66db11564bde248d8a  madwifi-headers-r1475.tar.bz2
-b51b2975f21006f85f7297f3fb1acde1  wpa_supplicant-0.6.3.tar.gz
+eb06a9a05d3916addf9451297a558aa2  wpa_supplicant-0.6.4.tar.gz

wpa_supplicant-assoc-timeout.patch:

Index: wpa_supplicant-assoc-timeout.patch
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant-assoc-timeout.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wpa_supplicant-assoc-timeout.patch	11 Jun 2008 11:01:48 -0000	1.3
+++ wpa_supplicant-assoc-timeout.patch	27 Aug 2008 21:14:47 -0000	1.4
@@ -1,14 +1,16 @@
---- wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c.timeout	2006-03-03 22:26:13.000000000 -0500
-+++ wpa_supplicant-0.6.3/wpa_supplicant/wpa_supplicant.c	2006-03-03 22:26:45.000000000 -0500
-@@ -1252,9 +1252,9 @@
- 		/* Timeout for IEEE 802.11 authentication and association */
- 		int timeout;
- 		if (assoc_failed)
--			timeout = 5;
-+			timeout = 15;
- 		else if (wpa_s->conf->ap_scan == 1)
--			timeout = 10;
-+			timeout = 20;
- 		else
- 			timeout = 60;
+diff -up wpa_supplicant-0.6.4/wpa_supplicant/wpa_supplicant.c.assoc-timeout wpa_supplicant-0.6.4/wpa_supplicant/wpa_supplicant.c
+--- wpa_supplicant-0.6.4/wpa_supplicant/wpa_supplicant.c.assoc-timeout	2008-08-27 17:01:00.000000000 -0400
++++ wpa_supplicant-0.6.4/wpa_supplicant/wpa_supplicant.c	2008-08-27 17:01:22.000000000 -0400
+@@ -1094,10 +1094,10 @@ void wpa_supplicant_associate(struct wpa
+ 
+ 		if (assoc_failed) {
+ 			/* give IBSS a bit more time */
+- 			timeout = ssid->mode ? 10 : 5;
++ 			timeout = ssid->mode ? 20 : 10;
+ 		} else if (wpa_s->conf->ap_scan == 1) {
+ 			/* give IBSS a bit more time */
+- 			timeout = ssid->mode ? 20 : 10;
++ 			timeout = ssid->mode ? 20 : 20;
+ 		}
  		wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);
+ 	}


Index: wpa_supplicant.config
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wpa_supplicant.config	17 Aug 2007 21:29:43 -0000	1.5
+++ wpa_supplicant.config	27 Aug 2008 21:14:47 -0000	1.6
@@ -1,12 +1,12 @@
 CONFIG_CTRL_IFACE=y
 CONFIG_CTRL_IFACE_DBUS=y
-CONFIG_DRIVER_HOSTAP=y
+//CONFIG_DRIVER_HOSTAP=y
 //CONFIG_DRIVER_HERMES=y
-CONFIG_DRIVER_MADWIFI=y
+//CONFIG_DRIVER_MADWIFI=y
 CONFIG_DRIVER_ATMEL=y
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NDISWRAPPER=y
-CONFIG_DRIVER_PRISM54=y
+//CONFIG_DRIVER_PRISM54=y
 CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wpa_supplicant.spec	11 Jun 2008 11:01:48 -0000	1.47
+++ wpa_supplicant.spec	27 Aug 2008 21:14:47 -0000	1.48
@@ -1,8 +1,8 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 0.6.3
-Release: 6%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -10,19 +10,13 @@
 Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
-Source5: madwifi-headers-r1475.tar.bz2
 Source6: %{name}.logrotate
 
 Patch0: wpa_supplicant-assoc-timeout.patch
-Patch1: wpa_supplicant-0.6.3-wpa-gui-fixes.patch
-Patch2: wpa_supplicant-0.5.7-qmake-location.patch
-Patch3: wpa_supplicant-0.5.7-flush-debug-output.patch
-Patch4: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
-Patch5: wpa_supplicant-0.5.10-dbus-service-file.patch
-Patch6: wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch
-Patch7: wpa_supplicant-0.6.3-wext-dont-overwrite-BSS-frequency.patch
-Patch8: wpa_supplicant-0.6.3-dont-reschedule-specific-scans.patch
-Patch9: wpa_supplicant-0.6.3-wext-handle-mac80211-mode-switches.patch
+Patch1: wpa_supplicant-0.5.7-qmake-location.patch
+Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch
+Patch3: wpa_supplicant-0.5.7-use-IW_ENCODE_TEMP.patch
+Patch4: wpa_supplicant-0.5.10-dbus-service-file.patch
 
 URL: http://w1.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,21 +45,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .assoc-timeout
-%patch1 -p1 -b .wpa-gui-fixes
-%patch2 -p1 -b .qmake-location
-%patch3 -p1 -b .flush-debug-output
-%patch4 -p1 -b .use-IW_ENCODE_TEMP
-%patch5 -p1 -b .dbus-service-file
-%patch6 -p1 -b .use-after-free
-%patch7 -p1 -b .bss-freq
-%patch8 -p1 -b .ssid-scans
-%patch9 -p1 -b .mac80211-mode
+%patch1 -p1 -b .qmake-location
+%patch2 -p1 -b .flush-debug-output
+%patch3 -p1 -b .use-IW_ENCODE_TEMP
+%patch4 -p1 -b .dbus-service-file
 
 %build
-pushd src
-  tar -xjf %{SOURCE5}
-popd
-
 pushd wpa_supplicant
   cp %{SOURCE1} ./.config
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
@@ -153,6 +138,11 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.4-1
+- Update to 0.6.4
+- Remove 'hostap', 'madwifi', and 'prism54' drivers; use standard 'wext' instead
+- Drop upstreamed patches
+
 * Tue Jun 10 2008 Dan Williams <dcbw at redhat.com> - 1:0.6.3-6
 - Fix 802.11a frequency bug
 - Always schedule specific SSID scans to help find hidden APs


--- wpa_supplicant-0.6.3-dont-reschedule-specific-scans.patch DELETED ---


--- wpa_supplicant-0.6.3-fix-dbus-use-after-free.patch DELETED ---


--- wpa_supplicant-0.6.3-wext-dont-overwrite-BSS-frequency.patch DELETED ---


--- wpa_supplicant-0.6.3-wext-handle-mac80211-mode-switches.patch DELETED ---


--- wpa_supplicant-0.6.3-wpa-gui-fixes.patch DELETED ---


