Won't update network if nothing changed

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

2 files changed, 20 insertions, 17 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 7a23246..fc77b1e 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 14877 RMD160 5897156374833d29253fdba9f2f8aaf6a7a32d87 SHA1 842dc7a682578f7659d864b400b23d25d373933d SHA256 7dc3157415800291eaac8a26bb9072e2dfa7021276c678b389cd34d07996532b
+AUX networkmanager-0.8.2-shared-connection.patch 14966 RMD160 2c8680d6c17f8ff747cf64e3d0c68993698fb6de SHA1 d508d27513c2affbc632fdb5c42c9c0d0fcd6a22 SHA256 7d8a06d8c9484c69eba880d9de5725a39f44247afa381e12e67386e7c99901a8
 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)
 
-iQEcBAEBAgAGBQJNMoA3AAoJEDCzDeQXsVfpPeAH/iB6ZKYySfJAmWIwSijiuAPD
-WVgB+Q0l3VB1GkpnhnUPF6HZYySNIW3Plj0QXs7JI6QPKaR+0Hq2Hpy81wDPfiW8
-LA2TN4U38iZyB729miTjBuk1xMQXRHcUbGvNF1VU0EyIZbeK4QiTLPFbu0/j7ETK
-4lANcU8Jw590DdZq4udUCoePm6ThjOWpo1k0NyJw5XO0d9/3V13oZetdyckMQ/hp
-j1MCDwNf9rSY6+TIHQYxxENmPVTbn4gbicNkapEE0Zh2uujlZwRTmXoi8wVpmwc0
-ah7Yr5xFLjdgqo+8VR1L/fAIxGGfmcQemdXem4waXgaUI//byxeu7mIOb44fGOY=
-=fKIJ
+iQEcBAEBAgAGBQJNMo7eAAoJEDCzDeQXsVfpoCkIAJfn5Zc8nSSCEyt4Lz2XE+SA
+wggV/XQfzaa9KmtmrfgJ5E1Km7iCClndFFHVS8yc2t3H80mMcmOATkHuTHfMsBDw
+icDV7IIXH9Wk798+H2AJP4pT9RW29p5pz8WQ9X+2g2zRRcLKKIrgAmUmYLdjksxJ
+xtedvB/VPjrSobVNy0CBH11Ri2RYeBfduG4J3sSdAdIA5RjKfR3bte0G7DhIagwO
+MPbPBV7h6ZRrN714i8eBZlIGYl4I2Km/NJrIolm63TxVbwzzgXkcXDRD9AbqcVud
+EvW/1UeJEaU3UxmQEtFhSCnm+B/FOlmadSWP5/RJw91DyWdZB2s76DolZ5x4Hi4=
+=SKqb
 -----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 49e94a0..17372ac 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 744f1789da873c98867855f2936c77310548b980 Mon Sep 17 00:00:00 2001
+From b524a132bcbf45e1da815e28e28ec662a30aaf87 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
@@ -10,12 +10,12 @@ 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  |   92 ++++++++++++++------
- system-settings/plugins/ifnet/net_parser.c         |   53 +++++++-----
+ system-settings/plugins/ifnet/net_parser.c         |   55 +++++++-----
  system-settings/plugins/ifnet/net_parser.h         |    4 +-
  system-settings/plugins/ifnet/net_utils.c          |    4 +
  .../plugins/ifnet/nm-ifnet-connection.c            |    8 +-
  system-settings/plugins/ifnet/wpa_parser.c         |   21 +++--
- 6 files changed, 121 insertions(+), 61 deletions(-)
+ 6 files changed, 123 insertions(+), 61 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
 index f9fae51..539f33c 100644
@@ -218,7 +218,7 @@ index f9fae51..539f33c 100644
  		    ifnet_update_parsers_by_connection (connection, new_name,
  							NULL, config_file,
 diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index b4a381d..8dc4f7f 100644
+index b4a381d..53a8726 100644
 --- a/system-settings/plugins/ifnet/net_parser.c
 +++ b/system-settings/plugins/ifnet/net_parser.c
 @@ -37,6 +37,9 @@ static GList *functions_list;
@@ -231,16 +231,19 @@ index b4a381d..8dc4f7f 100644
  static GHashTable *
  add_new_connection_config (const gchar * type, const gchar * name)
  {
-@@ -58,7 +61,7 @@ add_new_connection_config (const gchar * type, const gchar * name)
+@@ -58,8 +61,10 @@ add_new_connection_config (const gchar * type, const gchar * name)
  }
  
  gboolean
 -ifnet_add_connection (gchar * name, gchar * type)
 +ifnet_add_network (gchar * name, gchar * type)
  {
++	if (ifnet_has_network (conn_name))
++		return TRUE;
  	if (add_new_connection_config (type, name)) {
  		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name);
-@@ -69,11 +72,27 @@ ifnet_add_connection (gchar * name, gchar * type)
+ 		net_parser_data_changed = TRUE;
+@@ -69,11 +74,27 @@ ifnet_add_connection (gchar * name, gchar * type)
  }
  
  gboolean
@@ -269,7 +272,7 @@ index b4a381d..8dc4f7f 100644
  static GHashTable *
  get_connection_config (gchar * name)
  {
-@@ -377,21 +396,27 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
+@@ -377,21 +398,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);
@@ -300,7 +303,7 @@ index b4a381d..8dc4f7f 100644
  	net_parser_data_changed = TRUE;
  }
  
-@@ -467,7 +492,7 @@ ifnet_flush_to_file (gchar * config_file)
+@@ -467,7 +494,7 @@ ifnet_flush_to_file (gchar * config_file)
  	gboolean result = FALSE;
  
  	if (!net_parser_data_changed)
@@ -309,7 +312,7 @@ index b4a381d..8dc4f7f 100644
  	if (!conn_table || !global_settings_table)
  		return FALSE;
  
-@@ -583,22 +608,6 @@ ifnet_flush_to_file (gchar * config_file)
+@@ -583,22 +610,6 @@ ifnet_flush_to_file (gchar * config_file)
  	return result;
  }