Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

1 files changed, 156 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index b5756166..79b04628 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ sbin_PROGRAMS =
 bin_PROGRAMS =
 libexec_PROGRAMS =
 lib_LTLIBRARIES =
-pkglib_LTLIBRARIES =
+plugin_LTLIBRARIES =
 core_plugins =
 service_DATA =
 man_MANS =
@@ -73,12 +73,16 @@ examplesdir = $(docdir)/examples
 rundir=$(runstatedir)/NetworkManager
 statedir=$(localstatedir)/lib/NetworkManager
 
+plugindir=$(pkglibdir)/$(NM_DIST_VERSION)
+
 dbusactivationdir = $(datadir)/dbus-1/system-services
 
 servicedir = $(datadir)/dbus-1/system-services
 
 completiondir = $(datadir)/bash-completion/completions
 
+nmlocaledir = $(datadir)/locale
+
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 
@@ -102,6 +106,11 @@ endif
 
 ###############################################################################
 
+nm_build_cflags = \
+	-DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \
+	-DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \
+	$(NULL)
+
 set_sanitizer_env = \
 	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
 	if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \
@@ -436,7 +445,6 @@ libnm_core_lib_h_priv = \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-random-utils.h \
 	shared/nm-utils/nm-udev-utils.h \
-	shared/nm-utils/siphash24.h \
 	shared/nm-meta-setting.h \
 	libnm-core/crypto.h \
 	libnm-core/nm-connection-private.h \
@@ -575,10 +583,11 @@ libnm_core_libnm_core_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 	-DNMCONFDIR=\"$(nmconfdir)\" \
 	-DNMLIBDIR=\"$(nmlibdir)\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DNMVPNDIR=\"$(pkglibdir)\" \
+	-DNMPLUGINDIR=\"$(plugindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	$(NULL)
 
@@ -596,9 +605,11 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_c_mkenums)
 
 libnm_core_libnm_core_la_LIBADD = \
+	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
-	$(LIBUDEV_LIBS)
+	$(LIBUDEV_LIBS) \
+	$(NULL)
 
 libnm_core_libnm_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
@@ -662,9 +673,10 @@ libnm_core_tests_cppflags = \
 	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm-core/tests \
 	-I$(builddir)/libnm-core/tests \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
+	$(NULL)
 
 libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
 libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
@@ -860,7 +872,7 @@ libnm_lib_cppflags = \
 	-I$(builddir)/libnm \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	$(NULL)
 
 libnminclude_HEADERS += \
 	$(libnm_lib_h_pub_real)
@@ -948,8 +960,11 @@ EXTRA_DIST += \
 	libnm/libnm.pc.in \
 	libnm/libnm.ver
 
+libnm_NM_1_0_typelib =
 
 if HAVE_INTROSPECTION
+libnm_NM_1_0_typelib += libnm/NM-1.0.typelib
+
 libnm/NM-1.0.gir: libnm/libnm.la
 libnm_NM_1_0_gir_INCLUDES = Gio-2.0
 libnm_NM_1_0_gir_PACKAGES = gio-2.0
@@ -1059,20 +1074,29 @@ EXTRA_DIST += \
 ###############################################################################
 
 libnm_tests_programs = \
-	libnm/tests/test-general \
+	libnm/tests/test-general
+
+check_programs += $(libnm_tests_programs)
+
+libnm_tests_programs_req_introspection = \
 	libnm/tests/test-nm-client \
 	libnm/tests/test-remote-settings-client \
 	libnm/tests/test-secret-agent
 
-check_programs += $(libnm_tests_programs)
+if HAVE_INTROSPECTION
+check_programs += $(libnm_tests_programs_req_introspection)
+else
+check_programs_norun += $(libnm_tests_programs_req_introspection)
+endif
 
 libnm_tests_cppflags = \
 	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-	-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\"
+	$(NULL)
 
 libnm_tests_ldadd = \
 	libnm/libnm.la \
@@ -1122,6 +1146,12 @@ $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
+# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it
+# is built first.
+$(libnm_tests_test_nm_client_OBJECTS):              $(libnm_NM_1_0_typelib)
+$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib)
+$(libnm_tests_test_secret_agent_OBJECTS):           $(libnm_NM_1_0_typelib)
+
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
@@ -1172,8 +1202,8 @@ src_cppflags = \
 	-DRUNDIR=\"$(rundir)\" \
 	\
 	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
+	-DNMPLUGINDIR=\"$(plugindir)\" \
 	-DNMRUNDIR=\"$(nmrundir)\" \
 	-DNMSTATEDIR=\"$(nmstatedir)\" \
 	-DNMLIBDIR=\"$(nmlibdir)\" \
@@ -1209,24 +1239,34 @@ noinst_LTLIBRARIES += \
 
 ###############################################################################
 
-shared_libcsiphash_la_CPPFLAGS = $(src_cppflags)
+noinst_LTLIBRARIES += shared/libcsiphash.la
+
+shared_libcsiphash_la_CPPFLAGS = \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
+
 shared_libcsiphash_la_SOURCES = \
 	shared/c-siphash/src/c-siphash.c \
 	shared/c-siphash/src/c-siphash.h
 
+###############################################################################
+
+noinst_LTLIBRARIES += shared/libnacd.la
+
 shared_libnacd_la_CFLAGS = -std=gnu99
+
 shared_libnacd_la_CPPFLAGS = \
-	$(src_cppflags) \
-	-I $(srcdir)/shared/c-list/src \
-	-I $(srcdir)/shared/c-siphash/src
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-I$(srcdir)/shared/c-list/src \
+	-I$(srcdir)/shared/c-siphash/src \
+	$(NULL)
+
 shared_libnacd_la_SOURCES = \
 	shared/n-acd/src/n-acd.c \
 	shared/n-acd/src/n-acd.h
 
-noinst_LTLIBRARIES += \
-	shared/libcsiphash.la \
-	shared/libnacd.la
-
 EXTRA_DIST += shared/c-list/src/c-list.h
 
 ###############################################################################
@@ -1238,7 +1278,6 @@ src_libsystemd_nm_la_cppflags = \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
 	-I$(srcdir)/src/systemd/sd-adapt \
-	-I$(srcdir)/shared/nm-utils \
 	-I$(srcdir)/src/systemd/src/systemd \
 	-I$(srcdir)/src/systemd/src/basic \
 	-I$(srcdir)/src/systemd/src/shared \
@@ -1285,6 +1324,7 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/sd-adapt/terminal-util.h \
 	src/systemd/sd-adapt/udev-util.h \
 	src/systemd/sd-adapt/udev.h \
+	src/systemd/sd-adapt/unaligned.h \
 	src/systemd/sd-adapt/user-util.h \
 	src/systemd/sd-adapt/virt.h \
 	src/systemd/src/basic/alloc-util.c \
@@ -1332,9 +1372,12 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/src/basic/refcnt.h \
 	src/systemd/src/basic/set.h \
 	src/systemd/src/basic/signal-util.h \
+	src/systemd/src/basic/siphash24.h \
 	src/systemd/src/basic/socket-util.c \
 	src/systemd/src/basic/socket-util.h \
 	src/systemd/src/basic/sparse-endian.h \
+	src/systemd/src/basic/stat-util.c \
+	src/systemd/src/basic/stat-util.h \
 	src/systemd/src/basic/stdio-util.h \
 	src/systemd/src/basic/string-table.c \
 	src/systemd/src/basic/string-table.h \
@@ -1657,7 +1700,6 @@ src_libNetworkManager_la_SOURCES = \
 src_libNetworkManager_la_LIBADD = \
 	src/libNetworkManagerBase.la \
 	src/libsystemd-nm.la \
-	shared/libcsiphash.la \
 	shared/libnacd.la \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -1791,7 +1833,8 @@ EXTRA_DIST += \
 
 src_dhcp_tests_cppflags = \
 	$(src_tests_cppflags) \
-	-DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\""
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_dhcp_tests_ldadd = \
 	src/libNetworkManagerTest.la
@@ -1892,8 +1935,8 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
 
 src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\"
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2003,10 +2046,10 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\"
+	$(NULL)
 
 src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2144,8 +2187,8 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
 
 src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\"
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2452,10 +2495,11 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
 	-I$(srcdir)/libnm-core \
 	-I$(builddir)/libnm-core \
 	-I$(srcdir)/src \
+	$(GLIB_CFLAGS) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS) \
-	-DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\"
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
 	$(GLIB_LDFLAGS) \
@@ -2882,13 +2926,13 @@ check_programs += src/dnsmasq/tests/test-dnsmasq-utils
 
 src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-DTESTDIR="\"$(abs_srcdir)\""
+	$(NULL)
 
 src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
 	src/libNetworkManagerTest.la
 
 src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
-       $(SANITIZER_EXEC_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS)
 
 $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -3055,7 +3099,8 @@ check_programs += src/supplicant/tests/test-supplicant-config
 
 src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\"
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_supplicant_tests_test_supplicant_config_LDADD = \
 	src/libNetworkManagerTest.la
@@ -3083,8 +3128,8 @@ src_tests_config_test_config_SOURCES = \
 
 src_tests_config_test_config_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \
-	-DBUILDDIR=\""$(abs_builddir)/src/tests/config"\"
+	$(nm_build_cflags) \
+	$(NULL)
 
 src_tests_config_test_config_LDADD = \
 	src/libNetworkManagerTest.la
@@ -3166,11 +3211,12 @@ src_tests_test_systemd_CPPFLAGS = \
 	$(src_libsystemd_nm_la_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST
 src_tests_test_systemd_SOURCES = \
-	shared/nm-utils/siphash24.c \
 	src/tests/test-systemd.c
 src_tests_test_systemd_LDADD = \
 	src/libsystemd-nm.la \
-	$(src_libsystemd_nm_la_libadd)
+	shared/libcsiphash.la \
+	$(src_libsystemd_nm_la_libadd) \
+	$(NULL)
 
 $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
@@ -3295,11 +3341,12 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
 	-I$(builddir)/dispatcher \
-	-DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS)
+	$(SANITIZER_EXEC_CFLAGS) \
+	$(NULL)
 
 dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
@@ -3337,7 +3384,7 @@ clients_nm_online_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMLOCALEDIR=\"$(datadir)/locale\"
+	-DNMLOCALEDIR=\"$(nmlocaledir)\"
 
 clients_nm_online_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -3365,7 +3412,7 @@ clients_cppflags = \
 	-I$(srcdir)/clients/common \
 	-I$(builddir)/clients/common \
 	$(GLIB_CFLAGS) \
-	-DNMLOCALEDIR=\"$(datadir)/locale\" \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 	$(NULL)
 
 check_ltlibraries += clients/common/libnmc-base.la
@@ -3379,7 +3426,6 @@ clients_common_libnmc_base_la_SOURCES = \
 	shared/nm-utils/nm-random-utils.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/siphash24.h \
 	\
 	clients/common/nm-secret-agent-simple.c \
 	clients/common/nm-secret-agent-simple.h \
@@ -3395,9 +3441,12 @@ clients_common_libnmc_base_la_CPPFLAGS = \
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
-	$(GLIB_LIBS)
+	shared/libcsiphash.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
 $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
 
 clients_common_settings_doc_h = clients/common/settings-docs.h
@@ -3406,10 +3455,14 @@ $(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-prop
 	$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
 DISTCLEANFILES += $(clients_common_settings_doc_h)
 check-local-settings-docs: $(clients_common_settings_doc_h)
-	@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then  \
+	@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
 		if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \
-			echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
-			false; \
+			if test "$$NM_TEST_REGENERATE" == 1 ; then \
+				cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \
+			else \
+				echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \
+				false; \
+			fi; \
 		fi;\
 	fi
 check_local += check-local-settings-docs
@@ -3511,9 +3564,10 @@ clients_cli_nmcli_CPPFLAGS = \
 	-I$(srcdir)/clients/cli \
 	$(clients_cppflags) \
 	$(SANITIZER_EXEC_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DG_LOG_DOMAIN=\""nmcli"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
+	-DNMLOCALEDIR=\"$(nmlocaledir)\"
 
 clients_cli_nmcli_LDADD = \
 	libnm/libnm.la \
@@ -3535,6 +3589,7 @@ clients_cli_nmcli_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 $(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
 install-data-hook-nmcli:
 	$(mkinstalldirs) $(DESTDIR)$(completiondir)
@@ -3623,6 +3678,8 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
+$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
 bin_PROGRAMS += clients/tui/nmtui
 
 clients_tui_nmtui_SOURCES = \
@@ -3716,7 +3773,7 @@ clients_tui_nmtui_CPPFLAGS = \
 	$(NEWT_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DLOCALEDIR=\""$(localedir)"\"
+	-DNMLOCALEDIR=\""$(nmlocaledir)"\"
 
 clients_tui_nmtui_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -3755,6 +3812,32 @@ EXTRA_DIST += \
 	clients/tui/newt/meson.build
 
 ###############################################################################
+# clients/tests
+###############################################################################
+
+check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py
+	mkdir -p "$(builddir)/clients/tests/"
+	GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \
+	LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
+	NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
+	NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \
+	"$(PYTHON)" \
+	$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
+	cat "$(builddir)/clients/tests/test-client.log"; \
+	test "$$r" == ok
+
+check_local += check-local-clients-tests-test-client
+
+CLEANFILES += clients/tests/test-client.log
+
+include clients/tests/test-client.check-on-disk/Makefile.am
+
+EXTRA_DIST += \
+	clients/tests/test-client.py \
+	clients/tests/test-client.check-on-disk/Makefile.am \
+	$(clients_tests_expected_files)
+
+###############################################################################
 # data
 ###############################################################################
 
@@ -3851,7 +3934,7 @@ libnm_util_cppflags = \
 	-I$(builddir)/shared \
 	-DG_LOG_DOMAIN=\""libnm-util"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UUID_CFLAGS)
@@ -4063,11 +4146,11 @@ libnm_util_tests_cppflags = \
 	-I$(builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
-	-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-	$(SANITIZER_EXEC_CFLAGS)
+	$(SANITIZER_EXEC_CFLAGS) \
+	$(NULL)
 
 libnm_util_tests_ldadd = \
 	libnm-util/libnm-util.la \
@@ -4279,7 +4362,7 @@ nodist_libnm_glib_libnm_glib_la_SOURCES = \
 libnm_glib_libnm_glib_la_CPPFLAGS = \
 	$(libnm_glib_cppflags) \
 	$(LIBUDEV_CFLAGS) \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	$(NULL)
 
 libnm_glib_libnm_glib_la_LDFLAGS = \
 	-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \
@@ -4420,16 +4503,23 @@ libnm_glib_tests_cppflags = \
 	-I$(srcdir)/libnm-util \
 	-I$(builddir)/libnm-util \
 	-I$(srcdir)/libnm-glib \
+	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
-	-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \
 	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+	$(DBUS_CFLAGS) \
+	$(NULL)
 
-check_programs += \
+libnm_glib_tests_programs_req_introspection = \
 	libnm-glib/tests/test-nm-client \
 	libnm-glib/tests/test-remote-settings-client
 
+if HAVE_INTROSPECTION
+check_programs += $(libnm_glib_tests_programs_req_introspection)
+else
+check_programs_norun += $(libnm_glib_tests_programs_req_introspection)
+endif
+
 libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
 
 libnm_glib_tests_test_nm_client_SOURCES = \
@@ -4461,6 +4551,11 @@ libnm_glib_tests_test_remote_settings_client_LDADD = \
 
 $(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
+# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it
+# is built first.
+$(libnm_glib_tests_test_nm_client_OBJECTS):              $(libnm_NM_1_0_typelib)
+$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib)
+
 endif
 
 EXTRA_DIST += \
@@ -4499,6 +4594,8 @@ man_nm_settings_xml = \
 
 if HAVE_INTROSPECTION
 
+man/nm-setting%.xml: man/common.ent
+
 man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml
 	$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^
 
@@ -4650,7 +4747,7 @@ check_PROGRAMS += $(check_programs) $(check_programs_norun)
 check_LTLIBRARIES += $(check_ltlibraries)
 endif
 
-pkglib_LTLIBRARIES += $(core_plugins)
+plugin_LTLIBRARIES += $(core_plugins)
 
 TESTS += $(check_programs)
 
@@ -4698,8 +4795,6 @@ EXTRA_DIST += \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
 	shared/nm-utils/nm-vpn-plugin-utils.c \
 	shared/nm-utils/nm-vpn-plugin-utils.h \
-	shared/nm-utils/siphash24.c \
-	shared/nm-utils/siphash24.h \
 	shared/nm-utils/unaligned.h \
 	shared/nm-version-macros.h.in \
 	shared/meson.build \
@@ -4750,7 +4845,7 @@ install-data-hook: $(install_data_hook)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir)
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir)
 
 uninstall-hook: $(uninstall_hook)