--- a/ChangeLog	Fri Nov 07 16:11:02 2008 +0000
+++ b/ChangeLog	Tue Nov 11 11:57:07 2008 +0000
@@ -1,3 +1,10 @@
+2008-11-10  Darren Kenny  <[email protected]>
+
+	* base-specs/nwam-manager.spec,
+	  patches/nwam-manager-01-wpa.diff:
+	  Fix bug#4677 where WPA key was being incorrectly prompted for and as
+	  a result no passed to NWAM.
+
 2008-11-07 Erwann Chenede - <[email protected]>
 
 	* indiana/SUNWdesktop-cache.spec: bump to 0.1.3 for 4058

--- a/base-specs/nwam-manager.spec	Fri Nov 07 16:11:02 2008 +0000
+++ b/base-specs/nwam-manager.spec	Tue Nov 11 11:57:07 2008 +0000
@@ -16,6 +16,8 @@
 #Source:       http://src.opensolaris.org/source/raw/jds/nwam-manager/branches/phase-0.5/tarballs/%{name}-%{version}.tar.gz
 Source:       http://www.opensolaris.org/os/project/nwam/picea/%{name}-%{version}.tar.gz
 #Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
+# date:2008-11-10 owner:dkenny type:bug bugzilla:4677
+Patch1:       nwam-manager-01-wpa.diff
 URL:          http://www.opensolaris.org/os/project/nwam
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %ifos linux
@@ -103,6 +106,9 @@
 %{_includedir}/nwam/*
 
 %changelog
+* Mon Nov 10 2008 - [email protected]
+- Added patch to fix bug#4677 where WPA passwords are not being passed to NWAM
+  when requested.
 * Mon Oct 20 2008 - [email protected]
 - Bump to 0.5.11 to get translations (Bug#6761343) and also fix an issue where
   NWAM Manager is show messages too early in the login cycle (Bug#6761297).

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nwam-manager-01-wpa.diff	Tue Nov 11 11:57:07 2008 +0000
@@ -0,0 +1,13 @@
+--- nwam-manager-0.5.11/common/nwamui_wifi_net.c	(revision 189)
++++ nwam-manager-0.5.11/common/nwamui_wifi_net.c	(working copy)
+@@ -1124,7 +1124,9 @@
+         return NWAMUI_WIFI_SEC_WEP_HEX;
+     }
+     else if ( g_ascii_strcasecmp( str, "wpa" ) == 0 ) {
+-        return NWAMUI_WIFI_SEC_WPA_PERSONAL;
++        /* For Phase 0.5 - we don't differentiate, all should be seen as WEP */
++        /* return NWAMUI_WIFI_SEC_WPA_PERSONAL; */
++        return NWAMUI_WIFI_SEC_WEP_HEX;
+     }
+     else {
+         return NWAMUI_WIFI_SEC_NONE;