include the patch

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

2 files changed, 11 insertions, 39 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 8382a76..1956fa5 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,17 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- - -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 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 14966 RMD160 2c8680d6c17f8ff747cf64e3d0c68993698fb6de SHA1 d508d27513c2affbc632fdb5c42c9c0d0fcd6a22 SHA256 7d8a06d8c9484c69eba880d9de5725a39f44247afa381e12e67386e7c99901a8
+AUX networkmanager-0.8.2-shared-connection.patch 14961 RMD160 4c37ccb1e63c12dac0b60aabf2d107d51f1f2ac9 SHA1 709f4d9104d2423699d934ad9eca5e8cc3233395 SHA256 93ae68009518c4bdf809a43eb84c063042cf5d2bf099da8aeb8f52c97be42b9b
 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
@@ -19,36 +13,14 @@ EBUILD networkmanager-0.8.2-r104.ebuild 4202 RMD160 16fddd8bd4a77905a47850fecb12
 EBUILD networkmanager-9999.ebuild 4197 RMD160 4a64e0b4141d174eda2716f2a08f6ce5f0a52ed8 SHA1 fd2a1e026e7625312431048ccca94216c3936b76 SHA256 006eea72c4dfc9e605d353c47ad85b8a6a70cbd0eb784aa363b49397b53e393a
 MISC ChangeLog 18915 RMD160 6b010bfb98563502a1503c06f962ab2c030043f3 SHA1 88a338f79f4c7980b0322642aa055bb2ffb2adb9 SHA256 c4f984efef8828c8d04cc34ec4b42b187f012515bcb4675ae10fa1005f97f00d
 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
-- - -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNMo7eAAoJEDCzDeQXsVfpoCkIAJfn5Zc8nSSCEyt4Lz2XE+SA
-wggV/XQfzaa9KmtmrfgJ5E1Km7iCClndFFHVS8yc2t3H80mMcmOATkHuTHfMsBDw
-icDV7IIXH9Wk798+H2AJP4pT9RW29p5pz8WQ9X+2g2zRRcLKKIrgAmUmYLdjksxJ
-xtedvB/VPjrSobVNy0CBH11Ri2RYeBfduG4J3sSdAdIA5RjKfR3bte0G7DhIagwO
-MPbPBV7h6ZRrN714i8eBZlIGYl4I2Km/NJrIolm63TxVbwzzgXkcXDRD9AbqcVud
-EvW/1UeJEaU3UxmQEtFhSCnm+B/FOlmadSWP5/RJw91DyWdZB2s76DolZ5x4Hi4=
-=SKqb
-- - -----END PGP SIGNATURE-----
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNMo/AAAoJEDCzDeQXsVfpWo8H/1c22fY2HVwMg1gr/qrPyYWS
-nquRuDyQuPlhFp4tMRBygvRvMM2j5PV4EfyzK8qZbk3meSnxR68je5WIzBfK2IxP
-7cCxDGOXGPSwYWPNqv8TnapU3upsGa5G+Pj6b01Dp4kRbJeC5DshrmYtya7wyyfn
-j7iZ3Nd6RoimzH3v3tNgcHNws53NoSeYn7lFWvnc2NhrKTFKm2t+cO3LnPBtQv0a
-3Iv+d8nSz+pkNHbltoIZ1oKhn7Ay7Ke/aatzcNzmwO82Ua55uTH0d9kZygtMM9fK
-3mMNtDSDOs1+3gkHwWIMDFWQMGiXgQyKoF6x/sufbBOof150bfX8KeVBCQwphbE=
-=xqch
-- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNMo/WAAoJEDCzDeQXsVfp69UH/RvDjowXutfkne2p6mVvn9Mn
-oiG771kTHbTkgpJX1oToMINqblgtY139F0TTuEd0aJJKenlhF0c1hpkFOgD5OhiE
-RPohESwlV55ERydxEFaHyJV182wH7B4pUxEVGdmYNkVP9UNshgy/EONu27mawQ2K
-Va+mazuQjnqcrOHCQ2x7vPfivRZP8c5gtO6JjHaOp9J7fu7vYNvWVfrkKq+bbSZJ
-7UUoP3zY/Un1e2JZAEgfVNchV9q0oko2QpVii3oFkDK5YsA5bSp+dyfUitAkEbaM
-kaFqqT5Hz7upQ3/1JICVCqRgDbafA8DiVAohae8eqKUxPA7Uj5kLoUR1somPt5s=
-=8iCO
+iQEcBAEBAgAGBQJNMpDEAAoJEDCzDeQXsVfp19wH/RCAWWeVpo+wfMK4ypd2Z4wO
+GCH0NmpghXuX9IaFaVxgbWImuTajqoPf0pkAbCuPHfa9OuTE96WR4bypdTvH4n/X
+7IWgn4PXR7Spi3A7I9qn87npkyykCYwtfaaBszvEoCpEnkZLQlC8rmfBmtBrQ73f
+5rdJ+I4TVIx3L3M1Bgd84ODVa5FLnIkgttG80maGZSnCohSyIPJ3dEDSmigqu3hs
+Mspwqy1QW3mLDKPAEZAbTUAQ5sud4W4by+mMA7fgPvcqay780rpYqVB/BUOW+1PN
+kf9MVp41F32iPR3Xml5E3Q2AhCKmOeM8OEcg+010cAlVRd1WzmRMNdXU6IIspUk=
+=7RBR
 -----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 17372ac..8ffdf17 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 b524a132bcbf45e1da815e28e28ec662a30aaf87 Mon Sep 17 00:00:00 2001
+From 5a67c7a5ad341fa84091287eb6452458c7ee24b0 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
@@ -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..53a8726 100644
+index b4a381d..de2db8a 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;
@@ -238,7 +238,7 @@ index b4a381d..53a8726 100644
 -ifnet_add_connection (gchar * name, gchar * type)
 +ifnet_add_network (gchar * name, gchar * type)
  {
-+	if (ifnet_has_network (conn_name))
++	if (ifnet_has_network (name))
 +		return TRUE;
  	if (add_new_connection_config (type, name)) {
  		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name);