From 72473ecf9fafcc905c1edcc7605e2e391af5d262 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Fri, 13 Jan 2023 15:23:32 -0500 Subject: Refresh patch Gbp-Dch: Ignore --- debian/patches/Update-dnsmasq-parameters.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/Update-dnsmasq-parameters.patch b/debian/patches/Update-dnsmasq-parameters.patch index 56ac8bad..aa274f50 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 -@@ -522,8 +522,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 cc7c03a..1f3f5b7 100644 +--- a/src/core/dns/nm-dns-dnsmasq.c ++++ b/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"; 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 -@@ -1725,12 +1725,12 @@ plugin_skip:; +diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c +index edb8ce0..eb0d6eb 100644 +--- a/src/core/dns/nm-dns-manager.c ++++ b/src/core/dns/nm-dns-manager.c +@@ -1813,12 +1813,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; -@@ -2093,7 +2093,7 @@ nm_dns_manager_stop(NMDnsManager *self) +@@ -2188,7 +2188,7 @@ nm_dns_manager_stop(NMDnsManager *self) _LOGT("stopping..."); /* If we're quitting, leave a valid resolv.conf in place, not one -- cgit 1.3.0-6-gf8a5