- Fix WPA Ad-Hoc connections

This commit is contained in:
Daniel Williams 2008-09-04 17:35:25 +00:00
parent 716eed3a51
commit 15a5fd4144
2 changed files with 18 additions and 1 deletions

View File

@ -16,7 +16,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.7.0 Version: 0.7.0
Release: 0.11.%{snapshot}%{?dist} Release: 0.11.%{snapshot}.1%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -26,6 +26,7 @@ Source2: nm-system-settings.conf
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch4: serial-debug.patch Patch4: serial-debug.patch
Patch5: explain-dns1-dns2.patch Patch5: explain-dns1-dns2.patch
Patch6: wpa-adhoc-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig PreReq: chkconfig
@ -146,6 +147,7 @@ tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix %patch1 -p1 -b .buildfix
%patch4 -p1 -b .serial-debug %patch4 -p1 -b .serial-debug
%patch5 -p1 -b .explain-dns1-dns2 %patch5 -p1 -b .explain-dns1-dns2
%patch6 -p1 -b .wpa-adhoc-fix
%build %build
autoreconf -i autoreconf -i
@ -300,6 +302,9 @@ fi
%{_datadir}/gtk-doc/html/libnm-glib/ %{_datadir}/gtk-doc/html/libnm-glib/
%changelog %changelog
* Thu Sep 4 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022.1
- Fix WPA Ad-Hoc connections
* Wed Aug 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022 * Wed Aug 27 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.11.svn4022
- Fix parsing of DOMAIN in ifcfg files (rh #459370) - Fix parsing of DOMAIN in ifcfg files (rh #459370)
- Fix reconnection to mobile broadband networks after an auth failure - Fix reconnection to mobile broadband networks after an auth failure

12
wpa-adhoc-fix.patch Normal file
View File

@ -0,0 +1,12 @@
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",