diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 13:08:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 13:42:10 +0100 |
| commit | c424b42b33018994dc58daeaded2d6a6e671c2c4 (patch) | |
| tree | 47c05f6985c97f2ddf54261a80b9c8c602a9a7f0 /debian/patches/Update-dnsmasq-parameters.patch | |
| parent | f54a568880bf47c2ea54c9b30d291156b34d6539 (diff) | |
Update the debian packaging for the new version
Diffstat (limited to 'debian/patches/Update-dnsmasq-parameters.patch')
| -rw-r--r-- | debian/patches/Update-dnsmasq-parameters.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 6820bca3..1ad1117f 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/dns/nm-dns-manager.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) -Index: network-manager-1.14.4/src/dns/nm-dns-dnsmasq.c +Index: network-manager-1.15.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) +--- network-manager-1.15.2.orig/src/dns/nm-dns-dnsmasq.c ++++ network-manager-1.15.2/src/dns/nm-dns-dnsmasq.c +@@ -337,8 +337,8 @@ start_dnsmasq (NMDnsDnsmasq *self) argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */ argv[idx++] = "--bind-interfaces"; argv[idx++] = "--pid-file=" PIDFILE; @@ -25,13 +25,13 @@ Index: network-manager-1.14.4/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.14.4/src/dns/nm-dns-manager.c +Index: network-manager-1.15.2/src/dns/nm-dns-manager.c =================================================================== ---- 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, - ; - } +--- network-manager-1.15.2.orig/src/dns/nm-dns-manager.c ++++ network-manager-1.15.2/src/dns/nm-dns-manager.c +@@ -1478,12 +1478,12 @@ update_dns (NMDnsManager *self, + NM_CAST_STRV_CC (nameservers), + NM_CAST_STRV_CC (options)); - /* If caching was successful, we only send 127.0.0.1 to /etc/resolv.conf + /* If caching was successful, we only send 127.0.1.1 to /etc/resolv.conf @@ -44,7 +44,7 @@ Index: network-manager-1.14.4/src/dns/nm-dns-manager.c if (NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) { /* systemd-resolved uses a different link-local address */ -@@ -1758,7 +1758,7 @@ nm_dns_manager_stop (NMDnsManager *self) +@@ -1825,7 +1825,7 @@ nm_dns_manager_stop (NMDnsManager *self) _LOGT ("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one |