diff options
author | 2011-01-12 15:31:41 +0800 | |
---|---|---|
committer | 2011-01-12 15:31:41 +0800 | |
commit | 4e5a49731773cbca6b3de739ba56af89afa3fc14 (patch) | |
tree | d43f20cf42f043bb8f859b400cad9bdf9ebcd634 | |
parent | Revision bump. (diff) | |
download | qiaomuf-4e5a49731773cbca6b3de739ba56af89afa3fc14.tar.gz qiaomuf-4e5a49731773cbca6b3de739ba56af89afa3fc14.tar.bz2 qiaomuf-4e5a49731773cbca6b3de739ba56af89afa3fc14.zip |
Revision bump wrt bug #350476
(Portage version: 2.1.9.30/git/Linux x86_64, signed Manifest commit with key 17B157E9)
-rw-r--r-- | net-misc/networkmanager/Manifest | 18 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch | 34 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8.2-r103.ebuild (renamed from net-misc/networkmanager/networkmanager-0.8.2-r102.ebuild) | 0 |
3 files changed, 38 insertions, 14 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 0fda031..081bcb6 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -5,22 +5,22 @@ 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 6258 RMD160 be3510edd24b5006fc8767895bebd52493489c68 SHA1 27bcae072058041822fa68bce77059186bcc6034 SHA256 ba103f5d14ef81152e899a2f7cb88a884c8d7dcde15f104d70d4dc08ebf4e1fb +AUX networkmanager-0.8.2-shared-connection.patch 7075 RMD160 cf38a8c807d55299cf94cc8280caceda39ec1d19 SHA1 1a3aa09d7e728c046f9b99e485cd3dea8c30f279 SHA256 696c2d15f0f393f65036a06ca30ece29335fd6931da50bb1220cd1db7f7bc206 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 -EBUILD networkmanager-0.8.2-r102.ebuild 4202 RMD160 16fddd8bd4a77905a47850fecb12dd4a2d266931 SHA1 00daba60673f8886fa23efef7ad95193a8a5423d SHA256 78c93c5de6c2b1c1d46b1113f52c87df334a440e34d494d1af9efa6ab96764e2 +EBUILD networkmanager-0.8.2-r103.ebuild 4202 RMD160 16fddd8bd4a77905a47850fecb12dd4a2d266931 SHA1 00daba60673f8886fa23efef7ad95193a8a5423d SHA256 78c93c5de6c2b1c1d46b1113f52c87df334a440e34d494d1af9efa6ab96764e2 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) -iQEcBAEBAgAGBQJNLAUcAAoJEDCzDeQXsVfpU8sH/2jfqeXj7z5k741Do1Oh1D/R -kIxXfVkPnRmkHYImkTv9X0AH05y/j+J9yoeseSYdUT8hIn0zXqMQZOVIyVLIz8JZ -/oXSORsNq1ZzdPhNlK7SSn6wCxSrv5G6QrgavMHSwc6wl9UZqcGROWvwsTsGazM5 -d6AdI/5eucrf9JWEmXT6cocx+eoIQcVLQWMUrPsZLdw7nVMjbY0jzujYy/5ajCOX -BMZTpIN+F8yuzGOcwKHUgVPZpHOh5s1ur/etHkA6xSM+wqTY/u3wKpfxvjnEaZsS -WiKcbLJ4m5U2+2IKrRuRKje0vauebCtLuu2MM22UQDT3RYzL6D9YU8byaUq7Pd4= -=706p +iQEcBAEBAgAGBQJNLVjdAAoJEDCzDeQXsVfpyh4H/RiVPVrI5DYBHxqyZHDoSmKQ +dlXV2T6/k/3IojZ7U2H76t/oiu+fkX5vQn58oFlvERA8NfyWom4WmBhsVM8L3v4s +9b4c8prklXh/t9ohFNegYj5hhcrl0lLfw6KPtmYHvOKV/7OlwfLWh96EYWyLDeA+ +5pNCE3Oyj9CgoFvqjC3OA2voC1vGnjDEcRFlcM66PpVDzZ919bUhBz0QVsaHQcgC +3ELM35HuN5n+yGxbTpaB+Hbe/5B009Ra7/PAxa+k/gNPySlOHXrPrbx8f6N5bzBO +VVKImQNdRlO/hL6/QXZn1tDHKux1Y7F00USbRGbaEeovEwjZh4eHTZigx4UQ7QM= +=xa1/ -----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 541fb7f..ebd24a6 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,17 +1,17 @@ -From 708f212d1321bc9df4461054b9f8d4f5edcdc560 Mon Sep 17 00:00:00 2001 +From 28cd0d7fec3c09bcace6f68501b9f5cd53b5f192 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 | 64 +++++++++++++++----- + system-settings/plugins/ifnet/connection_parser.c | 74 +++++++++++++++----- system-settings/plugins/ifnet/net_utils.c | 4 + .../plugins/ifnet/nm-ifnet-connection.c | 8 ++- - 3 files changed, 58 insertions(+), 18 deletions(-) + 3 files changed, 65 insertions(+), 21 deletions(-) diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c -index f9fae51..32fa6f6 100644 +index f9fae51..703059d 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) @@ -120,7 +120,31 @@ index f9fae51..32fa6f6 100644 return hashed; } -@@ -2443,8 +2473,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, +@@ -2085,7 +2115,8 @@ write_wireless_security_setting (NMConnection * connection, + } else if (!strcmp (key_mgmt, "wpa-eap")) { + wpa_set_data (conn_name, "key_mgmt", "WPA-EAP"); + wpa = TRUE; +- } ++ } else ++ PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt); + + if (auth_alg) { + if (!strcmp (auth_alg, "shared")) +@@ -2180,8 +2211,11 @@ write_wireless_security_setting (NMConnection * connection, + g_string_append (quoted, psk); + g_string_append_c (quoted, '"'); + } +- wpa_set_data (conn_name, "psk", +- quoted ? quoted->str : (gchar *) psk); ++ if (psk) ++ wpa_set_data (conn_name, "psk", ++ quoted ? quoted->str : (gchar *) psk); ++ else ++ 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, } ifnet_set_data (conn_name, "config", ips->str); g_string_free (ips, TRUE); diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r102.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r103.ebuild index 8094376..8094376 100644 --- a/net-misc/networkmanager/networkmanager-0.8.2-r102.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.2-r103.ebuild |