fix flush_to_file

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

2 files changed, 38 insertions, 18 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 43fcaf2..5ea61a7 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 9762 RMD160 81ccdacb21ac3c5df8e64d8fc1f8e043e2852ec6 SHA1 24d88e095b1b83a3c6486979466c2d83cd4e468f SHA256 c5823d906f89bf67b4edfda42073a7399dd215f36c4b907bee42f2e10bf3d71c
+AUX networkmanager-0.8.2-shared-connection.patch 10242 RMD160 26df22af1ee21f321890e36b88384b60ab795d5f SHA1 fc3c3abcf4599b536c7f173a72819b7c5f48f607 SHA256 a980aaa2e03f409e0607f32f9943282cc067ddeb3eca7c3b5b68e5f85698ff2f
 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)
 
-iQEcBAEBAgAGBQJNMCQqAAoJEDCzDeQXsVfpxvEIAJTMw89DraD6Abwe8dF+/duw
-s38nZohAVdH/bz9B9SzJPcQ+bUMRtE9DZN5xIszh95nELclOV7pZIqO6LkOLdb2j
-yqaHgJDuST6JbVvw/Ajz7goJ8ebFoKTC1uOAGbLPFXGObY1sid0Zgiuxe3AQfdoO
-f1Fnv5NSZfFt1yj7yRIslMjaJtOgdTQLup4gmSQcI1xIEpghjP+UPPlGR75EPLD6
-5roR1qXDKyt3Khi/69BTVqAosLSMT3q7eCTNI0QSzLPyW+IosuVRzWRrfRgbqqGm
-30buDqmlggtaR7drixs0ZH0DRfn/zfTNoTioicWS6Z7GCZv4Qz9Z8vyOnur2LgU=
-=G/A2
+iQEcBAEBAgAGBQJNMCaTAAoJEDCzDeQXsVfp5aQIAK1Jq71uax+PQxFk/ja31lbs
+Jo+1WYq0NledDew9i18PVjp8orGPLEAKLRQbMZ8h+amQR2u/6AmSPjBrkrEnyAi6
+e4csy0/relzlj83XMsqkOvIQC46TY4UZW/VjMEJIDZGJIYsDn9MgY3QagEG8H9uK
+6+OkCJIFqFNingqiCUquoDBo2avh6iau4k+fI4U8y7IDfQumsPPpuvYP2DPRdcr/
+e2YY5dMRJi4NX5qEjMAFMNzfpFL2cWwEQjhtTJ9jXaklF3Xx2fdyYqVOrbkExAeX
+rE2uZUvmblDuwVKYzbu+IpXJqjmz6+qvRaU2viFoN19vUaCXPgFc3NW1OJazYRI=
+=rlEy
 -----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 fdac9fa..14cce76 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,16 +1,18 @@
-From 01cf3d5ead78786fb05921da18feeda985a05bac Mon Sep 17 00:00:00 2001
+From ea13027128e5d2781fe88805ee580cc9a49a8a4f 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>
+ fix flush_to_file, return TRUE when nothing changed
+ ssid do not lose quotes anymore
 
 ---
  system-settings/plugins/ifnet/connection_parser.c  |   77 +++++++++++++++-----
- system-settings/plugins/ifnet/net_parser.c         |   12 +++-
+ system-settings/plugins/ifnet/net_parser.c         |   14 +++-
  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, 85 insertions(+), 33 deletions(-)
+ system-settings/plugins/ifnet/wpa_parser.c         |   19 +++--
+ 5 files changed, 87 insertions(+), 35 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
 index f9fae51..a755ec8 100644
@@ -167,10 +169,10 @@ index f9fae51..a755ec8 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..5991f09 100644
+index b4a381d..9f58e91 100644
 --- a/system-settings/plugins/ifnet/net_parser.c
 +++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -377,6 +377,7 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+@@ -377,21 +377,27 @@ 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);
@@ -178,14 +180,14 @@ index b4a381d..5991f09 100644
  
  	if (!conn) {
  		PLUGIN_WARN (IFNET_PLUGIN_NAME,
-@@ -384,14 +385,19 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+ 			     "%s does not exsit!", conn_name);
  		return;
  	}
- 	/* Remove existing key value pair */
 +	if (value){
 +		new_value = g_strdup (value);
 +		strip_string (new_value, '"');
 +	}
+ 	/* Remove existing key value pair */
  	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
 +		if (new_value && !strcmp (orin_value, new_value))
 +			return;
@@ -201,6 +203,15 @@ index b4a381d..5991f09 100644
  	net_parser_data_changed = TRUE;
  }
  
+@@ -467,7 +473,7 @@ ifnet_flush_to_file (gchar * config_file)
+ 	gboolean result = FALSE;
+ 
+ 	if (!net_parser_data_changed)
+-		return FALSE;
++		return TRUE;
+ 	if (!conn_table || !global_settings_table)
+ 		return FALSE;
+ 
 diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
 index 2dc253c..7e52f10 100644
 --- a/system-settings/plugins/ifnet/net_utils.c
@@ -239,9 +250,18 @@ 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..957aafc 100644
+index 5e94108..726e4b2 100644
 --- a/system-settings/plugins/ifnet/wpa_parser.c
 +++ b/system-settings/plugins/ifnet/wpa_parser.c
+@@ -366,7 +366,7 @@ wpa_flush_to_file (gchar * config_file)
+ 	gboolean result = FALSE;
+ 
+ 	if (!wpa_parser_data_changed)
+-		return FALSE;
++		return TRUE;
+ 	if (!wsec_table || !wsec_global_table)
+ 		return FALSE;
+ 
 @@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
  {
  	gpointer orig_key = NULL, orig_value = NULL;
@@ -250,13 +270,13 @@ index 5e94108..957aafc 100644
  
  	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 (new_value, '"');
 +	}
+ 	/* Remove old key value pairs */
  	if (g_hash_table_lookup_extended
  	    (security, key, &orig_key, &orig_value)) {
 +		if (new_value && !strcmp(orig_value, new_value))