Update to 1.43.6 release (development)

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

.gitignore

@@ -339,3 +339,95 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.7.92.tar.xz
 /NetworkManager-1.8.0.tar.xz
 /NetworkManager-1.8.2.tar.xz
+/NetworkManager-1.8.4.tar.xz
+/NetworkManager-1.10.2.tar.xz
+/NetworkManager-1.10.4.tar.xz
+/NetworkManager-1.10.6.tar.xz
+/NetworkManager-1.10.8.tar.xz
+/NetworkManager-1.11.4.tar.xz
+/NetworkManager-1.11.90.tar.xz
+/NetworkManager-1.12.0.tar.xz
+/NetworkManager-1.12.2.tar.xz
+/NetworkManager-1.14.0.tar.xz
+/NetworkManager-1.14.2.tar.xz
+/NetworkManager-1.14.4.tar.xz
+/NetworkManager-1.15.90.tar.xz
+/NetworkManager-1.15.91.tar.xz
+/NetworkManager-1.16.0.tar.xz
+/NetworkManager-1.18.0.tar.xz
+/NetworkManager-1.19.2.tar.xz
+/NetworkManager-1.19.3.tar.xz
+/NetworkManager-1.19.5.tar.xz
+/NetworkManager-1.19.90.tar.xz
+/NetworkManager-1.20.0.tar.xz
+/NetworkManager-1.20.2.tar.xz
+/NetworkManager-1.20.4.tar.xz
+/NetworkManager-1.21.3.tar.xz
+/NetworkManager-1.21.90.tar.xz
+/NetworkManager-1.22.0.tar.xz
+/NetworkManager-1.22.2.tar.xz
+/NetworkManager-1.22.4.tar.xz
+/NetworkManager-1.22.6.tar.xz
+/NetworkManager-1.22.8.tar.xz
+/NetworkManager-1.22.10.tar.xz
+/NetworkManager-1.23.90.tar.xz
+/NetworkManager-1.23.91.tar.xz
+/NetworkManager-1.24.0.tar.xz
+/NetworkManager-1.24.2.tar.xz
+/NetworkManager-1.25.90.tar.xz
+/NetworkManager-1.26.0.tar.xz
+/NetworkManager-1.26.2.tar.xz
+/NetworkManager-1.27.90.tar.xz
+/NetworkManager-1.27.91.tar.xz
+/NetworkManager-1.28.0.tar.xz
+/NetworkManager-1.29.8.tar.xz
+/NetworkManager-1.29.9.tar.xz
+/NetworkManager-1.29.11.tar.xz
+/NetworkManager-1.29.90.tar.xz
+/NetworkManager-1.30.0.tar.xz
+/NetworkManager-1.30.2.tar.xz
+/NetworkManager-1.31.2.tar.xz
+/NetworkManager-1.31.3.tar.xz
+/NetworkManager-1.31.4.tar.xz
+/NetworkManager-1.31.90.tar.xz
+/NetworkManager-1.32.0.tar.xz
+/NetworkManager-1.32.4.tar.xz
+/NetworkManager-1.32.6.tar.xz
+/NetworkManager-1.32.8.tar.xz
+/NetworkManager-1.32.10.tar.xz
+/NetworkManager-1.32.12.tar.xz
+/NetworkManager-1.35.1.tar.xz
+/NetworkManager-1.35.2.tar.xz
+/NetworkManager-1.35.3.tar.xz
+/NetworkManager-1.35.4.tar.xz
+/NetworkManager-1.35.6.tar.xz
+/NetworkManager-1.35.7.tar.xz
+/NetworkManager-1.35.90.tar.xz
+/NetworkManager-1.35.91.tar.xz
+/NetworkManager-1.35.92.tar.xz
+/NetworkManager-1.36.0.tar.xz
+/NetworkManager-1.36.2.tar.xz
+/NetworkManager-1.36.4.tar.xz
+/NetworkManager-1.37.3.tar.xz
+/NetworkManager-1.37.90.tar.xz
+/NetworkManager-1.37.91.tar.xz
+/NetworkManager-1.37.92.tar.xz
+/NetworkManager-1.38.0.tar.xz
+/NetworkManager-1.39.8.tar.xz
+/NetworkManager-1.39.10.tar.xz
+/NetworkManager-1.39.11.tar.xz
+/NetworkManager-1.39.90.tar.xz
+/NetworkManager-1.40.0.tar.xz
+/NetworkManager-1.41.3.tar.xz
+/NetworkManager-1.41.4.tar.xz
+/NetworkManager-1.41.5.tar.xz
+/NetworkManager-1.41.6.tar.xz
+/NetworkManager-1.41.7.tar.xz
+/NetworkManager-1.41.8.tar.xz
+/NetworkManager-1.41.90.tar.xz
+/NetworkManager-1.41.91.tar.xz
+/NetworkManager-1.42.0.tar.xz
+/NetworkManager-1.43.3.tar.xz
+/NetworkManager-1.43.4.tar.xz
+/NetworkManager-1.43.5.tar.xz
+/NetworkManager-1.43.6.tar.xz

0001-dhcp-interface-parsing.patch

@@ -1,158 +0,0 @@
-From 810d243f3ebfe46e78024b239da19ac0cf150801 Mon Sep 17 00:00:00 2001
-From: Jonathan Kang <jonathan121537@gmail.com>
-Date: Thu, 6 Jul 2017 16:20:25 +0800
-Subject: [PATCH 1/2] 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: d405cfd9089f9552969e6a3e1a1c4550fc3c1695
-
-https://bugzilla.opensuse.org/show_bug.cgi?id=1047004
-https://mail.gnome.org/archives/networkmanager-list/2017-July/msg00015.html
-(cherry picked from commit 3646ed083dda590de1e991915048905b8c784cdd)
-(cherry picked from commit 7200906a6202285a97969fea8dea86d5dce9cddf)
----
- 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 216319b..28c290c 100644
---- a/src/dhcp/nm-dhcp-dhclient-utils.c
-+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
-@@ -296,7 +296,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.3
-
-From 3f2821e1d95c0acb6aebd7d91ae5457c1739b664 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Mon, 10 Jul 2017 11:40:43 +0200
-Subject: [PATCH 2/2] dhcp/tests: add test parsing dhclient config
-
-(cherry picked from commit 0c23191b01fb0582d8f3d470f463afdabc2fdf46)
-(cherry picked from commit beeb8df9ac93ad432c9533362d862c0c2466cd5e)
----
- src/dhcp/tests/test-dhcp-dhclient.c | 70 ++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 8 deletions(-)
-
-diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
-index 40a3e07..3c9760a 100644
---- a/src/dhcp/tests/test-dhcp-dhclient.c
-+++ b/src/dhcp/tests/test-dhcp-dhclient.c
-@@ -66,17 +66,16 @@ test_config (const char *orig,
- 	                                      &new_client_id);
- 	g_assert (new != NULL);
- 
--#if DEBUG
--	if (   strlen (new) != strlen (expected)
--	    || strcmp (new, expected)) {
--		g_message ("\n- NEW ---------------------------------\n"
-+	if (!nm_streq (new, expected)) {
-+		g_message ("\n* OLD ---------------------------------\n"
- 		           "%s"
--		           "+ EXPECTED ++++++++++++++++++++++++++++++\n"
-+		           "\n- NEW -----------------------------------\n"
- 		           "%s"
--		           "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
--		           new, expected);
-+		           "\n+ EXPECTED ++++++++++++++++++++++++++++++\n"
-+		           "%s"
-+		           "\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
-+		           orig, new, expected);
- 	}
--#endif
- 	g_assert_cmpstr (new, ==, expected);
- 
- 	if (expected_new_client_id) {
-@@ -831,6 +830,60 @@ test_interface2 (void)
- 	             NULL);
- }
- 
-+static void
-+test_config_req_intf (void)
-+{
-+	static const char *const orig = \
-+		"request subnet-mask, broadcast-address, routers,\n"
-+		"	rfc3442-classless-static-routes,\n"
-+		"	interface-mtu, host-name, domain-name, domain-search,\n"
-+		"	domain-name-servers, nis-domain, nis-servers,\n"
-+		"	nds-context, nds-servers, nds-tree-name,\n"
-+		"	netbios-name-servers, netbios-dd-server,\n"
-+		"	netbios-node-type, netbios-scope, ntp-servers;\n"
-+		"";
-+	static const char *const expected = \
-+		"# Created by NetworkManager\n"
-+		"# Merged from /path/to/dhclient.conf\n"
-+		"\n"
-+		"\n"
-+		"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
-+		"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
-+		"option wpad code 252 = string;\n"
-+		"\n"
-+		"request; # override dhclient defaults\n"
-+		"also request subnet-mask;\n"
-+		"also request broadcast-address;\n"
-+		"also request routers;\n"
-+		"also request rfc3442-classless-static-routes;\n"
-+		"also request interface-mtu;\n"
-+		"also request host-name;\n"
-+		"also request domain-name;\n"
-+		"also request domain-search;\n"
-+		"also request domain-name-servers;\n"
-+		"also request nis-domain;\n"
-+		"also request nis-servers;\n"
-+		"also request nds-context;\n"
-+		"also request nds-servers;\n"
-+		"also request nds-tree-name;\n"
-+		"also request netbios-name-servers;\n"
-+		"also request netbios-dd-server;\n"
-+		"also request netbios-node-type;\n"
-+		"also request netbios-scope;\n"
-+		"also request ntp-servers;\n"
-+		"also request ms-classless-static-routes;\n"
-+		"also request static-routes;\n"
-+		"also request wpad;\n"
-+		"\n";
-+
-+	test_config (orig, expected,
-+	             FALSE, NULL, FALSE,
-+	             NULL,
-+	             NULL,
-+	             "eth0",
-+	             NULL);
-+}
-+
- /*****************************************************************************/
- 
- static void
-@@ -982,6 +1035,7 @@ main (int argc, char **argv)
- 	g_test_add_func ("/dhcp/dhclient/duids", test_duids);
- 	g_test_add_func ("/dhcp/dhclient/interface/1", test_interface1);
- 	g_test_add_func ("/dhcp/dhclient/interface/2", test_interface2);
-+	g_test_add_func ("/dhcp/dhclient/config/req_intf", test_config_req_intf);
- 
- 	g_test_add_func ("/dhcp/dhclient/read_duid_from_leasefile", test_read_duid_from_leasefile);
- 	g_test_add_func ("/dhcp/dhclient/read_commented_duid_from_leasefile", test_read_commented_duid_from_leasefile);
--- 
-2.9.3
-

0002-dns-fix-domain-suffix-check.patch

@@ -1,108 +0,0 @@
-From dd3531f120df2e9d249c6fddc062345c169db58e Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Fri, 14 Jul 2017 07:10:08 +0200
-Subject: [PATCH] dns: perform the public-suffix check only for the
- hostname-derived domain
-
-The DNS manager drops from the search list domains that are public
-suffixes to prevent a possible domain hijack when using two-labels
-hostnames [1].
-
-This is a problem now that every single-label domain can be a TLD
-since this means that such domains can't be used in the search list.
-
-While it's useful to apply such restriction to the domain
-automatically derived from the system hostname, it seems wrong to drop
-domains specified by users in the configuration or provided by DHCP.
-
-This commit keeps the public-suffix check only for the
-hostname-derived domain
-
-[1] https://bugzilla.redhat.com/show_bug.cgi?id=812394
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1404350
-(cherry picked from commit 5aa22ed8c9c1944f8843442912561dcec83a11b2)
-(cherry picked from commit e80163c713cdd911cb79036f3f7b629040297c58)
----
- src/dns/nm-dns-manager.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
-index f443f34..952468e 100644
---- a/src/dns/nm-dns-manager.c
-+++ b/src/dns/nm-dns-manager.c
-@@ -158,12 +158,12 @@ G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, NM_TYPE_EXPORTED_OBJECT)
- #define NM_DNS_MANAGER_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDnsManager, NM_IS_DNS_MANAGER)
- 
- static gboolean
--domain_is_valid (const gchar *domain)
-+domain_is_valid (const gchar *domain, gboolean check_public_suffix)
- {
- 	if (*domain == '\0')
- 		return FALSE;
- #if WITH_LIBPSL
--	if (psl_is_public_suffix (psl_builtin (), domain))
-+	if (check_public_suffix && psl_is_public_suffix (psl_builtin (), domain))
- 		return FALSE;
- #endif
- 	return TRUE;
-@@ -312,7 +312,7 @@ merge_one_ip4_config (NMResolvConfData *rc, NMIP4Config *src)
- 		const char *search;
- 
- 		search = nm_ip4_config_get_search (src, i);
--		if (!domain_is_valid (search))
-+		if (!domain_is_valid (search, FALSE))
- 			continue;
- 		add_string_item (rc->searches, search);
- 	}
-@@ -322,7 +322,7 @@ merge_one_ip4_config (NMResolvConfData *rc, NMIP4Config *src)
- 			const char *domain;
- 
- 			domain = nm_ip4_config_get_domain (src, i);
--			if (!domain_is_valid (domain))
-+			if (!domain_is_valid (domain, FALSE))
- 				continue;
- 			add_string_item (rc->searches, domain);
- 		}
-@@ -382,7 +382,7 @@ merge_one_ip6_config (NMResolvConfData *rc, NMIP6Config *src, const char *iface)
- 		const char *search;
- 
- 		search = nm_ip6_config_get_search (src, i);
--		if (!domain_is_valid (search))
-+		if (!domain_is_valid (search, FALSE))
- 			continue;
- 		add_string_item (rc->searches, search);
- 	}
-@@ -392,7 +392,7 @@ merge_one_ip6_config (NMResolvConfData *rc, NMIP6Config *src, const char *iface)
- 			const char *domain;
- 
- 			domain = nm_ip6_config_get_domain (src, i);
--			if (!domain_is_valid (domain))
-+			if (!domain_is_valid (domain, FALSE))
- 				continue;
- 			add_string_item (rc->searches, domain);
- 		}
-@@ -923,7 +923,7 @@ merge_global_dns_config (NMResolvConfData *rc, NMGlobalDnsConfig *global_conf)
- 	options = nm_global_dns_config_get_options (global_conf);
- 
- 	for (i = 0; searches && searches[i]; i++) {
--		if (domain_is_valid (searches[i]))
-+		if (domain_is_valid (searches[i], FALSE))
- 			add_string_item (rc->searches, searches[i]);
- 	}
- 
-@@ -1055,9 +1055,9 @@ _collect_resolv_conf_data (NMDnsManager *self, /* only for logging context, no o
- 		if (   hostdomain
- 		    && !nm_utils_ipaddr_valid (AF_UNSPEC, hostname)) {
- 			hostdomain++;
--			if (domain_is_valid (hostdomain))
-+			if (domain_is_valid (hostdomain, TRUE))
- 				add_string_item (rc.searches, hostdomain);
--			else if (domain_is_valid (hostname))
-+			else if (domain_is_valid (hostname, TRUE))
- 				add_string_item (rc.searches, hostname);
- 		}
- 	}
--- 
-2.9.3
-

20-connectivity-fedora.conf

@@ -1,4 +1,10 @@
+# Enable connectivity checking for NetworkManager.
+# See `man NetworkManager.conf`.
+#
+# Note that connectivity checking works badly with rp_filter set to
+# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
 [connectivity]
+enabled=true
 uri=http://fedoraproject.org/static/hotspot.txt
 response=OK
 interval=300

20-connectivity-redhat.conf

@@ -0,0 +1,10 @@
+# Enable connectivity checking for NetworkManager.
+# See `man NetworkManager.conf`.
+#
+# Note that connectivity checking works badly with rp_filter set to
+# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
+[connectivity]
+enabled=true
+uri=http://static.redhat.com/test/rhel-networkmanager.txt
+response=OK
+interval=300

70-nm-connectivity.conf

@@ -0,0 +1,15 @@
+# The Strict mode of RFC3704 Reverse Path filtering breaks some pretty
+# common and reasonable use cases.
+#
+# Notably, it makes it impossible for NetworkManager to do connectivity
+# check on a newly arriving default route (it starts with a higher metric
+# and is bumped lower if there's connectivity).
+#
+# Kernel's default is 0 (no filter), systemd configures a Loose filter since
+# commit 230450d4e4f1 ('sysctl.d: switch net.ipv4.conf.all.rp_filter from 1
+# to 2'). However, RHEL systemd package happens to default to Strict mode
+# for historic reasons. Let's override it if we're doing connectivity
+# checking.
+
+# Source route verification
+net.ipv4.conf.all.rp_filter = 0

NetworkManager.conf

@@ -2,27 +2,25 @@
 #
 # See "man 5 NetworkManager.conf" for details.
 #
-# The directories /usr/lib/NetworkManager/conf.d/ and /var/run/NetworkManager/conf.d/
-# can contain additional configuration snippets installed by packages. These files are
+# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/
+# can contain additional .conf snippets installed by packages. These files are
 # read before NetworkManager.conf and have thus lowest priority.
-# The directory /etc/NetworkManager/conf.d/ can contain additional configuration
+# The directory /etc/NetworkManager/conf.d/ can contain additional .conf
 # snippets. Those snippets are merged last and overwrite the settings from this main
 # file.
 #
 # The files within one conf.d/ directory are read in asciibetical order.
 #
-# If /etc/NetworkManager/conf.d/ contains a file with the same name as
-# /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored.
-# Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can
-# put an empty file to /etc with the same name. The same applies with respect
-# to the directory /var/run/NetworkManager/conf.d where files in /var/run shadow
-# /usr/lib and are themselves shadowed by files under /etc.
+# You can prevent loading a file /usr/lib/NetworkManager/conf.d/NAME.conf
+# by having a file NAME.conf in either /run/NetworkManager/conf.d/ or /etc/NetworkManager/conf.d/.
+# Likewise, snippets from /run can be prevented from loading by placing
+# a file with the same name in /etc/NetworkManager/conf.d/.
 #
 # If two files define the same key, the one that is read afterwards will overwrite
 # the previous one.
 
 [main]
-#plugins=ifcfg-rh,ibft
+#plugins=keyfile,ifcfg-rh
 
 
 [logging]
@@ -30,8 +28,7 @@
 #
 # Logfiles contain no passwords and little sensitive information. But please
 # check before posting the file online. You can also personally hand over the
-# logfile to a NM developer to treat it confidential. Meet us on #nm on freenode.
-# Please post full logfiles except minimal modifications of private data.
+# logfile to a NM developer to treat it confidential. Meet us on #nm on Libera.Chat.
 #
 # You can also change the log-level at runtime via
 #   $ nmcli general logging level TRACE domains ALL
@@ -42,9 +39,14 @@
 # You will find the logfiles in syslog, for example via
 #   $ journalctl -u NetworkManager
 #
+# Please post full logfiles for bug reports without pre-filtering or truncation.
+# Also, for debugging the entire `journalctl` output can be interesting. Don't
+# limit unnecessarily with `journalctl -u`. Exceptions are if you are worried
+# about private data. Check before posting logfiles!
+#
 # Note that debug logging of NetworkManager can be quite verbose. Some messages
 # might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst
-# in man journald.conf).
+# in man journald.conf). Please disable rate-limiting before collecting debug logs!
 #
 #level=TRACE
 #domains=ALL

readme-ifcfg-rh.txt

@@ -0,0 +1,31 @@
+NetworkManager stores new network profiles in keyfile format in the
+/etc/NetworkManager/system-connections/ directory.
+
+Previously, NetworkManager stored network profiles in ifcfg format
+in this directory (/etc/sysconfig/network-scripts/). However, the ifcfg
+format is deprecated. By default, NetworkManager no longer creates
+new profiles in this format.
+
+Connection profiles in keyfile format have many benefits. For example,
+this format is INI file-based and can easily be parsed and generated.
+
+Each section in NetworkManager keyfiles corresponds to a NetworkManager
+setting name as described in the nm-settings(5) and nm-settings-keyfile(5)
+man pages. Each key-value-pair in a section is one of the properties
+listed in the settings specification of the man page.
+
+If you still use network profiles in ifcfg format, consider migrating
+them to keyfile format. To migrate all profiles at once, enter:
+
+# nmcli connection migrate
+
+This command migrates all profiles from ifcfg format to keyfile
+format and stores them in /etc/NetworkManager/system-connections/.
+
+Alternatively, to migrate only a specific profile, enter:
+
+# nmcli connection migrate <profile_name|UUID|D-Bus_path>
+
+For further details, see:
+* nm-settings-keyfile(5)
+* nmcli(1)

sources

@@ -1 +1 @@
-SHA512 (NetworkManager-1.8.2.tar.xz) = 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
+SHA512 (NetworkManager-1.43.6.tar.xz) = e1d898d3e6154018defcf189bc017a962ed93b9f5d7bafd90642cd70f9bbd4885874b24f716d524e52cf9e44c7ba338e3c416e78bd7b6ec6eaa1cb5066244504

tests/tests.yml

@@ -0,0 +1,13 @@
+# Tests for NetworkManager
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://github.com/NetworkManager/NetworkManager-ci"
+      dest: "NetworkManager-ci"
+    tests:
+    - sanity-tests:
+        dir: NetworkManager-ci
+        run: run/osci/run-tests fedora28