Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2017-07-17 08:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Mon Jul 17 08:59:30 2017 rev:170 rq:509987 version:1.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2017-07-12 19:34:45.234960625 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2017-07-17 08:59:31.270266749 +0200 @@ -1,0 +2,6 @@ +Tue Jul 11 07:38:40 UTC 2017 - [email protected] + +- Add NM-dhcp-improve-parsing-interface-statement.patch: Fix NM + not writing DNS servers to /etc/resolv.conf (boo#1047004). + +------------------------------------------------------------------- New: ---- NM-dhcp-improve-parsing-interface-statement.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.GaeZOT/_old 2017-07-17 08:59:32.026160316 +0200 +++ /var/tmp/diff_new_pack.GaeZOT/_new 2017-07-17 08:59:32.026160316 +0200 @@ -44,6 +44,8 @@ BuildRequires: dnsmasq # PATCH-FIX-OPENSUSE nm-dont-overwrite-resolv-conf.patch bsc#1021665, bsc#960153 [email protected] -- NetworkManager spawns netconfig to update DNS settings, and terminates netconfig after 1s. But 1s isn't quite long enough for netconfig to complete the task. Adjust it to 2 seconds to avoid NM overwriting /etc/resolv.conf. Patch4: nm-dont-overwrite-resolv-conf.patch +# PATCH-FIX-UPSTREAM NM-dhcp-improve-parsing-interface-statement.patch boo#1047004 [email protected] -- Fix NetworkManager not writing DNS servers to /etc/resolv.conf +Patch5: NM-dhcp-improve-parsing-interface-statement.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: iptables @@ -235,6 +237,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build NOCONFIGURE=1 ./autogen.sh ++++++ NM-dhcp-improve-parsing-interface-statement.patch ++++++ >From c4b926c3b4acba572471e23b6727fa9537a21d7c Mon Sep 17 00:00:00 2001 From: Jonathan Kang <[email protected]> Date: Thu, 6 Jul 2017 16:20:25 +0800 Subject: [PATCH] dhcp/dhclient: Improve "interface" statement parsing In commit d405cfd9089f9552969e6a3e1a1c4550fc3c1695, parsing "interface" statement is introduced. But it leads to uncommplete parsing of the "request" entry, if one of the lines in "request" entry is prefixed with word "interface". For example, the default configuration of openSUSE distribution: request subnet-mask, broadcast-address, routers, rfc3442-classless-static-routes, interface-mtu, host-name, domain-name, domain-search, domain-name-servers, nis-domain, nis-servers, nds-context, nds-servers, nds-tree-name, netbios-name-servers, netbios-dd-server, netbios-node-type, netbios-scope, ntp-servers; Fixes commit d405cfd9089f9552969e6a3e1a1c4550fc3c1695. --- src/dhcp/nm-dhcp-dhclient-utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index 11f868e..b2f1d99 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -292,7 +292,8 @@ nm_dhcp_dhclient_create_config (const char *interface, continue; if ( !intf[0] - && g_str_has_prefix (p, "interface")) { + && g_str_has_prefix (p, "interface") + && !in_req) { if (read_interface (p, intf, sizeof (intf))) continue; } -- 2.9.4
