Fix parsing dhclient.conf wrt bug #352638

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 50 insertions, 38 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 5b8aba707266..1c3b07937167 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.93 2011/01/24 07:31:48 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.94 2011/01/25 02:46:46 qiaomuf Exp $
+
+*networkmanager-0.8.2-r4 (25 Jan 2011)
+
+  25 Jan 2011; Mu Qiao <qiaomuf@gentoo.org> -networkmanager-0.8.2-r3.ebuild,
+  +networkmanager-0.8.2-r4.ebuild,
+  files/networkmanager-0.8.2-shared-connection.patch:
+  Fix parsing dhclient.conf wrt bug #352638
 
 *networkmanager-0.8.2-r3 (24 Jan 2011)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3b097ff47ed1..4b51a59ea5df 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -11,7 +11,7 @@ AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a61482
 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 14961 RMD160 4c37ccb1e63c12dac0b60aabf2d107d51f1f2ac9 SHA1 709f4d9104d2423699d934ad9eca5e8cc3233395 SHA256 93ae68009518c4bdf809a43eb84c063042cf5d2bf099da8aeb8f52c97be42b9b
+AUX networkmanager-0.8.2-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
 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.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa
@@ -22,6 +22,6 @@ EBUILD networkmanager-0.8-r1.ebuild 3516 RMD160 8722fcf8330e8f11a1e3dd83f2e2b53c
 EBUILD networkmanager-0.8.1-r6.ebuild 4632 RMD160 15481e54c0f3e9502c8357fd6a6b772a53c7ceab SHA1 b656512bcd456c4b621cff0876e846954a6545df SHA256 ec4be6303fd338df4efc0e4c51bce67985b295a14a9b6eea0e0a46460fffe557
 EBUILD networkmanager-0.8.2-r1.ebuild 4132 RMD160 1261ce2f0e499ece5e2ea4c010c8627ede1fa754 SHA1 96f9ac6b0ecaf0656386e82458453a97dfb8be61 SHA256 d247e094c0e22b885b78efa2cc8a6c8b32bbb5967f95a46439985d9a9da7362e
 EBUILD networkmanager-0.8.2-r2.ebuild 4248 RMD160 3dad60b3020562ffe57420ec35a00b244c7c7bbc SHA1 6e5a9805a9dc7f5fdc0ecaafc1c19135653afb19 SHA256 493187eaafb50c8c6294afd254beeaca570ad5f57b3b61a9f597356b86475bde
-EBUILD networkmanager-0.8.2-r3.ebuild 4341 RMD160 aa1e9879343e0f881a80633ee8c36d8968985ca6 SHA1 8770a26819360dc1abfcadec49c1a3cd20e27475 SHA256 4be7d4b109c9a0245496d4bf7084a3429dd0a3a4a1fa9366c72c2e23dd46c28e
-MISC ChangeLog 19265 RMD160 53fa5e33d101bd67f7be4391f9aa804e48f3235b SHA1 a6e5574dfbd8ea5a340e0ed5a81fd0b9b6f5540e SHA256 9195ea94ecbf547de25f4753a0785f2799e24223f6c9face533fbe7f52c116e0
+EBUILD networkmanager-0.8.2-r4.ebuild 4386 RMD160 9171dc6609ac9f0648cd5b7f5a863e874ed95e5f SHA1 6027212a2b04d3e3ee6a5135e149d8396400a784 SHA256 f9ef8c233475c5c65680b2c5a4756a2d08c449c2bb9578c1eb21d046ed88d958
+MISC ChangeLog 19516 RMD160 4dde4fae6ce9e9f4186c80186589e44fd13df337 SHA1 6ecb265ab362006cdda26a78a42081649231cac5 SHA256 cfd683e00589b0f99cd659916fe1954a0d85bdb0d0786e99444bfe8b40b1047c
 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
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 8ffdf17915b8..3ce883aa7c1c 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,24 +1,20 @@
-From 5a67c7a5ad341fa84091287eb6452458c7ee24b0 Mon Sep 17 00:00:00 2001
+From d252fad6aa69aefa17b592111c2db23864f63907 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
- do not delete old connection when ssid is not changed
+Date: Tue, 25 Jan 2011 10:31:53 +0000
+Subject: [PATCH] shared-connection
 
 Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
 ---
- system-settings/plugins/ifnet/connection_parser.c  |   92 ++++++++++++++------
+ system-settings/plugins/ifnet/connection_parser.c  |   90 ++++++++++++++------
  system-settings/plugins/ifnet/net_parser.c         |   55 +++++++-----
  system-settings/plugins/ifnet/net_parser.h         |    4 +-
- system-settings/plugins/ifnet/net_utils.c          |    4 +
+ system-settings/plugins/ifnet/net_utils.c          |    6 +-
  .../plugins/ifnet/nm-ifnet-connection.c            |    8 +-
  system-settings/plugins/ifnet/wpa_parser.c         |   21 +++--
- 6 files changed, 123 insertions(+), 61 deletions(-)
+ 6 files changed, 122 insertions(+), 62 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index f9fae51..539f33c 100644
+index f9fae51..9b5ddc1 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)
@@ -30,7 +26,7 @@ index f9fae51..539f33c 100644
  	gboolean is_static_block = is_static_ip4 (conn_name);
  	ip_block *iblock = NULL;
  
-@@ -569,12 +569,42 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
+@@ -569,13 +569,41 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
  		      && strstr (value, "nogateway") ? TRUE : FALSE, NULL);
  
  	if (!is_static_block) {
@@ -40,6 +36,7 @@ index f9fae51..539f33c 100644
 -			      NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
 -		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using DHCP for %s",
 -			      conn_name);
+-	} else {
 +		method = ifnet_get_data (conn_name, "config");
 +		if (!method){
 +			g_set_error (error, ifnet_plugin_error_quark (), 0,
@@ -59,16 +56,14 @@ index f9fae51..539f33c 100644
 +						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
 +			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
 +			return;
-+		}
-+		else if (!strcmp (method, "shared")){
++		} else if (!strcmp (method, "shared")){
 +			g_object_set (ip4_setting,
 +						  NM_SETTING_IP4_CONFIG_METHOD,
 +						  NM_SETTING_IP4_CONFIG_METHOD_SHARED,
 +						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
 +			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
 +			return;
-+		}
-+		else {
++		} else {
 +			g_set_error (error, ifnet_plugin_error_quark (), 0,
 +						 "Unknown config for %s", conn_name);
 +			g_object_unref (ip4_setting);
@@ -76,10 +71,11 @@ index f9fae51..539f33c 100644
 +		}
 +		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s",
 +					  method, conn_name);
- 	} else {
++	}else {
  		iblock = convert_ip4_config_block (conn_name);
  		if (!iblock) {
-@@ -625,7 +655,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
+ 			g_set_error (error, ifnet_plugin_error_quark (), 0,
+@@ -625,7 +653,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
  	}
  
  	/* add dhcp hostname and client id */
@@ -88,7 +84,7 @@ index f9fae51..539f33c 100644
  		gchar *dhcp_hostname, *client_id;
  
  		get_dhcp_hostname_and_client_id (&dhcp_hostname, &client_id);
-@@ -712,7 +742,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
+@@ -712,7 +740,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
  		iblock = iblock->next;
  		destroy_ip_block (current_iblock);
  	}
@@ -96,7 +92,7 @@ index f9fae51..539f33c 100644
  	/* Finally add setting to connection */
  	nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
  }
-@@ -1243,10 +1272,10 @@ parse_wpa_psk (gchar * psk, GError ** error)
+@@ -1243,10 +1270,10 @@ parse_wpa_psk (gchar * psk, GError ** error)
  	 * the passphrase contains spaces.
  	 */
  
@@ -110,7 +106,7 @@ index f9fae51..539f33c 100644
  		/* Verify the hex PSK; 64 digits */
  		if (!is_hex (p)) {
  			g_set_error (error, ifnet_plugin_error_quark (),
-@@ -1254,7 +1283,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
+@@ -1254,7 +1281,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
  				     "Invalid WPA_PSK (contains non-hexadecimal characters)");
  			goto out;
  		}
@@ -119,7 +115,7 @@ index f9fae51..539f33c 100644
  	} else {
  		strip_string (p, '"');
  
-@@ -1276,6 +1305,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
+@@ -1276,6 +1303,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
  	}
  
        out:
@@ -127,7 +123,7 @@ index f9fae51..539f33c 100644
  	return hashed;
  }
  
-@@ -2085,7 +2115,8 @@ write_wireless_security_setting (NMConnection * connection,
+@@ -2085,7 +2113,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;
@@ -137,7 +133,7 @@ index f9fae51..539f33c 100644
  
  	if (auth_alg) {
  		if (!strcmp (auth_alg, "shared"))
-@@ -2180,8 +2211,11 @@ write_wireless_security_setting (NMConnection * connection,
+@@ -2180,8 +2209,11 @@ write_wireless_security_setting (NMConnection * connection,
  			g_string_append (quoted, psk);
  			g_string_append_c (quoted, '"');
  		}
@@ -151,7 +147,7 @@ index f9fae51..539f33c 100644
  		if (quoted)
  			g_string_free (quoted, TRUE);
  	} else
-@@ -2190,15 +2224,19 @@ write_wireless_security_setting (NMConnection * connection,
+@@ -2190,15 +2222,19 @@ write_wireless_security_setting (NMConnection * connection,
  	return TRUE;
  }
  
@@ -175,22 +171,20 @@ index f9fae51..539f33c 100644
  	wpa_add_security (ssid);
  }
  
-@@ -2443,8 +2481,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
+@@ -2443,7 +2479,11 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
  		}
  		ifnet_set_data (conn_name, "config", ips->str);
  		g_string_free (ips, TRUE);
 -	} else
--		ifnet_set_data (conn_name, "config", "dhcp");
 +	} else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
 +		ifnet_set_data (conn_name, "config", "shared");
 +	else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL))
 +		ifnet_set_data (conn_name, "config", "autoip");
 +	else
-+        ifnet_set_data (conn_name, "config", "dhcp");
+ 		ifnet_set_data (conn_name, "config", "dhcp");
  
  	/* DNS Servers */
- 	ifnet_set_data (conn_name, "dns_servers", NULL);
-@@ -2858,7 +2900,7 @@ get_wired_name ()
+@@ -2858,7 +2898,7 @@ get_wired_name ()
  	for (; i < 256; i++) {
  		gchar *conn_name = g_strdup_printf ("eth%d", i);
  
@@ -199,7 +193,7 @@ index f9fae51..539f33c 100644
  			return conn_name;
  		} else
  			g_free (conn_name);
-@@ -2875,7 +2917,7 @@ get_ppp_name ()
+@@ -2875,7 +2915,7 @@ get_ppp_name ()
  	for (; i < 256; i++) {
  		gchar *conn_name = g_strdup_printf ("ppp%d", i);
  
@@ -208,7 +202,7 @@ index f9fae51..539f33c 100644
  			return conn_name;
  		} else
  			g_free (conn_name);
-@@ -2982,7 +3024,7 @@ ifnet_add_new_connection (NMConnection * connection,
+@@ -2982,7 +3022,7 @@ ifnet_add_new_connection (NMConnection * connection,
  		goto out;
  	}
  
@@ -354,7 +348,7 @@ index 73a44c8..b71a01f 100644
  gboolean ifnet_delete_network (gchar * conn_name);
  #endif
 diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
-index 2dc253c..7e52f10 100644
+index 2dc253c..83b4325 100644
 --- a/system-settings/plugins/ifnet/net_utils.c
 +++ b/system-settings/plugins/ifnet/net_utils.c
 @@ -278,6 +278,10 @@ is_static_ip4 (gchar * conn_name)
@@ -368,6 +362,16 @@ index 2dc253c..7e52f10 100644
  	dhcp6 = strstr (data, "dhcp6");
  	if (dhcp6) {
  		gchar *dhcp4;
+@@ -942,8 +946,8 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
+ 		else if ((tmp = strstr (line, "send host-name")) != NULL) {
+ 			tmp += strlen ("send host-name");
+ 			g_strstrip (tmp);
+-			strip_string (tmp, '"');
+ 			strip_string (tmp, ';');
++			strip_string (tmp, '"');
+ 			if (tmp[0] != '\0')
+ 				*hostname = g_strdup (tmp);
+ 			else
 diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/system-settings/plugins/ifnet/nm-ifnet-connection.c
 index e47495c..ebe2581 100644
 --- a/system-settings/plugins/ifnet/nm-ifnet-connection.c
diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild
index a36ccfb1af60..746a6fea973a 100644
--- a/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild,v 1.1 2011/01/24 07:31:48 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild,v 1.1 2011/01/25 02:46:46 qiaomuf Exp $
 
 EAPI="2"
 
@@ -86,6 +86,7 @@ src_prepare() {
 	# accept "gw" in /etc/conf.d/net (bug #339215)
 	epatch "${FILESDIR}/${P}-accept-gw.patch"
 	# fix shared connection wrt bug #350476
+	# fix parsing dhclient.conf wrt bug #352638
 	epatch "${FILESDIR}/${P}-shared-connection.patch"
 	# Backports #1
 	epatch "${FILESDIR}/${P}-1.patch"