Refresh patches

3 files changed, 22 insertions, 22 deletions

diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch
index bd8cad96..0d687210 100644
--- a/debian/patches/Force-online-state-with-unmanaged-devices.patch
+++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch
@@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286
  1 file changed, 115 insertions(+)
 
 diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
-index 3c9660c..62ffdd0 100644
+index b440b22..b4599d9 100644
 --- a/src/core/nm-manager.c
 +++ b/src/core/nm-manager.c
 @@ -51,6 +51,8 @@
@@ -73,7 +73,7 @@ index 3c9660c..62ffdd0 100644
      if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) {
          new_state = NM_STATE_CONNECTED_GLOBAL;
      }
-@@ -6671,6 +6701,62 @@ impl_manager_set_logging(NMDBusObject *                     obj,
+@@ -6659,6 +6689,62 @@ impl_manager_set_logging(NMDBusObject                      *obj,
          g_dbus_method_invocation_return_value(invocation, NULL);
  }
  
@@ -134,9 +134,9 @@ index 3c9660c..62ffdd0 100644
 +}
 +
  static void
- impl_manager_get_logging(NMDBusObject *                     obj,
+ impl_manager_get_logging(NMDBusObject                      *obj,
                           const NMDBusInterfaceInfoExtended *interface_info,
-@@ -6999,6 +7085,9 @@ nm_manager_start(NMManager *self, GError **error)
+@@ -6987,6 +7073,9 @@ nm_manager_start(NMManager *self, GError **error)
      nm_clear_g_source(&priv->devices_inited_id);
      priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL);
  
@@ -146,7 +146,7 @@ index 3c9660c..62ffdd0 100644
      return TRUE;
  }
  
-@@ -7979,6 +8068,22 @@ nm_manager_init(NMManager *self)
+@@ -7967,6 +8056,22 @@ nm_manager_init(NMManager *self)
          _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR);
      }
  
@@ -169,7 +169,7 @@ index 3c9660c..62ffdd0 100644
      /* Update timestamps in active connections */
      priv->timestamp_update_id =
          g_timeout_add_seconds(300,
-@@ -8262,6 +8367,16 @@ dispose(GObject *object)
+@@ -8252,6 +8357,16 @@ dispose(GObject *object)
          g_clear_object(&priv->fw_monitor);
      }
  
diff --git a/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch b/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
index 36f76e90..56cdf48b 100644
--- a/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
+++ b/debian/patches/Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
@@ -6,13 +6,13 @@ Whoopsie is the crash database reporting daemon. It needs access to some of
 the information NM keeps about devices to avoid sending data over the network
 when connected to 3G or other systems that are potentially billable.
 ---
- src/org.freedesktop.NetworkManager.conf | 13 +++++++++++++
+ src/core/org.freedesktop.NetworkManager.conf | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-Index: network-manager/src/core/org.freedesktop.NetworkManager.conf
-===================================================================
---- network-manager.orig/src/core/org.freedesktop.NetworkManager.conf
-+++ network-manager/src/core/org.freedesktop.NetworkManager.conf
+diff --git a/src/core/org.freedesktop.NetworkManager.conf b/src/core/org.freedesktop.NetworkManager.conf
+index 5c2af2e..f56c7fb 100644
+--- a/src/core/org.freedesktop.NetworkManager.conf
++++ b/src/core/org.freedesktop.NetworkManager.conf
 @@ -37,6 +37,19 @@
          <allow own="org.freedesktop.NetworkManager.dnsmasq"/>
          <allow send_destination="org.freedesktop.NetworkManager.dnsmasq"/>
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index cf13dac3..61685795 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -10,11 +10,11 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv
  src/core/dns/nm-dns-manager.c | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: network-manager/src/core/dns/nm-dns-dnsmasq.c
-===================================================================
---- network-manager.orig/src/core/dns/nm-dns-dnsmasq.c
-+++ network-manager/src/core/dns/nm-dns-dnsmasq.c
-@@ -523,8 +523,8 @@ _gl_pid_spawn_next_step(void)
+diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
+index f0abf56..01afd52 100644
+--- a/src/core/dns/nm-dns-dnsmasq.c
++++ b/src/core/dns/nm-dns-dnsmasq.c
+@@ -522,8 +522,8 @@ _gl_pid_spawn_next_step(void)
      argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
      argv[argv_idx++] = "--bind-interfaces";
      argv[argv_idx++] = "--pid-file=" PIDFILE;
@@ -25,11 +25,11 @@ Index: network-manager/src/core/dns/nm-dns-dnsmasq.c
      argv[argv_idx++] = "--clear-on-reload";     /* clear cache when dns server changes */
      argv[argv_idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
      argv[argv_idx++] = "--proxy-dnssec";        /* Allow DNSSEC to pass through */
-Index: network-manager/src/core/dns/nm-dns-manager.c
-===================================================================
---- network-manager.orig/src/core/dns/nm-dns-manager.c
-+++ network-manager/src/core/dns/nm-dns-manager.c
-@@ -1726,12 +1726,12 @@ plugin_skip:;
+diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
+index efbf847..a419dd2 100644
+--- a/src/core/dns/nm-dns-manager.c
++++ b/src/core/dns/nm-dns-manager.c
+@@ -1740,12 +1740,12 @@ plugin_skip:;
                                 NM_CAST_STRV_CC(nameservers),
                                 NM_CAST_STRV_CC(options));
  
@@ -44,7 +44,7 @@ Index: network-manager/src/core/dns/nm-dns-manager.c
          gboolean    need_edns0;
          gboolean    need_trust;
  
-@@ -2012,7 +2012,7 @@ nm_dns_manager_stop(NMDnsManager *self)
+@@ -2096,7 +2096,7 @@ nm_dns_manager_stop(NMDnsManager *self)
      _LOGT("stopping...");
  
      /* If we're quitting, leave a valid resolv.conf in place, not one