Merge remote-tracking branch 'salsa/master' into disco

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch
index d80cf672..6820bca3 100644
--- a/debian/patches/Update-dnsmasq-parameters.patch
+++ b/debian/patches/Update-dnsmasq-parameters.patch
@@ -10,10 +10,10 @@ See also: https://blueprints.launchpad.net/ubuntu/+spec/foundations-p-dns-resolv
  src/dns/nm-dns-manager.c | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
-Index: network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+Index: network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c
 ===================================================================
---- network-manager-1.12.2.orig/src/dns/nm-dns-dnsmasq.c
-+++ network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
+--- network-manager-1.14.4.orig/src/dns/nm-dns-dnsmasq.c
++++ network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c
 @@ -330,8 +330,8 @@ start_dnsmasq (NMDnsDnsmasq *self)
  	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
  	argv[idx++] = "--bind-interfaces";
@@ -25,11 +25,11 @@ Index: network-manager-1.12.2/src/dns/nm-dns-dnsmasq.c
  	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
  	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
  	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-Index: network-manager-1.12.2/src/dns/nm-dns-manager.c
+Index: network-manager-1.14.4/src/dns/nm-dns-manager.c
 ===================================================================
---- network-manager-1.12.2.orig/src/dns/nm-dns-manager.c
-+++ network-manager-1.12.2/src/dns/nm-dns-manager.c
-@@ -1426,12 +1426,12 @@ update_dns (NMDnsManager *self,
+--- network-manager-1.14.4.orig/src/dns/nm-dns-manager.c
++++ network-manager-1.14.4/src/dns/nm-dns-manager.c
+@@ -1428,12 +1428,12 @@ update_dns (NMDnsManager *self,
  		;
  	}
  
@@ -44,7 +44,7 @@ Index: network-manager-1.12.2/src/dns/nm-dns-manager.c
  
  		if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
  			/* systemd-resolved uses a different link-local address */
-@@ -1756,7 +1756,7 @@ nm_dns_manager_stop (NMDnsManager *self)
+@@ -1758,7 +1758,7 @@ nm_dns_manager_stop (NMDnsManager *self)
  	_LOGT ("stopping...");
  
  	/* If we're quitting, leave a valid resolv.conf in place, not one