rpms/NetworkManager/FC-6 wpas-debugspew.patch, NONE, 1.1 wpas-wait-longer.patch, NONE, 1.1 NetworkManager.spec, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32361

Modified Files:
	NetworkManager.spec 
Added Files:
	wpas-debugspew.patch wpas-wait-longer.patch 
Log Message:
* Sun Nov 12 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-8
- OLPC one-off build: up supplicant timeout, add debug spew



wpas-debugspew.patch:
 nm-device-802-11-wireless.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE wpas-debugspew.patch ---
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.wpas-debugspew	2006-08-13 23:34:20.000000000 -0400
+++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-11-12 20:23:56.000000000 -0500
@@ -2412,7 +2412,7 @@
 }
 
 
-#define NM_SUPPLICANT_TIMEOUT	20	/* how long we wait for wpa_supplicant to associate (in seconds) */
+#define NM_SUPPLICANT_TIMEOUT	40	/* how long we wait for wpa_supplicant to associate (in seconds) */
 
 static unsigned int
 get_supplicant_timeout (NMDevice80211Wireless *self)
@@ -2543,7 +2543,7 @@
 supplicant_exec (NMDevice80211Wireless *self)
 {
 	gboolean	success = FALSE;
-	char *	argv[4];
+	char *	argv[5];
 	GError *	error = NULL;
 	GPid		pid = -1;
 	int		sup_stdout;
@@ -2551,7 +2551,8 @@
 	argv[0] = WPA_SUPPLICANT_BIN;
 	argv[1] = "-g";
 	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
-	argv[3] = NULL;
+	argv[3] = "-dd";
+	argv[4] = NULL;
 
 	success = g_spawn_async_with_pipes ("/", argv, NULL, 0, NULL, NULL,
 	                    &pid, NULL, &sup_stdout, NULL, &error);

wpas-wait-longer.patch:
 wpa_ctrl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE wpas-wait-longer.patch ---
--- NetworkManager-0.6.4/src/wpa_ctrl.c.foo	2006-11-12 20:09:19.000000000 -0500
+++ NetworkManager-0.6.4/src/wpa_ctrl.c	2006-11-12 20:09:50.000000000 -0500
@@ -144,7 +144,7 @@
 		return -1;
 
 	for (;;) {
-		tv.tv_sec = 2;
+		tv.tv_sec = 10;
 		tv.tv_usec = 0;
 		FD_ZERO(&rfds);
 		FD_SET(ctrl->s, &rfds);


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-6/NetworkManager.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- NetworkManager.spec	25 Oct 2006 04:16:34 -0000	1.128
+++ NetworkManager.spec	13 Nov 2006 01:45:25 -0000	1.129
@@ -27,7 +27,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -37,6 +37,8 @@
 Patch2: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch3: NetworkManager-0.6.4-kill-stupid-timeouts.patch
 Patch4: NetworkManager-0.6.4-dbus-vpn-dont-block.patch
+Patch5: wpas-debugspew.patch
+Patch6: wpas-wait-longer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -144,6 +146,8 @@
 %patch2 -p1 -b .startup-dhcdbd
 %patch3 -p1 -b .kill-stupid-timeouts
 %patch4 -p1 -b .dbus-vpn-nonblock
+%patch5 -p1 -b .wpas-debugspew
+%patch6 -p1 -b .wpas-wait-longer
 
 %build
 # Even though we don't require named, we still build with it
@@ -244,6 +248,9 @@
 
 
 %changelog
+* Sun Nov 12 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-8
+- OLPC one-off build: up supplicant timeout, add debug spew
+
 * Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.4-7
 - Bump revision #