Accepting request 19886 from GNOME:Factory

Copy from GNOME:Factory/NetworkManager based on submit request 19886 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/19886
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager?expand=0&rev=61

NetworkManager.changes

@@ -16,6 +16,18 @@ Thu Aug 20 09:14:01 UTC 2009 - aj@suse.de
 
 - Require libiw-devel for building instead of wireless-tools.
 
+-------------------------------------------------------------------
+Tue Aug 11 14:28:29 UTC 2009 - tittiatcoke@gmail.com
+
+- Update to latest 0.7.1 upstream
+  + Handle ZTE (Onda) device port types
+  + Wait 20 seconds (instead of 15) for PPP connections to come up
+  + Block until netconfig exits
+  + Allow 63 byte long PSK 
+  + Fix dbus reconnection
+  + Handle unsolicited supplicant scans
+  + Other fixes
+
 -------------------------------------------------------------------
 Tue Jul 21 14:21:18 CEST 2009 - aj@suse.de
 

NetworkManager.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package NetworkManager (Version 0.7.1)
+# spec file for package NetworkManager (Version 0.7.1_git20090811)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,17 +19,19 @@
 
 Name:           NetworkManager
 Url:            http://www.gnome.org/projects/NetworkManager/
-Version:        0.7.1
-Release:        3
+%define rversion 0.7.1
+Version:        0.7.1_git20090811
+Release:        1
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  PolicyKit-devel dhcp-client gtk-doc hal-devel intltool iproute2 libgcrypt-devel libiw-devel libnl-devel libtool libuuid-devel mozilla-nss-devel ppp-devel translation-update-upstream
 Group:          Productivity/Networking/System
 Summary:        Network Link Manager and User Applications
-Source0:        NetworkManager-%{version}.tar.bz2
+Source0:        NetworkManager-%{rversion}.tar.bz2
 Source1:        nfs
 Source2:        nm-system-settings.conf
 Source3:        NetworkManager-rpmlintrc
+Patch0:         0000-upstream.patch
 Patch1:         0001-Use-ModemManager.patch
 Patch2:         0002-Certificate-formats.patch
 Patch3:         0003-PKCS11.patch
@@ -40,11 +42,9 @@ Patch7:         0007-Fix-etc-hosts-updating.patch
 Patch8:         0008-Fallback.patch
 Patch9:         0009-Implement-sending-system-hostname-with-DHCP-client.patch
 Patch10:        0010-Increase-wired-802.1x-wired-authentication-timeout.patch
-Patch11:        0011-Don-t-bring-wireless-devices-up-when-wifi-is-disable.patch
 Patch12:        0012-Update-resolv.conf-once.patch
 Patch13:        0013-iptables-path.patch
-Patch14:        nm-root-at-console-permissions.patch
-Patch15:        nm-hal-tree-changes.patch
+Patch14:        nm-hal-tree-changes.patch
 Requires:       wpa_supplicant >= 0.5.8-54
 Requires:       dhcp-client
 Requires:       dnsmasq
@@ -135,7 +135,8 @@ Authors:
 
 %prep
 %setup -n %{name}-0.7.1 -q
-#translation-update-upstream
+translation-update-upstream
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -146,11 +147,9 @@ Authors:
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p0
 %patch14 -p1
-%patch15 -p1
 pppddir=`ls -1d /usr/%_lib/pppd/2*`
 test -n "$pppddir" || exit 1
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

0002-Certificate-formats.patch

@@ -4,11 +4,11 @@ Date: Tue, 13 Jan 2009 12:31:34 +0200
 Subject: [PATCH] Certificate formats.
 
 
-diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
-index 1c7a8bc..68beef7 100644
+Index: b/libnm-util/nm-setting-8021x.c
+===================================================================
 --- a/libnm-util/nm-setting-8021x.c
 +++ b/libnm-util/nm-setting-8021x.c
-@@ -717,6 +717,9 @@ need_private_key_password (GByteArray *key, const char *password)
+@@ -717,6 +717,9 @@ need_private_key_password (GByteArray *k
  	GError *error = NULL;
  	gboolean needed = TRUE;
  
@@ -18,7 +18,7 @@ index 1c7a8bc..68beef7 100644
  	/* See if a private key password is needed, which basically is whether
  	 * or not the private key is a PKCS#12 file or not, since PKCS#1 files
  	 * are decrypted by the settings service.
-@@ -1384,7 +1387,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1384,7 +1387,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "CA certificate",
  							   "CA certificate",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -27,7 +27,7 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_CA_PATH,
-@@ -1400,7 +1403,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1400,7 +1403,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "Client certificate",
  							   "Client certificate",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -36,7 +36,7 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_PHASE1_PEAPVER,
-@@ -1448,7 +1451,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1448,7 +1451,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "Phase2 CA certificate",
  							   "Phase2 CA certificate",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -45,7 +45,7 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_PHASE2_CA_PATH,
-@@ -1464,7 +1467,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1464,7 +1467,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "Phase2 client certificate",
  							   "Phase2 client certificate",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -54,7 +54,7 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_PASSWORD,
-@@ -1480,7 +1483,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1480,7 +1483,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "Private key",
  							   "Private key",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -63,7 +63,7 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_PRIVATE_KEY_PASSWORD,
-@@ -1496,7 +1499,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1496,7 +1499,7 @@ nm_setting_802_1x_class_init (NMSetting8
  							   "Phase2 private key",
  							   "Phase2 private key",
  							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -72,11 +72,11 @@ index 1c7a8bc..68beef7 100644
  
  	g_object_class_install_property
  		(object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD,
-diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
-index e956e68..d170e4e 100644
+Index: b/libnm-util/nm-setting-8021x.h
+===================================================================
 --- a/libnm-util/nm-setting-8021x.h
 +++ b/libnm-util/nm-setting-8021x.h
-@@ -83,6 +83,9 @@ GQuark nm_setting_802_1x_error_quark (void);
+@@ -83,6 +83,9 @@ GQuark nm_setting_802_1x_error_quark (vo
  #define NM_SETTING_802_1X_PSK "psk"
  #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
  
@@ -86,8 +86,8 @@ index e956e68..d170e4e 100644
  typedef struct {
  	NMSetting parent;
  } NMSetting8021x;
-diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
-index 6806363..93386bf 100644
+Index: b/libnm-util/nm-setting.h
+===================================================================
 --- a/libnm-util/nm-setting.h
 +++ b/libnm-util/nm-setting.h
 @@ -81,6 +81,8 @@ GQuark nm_setting_error_quark (void);
@@ -99,11 +99,11 @@ index 6806363..93386bf 100644
  #define NM_SETTING_NAME "name"
  
  /**
-diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
-index e2208ec..53229c6 100644
+Index: b/src/supplicant-manager/nm-supplicant-config.c
+===================================================================
 --- a/src/supplicant-manager/nm-supplicant-config.c
 +++ b/src/supplicant-manager/nm-supplicant-config.c
-@@ -558,6 +558,174 @@ nm_supplicant_config_add_setting_wireless_security (NMSupplicantConfig *self,
+@@ -694,6 +694,174 @@ nm_supplicant_config_add_setting_wireles
  	return TRUE;
  }
  
@@ -121,7 +121,7 @@ index e2208ec..53229c6 100644
 +	use_system_ca = nm_setting_802_1x_get_system_ca_certs (setting) || nm_setting_802_1x_get_ca_cert (setting) == NULL;
 +
 +	if (use_system_ca) {
-+		ADD_STRING_VAL (SYSTEM_CA_PATH, "ca_path", FALSE, FALSE, FALSE);
++		add_string_val (self, SYSTEM_CA_PATH, "ca_path", FALSE, FALSE);
 +	} else {
 +		array = nm_setting_802_1x_get_ca_cert (setting);
 +		if (array && array->data) {
@@ -173,8 +173,8 @@ index e2208ec..53229c6 100644
 +	}
 +
 +	if (send_private_key_passwd) {
-+		ADD_STRING_VAL (nm_setting_802_1x_get_private_key_password (setting),
-+						"private_key_passwd", FALSE, FALSE, TRUE);
++		add_string_val (self, nm_setting_802_1x_get_private_key_password (setting),
++						"private_key_passwd", FALSE, TRUE);
 +	} 
 +
 +	if (send_client_cert) {
@@ -249,8 +249,8 @@ index e2208ec..53229c6 100644
 +	}
 +
 +	if (send_private_key_passwd) {
-+		ADD_STRING_VAL (nm_setting_802_1x_get_phase2_private_key_password (setting),
-+						"private_key2_passwd", FALSE, FALSE, TRUE);
++		add_string_val (self, nm_setting_802_1x_get_phase2_private_key_password (setting),
++						"private_key2_passwd", FALSE, TRUE);
 +	} 
 +
 +	if (send_client_cert) {
@@ -278,20 +278,21 @@ index e2208ec..53229c6 100644
  gboolean
  nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
                                          NMSetting8021x *setting,
-@@ -569,7 +737,6 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
- 	const char *peapver;
+@@ -705,7 +873,6 @@ nm_supplicant_config_add_setting_8021x (
+ 	const char *peapver, *value;
  	gboolean success;
  	GString *phase1, *phase2;
 -	const GByteArray *array;
  
  	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
  	g_return_val_if_fail (setting != NULL, FALSE);
-@@ -630,53 +797,11 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
- 		ADD_STRING_VAL (phase2->str, "phase2", FALSE, FALSE, FALSE);
+@@ -780,56 +947,6 @@ nm_supplicant_config_add_setting_8021x (
+ 	}
  	g_string_free (phase2, TRUE);
  
 -	if (nm_setting_802_1x_get_system_ca_certs (setting)) {
--		ADD_STRING_VAL (SYSTEM_CA_PATH, "ca_path", FALSE, FALSE, FALSE);
+-		if (!add_string_val (self, SYSTEM_CA_PATH, "ca_path", FALSE, FALSE))
+-			return FALSE;
 -	} else {
 -		ADD_BLOB_VAL (nm_setting_802_1x_get_ca_cert (setting), "ca_cert", connection_uid);
 -	}
@@ -303,7 +304,9 @@ index e2208ec..53229c6 100644
 -		switch (nm_setting_802_1x_get_private_key_type (setting)) {
 -		case NM_SETTING_802_1X_CK_TYPE_PKCS12:
 -			/* Only add the private key password for PKCS#12 keys */
--			ADD_STRING_VAL (nm_setting_802_1x_get_private_key_password (setting), "private_key_passwd", FALSE, FALSE, TRUE);
+-			value = nm_setting_802_1x_get_private_key_password (setting);
+-			if (!add_string_val (self, value, "private_key_passwd", FALSE, TRUE))
+-				return FALSE;
 -			break;
 -		default:
 -			/* Only add the client cert if the private key is not PKCS#12 */
@@ -313,7 +316,8 @@ index e2208ec..53229c6 100644
 -	}
 -
 -	if (nm_setting_802_1x_get_system_ca_certs (setting)) {
--		ADD_STRING_VAL (SYSTEM_CA_PATH, "ca_path2", FALSE, FALSE, FALSE);
+-		if (!add_string_val (self, SYSTEM_CA_PATH, "ca_path2", FALSE, FALSE))
+-			return FALSE;
 -	} else {
 -		ADD_BLOB_VAL (nm_setting_802_1x_get_phase2_ca_cert (setting), "ca_cert2", connection_uid);
 -	}
@@ -325,7 +329,9 @@ index e2208ec..53229c6 100644
 -		switch (nm_setting_802_1x_get_phase2_private_key_type (setting)) {
 -		case NM_SETTING_802_1X_CK_TYPE_PKCS12:
 -			/* Only add the private key password for PKCS#12 keys */
--			ADD_STRING_VAL (nm_setting_802_1x_get_phase2_private_key_password (setting), "private_key2_passwd", FALSE, FALSE, TRUE);
+-			value = nm_setting_802_1x_get_phase2_private_key_password (setting);
+-			if (!add_string_val (self, value, "private_key2_passwd", FALSE, TRUE))
+-				return FALSE;
 -			break;
 -		default:
 -			/* Only add the client cert if the private key is not PKCS#12 */
@@ -334,16 +340,20 @@ index e2208ec..53229c6 100644
 -		}
 -	}
 -
- 	ADD_STRING_VAL (nm_setting_802_1x_get_identity (setting), "identity", FALSE, FALSE, FALSE);
- 	ADD_STRING_VAL (nm_setting_802_1x_get_anonymous_identity (setting), "anonymous_identity", FALSE, FALSE, FALSE);
+ 	value = nm_setting_802_1x_get_identity (setting);
+ 	if (!add_string_val (self, value, "identity", FALSE, FALSE))
+ 		return FALSE;
+@@ -837,6 +954,8 @@ nm_supplicant_config_add_setting_8021x (
+ 	if (!add_string_val (self, value, "anonymous_identity", FALSE, FALSE))
+ 		return FALSE;
  
 +	add_certificates (self, setting, connection_uid);
 +
  	return TRUE;
  }
  
-diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
-index 5e30795..2c70d22 100644
+Index: b/src/supplicant-manager/nm-supplicant-settings-verify.c
+===================================================================
 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c
 +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
 @@ -103,16 +103,22 @@ static const struct Opt opt_table[] = {
@@ -369,8 +379,8 @@ index 5e30795..2c70d22 100644
  	{ "pin",                TYPE_BYTES,   0, 0, FALSE,  NULL },
  	{ "pcsc",               TYPE_BYTES,   0, 0, FALSE,  NULL },
  	{ "nai",                TYPE_BYTES,   0, 0, FALSE,  NULL },
-diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c
-index e7f360d..4160506 100644
+Index: b/system-settings/plugins/keyfile/io/reader.c
+===================================================================
 --- a/system-settings/plugins/keyfile/io/reader.c
 +++ b/system-settings/plugins/keyfile/io/reader.c
 @@ -31,6 +31,7 @@
@@ -381,7 +391,7 @@ index e7f360d..4160506 100644
  #include <arpa/inet.h>
  #include <netinet/ether.h>
  #include <string.h>
-@@ -397,6 +398,55 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
+@@ -397,6 +398,55 @@ read_hash_of_string (GKeyFile *file, NMS
  	g_strfreev (keys);
  }
  
@@ -437,7 +447,7 @@ index e7f360d..4160506 100644
  
  typedef struct {
  	const char *setting_name;
-@@ -502,6 +552,12 @@ read_one_setting_value (NMSetting *setting,
+@@ -502,6 +552,12 @@ read_one_setting_value (NMSetting *setti
  		return;
  	}
  
@@ -450,7 +460,7 @@ index e7f360d..4160506 100644
  	type = G_VALUE_TYPE (value);
  
  	if (type == G_TYPE_STRING) {
-@@ -544,29 +600,7 @@ read_one_setting_value (NMSetting *setting,
+@@ -544,29 +600,7 @@ read_one_setting_value (NMSetting *setti
  		g_free (tmp_str);
  		g_object_set (setting, key, uint_val, NULL);
   	} else if (type == DBUS_TYPE_G_UCHAR_ARRAY) {
@@ -481,6 +491,3 @@ index e7f360d..4160506 100644
   	} else if (type == DBUS_TYPE_G_LIST_OF_STRING) {
  		gchar **sa;
  		gsize length;
--- 
-1.6.0.2
-

0003-PKCS11.patch

@@ -4,8 +4,8 @@ Date: Thu, 23 Apr 2009 12:54:11 +0300
 Subject: [PATCH] PKCS11.
 
 
-diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
-index bc86e08..80453e1 100644
+Index: b/libnm-util/libnm-util.ver
+===================================================================
 --- a/libnm-util/libnm-util.ver
 +++ b/libnm-util/libnm-util.ver
 @@ -55,6 +55,10 @@ global:
@@ -19,8 +19,8 @@ index bc86e08..80453e1 100644
  	nm_setting_802_1x_get_private_key;
  	nm_setting_802_1x_set_private_key_from_file;
  	nm_setting_802_1x_get_private_key_password;
-diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
-index 68beef7..3a9b29f 100644
+Index: b/libnm-util/nm-setting-8021x.c
+===================================================================
 --- a/libnm-util/nm-setting-8021x.c
 +++ b/libnm-util/nm-setting-8021x.c
 @@ -94,6 +94,10 @@ typedef struct {
@@ -45,7 +45,7 @@ index 68beef7..3a9b29f 100644
  
  	LAST_PROP
  };
-@@ -689,6 +697,38 @@ nm_setting_802_1x_get_phase2_private_key_type (NMSetting8021x *setting)
+@@ -689,6 +697,38 @@ nm_setting_802_1x_get_phase2_private_key
  	return NM_SETTING_802_1X_CK_TYPE_X509;
  }
  
@@ -106,7 +106,7 @@ index 68beef7..3a9b29f 100644
  
  	nm_utils_slist_free (priv->eap, g_free);
  
-@@ -1238,6 +1286,10 @@ set_property (GObject *object, guint prop_id,
+@@ -1238,6 +1286,10 @@ set_property (GObject *object, guint pro
  		g_free (priv->password);
  		priv->password = g_value_dup_string (value);
  		break;
@@ -117,7 +117,7 @@ index 68beef7..3a9b29f 100644
  	case PROP_PRIVATE_KEY:
  		if (priv->private_key)
  			g_byte_array_free (priv->private_key, TRUE);
-@@ -1259,6 +1311,20 @@ set_property (GObject *object, guint prop_id,
+@@ -1259,6 +1311,20 @@ set_property (GObject *object, guint pro
  	case PROP_SYSTEM_CA_CERTS:
  		priv->system_ca_certs = g_value_get_boolean (value);
  		break;
@@ -138,7 +138,7 @@ index 68beef7..3a9b29f 100644
  	default:
  		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
  		break;
-@@ -1318,6 +1384,9 @@ get_property (GObject *object, guint prop_id,
+@@ -1318,6 +1384,9 @@ get_property (GObject *object, guint pro
  	case PROP_PASSWORD:
  		g_value_set_string (value, priv->password);
  		break;
@@ -148,7 +148,7 @@ index 68beef7..3a9b29f 100644
  	case PROP_PRIVATE_KEY:
  		g_value_set_boxed (value, priv->private_key);
  		break;
-@@ -1333,6 +1402,18 @@ get_property (GObject *object, guint prop_id,
+@@ -1333,6 +1402,18 @@ get_property (GObject *object, guint pro
  	case PROP_SYSTEM_CA_CERTS:
  		g_value_set_boolean (value, priv->system_ca_certs);
  		break;
@@ -167,7 +167,7 @@ index 68beef7..3a9b29f 100644
  	default:
  		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
  		break;
-@@ -1478,6 +1559,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1478,6 +1559,14 @@ nm_setting_802_1x_class_init (NMSetting8
  						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
  
  	g_object_class_install_property
@@ -182,7 +182,7 @@ index 68beef7..3a9b29f 100644
  		(object_class, PROP_PRIVATE_KEY,
  		 _nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY,
  							   "Private key",
-@@ -1517,6 +1606,38 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
+@@ -1517,6 +1606,38 @@ nm_setting_802_1x_class_init (NMSetting8
  							   FALSE,
  							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
  
@@ -221,11 +221,11 @@ index 68beef7..3a9b29f 100644
  	/* Initialize crypto lbrary. */
  	if (!nm_utils_init (&error)) {
  		g_warning ("Couldn't initilize nm-utils/crypto system: %d %s",
-diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
-index d170e4e..681347b 100644
+Index: b/libnm-util/nm-setting-8021x.h
+===================================================================
 --- a/libnm-util/nm-setting-8021x.h
 +++ b/libnm-util/nm-setting-8021x.h
-@@ -82,6 +82,10 @@ GQuark nm_setting_802_1x_error_quark (void);
+@@ -82,6 +82,10 @@ GQuark nm_setting_802_1x_error_quark (vo
  #define NM_SETTING_802_1X_PIN "pin"
  #define NM_SETTING_802_1X_PSK "psk"
  #define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
@@ -236,7 +236,7 @@ index d170e4e..681347b 100644
  
  #define NM_SETTING_802_1X_CK_FORMAT_ID   "id:"
  #define NM_SETTING_802_1X_CK_FORMAT_FILE "file:"
-@@ -185,6 +189,11 @@ gboolean          nm_setting_802_1x_set_phase2_private_key_from_file (NMSetting8
+@@ -185,6 +189,11 @@ gboolean          nm_setting_802_1x_set_
                                                                        GError **err);
  NMSetting8021xCKType nm_setting_802_1x_get_phase2_private_key_type   (NMSetting8021x *setting);
  
@@ -248,11 +248,11 @@ index d170e4e..681347b 100644
  G_END_DECLS
  
  #endif /* NM_SETTING_8021X_H */
-diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
-index 53229c6..9ffbc02 100644
+Index: b/src/supplicant-manager/nm-supplicant-config.c
+===================================================================
 --- a/src/supplicant-manager/nm-supplicant-config.c
 +++ b/src/supplicant-manager/nm-supplicant-config.c
-@@ -53,6 +53,9 @@ typedef struct
+@@ -57,6 +57,9 @@ typedef struct
  	GHashTable *blobs;
  	guint32    ap_scan;
  	gboolean   dispose_has_run;
@@ -262,7 +262,7 @@ index 53229c6..9ffbc02 100644
  } NMSupplicantConfigPrivate;
  
  NMSupplicantConfig *
-@@ -88,6 +91,8 @@ nm_supplicant_config_init (NMSupplicantConfig * self)
+@@ -92,6 +95,8 @@ nm_supplicant_config_init (NMSupplicantC
  	                                     (GDestroyNotify) blob_free);
  
  	priv->ap_scan = 1;
@@ -271,7 +271,7 @@ index 53229c6..9ffbc02 100644
  	priv->dispose_has_run = FALSE;
  }
  
-@@ -224,9 +229,14 @@ nm_info ("Config: added '%s' value '%s'", key, opt->value);
+@@ -242,9 +247,14 @@ nm_info ("Config: added '%s' value '%s'"
  static void
  nm_supplicant_config_finalize (GObject *object)
  {
@@ -288,7 +288,7 @@ index 53229c6..9ffbc02 100644
  
  	/* Chain up to the parent class */
  	G_OBJECT_CLASS (nm_supplicant_config_parent_class)->finalize (object);
-@@ -261,6 +271,69 @@ nm_supplicant_config_set_ap_scan (NMSupplicantConfig * self,
+@@ -279,6 +289,69 @@ nm_supplicant_config_set_ap_scan (NMSupp
  	NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->ap_scan = ap_scan;
  }
  
@@ -358,7 +358,7 @@ index 53229c6..9ffbc02 100644
  static void
  get_hash_cb (gpointer key, gpointer value, gpointer user_data)
  {
-@@ -569,7 +642,7 @@ add_certificates (NMSupplicantConfig *self, NMSetting8021x *setting, const char
+@@ -705,7 +778,7 @@ add_certificates (NMSupplicantConfig *se
  	gboolean send_client_cert;
  	gboolean success;
  
@@ -366,9 +366,9 @@ index 53229c6..9ffbc02 100644
 +	use_system_ca = nm_setting_802_1x_get_system_ca_certs (setting);
  
  	if (use_system_ca) {
- 		ADD_STRING_VAL (SYSTEM_CA_PATH, "ca_path", FALSE, FALSE, FALSE);
-@@ -737,6 +810,8 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
- 	const char *peapver;
+ 		add_string_val (self, SYSTEM_CA_PATH, "ca_path", FALSE, FALSE);
+@@ -873,6 +946,8 @@ nm_supplicant_config_add_setting_8021x (
+ 	const char *peapver, *value;
  	gboolean success;
  	GString *phase1, *phase2;
 +	const char *pkcs11_engine_path;
@@ -376,7 +376,7 @@ index 53229c6..9ffbc02 100644
  
  	g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE);
  	g_return_val_if_fail (setting != NULL, FALSE);
-@@ -802,6 +877,19 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self,
+@@ -956,6 +1031,19 @@ nm_supplicant_config_add_setting_8021x (
  
  	add_certificates (self, setting, connection_uid);
  
@@ -389,19 +389,19 @@ index 53229c6..9ffbc02 100644
 +		nm_supplicant_config_set_pkcs11_module_init_args (self,
 +														  nm_setting_802_1x_get_pkcs11_module_init_args (setting));
 +
-+		ADD_STRING_VAL ("1", "engine", FALSE, FALSE, FALSE);
-+		ADD_STRING_VAL ("pkcs11", "engine_id", FALSE, FALSE, FALSE);
++		add_string_val (self, "1", "engine", FALSE, FALSE);
++		add_string_val (self, "pkcs11", "engine_id", FALSE, FALSE);
 +	}
 +
  	return TRUE;
  }
  
-diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h
-index 9fc8d71..ed24266 100644
+Index: b/src/supplicant-manager/nm-supplicant-config.h
+===================================================================
 --- a/src/supplicant-manager/nm-supplicant-config.h
 +++ b/src/supplicant-manager/nm-supplicant-config.h
-@@ -57,6 +57,21 @@ guint32 nm_supplicant_config_get_ap_scan (NMSupplicantConfig * self);
- void nm_supplicant_config_set_ap_scan (NMSupplicantConfig * self,
+@@ -57,6 +57,21 @@ guint32 nm_supplicant_config_get_ap_scan
+ void nm_supplicant_config_set_ap_scan (NMSupplicantConfig *self,
                                         guint32 ap_scan);
  
 +const char *nm_supplicant_config_get_pkcs11_engine_path (NMSupplicantConfig * self);
@@ -417,16 +417,16 @@ index 9fc8d71..ed24266 100644
 +const char *nm_supplicant_config_get_pkcs11_module_init_args (NMSupplicantConfig * self);
 +
 +void nm_supplicant_config_set_pkcs11_module_init_args (NMSupplicantConfig * self,
-+													   const char *pkcs11_module_init_args);
++                                                       const char *pkcs11_module_init_args);
 +
- gboolean nm_supplicant_config_add_option (NMSupplicantConfig *self,
-                                           const char * key,
-                                           const char * value,
-diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
-index 2076936..2426fcb 100644
+ GHashTable *nm_supplicant_config_get_hash (NMSupplicantConfig *self);
+ 
+ GHashTable *nm_supplicant_config_get_blobs (NMSupplicantConfig *self);
+Index: b/src/supplicant-manager/nm-supplicant-interface.c
+===================================================================
 --- a/src/supplicant-manager/nm-supplicant-interface.c
 +++ b/src/supplicant-manager/nm-supplicant-interface.c
-@@ -1039,7 +1039,7 @@ byte_array_to_gvalue (const GByteArray *array)
+@@ -1138,7 +1138,7 @@ byte_array_to_gvalue (const GByteArray *
  }
  
  static void
@@ -435,7 +435,7 @@ index 2076936..2426fcb 100644
  {
  	g_value_unset (val);
  	g_slice_free (GValue, val);
-@@ -1063,7 +1063,7 @@ call_set_blobs (NMSupplicantInfo *info, GHashTable *orig_blobs)
+@@ -1162,7 +1162,7 @@ call_set_blobs (NMSupplicantInfo *info,
  
  	blobs = g_hash_table_new_full (g_str_hash, g_str_equal,
  	                               (GDestroyNotify) g_free,
@@ -444,7 +444,7 @@ index 2076936..2426fcb 100644
  	if (!blobs) {
  		const char *msg = "Not enough memory to create blob table.";
  		nm_warning ("%s", msg);
-@@ -1158,13 +1158,15 @@ nm_supplicant_interface_set_config (NMSupplicantInterface * self,
+@@ -1259,13 +1259,15 @@ nm_supplicant_interface_set_config (NMSu
  	NMSupplicantInfo *info;
  	DBusGProxyCall *call;
  	guint32 ap_scan;
@@ -461,8 +461,8 @@ index 2076936..2426fcb 100644
  	if (priv->cfg)
  		g_object_unref (priv->cfg);
  	priv->cfg = cfg;
-@@ -1183,6 +1185,40 @@ nm_supplicant_interface_set_config (NMSupplicantInterface * self,
- 									G_TYPE_INVALID);
+@@ -1285,6 +1287,40 @@ nm_supplicant_interface_set_config (NMSu
+ 	                                G_TYPE_INVALID);
  	nm_supplicant_info_set_call (info, call);
  
 +	if (!call)
@@ -502,6 +502,3 @@ index 2076936..2426fcb 100644
  	return call != NULL;
  }
  
--- 
-1.6.0.2
-

0005-Fix-the-DHCP-lease-directory-location-for-suse.patch

@@ -4,11 +4,11 @@ Date: Mon, 16 Mar 2009 11:17:34 +0200
 Subject: [PATCH] Fix the DHCP lease directory location for suse.
 
 
-diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
-index 946be0c..43ff8b7 100644
+Index: b/src/dhcp-manager/nm-dhcp-dhclient.c
+===================================================================
 --- a/src/dhcp-manager/nm-dhcp-dhclient.c
 +++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -40,6 +40,8 @@
+@@ -41,6 +41,8 @@
  
  #if defined(TARGET_DEBIAN)
  #define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhcp3"
@@ -17,6 +17,3 @@ index 946be0c..43ff8b7 100644
  #else
  #define NM_DHCP_MANAGER_LEASE_DIR       LOCALSTATEDIR "/lib/dhclient"
  #endif
--- 
-1.6.0.2
-

0006-NIS-patch.patch

@@ -4,11 +4,11 @@ Date: Tue, 13 Jan 2009 12:34:51 +0200
 Subject: [PATCH] NIS patch.
 
 
-diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
-index 1d50abb..2cfb0be 100644
+Index: b/src/dhcp-manager/nm-dhcp-manager.c
+===================================================================
 --- a/src/dhcp-manager/nm-dhcp-manager.c
 +++ b/src/dhcp-manager/nm-dhcp-manager.c
-@@ -952,6 +952,18 @@ nm_dhcp_manager_options_to_ip4_config (const char *iface, GHashTable *options)
+@@ -952,6 +952,18 @@ nm_dhcp_manager_options_to_ip4_config (c
  			nm_ip4_config_set_mtu (ip4_config, int_mtu);
  	}
  
@@ -27,15 +27,16 @@ index 1d50abb..2cfb0be 100644
  	return ip4_config;
  
  error:
-diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
-index adb76fd..9fbc3da 100644
+Index: b/src/named-manager/nm-named-manager.c
+===================================================================
 --- a/src/named-manager/nm-named-manager.c
 +++ b/src/named-manager/nm-named-manager.c
-@@ -117,6 +117,19 @@ merge_one_ip4_config (NMIP4Config *dst, NMIP4Config *src)
- 		for (i = 0; i < num_domains; i++)
- 			nm_ip4_config_add_search (dst, nm_ip4_config_get_domain (src, i));
- 	}
-+
+@@ -117,8 +117,20 @@ merge_one_ip4_config (NMIP4Config *dst,
+ 	 */
+ 	for (i = 0; i < num_domains; i++)
+ 		nm_ip4_config_add_search (dst, nm_ip4_config_get_domain (src, i));
+-}
+ 
 +	if (!g_object_get_data (G_OBJECT (dst), "NISDOMAIN") &&
 +		!g_object_get_data (G_OBJECT (dst), "NISSERVERS")) {
 +		const char *tmp;
@@ -48,19 +49,20 @@ index adb76fd..9fbc3da 100644
 +		if (tmp)
 +			g_object_set_data_full (G_OBJECT (dst), "NISSERVERS", g_strdup (tmp), g_free);
 +	}
- }
++}
  
- 
-@@ -172,6 +185,8 @@ dispatch_netconfig (const char *domain,
- 				char **searches,
- 				char **nameservers,
- 				const char *iface,
-+					const char *nis_domain,
-+					const char *nis_servers,
- 				GError **error)
+ #if defined(TARGET_SUSE)
+ /**********************************/
+@@ -172,6 +184,8 @@ dispatch_netconfig (const char *domain,
+                     char **searches,
+                     char **nameservers,
+                     const char *iface,
++                    const char *nis_domain,
++                    const char *nis_servers,
+                     GError **error)
  {
- 	gint fd;
-@@ -204,6 +219,12 @@ dispatch_netconfig (const char *domain,
+ 	char *str;
+@@ -206,6 +220,12 @@ dispatch_netconfig (const char *domain,
  		g_free (str);
  	}
  
@@ -72,8 +74,8 @@ index adb76fd..9fbc3da 100644
 +
  	close (fd);
  
- 	return TRUE;
-@@ -470,7 +491,10 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
+ 	/* Wait until the process exits */
+@@ -509,7 +529,10 @@ rewrite_resolv_conf (NMNamedManager *mgr
  
  #ifdef TARGET_SUSE
  	if (success == FALSE)
@@ -85,6 +87,3 @@ index adb76fd..9fbc3da 100644
  #endif
  
  	if (success == FALSE)
--- 
-1.6.0.2
-

0009-Implement-sending-system-hostname-with-DHCP-client.patch

@@ -4,11 +4,11 @@ Date: Tue, 13 Jan 2009 16:12:50 +0200
 Subject: [PATCH] Implement sending system hostname with DHCP client.
 
 
-diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h
-index 91a1c69..fb55393 100644
+Index: b/libnm-util/nm-setting-ip4-config.h
+===================================================================
 --- a/libnm-util/nm-setting-ip4-config.h
 +++ b/libnm-util/nm-setting-ip4-config.h
-@@ -69,6 +69,7 @@ GQuark nm_setting_ip4_config_error_quark (void);
+@@ -69,6 +69,7 @@ GQuark nm_setting_ip4_config_error_quark
  #define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
  #define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
  
@@ -16,8 +16,8 @@ index 91a1c69..fb55393 100644
  
  typedef struct NMIP4Address NMIP4Address;
  
-diff --git a/src/NetworkManager.c b/src/NetworkManager.c
-index 5aa1b15..677ae36 100644
+Index: b/src/NetworkManager.c
+===================================================================
 --- a/src/NetworkManager.c
 +++ b/src/NetworkManager.c
 @@ -378,6 +378,8 @@ main (int argc, char *argv[])
@@ -29,8 +29,8 @@ index 5aa1b15..677ae36 100644
  	/* Start our DBus service */
  	if (!nm_dbus_manager_start_service (dbus_mgr)) {
  		nm_warning ("Failed to start the dbus service.");
-diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
-index 2cfb0be..fd794d1 100644
+Index: b/src/dhcp-manager/nm-dhcp-manager.c
+===================================================================
 --- a/src/dhcp-manager/nm-dhcp-manager.c
 +++ b/src/dhcp-manager/nm-dhcp-manager.c
 @@ -52,6 +52,7 @@ typedef struct {
@@ -41,7 +41,7 @@ index 2cfb0be..fd794d1 100644
  } NMDHCPManagerPrivate;
  
  
-@@ -71,6 +72,8 @@ static NMDHCPManager *nm_dhcp_manager_new (void);
+@@ -71,6 +72,8 @@ static NMDHCPManager *nm_dhcp_manager_ne
  
  static void nm_dhcp_manager_cancel_transaction_real (NMDHCPDevice *device);
  
@@ -62,7 +62,7 @@ index 2cfb0be..fd794d1 100644
  	g_hash_table_destroy (priv->devices);
  	g_object_unref (priv->proxy);
  	g_object_unref (priv->dbus_mgr);
-@@ -582,6 +590,7 @@ nm_dhcp_manager_begin_transaction (NMDHCPManager *manager,
+@@ -583,6 +591,7 @@ nm_dhcp_manager_begin_transaction (NMDHC
  {
  	NMDHCPManagerPrivate *priv;
  	NMDHCPDevice *device;
@@ -70,14 +70,14 @@ index 2cfb0be..fd794d1 100644
  
  	g_return_val_if_fail (NM_IS_DHCP_MANAGER (manager), FALSE);
  	g_return_val_if_fail (iface != NULL, FALSE);
-@@ -597,9 +606,33 @@ nm_dhcp_manager_begin_transaction (NMDHCPManager *manager,
+@@ -598,9 +607,33 @@ nm_dhcp_manager_begin_transaction (NMDHC
  		nm_dhcp_manager_cancel_transaction_real (device);
  	}
  
 -	nm_info ("Activation (%s) Beginning DHCP transaction.", iface);
 +	if (s_ip4 && priv->hostname_provider) {
 +		const char *dhcp_hostname;
- 
++
 +		dhcp_hostname = nm_setting_ip4_config_get_dhcp_hostname (s_ip4);
 +		if (dhcp_hostname && !strcmp (dhcp_hostname, NM_SETTING_IP4_CONFIG_DHCP_USE_SYSTEM_HOSTNAME)) {
 +			char *system_hostname;
@@ -90,9 +90,9 @@ index 2cfb0be..fd794d1 100644
 +			}
 +		}
 +	}
-+
+ 
 +	nm_info ("Activation (%s) Beginning DHCP transaction.", iface);
- 	device->pid = nm_dhcp_client_start (device, s_ip4);
+ 	device->pid = nm_dhcp_client_start (device, uuid, s_ip4);
 +
 +	if (hostname_modified) {
 +		/* Restore the saved hostname */
@@ -105,7 +105,7 @@ index 2cfb0be..fd794d1 100644
  	if (device->pid == 0)
  		return FALSE;
  
-@@ -1076,3 +1112,28 @@ nm_dhcp_manager_foreach_dhcp4_option (NMDHCPManager *self,
+@@ -1076,3 +1109,28 @@ nm_dhcp_manager_foreach_dhcp4_option (NM
  	return TRUE;
  }
  
@@ -134,17 +134,14 @@ index 2cfb0be..fd794d1 100644
 +		g_object_weak_ref (provider, hostname_provider_destroyed, manager);
 +	}
 +}
-diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
-index c352738..a3047bb 100644
+Index: b/src/dhcp-manager/nm-dhcp-manager.h
+===================================================================
 --- a/src/dhcp-manager/nm-dhcp-manager.h
 +++ b/src/dhcp-manager/nm-dhcp-manager.h
-@@ -113,4 +113,6 @@ gboolean       nm_dhcp_client_process_classless_routes (GHashTable *options,
+@@ -116,4 +116,6 @@ gboolean       nm_dhcp_client_process_cl
  NMIP4Config *nm_dhcp_manager_options_to_ip4_config (const char *iface,
                                                      GHashTable *options);
  
 +void           nm_dhcp_manager_set_hostname_provider (NMDHCPManager *manager, GObject *provider);
 +
  #endif /* NM_DHCP_MANAGER_H */
--- 
-1.6.0.2
-

0011-Don-t-bring-wireless-devices-up-when-wifi-is-disable.patch

@@ -1,23 +0,0 @@
-From 86f729242541a5198a99fc25742771f6f8dec91d Mon Sep 17 00:00:00 2001
-From: Tambet Ingo <tambet@gmail.com>
-Date: Tue, 31 Mar 2009 10:04:02 +0300
-Subject: [PATCH] Don't bring wireless devices up when wifi is disabled.
-
-
-diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
-index 4b76017..1e5ea66 100644
---- a/src/nm-device-wifi.c
-+++ b/src/nm-device-wifi.c
-@@ -978,6 +978,9 @@ real_hw_is_up (NMDevice *device)
- static gboolean
- real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
- {
-+	if (!NM_DEVICE_WIFI_GET_PRIVATE (dev)->enabled)
-+		return FALSE;
-+
- 	return nm_system_device_set_up_down (dev, TRUE, no_firmware);
- }
- 
--- 
-1.6.0.2
-

0012-Update-resolv.conf-once.patch

@@ -4,11 +4,11 @@ Date: Wed, 1 Apr 2009 10:02:52 +0300
 Subject: [PATCH] Update resolv.conf once.
 
 
-diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c
-index a3cff6a..e77adce 100644
+Index: b/src/NetworkManagerPolicy.c
+===================================================================
 --- a/src/NetworkManagerPolicy.c
 +++ b/src/NetworkManagerPolicy.c
-@@ -553,7 +553,7 @@ update_routing_and_dns (NMPolicy *policy, gboolean force_update)
+@@ -553,7 +553,7 @@ update_routing_and_dns (NMPolicy *policy
  	}
  
  	named_mgr = nm_named_manager_get ();
@@ -17,7 +17,7 @@ index a3cff6a..e77adce 100644
  	g_object_unref (named_mgr);
  
  	/* Now set new default active connection _after_ updating DNS info, so that
-@@ -774,7 +774,10 @@ device_ip4_config_changed (NMDevice *device,
+@@ -774,7 +774,10 @@ device_ip4_config_changed (NMDevice *dev
                             GParamSpec *pspec,
                             gpointer user_data)
  {
@@ -29,24 +29,20 @@ index a3cff6a..e77adce 100644
  }
  
  static void
-diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
-index 9fbc3da..05298d8 100644
+Index: b/src/named-manager/nm-named-manager.c
+===================================================================
 --- a/src/named-manager/nm-named-manager.c
 +++ b/src/named-manager/nm-named-manager.c
-@@ -184,9 +184,8 @@ static gboolean
+@@ -183,7 +183,6 @@ static gboolean
  dispatch_netconfig (const char *domain,
- 				char **searches,
- 				char **nameservers,
--				const char *iface,
--					const char *nis_domain,
--					const char *nis_servers,
-+				const char *nis_domain,
-+				const char *nis_servers,
- 				GError **error)
- {
- 	gint fd;
-@@ -196,8 +195,6 @@ dispatch_netconfig (const char *domain,
- 	if (fd < 0)
+                     char **searches,
+                     char **nameservers,
+-                    const char *iface,
+                     const char *nis_domain,
+                     const char *nis_servers,
+                     GError **error)
+@@ -197,8 +196,6 @@ dispatch_netconfig (const char *domain,
+ 	if (pid < 0)
  		return FALSE;
  
 -	write_to_netconfig (fd, "INTERFACE", iface);
@@ -54,15 +50,15 @@ index 9fbc3da..05298d8 100644
  	if (searches) {
  		str = g_strjoinv (" ", searches);
  
-@@ -306,7 +303,6 @@ static gboolean
+@@ -315,7 +312,6 @@ static gboolean
  dispatch_resolvconf (const char *domain,
- 		     char **searches,
- 		     char **nameservers,
--		     const char *iface,
- 		     GError **error)
+                      char **searches,
+                      char **nameservers,
+-                     const char *iface,
+                      GError **error)
  {
  	char *cmd;
-@@ -318,7 +314,7 @@ dispatch_resolvconf (const char *domain,
+@@ -327,7 +323,7 @@ dispatch_resolvconf (const char *domain,
  
  	if (domain || searches || nameservers) {
  		cmd = g_strconcat (RESOLVCONF_PATH, " -a ", "NetworkManager", NULL);
@@ -71,7 +67,7 @@ index 9fbc3da..05298d8 100644
  		if ((f = popen (cmd, "w")) == NULL)
  			g_set_error (error,
  				     NM_NAMED_MANAGER_ERROR,
-@@ -332,7 +328,7 @@ dispatch_resolvconf (const char *domain,
+@@ -341,7 +337,7 @@ dispatch_resolvconf (const char *domain,
  		}
  	} else {
  		cmd = g_strconcat (RESOLVCONF_PATH, " -d ", "NetworkManager", NULL);
@@ -80,19 +76,16 @@ index 9fbc3da..05298d8 100644
  		if (nm_spawn_process (cmd) == 0)
  			retval = TRUE;
  	}
-@@ -345,9 +341,8 @@ dispatch_resolvconf (const char *domain,
- 
- static gboolean
+@@ -356,7 +352,6 @@ static gboolean
  update_resolv_conf (const char *domain,
--		    		char **searches,
-+				char **searches,
- 				char **nameservers,
--				const char *iface,
- 				GError **error)
+                     char **searches,
+                     char **nameservers,
+-                    const char *iface,
+                     GError **error)
  {
  	const char *tmp_resolv_conf = RESOLV_CONF ".tmp";
-@@ -395,7 +390,7 @@ update_resolv_conf (const char *domain,
- 
+@@ -442,7 +437,7 @@ compute_searches (guint32 num, NMIP4Conf
+ }
  
  static gboolean
 -rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
@@ -100,8 +93,8 @@ index 9fbc3da..05298d8 100644
  {
  	NMNamedManagerPrivate *priv;
  	NMIP4Config *composite;
-@@ -486,19 +481,19 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
- 	}
+@@ -524,19 +519,19 @@ rewrite_resolv_conf (NMNamedManager *mgr
+ 	g_object_unref (composite);
  
  #ifdef RESOLVCONF_PATH
 -	success = dispatch_resolvconf (domain, searches, nameservers, iface, error);
@@ -123,7 +116,7 @@ index 9fbc3da..05298d8 100644
  
  	if (success)
  		nm_system_update_dns ();
-@@ -511,7 +506,6 @@ rewrite_resolv_conf (NMNamedManager *mgr, const char *iface, GError **error)
+@@ -549,7 +544,6 @@ rewrite_resolv_conf (NMNamedManager *mgr
  
  gboolean
  nm_named_manager_add_ip4_config (NMNamedManager *mgr,
@@ -131,7 +124,7 @@ index 9fbc3da..05298d8 100644
                                   NMIP4Config *config,
                                   NMNamedIPConfigType cfg_type)
  {
-@@ -519,7 +513,6 @@ nm_named_manager_add_ip4_config (NMNamedManager *mgr,
+@@ -557,7 +551,6 @@ nm_named_manager_add_ip4_config (NMNamed
  	GError *error = NULL;
  
  	g_return_val_if_fail (mgr != NULL, FALSE);
@@ -139,7 +132,7 @@ index 9fbc3da..05298d8 100644
  	g_return_val_if_fail (config != NULL, FALSE);
  
  	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
-@@ -539,7 +532,7 @@ nm_named_manager_add_ip4_config (NMNamedManager *mgr,
+@@ -577,7 +570,7 @@ nm_named_manager_add_ip4_config (NMNamed
  	if (!g_slist_find (priv->configs, config))
  		priv->configs = g_slist_append (priv->configs, g_object_ref (config));
  
@@ -148,7 +141,7 @@ index 9fbc3da..05298d8 100644
  		nm_warning ("Could not commit DNS changes.  Error: '%s'", error ? error->message : "(none)");
  		g_error_free (error);
  	}
-@@ -549,14 +542,12 @@ nm_named_manager_add_ip4_config (NMNamedManager *mgr,
+@@ -587,14 +580,12 @@ nm_named_manager_add_ip4_config (NMNamed
  
  gboolean
  nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
@@ -163,7 +156,7 @@ index 9fbc3da..05298d8 100644
  	g_return_val_if_fail (config != NULL, FALSE);
  
  	priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
-@@ -575,7 +566,7 @@ nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
+@@ -613,7 +604,7 @@ nm_named_manager_remove_ip4_config (NMNa
  
  	g_object_unref (config);	
  
@@ -172,8 +165,8 @@ index 9fbc3da..05298d8 100644
  		nm_warning ("Could not commit DNS changes.  Error: '%s'", error ? error->message : "(none)");
  		if (error)
  			g_error_free (error);
-diff --git a/src/named-manager/nm-named-manager.h b/src/named-manager/nm-named-manager.h
-index 2b5b647..cc40c04 100644
+Index: b/src/named-manager/nm-named-manager.h
+===================================================================
 --- a/src/named-manager/nm-named-manager.h
 +++ b/src/named-manager/nm-named-manager.h
 @@ -69,12 +69,10 @@ GType nm_named_manager_get_type (void);
@@ -189,11 +182,11 @@ index 2b5b647..cc40c04 100644
  					     NMIP4Config *config);
  
  G_END_DECLS
-diff --git a/src/nm-device.c b/src/nm-device.c
-index 1ea77b2..fa14824 100644
+Index: b/src/nm-device.c
+===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
-@@ -1970,7 +1970,7 @@ nm_device_set_ip4_config (NMDevice *self,
+@@ -1976,7 +1976,7 @@ nm_device_set_ip4_config (NMDevice *self
  	named_mgr = nm_named_manager_get ();
  	if (old_config) {
  		/* Remove any previous IP4 Config from the named manager */
@@ -202,7 +195,7 @@ index 1ea77b2..fa14824 100644
  		g_object_unref (old_config);
  		priv->ip4_config = NULL;
  	}
-@@ -1984,9 +1984,6 @@ nm_device_set_ip4_config (NMDevice *self,
+@@ -1990,9 +1990,6 @@ nm_device_set_ip4_config (NMDevice *self
  			if (!nm_ip4_config_get_dbus_path (new_config))
  				nm_ip4_config_export (new_config);
  
@@ -212,11 +205,11 @@ index 1ea77b2..fa14824 100644
  			nm_device_update_ip4_address (self);
  		}
  	}
-diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
-index b89587f..14de8ee 100644
+Index: b/src/vpn-manager/nm-vpn-connection.c
+===================================================================
 --- a/src/vpn-manager/nm-vpn-connection.c
 +++ b/src/vpn-manager/nm-vpn-connection.c
-@@ -506,7 +506,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
+@@ -506,7 +506,7 @@ nm_vpn_connection_ip4_config_get (DBusGP
  
  		/* Add the VPN to DNS */
  		named_mgr = nm_named_manager_get ();
@@ -225,7 +218,7 @@ index b89587f..14de8ee 100644
  		g_object_unref (named_mgr);
  
  		priv->ip4_config = config;
-@@ -943,7 +943,7 @@ vpn_cleanup (NMVPNConnection *connection)
+@@ -943,7 +943,7 @@ vpn_cleanup (NMVPNConnection *connection
  
  		/* Remove attributes of the VPN's IP4 Config */
  		named_mgr = nm_named_manager_get ();
@@ -234,6 +227,3 @@ index b89587f..14de8ee 100644
  		g_object_unref (named_mgr);
  
  		/* Remove any previously added VPN gateway host route */
--- 
-1.6.0.2
-

nm-hal-tree-changes.patch

@@ -2,44 +2,12 @@ Index: NetworkManager-0.7.1/src/nm-hal-manager.c
 ===================================================================
 --- NetworkManager-0.7.1.orig/src/nm-hal-manager.c
 +++ NetworkManager-0.7.1/src/nm-hal-manager.c
-@@ -110,12 +110,40 @@ get_creator (NMHalManager *self, const c
- /* Common helpers for built-in device creators */
+@@ -134,7 +134,7 @@ nm_get_device_driver_name (LibHalContext
  
- static char *
-+hal_get_subsystem (LibHalContext *ctx, const char *udi)
-+{
-+	char *subsys;
-+
-+	subsys = libhal_device_get_property_string (ctx, udi, "info.subsystem", NULL);
-+	if (!subsys) {
-+		/* info.bus is deprecated */
-+		subsys = libhal_device_get_property_string (ctx, udi, "info.bus", NULL);
-+	}
-+	return subsys;
-+}
-+
-+static char *
- nm_get_device_driver_name (LibHalContext *ctx, const char *udi)
- {
- 	char *origdev_udi;
-+	char *subsystem;
- 	char *driver_name = NULL;
- 
- 	origdev_udi = libhal_device_get_property_string (ctx, udi, "net.originating_device", NULL);
-+	if (!origdev_udi)
-+		return NULL;
-+
-+	subsystem = hal_get_subsystem (ctx, origdev_udi);
+ 	/* s390 driver name is on the grandparent of the net device */
+ 	subsystem = hal_get_subsystem (ctx, origdev_udi);
+-	if (subsystem && !strcmp (subsystem, "ibmebus")) {
 +	if (subsystem && (!strcmp (subsystem, "ibmebus") || !strcmp (subsystem, "ssb"))) {
-+		char *tmp;
-+
-+		/* The driver name is on the grandparent of the net device */
-+		tmp = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL);
-+		libhal_free_string (origdev_udi);
-+		origdev_udi = tmp;
-+	}
-+	libhal_free_string (subsystem);
-+
- 	if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) {
- 		char *drv;
- 
+ 		od_parent = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL);
+ 		origdev_udi = (const char *) od_parent;
+ 	}

nm-root-at-console-permissions.patch

@@ -1,73 +0,0 @@
-commit 5aa1f7bb6d547f43cc7a82b163a3a10550720d0c
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Sun May 10 00:20:12 2009 -0400
-
-    dbus: fix issues with root being at_console
-    
-    When root is at_console, the at_console stuff overrides the user=root
-    section.  Since the default section will deny-by-default, explicitly
-    allow certain D-Bus interfaces to be usable by at_console users (including
-    root when root is at_console) prevents root from being denied access to
-    those interfaces when root is at_console.
-
-diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf
-index bb1c771..c3d7b84 100644
---- a/src/NetworkManager.conf
-+++ b/src/NetworkManager.conf
-@@ -12,15 +12,51 @@
-         <policy at_console="true">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
- 
--                <deny send_destination="org.freedesktop.NetworkManager"
--                      send_interface="org.freedesktop.NetworkManager.PPP"/>
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.DBus.Introspectable"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.DBus.Properties"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.Device"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.IP4Config"/>
-+
-+		<allow send_destination="org.freedesktop.NetworkManager"
-+		       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
-         </policy>
-         <policy context="default">
-                 <deny own="org.freedesktop.NetworkManager"/>
-                 <deny send_destination="org.freedesktop.NetworkManager"/>
--
--                <deny send_destination="org.freedesktop.NetworkManager"
--                      send_interface="org.freedesktop.NetworkManager.PPP"/>
-         </policy>
- 
-         <limit name="max_replies_per_connection">512</limit>