rpms/NetworkManager/FC-5 NetworkManager.spec, 1.107, 1.108 sources, 1.53, 1.54 special-case-madwifi.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dcbw

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

Modified Files:
	NetworkManager.spec sources special-case-madwifi.patch 
Log Message:
Update to 0.6.4 release



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- NetworkManager.spec	8 Jun 2006 18:51:33 -0000	1.107
+++ NetworkManager.spec	14 Jul 2006 19:32:13 -0000	1.108
@@ -14,12 +14,12 @@
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
-Version: 0.6.3
-Release: 1%{?nm_cvs_version}.fc5
+Version: 0.6.4
+Release: 1%{?nm_cvs_version}%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}%{?nm_cvs_version}.tar.bz2
+Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
@@ -118,7 +118,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .madwifi
+%patch0 -p1 -b .madwifi
 %patch1 -p1 -b .service-startup
 
 %build
@@ -214,6 +214,9 @@
 
 
 %changelog
+* Fri Jul 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.4-1
+- Update to 0.6.4 release
+
 * Thu Jun  8 2006 Dan Williams <dcbw at redhat.com> - 0.6.3-1
 - Update to 0.6.3 release
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	8 Jun 2006 14:54:02 -0000	1.53
+++ sources	14 Jul 2006 19:32:14 -0000	1.54
@@ -1 +0,0 @@
-8970eabfb8e8141104ad3e9c7f7cde01  NetworkManager-0.6.3.tar.bz2

special-case-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

Index: special-case-madwifi.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-5/special-case-madwifi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- special-case-madwifi.patch	6 Feb 2006 03:18:10 -0000	1.1
+++ special-case-madwifi.patch	14 Jul 2006 19:32:14 -0000	1.2
@@ -1,30 +1,25 @@
-? nl-route.patch
-? src/madwifi.diff
-? src/nm-coddle-madwifi.diff
-Index: src/nm-device-802-11-wireless.c
-===================================================================
-RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
-retrieving revision 1.45
-diff -u -p -r1.45 nm-device-802-11-wireless.c
---- src/nm-device-802-11-wireless.c	5 Feb 2006 23:54:47 -0000	1.45
-+++ src/nm-device-802-11-wireless.c	6 Feb 2006 03:00:46 -0000
-@@ -2277,13 +2277,22 @@ supplicant_interface_init (NMDevice80211
+--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c.madwifi	2006-07-13 12:42:13.000000000 -0400
++++ NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-07-14 15:28:21.000000000 -0400
+@@ -2497,6 +2497,8 @@
  	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
  	gboolean			success = FALSE;
  	int				tries = 0;
-+	const char *		dev_driver;
-+	char *			wpa_driver = "wext";
++ 	const char *		dev_driver;
++ 	char *			wpa_driver = "wext";
  
- 	if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_RUN_DIR)))
+ 	/* Try to open wpa_supplicant's global control socket */
+ 	for (tries = 0; tries < WPA_SUPPLICANT_NUM_RETRIES && !ctrl; tries++)
+@@ -2511,9 +2513,16 @@
  		goto exit;
+ 	}
  
-+	/* Special-case madwifi for now.  madwifi needs to get their
-+	 * act in gear and support WEXT too.
-+	 */
-+	dev_driver = nm_device_get_driver (NM_DEVICE (self));
-+	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
-+		wpa_driver = "madwifi";
-+
++ 	/* Special-case madwifi for now.  madwifi needs to get their
++ 	 * act in gear and support WEXT too.
++ 	 */
++ 	dev_driver = nm_device_get_driver (NM_DEVICE (self));
++ 	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
++ 		wpa_driver = "madwifi";
++ 
  	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
  	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
 -			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))