rpms/NetworkManager/devel wpa-adhoc-fix.patch, NONE, 1.1 NetworkManager.spec, 1.236, 1.237

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18303

Modified Files:
	NetworkManager.spec 
Added Files:
	wpa-adhoc-fix.patch 
Log Message:
* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
- Fix WPA Ad-Hoc connections



wpa-adhoc-fix.patch:

--- NEW FILE wpa-adhoc-fix.patch ---
diff -up NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c
--- NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c.foo	2008-09-04 13:33:24.000000000 -0400
+++ NetworkManager-0.7.0/src/supplicant-manager/nm-supplicant-settings-verify.c	2008-09-04 13:33:32.000000000 -0400
@@ -66,7 +66,7 @@ static const struct validate_entry valid
 const char * pairwise_allowed[] = { "CCMP", "TKIP", "NONE", NULL };
 const char * group_allowed[] =    { "CCMP", "TKIP", "WEP104", "WEP40", NULL };
 const char * proto_allowed[] =    { "WPA", "RSN", NULL };
-const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X",
+const char * key_mgmt_allowed[] = { "WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",
                                     "NONE", NULL };
 const char * auth_alg_allowed[] = { "OPEN", "SHARED", "LEAP", NULL };
 const char * eap_allowed[] =      { "LEAP", "MD5", "TLS", "PEAP", "TTLS", "SIM",


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- NetworkManager.spec	27 Aug 2008 20:56:34 -0000	1.236
+++ NetworkManager.spec	4 Sep 2008 17:35:25 -0000	1.237
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}%{?dist}
+Release: 0.11.%{snapshot}.1%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,6 +26,7 @@
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
+Patch6: wpa-adhoc-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,6 +147,7 @@
 %patch1 -p1 -b .buildfix
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
+%patch6 -p1 -b .wpa-adhoc-fix
 
 %build
 autoreconf -i
@@ -300,6 +302,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/
 
 %changelog
+* Thu Sep  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.1
+- Fix WPA Ad-Hoc connections
+
 * Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022
 - Fix parsing of DOMAIN in ifcfg files (rh #459370)
 - Fix reconnection to mobile broadband networks after an auth failure