summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMu Qiao <qiaomuf@gentoo.org>2011-01-14 17:25:05 +0800
committerMu Qiao <qiaomuf@gentoo.org>2011-01-14 17:25:05 +0800
commit613e2e94dc8508b76866c72fa05cd3c1ac240556 (patch)
tree62aa3f8857b44bcaab40deef5d12fafe245637a0
parentSplit sunpinyin packages (diff)
downloadqiaomuf-613e2e94dc8508b76866c72fa05cd3c1ac240556.tar.gz
qiaomuf-613e2e94dc8508b76866c72fa05cd3c1ac240556.tar.bz2
qiaomuf-613e2e94dc8508b76866c72fa05cd3c1ac240556.zip
fix shared connection patch
(Portage version: 2.1.9.31/git/Linux x86_64, signed Manifest commit with key 17B157E9)
-rw-r--r--net-misc/networkmanager/Manifest16
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch8
2 files changed, 12 insertions, 12 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 33e73ff..225fe5f 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 8358c9cce6377aba34a7eee6413bca3e21064543 SHA1 612825aa41129c070909d63d47e0ec3dd061c6a5 SHA256 0c906511c32eb50692aa09878dec223f04b75301347870239b8b9cb10e527a8a
+AUX networkmanager-0.8.2-shared-connection.patch 9289 RMD160 6e075af500706326f2fb8323d743e9c9b71cbadb SHA1 158bb1512850126dca218e91fba680665c414156 SHA256 cb527e81026e144ee185af5a4d5be4c3e572e7723ecbb6b23a77d24edd6da2b6
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)
-iQEcBAEBAgAGBQJNMBTkAAoJEDCzDeQXsVfpHnAIAIuFU6iZIAHdosYAirYYl0zO
-OcaQE4sJeFjL+N1tc2ZpX2p9VGEWUpoY/yqA563d9/ISwaUnwl4pV//kYYEOUsEE
-e3s62plA+daRwY3eTb5BJa+Z6rM2KhO7VGkDNOVDvyQEYuXuRkUMplVmdcAcBX7g
-FCGegXHhLGpeV/NkN4YRGqcLncTAVep3o1WP28EFd7q3rKgoYAL/jFaCyBhKJkae
-4dgGTDdCNcnb4hL4eRN7wEe0TJ3aGo8NqEWiaJhgYxclXH1vOXxHiL8Xk4x/Op4d
-ixJ9KRTOk+N6j8RI9a27j/xa3GYehtLKGKvk2V8Sr9q0d7e5Aydn2SXUWSzIzYc=
-=niVd
+iQEcBAEBAgAGBQJNMBZxAAoJEDCzDeQXsVfp6iEIAJE+5G3W722TaxeLA+VFfZJq
+1eP9qBvbIDmmVDQwxUnvq/CijyW8UnwPTyEdya4Funrqrqu4oNCjK3s8VSpUwZGj
+j0I6D8az8NB/kUvMloY4N7tAGzZrfOmWWRaa8jNIDibiQL1QvFMLiYCO9Wgt5JBY
+r7oLu5Q+2Il03YnnRHSoTrxQ8QkEiunPuRNvGaAFI23vY/cfTnZX/Rwvqrii+qA6
+IFuvrFw2m3u5tJzXRq3p6PtckgP37fXCxImuC14wO6O8Alg1iPqqvm5BPqPU0ulr
+ujud3e3wV8XeUe2UPBOE+ooK6QSL7u96z0fH74R1j2R3V+cXGWOgYoI2xUeabrc=
+=QgXh
-----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 6513221..41d8cae 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 5dc7075a1bb262b60880ee5130ee128e33f71b87 Mon Sep 17 00:00:00 2001
+From 3db3f156b2346419afd70621649b590a0667219e 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
@@ -162,7 +162,7 @@ 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..a0b45cb 100644
+index b4a381d..3dd9fe7 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)
@@ -170,7 +170,7 @@ index b4a381d..a0b45cb 100644
}
/* Remove existing key value pair */
+ if (value)
-+ strip_string (value);
++ strip_string (value, '"');
if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
+ if (value && !strcmp (orin_value, value))
+ return;
@@ -181,7 +181,7 @@ index b4a381d..a0b45cb 100644
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), '"');
++ g_hash_table_insert (conn, g_strdup (key), g_strdup (value));
net_parser_data_changed = TRUE;
}