Merge branch 'debian/master' into ubuntu/master

1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index e0b89aa6..be5ecc08 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -6,14 +6,14 @@ Disable caching since it's a potential security issue (local dns cache poisoning
 
 See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolving
 ---
- src/dns/nm-dns-dnsmasq.c | 4 ++--
- src/dns/nm-dns-manager.c | 6 +++---
+ src/core/dns/nm-dns-dnsmasq.c | 4 ++--
+ src/core/dns/nm-dns-manager.c | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: network-manager/src/dns/nm-dns-dnsmasq.c
+Index: network-manager/src/core/dns/nm-dns-dnsmasq.c
 ===================================================================
---- network-manager.orig/src/dns/nm-dns-dnsmasq.c
-+++ network-manager/src/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)
      argv[argv_idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
      argv[argv_idx++] = "--bind-interfaces";
@@ -25,11 +25,11 @@ Index: network-manager/src/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/dns/nm-dns-manager.c
+Index: network-manager/src/core/dns/nm-dns-manager.c
 ===================================================================
---- network-manager.orig/src/dns/nm-dns-manager.c
-+++ network-manager/src/dns/nm-dns-manager.c
-@@ -1696,12 +1696,12 @@ plugin_skip:;
+--- 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:;
                                 NM_CAST_STRV_CC(nameservers),
                                 NM_CAST_STRV_CC(options));
  
@@ -41,10 +41,10 @@ Index: network-manager/src/dns/nm-dns-manager.c
      if (caching) {
 -        const char *lladdr = "127.0.0.1";
 +        const char *lladdr = "127.0.1.1";
+         gboolean    need_edns0;
+         gboolean    need_trust;
  
-         if (NM_IS_DNS_SYSTEMD_RESOLVED(priv->plugin)) {
-             /* systemd-resolved uses a different link-local address */
-@@ -1982,7 +1982,7 @@ nm_dns_manager_stop(NMDnsManager *self)
+@@ -2031,7 +2031,7 @@ nm_dns_manager_stop(NMDnsManager *self)
      _LOGT("stopping...");
  
      /* If we're quitting, leave a valid resolv.conf in place, not one