do not remove psk any more

(Portage version: 2.1.9.31/git/Linux x86_64, signed Manifest commit with key 17B157E9)

2 files changed, 20 insertions, 15 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3d5beee..43fcaf2 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,7 @@ AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98
 AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3
 AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
 AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
-AUX networkmanager-0.8.2-shared-connection.patch 9695 RMD160 637fc7be816f9c4676d64824b293e96201016697 SHA1 a8370b763ef8fcebad280d34dfce1e2bbc176ac9 SHA256 a6364507b673843313ec8e4bde51177b04f8d4ed9965113c5784f1972e8f868e
+AUX networkmanager-0.8.2-shared-connection.patch 9762 RMD160 81ccdacb21ac3c5df8e64d8fc1f8e043e2852ec6 SHA1 24d88e095b1b83a3c6486979466c2d83cd4e468f SHA256 c5823d906f89bf67b4edfda42073a7399dd215f36c4b907bee42f2e10bf3d71c
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
@@ -16,11 +16,11 @@ MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNMCMwAAoJEDCzDeQXsVfpx8IH+wZLWc27HCW9k1lwIYh5mfnA
-wluMj0vBl/CNpKvc9ta+qwbCRvq/JSAozq9WYZEkRj8Zsigv1OfMQ/CZmsXo0YV/
-+R24X8oahHwktPO8J8muURlh3SpowDYE5Zc3844L3X1WQgs4iBUXA/yFAlHInv30
-ADL5i/33fkqFXs3lJTPeZOVBEC9KkpySuieUvQgbJzAMBYnkrf7o9qqn0UvoTWLz
-DGTiB7FLu2zk4euOawO72TFReFBuO4S2xaaMsWa71ymnUlJOiSkNkd3P35ghMYl5
-rVFXM2euB1QNJ5GGo32qetkpharBhygIBypePg0aj7aLMf2XhjNMKeCHNkF6n0Q=
-=9Wv1
+iQEcBAEBAgAGBQJNMCQqAAoJEDCzDeQXsVfpxvEIAJTMw89DraD6Abwe8dF+/duw
+s38nZohAVdH/bz9B9SzJPcQ+bUMRtE9DZN5xIszh95nELclOV7pZIqO6LkOLdb2j
+yqaHgJDuST6JbVvw/Ajz7goJ8ebFoKTC1uOAGbLPFXGObY1sid0Zgiuxe3AQfdoO
+f1Fnv5NSZfFt1yj7yRIslMjaJtOgdTQLup4gmSQcI1xIEpghjP+UPPlGR75EPLD6
+5roR1qXDKyt3Khi/69BTVqAosLSMT3q7eCTNI0QSzLPyW+IosuVRzWRrfRgbqqGm
+30buDqmlggtaR7drixs0ZH0DRfn/zfTNoTioicWS6Z7GCZv4Qz9Z8vyOnur2LgU=
+=G/A2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
index 3ace78b..fdac9fa 100644
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
@@ -1,19 +1,19 @@
-From 11adb5feaf8fff565ed16127a040a2a643be412f Mon Sep 17 00:00:00 2001
+From 01cf3d5ead78786fb05921da18feeda985a05bac Mon Sep 17 00:00:00 2001
 From: Mu Qiao <qiaomuf@gentoo.org>
 Date: Wed, 5 Jan 2011 13:30:08 +0800
 Subject: [PATCH] Support shared and link-local method for ipv4
  Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
 
 ---
- system-settings/plugins/ifnet/connection_parser.c  |   74 +++++++++++++++-----
+ system-settings/plugins/ifnet/connection_parser.c  |   77 +++++++++++++++-----
  system-settings/plugins/ifnet/net_parser.c         |   12 +++-
  system-settings/plugins/ifnet/net_utils.c          |    4 +
  .../plugins/ifnet/nm-ifnet-connection.c            |    8 ++-
  system-settings/plugins/ifnet/wpa_parser.c         |   17 +++--
- 5 files changed, 84 insertions(+), 31 deletions(-)
+ 5 files changed, 85 insertions(+), 33 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index f9fae51..703059d 100644
+index f9fae51..a755ec8 100644
 --- a/system-settings/plugins/ifnet/connection_parser.c
 +++ b/system-settings/plugins/ifnet/connection_parser.c
 @@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
@@ -132,7 +132,7 @@ index f9fae51..703059d 100644
  
  	if (auth_alg) {
  		if (!strcmp (auth_alg, "shared"))
-@@ -2180,8 +2211,11 @@ write_wireless_security_setting (NMConnection * connection,
+@@ -2180,12 +2211,14 @@ write_wireless_security_setting (NMConnection * connection,
  			g_string_append (quoted, psk);
  			g_string_append_c (quoted, '"');
  		}
@@ -145,8 +145,13 @@ index f9fae51..703059d 100644
 +			PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM");
  		if (quoted)
  			g_string_free (quoted, TRUE);
- 	} else
-@@ -2443,8 +2477,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
+-	} else
+-		wpa_set_data (conn_name, "psk", NULL);
++	}
+ 
+ 	return TRUE;
+ }
+@@ -2443,8 +2476,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
  		}
  		ifnet_set_data (conn_name, "config", ips->str);
  		g_string_free (ips, TRUE);