fix set data

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

2 files changed, 46 insertions, 28 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 225fe5f..695af27 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 9289 RMD160 6e075af500706326f2fb8323d743e9c9b71cbadb SHA1 158bb1512850126dca218e91fba680665c414156 SHA256 cb527e81026e144ee185af5a4d5be4c3e572e7723ecbb6b23a77d24edd6da2b6
+AUX networkmanager-0.8.2-shared-connection.patch 9688 RMD160 ee9653750ab503d062789671c550646ffa4aca49 SHA1 de59d96e2b1a2039b556cca95196a55a8a2c3dd5 SHA256 c4752536020c1cd0d961e09f34d2c3de380a16a84b5b6a2d3b8f2cdf15e5353a
 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)
 
-iQEcBAEBAgAGBQJNMBZxAAoJEDCzDeQXsVfp6iEIAJE+5G3W722TaxeLA+VFfZJq
-1eP9qBvbIDmmVDQwxUnvq/CijyW8UnwPTyEdya4Funrqrqu4oNCjK3s8VSpUwZGj
-j0I6D8az8NB/kUvMloY4N7tAGzZrfOmWWRaa8jNIDibiQL1QvFMLiYCO9Wgt5JBY
-r7oLu5Q+2Il03YnnRHSoTrxQ8QkEiunPuRNvGaAFI23vY/cfTnZX/Rwvqrii+qA6
-IFuvrFw2m3u5tJzXRq3p6PtckgP37fXCxImuC14wO6O8Alg1iPqqvm5BPqPU0ulr
-ujud3e3wV8XeUe2UPBOE+ooK6QSL7u96z0fH74R1j2R3V+cXGWOgYoI2xUeabrc=
-=QgXh
+iQEcBAEBAgAGBQJNMCG+AAoJEDCzDeQXsVfp3v4IAJAYa1veSdmeHtjh+hgTCvcq
+UemdZIRoBI99S7mscTVRKIGkXou97fhawWIPpQBMiM69+2dmobr2NmtcaV4kXjoq
+Ocs9s7Dwj4NgODl83PhF2TQnIK0EpuGAPINiTBlt1KpNM9c2/iWPOQgpENENy60K
+qO5NLzqWaM7dvJdPbN+w5NREXePTvXrPV8NeGTGMBX7ZxxuXJehRaz1wf1G7dspg
+oBYqGJEk7UJv8VuOQBXG54yMfgX5n0+L65SbE9D4U6bDvhC0ruqzpCCMDjfk8vUe
+c/EOd1exaKm7vx/yuF+Su2BgbFcVKJoozsAF2FNKclIXPcIDcsXKxgqS8Shfx00=
+=ULAK
 -----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 41d8cae..0efbb05 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,4 +1,4 @@
-From 3db3f156b2346419afd70621649b590a0667219e Mon Sep 17 00:00:00 2001
+From c1f98ee9f0897f60fba68378020579647055a0c8 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
@@ -6,11 +6,11 @@ Subject: [PATCH] Support shared and link-local method for ipv4
 
 ---
  system-settings/plugins/ifnet/connection_parser.c  |   74 +++++++++++++++-----
- system-settings/plugins/ifnet/net_parser.c         |    7 ++-
+ 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         |   14 ++--
- 5 files changed, 78 insertions(+), 29 deletions(-)
+ system-settings/plugins/ifnet/wpa_parser.c         |   17 +++--
+ 5 files changed, 84 insertions(+), 31 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
 index f9fae51..703059d 100644
@@ -162,26 +162,37 @@ index f9fae51..703059d 100644
  	/* DNS Servers */
  	ifnet_set_data (conn_name, "dns_servers", NULL);
 diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index b4a381d..3dd9fe7 100644
+index b4a381d..6b61c24 100644
 --- a/system-settings/plugins/ifnet/net_parser.c
 +++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -384,14 +384,17 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+@@ -377,6 +377,7 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+ {
+ 	gpointer orin_key = NULL, orin_value = NULL;
+ 	GHashTable *conn = g_hash_table_lookup (conn_table, conn_name);
++	gchar *new_value = NULL;
+ 
+ 	if (!conn) {
+ 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
+@@ -384,14 +385,19 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
  		return;
  	}
  	/* Remove existing key value pair */
-+	if (value)
-+		strip_string (value, '"');
++	if (value){
++		new_value = g_strdup(value);
++		strip_string(new_value);
++	}
  	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
-+		if (value && !strcmp (orin_value, value))
++		if (new_value && !strcmp (orin_value, new_value))
 +			return;
  		g_hash_table_remove (conn, orin_key);
  		g_free (orin_key);
  		g_free (orin_value);
  	}
- 	if (value)
+-	if (value)
 -		g_hash_table_insert (conn, g_strdup (key),
 -				     strip_string (g_strdup (value), '"'));
-+		g_hash_table_insert (conn, g_strdup (key), g_strdup (value));
++	if (new_value)
++		g_hash_table_insert (conn, g_strdup (key), new_value);
  	net_parser_data_changed = TRUE;
  }
  
@@ -223,39 +234,46 @@ index e47495c..ebe2581 100644
  					   NM_IFNET_CONNECTION_CONN_NAME,
  					   conn_name, NULL);
 diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
-index 5e94108..879a026 100644
+index 5e94108..957aafc 100644
 --- a/system-settings/plugins/ifnet/wpa_parser.c
 +++ b/system-settings/plugins/ifnet/wpa_parser.c
-@@ -454,8 +454,15 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
+@@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
+ {
+ 	gpointer orig_key = NULL, orig_value = NULL;
+ 	GHashTable *security = g_hash_table_lookup (wsec_table, ssid);
++	gchar *new_value = NULL;
+ 
  	g_return_if_fail (security != NULL);
  
  	/* Remove old key value pairs */
 +	if (value){
++		new_value = g_strdup(value);
 +		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
 +			&& !g_str_has_prefix (key, "wep_key"))
-+			strip_string (value, '"');
++			strip_string (new_value, '"');
 +	}
  	if (g_hash_table_lookup_extended
  	    (security, key, &orig_key, &orig_value)) {
-+		if (value && !strcmp(orig_value, value))
++		if (new_value && !strcmp(orig_value, new_value))
 +			return;
  		g_hash_table_remove (security, orig_key);
  		g_free (orig_key);
  		g_free (orig_value);
-@@ -463,12 +470,7 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
+ 	}
  
  	/* Add new key value */
- 	if (value) {
+-	if (value) {
 -		gchar *new_value = g_strdup (value);
 -
 -		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
 -		    && !g_str_has_prefix (key, "wep_key"))
 -			strip_string (new_value, '"');
--		g_hash_table_insert (security, g_strdup (key), new_value);
-+		g_hash_table_insert (security, g_strdup (key), g_strdup (value));
- 	}
++	if (new_value)
+ 		g_hash_table_insert (security, g_strdup (key), new_value);
+-	}
  	wpa_parser_data_changed = TRUE;
  }
+ 
 -- 
 1.7.3.4