Merge remote branch 'svn/master'

5 files changed, 262 insertions, 0 deletions

diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
new file mode 100644
index 00000000..c2d741e5
--- /dev/null
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -0,0 +1,56 @@
+Index: network-manager-0.7.999/src/NetworkManager.conf
+===================================================================
+--- network-manager-0.7.999.orig/src/NetworkManager.conf	2010-01-22 01:27:48.273977786 +0100
++++ network-manager-0.7.999/src/NetworkManager.conf	2010-01-22 01:28:01.153983423 +0100
+@@ -12,6 +12,51 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
++        <policy group="netdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++
++                <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 at_console="true">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+ 
diff --git a/debian/patches/10-dont_require_ifup_for_lo.patch b/debian/patches/10-dont_require_ifup_for_lo.patch
new file mode 100644
index 00000000..ffea6ff0
--- /dev/null
+++ b/debian/patches/10-dont_require_ifup_for_lo.patch
@@ -0,0 +1,30 @@
+commit 7e87d79de6d1eeeb47c8e43fb44962bce9c70664
+Author: Dan Williams <dcbw@redhat.com>
+Date:   Tue Aug 3 11:36:59 2010 -0700
+
+    debian: don't require ifup for enabling loopback (bgo #625427)
+    
+    But use it if it's installed.
+
+diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
+index ef9475a..37eb645 100644
+--- a/src/backends/NetworkManagerDebian.c
++++ b/src/backends/NetworkManagerDebian.c
+@@ -1,3 +1,4 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+ /* NetworkManager -- Network link manager
+  *
+  * Matthew Garrett <mjg59@srcf.ucam.org>
+@@ -44,7 +45,11 @@
+  */
+ void nm_system_enable_loopback (void)
+ {
+-	nm_spawn_process ("/sbin/ifup lo");
++	/* ifupdown isn't always installed (bgo #625427) */
++	if (g_file_test ("/sbin/ifup", G_FILE_TEST_EXISTS))
++		nm_spawn_process ("/sbin/ifup lo");
++	else
++		nm_generic_enable_loopback ();
+ }
+ 
+ /*
diff --git a/debian/patches/20-manual_means_always_online.patch b/debian/patches/20-manual_means_always_online.patch
new file mode 100644
index 00000000..4da87b8e
--- /dev/null
+++ b/debian/patches/20-manual_means_always_online.patch
@@ -0,0 +1,36 @@
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerDbus.c bzr.debian.0.9.5.new/src/NetworkManagerDbus.c
+--- bzr.debian.0.9.5/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
+@@ -302,6 +302,9 @@
+ 	if (data->asleep == TRUE)
+ 		return NM_STATE_ASLEEP;
+ 
++	if (data->always_online == TRUE)
++	  return NM_STATE_CONNECTED;
++
+ 	act_dev = nm_get_active_device (data);
+ 	if (!act_dev && !data->modem_active)
+ 		return NM_STATE_DISCONNECTED;
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerMain.h bzr.debian.0.9.5.new/src/NetworkManagerMain.h
+--- bzr.debian.0.9.5/src/NetworkManagerMain.h	2007-06-25 17:18:17.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerMain.h	2007-06-25 17:38:42.000000000 +0200
+@@ -86,6 +86,7 @@
+ 	gboolean				modem_active;
+ 	gboolean				asleep;
+ 	gboolean				disconnected;
++	gboolean                                always_online;
+ 
+ 	GSList *				dialup_list;
+ 	GMutex *				dialup_list_mutex;
+diff -Nur bzr.debian.0.9.5/src/nm-device.c bzr.debian.0.9.5.new/src/nm-device.c
+--- bzr.debian.0.9.5/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
+@@ -195,6 +195,8 @@
+ 	/* Allow distributions to flag devices as disabled */
+ 	if (nm_system_device_get_disabled (dev))
+ 	{
++		/* In this case, we assume we're always online */
++		app_data->always_online = TRUE;
+ 		g_object_unref (G_OBJECT (dev));
+ 		return NULL;
+ 	}
diff --git a/debian/patches/30-typo_fix.patch b/debian/patches/30-typo_fix.patch
new file mode 100644
index 00000000..2d8edfaa
--- /dev/null
+++ b/debian/patches/30-typo_fix.patch
@@ -0,0 +1,136 @@
+diff --git a/ChangeLog b/ChangeLog
+index d529664..b611b3d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1317,7 +1317,7 @@
+ 2008-09-30  Dan Williams  <dcbw@redhat.com>
+ 
+ 	* src/NetworkManagerPolicy.c
+-		- (lookup_thread_worker): don't store the idle handler ID becuase the
++		- (lookup_thread_worker): don't store the idle handler ID because the
+ 			idle handler could have already run and freed the LookupThread
+ 			structure
+ 
+@@ -8391,7 +8391,7 @@
+ 			internally; clients should provide a setting that applies to
+ 			the device with 'autoconnect: True'.  Problem was that these
+ 			internally auto-created connections don't have a proxy or service
+-			name becuase they weren't created by a settings daemon, and therefore
++			name because they weren't created by a settings daemon, and therefore
+ 			clients have no idea what to do with them.
+ 
+ 2007-10-03  Dan Williams  <dcbw@redhat.com>
+@@ -9794,7 +9794,7 @@
+ 	* libnm-glib/nm-settings.c
+ 	  libnm-glib/nm-settings.h
+ 		- make the dbus path a property of the object, and autogenerate it.
+-		It can't be composed of the 'id' field becuase that's not available
++		It can't be composed of the 'id' field because that's not available
+ 		yet during the GObject creation in nm_connection_settings_init()
+ 
+ 2007-08-29  Dan Williams  <dcbw@redhat.com>
+diff --git a/README b/README
+index acb807b..286cabc 100644
+--- a/README
++++ b/README
+@@ -66,11 +66,11 @@ those drivers that are shipped with the upstream Linux kernel, because only
+ those drivers can be easily fixed and debugged.  ndiswrapper, vendor binary
+ drivers, or other out-of-tree drivers may or may not work well with
+ NetworkManager, precisely because they have not been vetted and improved by the
+-open-source community, and becuase problems in these drivers usually cannot
++open-source community, and because problems in these drivers usually cannot
+ be fixed.
+ 
+ Sometimes, command-line tools like 'iwconfig' will work, but NetworkManager will
+-fail.  This is again often due to buggy drivers, becuase these drivers simply
++fail.  This is again often due to buggy drivers, because these drivers simply
+ aren't expecting the dynamic requests that NetworkManager and wpa_supplicant
+ make.  Driver bugs should be filed in the bug tracker of the distribution being
+ run, since often distributions customize their kernel and drivers.
+diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
+index 5e9eb50..120be3f 100644
+--- a/libnm-glib/nm-device.c
++++ b/libnm-glib/nm-device.c
+@@ -1084,7 +1084,7 @@ nm_device_update_description (NMDevice *device)
+ 	 * vendor and device ID information off it.
+ 	 */
+ 
+-	/* Ref the device again becuase we have to unref it each iteration,
++	/* Ref the device again because we have to unref it each iteration,
+ 	 * as g_udev_device_get_parent() returns a ref-ed object.
+ 	 */
+ 	tmpdev = g_object_ref (udev_device);
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
+index bb5cd2e..26a2b7b 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -385,7 +385,7 @@ merge_dhclient_config (const char *iface,
+ 			}
+ 
+ 			/* If the client ID is just hex digits and : then don't use quotes,
+-			 * becuase dhclient expects either a quoted ASCII string, or a byte
++			 * because dhclient expects either a quoted ASCII string, or a byte
+ 			 * array formated as hex octets separated by :
+ 			 */
+ 			if (is_octets)
+diff --git a/src/nm-device.c b/src/nm-device.c
+index 176d90f..906abd4 100644
+--- a/src/nm-device.c
++++ b/src/nm-device.c
+@@ -3683,7 +3683,7 @@ nm_device_state_changed (NMDevice *device,
+ 	case NM_DEVICE_STATE_UNAVAILABLE:
+ 		/* If the device can activate now (ie, it's got a carrier, the supplicant
+ 		 * is active, or whatever) schedule a delayed transition to DISCONNECTED
+-		 * to get things rolling.  The device can't transition immediately becuase
++		 * to get things rolling.  The device can't transition immediately because
+ 		 * we can't change states again from the state handler for a variety of
+ 		 * reasons.
+ 		 */
+@@ -3704,7 +3704,7 @@ nm_device_state_changed (NMDevice *device,
+ 	case NM_DEVICE_STATE_FAILED:
+ 		nm_log_warn (LOGD_DEVICE, "Activation (%s) failed.", nm_device_get_iface (device));
+ 		/* Schedule the transition to DISCONNECTED.  The device can't transition
+-		 * immediately becuase we can't change states again from the state
++		 * immediately because we can't change states again from the state
+ 		 * handler for a variety of reasons.
+ 		 */
+ 		priv->failed_to_disconnected_id = g_idle_add (failed_to_disconnected, device);
+diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/system-settings/plugins/ifcfg-rh/reader.c
+index 1c7e8eb..3697737 100644
+--- a/system-settings/plugins/ifcfg-rh/reader.c
++++ b/system-settings/plugins/ifcfg-rh/reader.c
+@@ -1874,7 +1874,7 @@ parse_wpa_psk (shvarFile *ifcfg,
+ 	char *psk = NULL, *p, *hashed = NULL;
+ 	gboolean quoted = FALSE;
+ 
+-	/* Passphrase must be between 10 and 66 characters in length becuase WPA
++	/* Passphrase must be between 10 and 66 characters in length because WPA
+ 	 * hex keys are exactly 64 characters (no quoting), and WPA passphrases
+ 	 * are between 8 and 63 characters (inclusive), plus optional quoting if
+ 	 * the passphrase contains spaces.
+diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c
+index 5582733..cbcb42c 100644
+--- a/system-settings/plugins/keyfile/io/reader.c
++++ b/system-settings/plugins/keyfile/io/reader.c
+@@ -738,7 +738,7 @@ typedef struct {
+ 	void (*parser) (NMSetting *setting, const char *key, GKeyFile *keyfile);
+ } KeyParser;
+ 
+-/* A table of keys that require further parsing/conversion becuase they are
++/* A table of keys that require further parsing/conversion because they are
+  * stored in a format that can't be automatically read using the key's type.
+  * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are
+  * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored 
+diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/io/writer.c
+index 348fa51..06b5b85 100644
+--- a/system-settings/plugins/keyfile/io/writer.c
++++ b/system-settings/plugins/keyfile/io/writer.c
+@@ -460,7 +460,7 @@ typedef struct {
+ 	void (*writer) (GKeyFile *keyfile, NMSetting *setting, const char *key, const GValue *value);
+ } KeyWriter;
+ 
+-/* A table of keys that require further parsing/conversion becuase they are
++/* A table of keys that require further parsing/conversion because they are
+  * stored in a format that can't be automatically read using the key's type.
+  * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are
+  * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..365331c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+# Debian patches for network-manager
+02-dbus_access_network_manager.patch
+10-dont_require_ifup_for_lo.patch
+30-typo_fix.patch