New upstream version 1.18.0 upstream/1.18.0

1 files changed, 208 insertions, 83 deletions

diff --git a/Makefile.am b/Makefile.am
index b180466a..d78bfded 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,6 +213,9 @@ shared_libcsiphash_la_CPPFLAGS = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
+shared_libcsiphash_la_LDFLAGS = \
+	$(SANITIZER_LIB_LDFLAGS)
+
 shared_libcsiphash_la_SOURCES = \
 	shared/c-siphash/src/c-siphash.c \
 	shared/c-siphash/src/c-siphash.h \
@@ -232,6 +235,9 @@ shared_libcrbtree_la_CPPFLAGS = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
+shared_libcrbtree_la_LDFLAGS = \
+	$(SANITIZER_LIB_LDFLAGS)
+
 shared_libcrbtree_la_SOURCES = \
 	shared/c-rbtree/src/c-rbtree.c \
 	shared/c-rbtree/src/c-rbtree.h \
@@ -259,6 +265,9 @@ shared_libnacd_la_CPPFLAGS = \
 	-I$(srcdir)/shared/c-rbtree/src \
 	$(NULL)
 
+shared_libnacd_la_LDFLAGS = \
+	$(SANITIZER_LIB_LDFLAGS)
+
 shared_libnacd_la_SOURCES = \
 	shared/n-acd/src/n-acd.c \
 	shared/n-acd/src/n-acd.h \
@@ -280,7 +289,37 @@ shared_libnacd_la_LIBADD = \
 
 ###############################################################################
 
-shared_nm_utils_libnm_utils_cppflags = \
+noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la
+
+shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION='0' \
+	$(NULL)
+
+shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
+	shared/c-list/src/c-list.h \
+	shared/nm-std-aux/c-list-util.c \
+	shared/nm-std-aux/c-list-util.h \
+	shared/nm-std-aux/nm-dbus-compat.h \
+	shared/nm-std-aux/unaligned.h \
+	$(NULL)
+
+shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_std_aux_libnm_std_aux_la_LIBADD = \
+	shared/libcsiphash.la \
+	$(NULL)
+
+###############################################################################
+
+shared_nm_glib_aux_cppflags = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	$(CODE_COVERAGE_CFLAGS) \
@@ -290,78 +329,143 @@ shared_nm_utils_libnm_utils_cppflags = \
 	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
 	$(NULL)
 
-noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-base.la
+noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
 
-shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \
-	$(shared_nm_utils_libnm_utils_cppflags) \
+shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
+	$(shared_nm_glib_aux_cppflags) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_base_la_SOURCES = \
-	shared/c-list/src/c-list.h \
-	shared/nm-utils/c-list-util.c \
-	shared/nm-utils/c-list-util.h \
-	shared/nm-utils/nm-c-list.h \
-	shared/nm-utils/nm-dedup-multi.c \
-	shared/nm-utils/nm-dedup-multi.h \
-	shared/nm-utils/nm-enum-utils.c \
-	shared/nm-utils/nm-enum-utils.h \
-	shared/nm-utils/nm-errno.c \
-	shared/nm-utils/nm-errno.h \
-	shared/nm-utils/nm-glib.h \
-	shared/nm-utils/nm-hash-utils.c \
-	shared/nm-utils/nm-hash-utils.h \
-	shared/nm-utils/nm-io-utils.c \
-	shared/nm-utils/nm-io-utils.h \
-	shared/nm-utils/nm-logging-fwd.h \
-	shared/nm-utils/nm-macros-internal.h \
-	shared/nm-utils/nm-obj.h \
-	shared/nm-utils/nm-random-utils.c \
-	shared/nm-utils/nm-random-utils.h \
-	shared/nm-utils/nm-secret-utils.c \
-	shared/nm-utils/nm-secret-utils.h \
-	shared/nm-utils/nm-shared-utils.c \
-	shared/nm-utils/nm-shared-utils.h \
-	shared/nm-utils/nm-time-utils.c \
-	shared/nm-utils/nm-time-utils.h \
-	shared/nm-utils/unaligned.h \
+shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
+	shared/nm-glib-aux/nm-c-list.h \
+	shared/nm-glib-aux/nm-dedup-multi.c \
+	shared/nm-glib-aux/nm-dedup-multi.h \
+	shared/nm-glib-aux/nm-enum-utils.c \
+	shared/nm-glib-aux/nm-enum-utils.h \
+	shared/nm-glib-aux/nm-errno.c \
+	shared/nm-glib-aux/nm-errno.h \
+	shared/nm-glib-aux/nm-glib.h \
+	shared/nm-glib-aux/nm-hash-utils.c \
+	shared/nm-glib-aux/nm-hash-utils.h \
+	shared/nm-glib-aux/nm-io-utils.c \
+	shared/nm-glib-aux/nm-io-utils.h \
+	shared/nm-glib-aux/nm-jansson.h \
+	shared/nm-glib-aux/nm-logging-fwd.h \
+	shared/nm-glib-aux/nm-macros-internal.h \
+	shared/nm-glib-aux/nm-obj.h \
+	shared/nm-glib-aux/nm-random-utils.c \
+	shared/nm-glib-aux/nm-random-utils.h \
+	shared/nm-glib-aux/nm-secret-utils.c \
+	shared/nm-glib-aux/nm-secret-utils.h \
+	shared/nm-glib-aux/nm-shared-utils.c \
+	shared/nm-glib-aux/nm-shared-utils.h \
+	shared/nm-glib-aux/nm-time-utils.c \
+	shared/nm-glib-aux/nm-time-utils.h \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_base_la_LDFLAGS = \
+shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_base_la_LIBADD = \
-	shared/libcsiphash.la \
+shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
+	shared/nm-std-aux/libnm-std-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-udev.la
+noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
 
-shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \
-	$(shared_nm_utils_libnm_utils_cppflags) \
+shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
+	$(shared_nm_glib_aux_cppflags) \
 	$(LIBUDEV_CFLAGS) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_SOURCES = \
-	shared/nm-utils/nm-udev-utils.c \
-	shared/nm-utils/nm-udev-utils.h \
+shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \
+	shared/nm-udev-aux/nm-udev-utils.c \
+	shared/nm-udev-aux/nm-udev-utils.h \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \
+shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_utils_libnm_utils_udev_la_LIBADD = \
+shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
 ###############################################################################
 
+noinst_LTLIBRARIES += shared/nm-libnm-core-intern/libnm-libnm-core-intern.la
+
+shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm-core \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
+	$(NULL)
+
+shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
+	shared/nm-libnm-core-intern/nm-common-macros.h \
+	shared/nm-libnm-core-intern/nm-ethtool-utils.c \
+	shared/nm-libnm-core-intern/nm-ethtool-utils.h \
+	shared/nm-libnm-core-intern/nm-libnm-core-utils.c \
+	shared/nm-libnm-core-intern/nm-libnm-core-utils.h \
+	$(NULL)
+
+shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+###############################################################################
+
+noinst_LTLIBRARIES += shared/nm-libnm-core-aux/libnm-libnm-core-aux.la
+
+shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
+	$(dflt_cppflags) \
+	-I$(srcdir)/shared \
+	-I$(builddir)/shared \
+	-I$(srcdir)/libnm-core \
+	-I$(builddir)/libnm-core \
+	$(CODE_COVERAGE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(SANITIZER_LIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""libnm"\" \
+	-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
+	$(NULL)
+
+shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
+	shared/nm-libnm-core-aux/nm-dispatcher-api.h \
+	$(NULL)
+
+shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+
+###############################################################################
+
 check_programs += shared/nm-utils/tests/test-shared-general
 
 shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
@@ -374,8 +478,13 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
+shared_nm_utils_tests_test_shared_general_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
+
 shared_nm_utils_tests_test_shared_general_LDADD = \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -684,7 +793,6 @@ libnm_core_lib_h_pub_real = \
 libnm_core_lib_h_pub_mkenums = \
 	libnm-core/nm-core-enum-types.h
 libnm_core_lib_h_priv = \
-	shared/nm-ethtool-utils.h \
 	shared/nm-meta-setting.h \
 	libnm-core/nm-crypto.h \
 	libnm-core/nm-crypto-impl.h \
@@ -746,7 +854,6 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-wpan.c
 libnm_core_lib_c_real = \
 	$(libnm_core_lib_c_settings_real) \
-	shared/nm-ethtool-utils.c \
 	shared/nm-meta-setting.c \
 	libnm-core/nm-crypto.c \
 	libnm-core/nm-connection.c \
@@ -947,22 +1054,28 @@ libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags)
 
 libnm_core_tests_test_general_SOURCES = \
 	libnm-core/tests/test-general-enums.h \
-	libnm-core/tests/test-general.c
+	libnm-core/tests/test-general.c \
+	$(NULL)
 
 nodist_libnm_core_tests_test_general_SOURCES = \
 	libnm-core/tests/nm-core-tests-enum-types.c \
-	libnm-core/tests/nm-core-tests-enum-types.h
+	libnm-core/tests/nm-core-tests-enum-types.h \
+	$(NULL)
 
 libnm_core_tests_ldadd = \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la \
+	$(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-utils/libnm-utils-base.la \
-	$(libnm_crypto_lib) \
-	$(GLIB_LIBS)
+	shared/nm-glib-aux/libnm-glib-aux.la \
+	$(GLIB_LIBS) \
+	$(NULL)
 
 libnm_core_tests_ldflags = \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS) \
+	$(NULL)
 
 libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd)
 libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
@@ -1166,10 +1279,12 @@ libnm_libnm_utils_la_SOURCES = \
 	libnm/nm-libnm-utils.c
 
 libnm_libnm_utils_la_LIBADD = \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	introspection/libnmdbus.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -1214,7 +1329,7 @@ libnm_libnm_la_LIBADD = \
 	libnm/libnm-utils.la \
 	shared/systemd/libnm-systemd-shared.la \
 	shared/systemd/libnm-systemd-logging-stub.la \
-	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
 	$(DL_LIBS) \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
@@ -1385,7 +1500,7 @@ libnm_tests_ldadd = \
 	$(GLIB_LIBS)
 
 libnm_tests_ldflags = \
-	$(SANITIZER_LIB_LDFLAGS)
+	$(SANITIZER_EXEC_LDFLAGS)
 
 libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags)
 libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
@@ -1414,6 +1529,7 @@ libnm_tests_test_secret_agent_SOURCES = \
 libnm_tests_test_general_LDADD = \
 	libnm/libnm-utils.la \
 	$(libnm_tests_ldadd)
+
 libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
 libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
@@ -1585,15 +1701,17 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/sd-adapt-shared/locale-util.h \
 	shared/systemd/sd-adapt-shared/memfd-util.h \
 	shared/systemd/sd-adapt-shared/missing.h \
-	shared/systemd/sd-adapt-shared/missing_socket.h \
 	shared/systemd/sd-adapt-shared/missing_syscall.h \
 	shared/systemd/sd-adapt-shared/missing_timerfd.h \
 	shared/systemd/sd-adapt-shared/mkdir.h \
+	shared/systemd/sd-adapt-shared/namespace-util.h \
 	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
 	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
+	shared/systemd/sd-adapt-shared/nulstr-util.h \
 	shared/systemd/sd-adapt-shared/procfs-util.h \
 	shared/systemd/sd-adapt-shared/raw-clone.h \
 	shared/systemd/sd-adapt-shared/rlimit-util.h \
+	shared/systemd/sd-adapt-shared/strxcpyx.h \
 	shared/systemd/sd-adapt-shared/terminal-util.h \
 	shared/systemd/sd-adapt-shared/unaligned.h \
 	shared/systemd/sd-adapt-shared/user-util.h \
@@ -1605,6 +1723,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/env-file.h \
 	shared/systemd/src/basic/env-util.c \
 	shared/systemd/src/basic/env-util.h \
+	shared/systemd/src/basic/errno-util.h \
 	shared/systemd/src/basic/escape.c \
 	shared/systemd/src/basic/escape.h \
 	shared/systemd/src/basic/ether-addr-util.c \
@@ -1632,9 +1751,13 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/list.h \
 	shared/systemd/src/basic/log.h \
 	shared/systemd/src/basic/macro.h \
+	shared/systemd/src/basic/memory-util.c \
+	shared/systemd/src/basic/memory-util.h \
 	shared/systemd/src/basic/mempool.c \
 	shared/systemd/src/basic/mempool.h \
 	shared/systemd/src/basic/missing_fcntl.h \
+	shared/systemd/src/basic/missing_socket.h \
+	shared/systemd/src/basic/missing_stat.h \
 	shared/systemd/src/basic/missing_type.h \
 	shared/systemd/src/basic/parse-util.c \
 	shared/systemd/src/basic/parse-util.h \
@@ -1646,12 +1769,12 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
 	shared/systemd/src/basic/process-util.h \
 	shared/systemd/src/basic/random-util.c \
 	shared/systemd/src/basic/random-util.h \
-	shared/systemd/src/basic/refcnt.h \
 	shared/systemd/src/basic/set.h \
 	shared/systemd/src/basic/signal-util.h \
 	shared/systemd/src/basic/siphash24.h \
 	shared/systemd/src/basic/socket-util.c \
 	shared/systemd/src/basic/socket-util.h \
+	shared/systemd/src/basic/sort-util.h \
 	shared/systemd/src/basic/sparse-endian.h \
 	shared/systemd/src/basic/stat-util.c \
 	shared/systemd/src/basic/stat-util.h \
@@ -1709,7 +1832,7 @@ src_libnm_systemd_core_la_SOURCES = \
 	src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
 	src/systemd/sd-adapt-core/sd-daemon.h \
 	src/systemd/sd-adapt-core/sd-device.h \
-	src/systemd/sd-adapt-core/stat-util.h \
+	src/systemd/sd-adapt-core/udev-util.h \
 	src/systemd/src/libsystemd-network/arp-util.c \
 	src/systemd/src/libsystemd-network/arp-util.h \
 	src/systemd/src/libsystemd-network/dhcp-identifier.c \
@@ -1795,6 +1918,8 @@ src_libNetworkManagerBase_la_SOURCES = \
 	src/platform/nm-platform-private.h \
 	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
+	src/platform/nmp-rules-manager.c \
+	src/platform/nmp-rules-manager.h \
 	src/platform/wifi/nm-wifi-utils-nl80211.c \
 	src/platform/wifi/nm-wifi-utils-nl80211.h \
 	src/platform/wifi/nm-wifi-utils-private.h \
@@ -1839,10 +1964,12 @@ src_libNetworkManagerBase_la_SOURCES += \
 endif
 
 src_libNetworkManagerBase_la_LIBADD = \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/libnm-core.la \
 	$(libnm_crypto_lib) \
-	shared/nm-utils/libnm-utils-udev.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -2145,11 +2272,10 @@ src_initrd_nm_initrd_generator_SOURCES = \
 	src/initrd/nm-initrd-generator.c
 
 src_initrd_nm_initrd_generator_LDADD = \
-	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerBase.la \
 	shared/systemd/libnm-systemd-shared.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -2169,10 +2295,9 @@ src_initrd_tests_test_ibft_reader_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 src_initrd_tests_test_ibft_reader_LDADD = \
-	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -2385,10 +2510,9 @@ src_initrd_tests_test_cmdline_reader_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 src_initrd_tests_test_cmdline_reader_LDADD = \
-	libnm-core/libnm-core.la \
 	src/initrd/libnmi-core.la \
 	src/libNetworkManagerTest.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -2771,6 +2895,7 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
@@ -3698,6 +3823,10 @@ $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 src_tests_test_systemd_CPPFLAGS = \
 	$(src_libnm_systemd_core_la_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST
+
+src_tests_test_systemd_LDFLAGS = \
+	$(SANITIZER_EXEC_LDFLAGS)
+
 src_tests_test_systemd_LDADD = \
 	src/libnm-systemd-core.la \
 	shared/systemd/libnm-systemd-shared.la \
@@ -3755,9 +3884,9 @@ $(dispatcher_nm_dispatcher_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
 CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources)
 
 dispatcher_libnm_dispatcher_core_la_SOURCES = \
-	shared/nm-dispatcher-api.h \
 	dispatcher/nm-dispatcher-utils.c \
-	dispatcher/nm-dispatcher-utils.h
+	dispatcher/nm-dispatcher-utils.h \
+	$(NULL)
 
 dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags)
 
@@ -3766,8 +3895,8 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \
 	$(GLIB_LIBS)
 
 dispatcher_nm_dispatcher_SOURCES = \
-	shared/nm-dispatcher-api.h \
-	dispatcher/nm-dispatcher.c
+	dispatcher/nm-dispatcher.c \
+	$(NULL)
 
 nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
 
@@ -3837,8 +3966,9 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 dispatcher_tests_test_dispatcher_envp_LDADD = \
-	libnm/libnm.la \
 	dispatcher/libnm-dispatcher-core.la \
+	libnm/libnm.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS)
 
 $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -3921,7 +4051,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
@@ -3956,9 +4086,6 @@ clients_common_libnmc_la_SOURCES = \
 	shared/nm-meta-setting.c \
 	shared/nm-meta-setting.h \
 	\
-	shared/nm-ethtool-utils.c \
-	shared/nm-ethtool-utils.h \
-	\
 	clients/common/nm-meta-setting-desc.c \
 	clients/common/nm-meta-setting-desc.h \
 	clients/common/nm-meta-setting-access.c \
@@ -3971,8 +4098,10 @@ clients_common_libnmc_la_CPPFLAGS = \
 	$(NULL)
 
 clients_common_libnmc_la_LIBADD = \
-	libnm/libnm.la \
 	clients/common/libnmc-base.la \
+	libnm/libnm.la \
+	shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
+	shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
 	$(GLIB_LIBS)
 
 $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -4251,6 +4380,7 @@ clients_tui_nmtui_LDADD = \
 	libnm/libnm.la \
 	clients/tui/newt/libnmt-newt.a \
 	clients/common/libnmc-base.la \
+	clients/common/libnmc.la \
 	$(GLIB_LIBS) \
 	$(NEWT_LIBS) \
 	$(NULL)
@@ -4510,7 +4640,7 @@ nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_ut
 $(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums)
 
 libnm_util_libnm_util_la_LIBADD = \
-	shared/nm-utils/libnm-utils-base.la \
+	shared/nm-glib-aux/libnm-glib-aux.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(UUID_LIBS)
@@ -4832,7 +4962,7 @@ libnm_glib_libnm_glib_la_LDFLAGS = \
 libnm_glib_libnm_glib_la_LIBADD = \
 	libnm-util/libnm-util.la \
 	libnm-glib/libdeprecated-nm-glib.la \
-	shared/nm-utils/libnm-utils-udev.la \
+	shared/nm-udev-aux/libnm-udev-aux.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -5246,15 +5376,11 @@ EXTRA_DIST += \
 	\
 	po/meson.build \
 	\
-	shared/nm-common-macros.h \
-	shared/nm-dbus-compat.h \
 	shared/nm-default.h \
-	shared/nm-dispatcher-api.h \
 	shared/nm-test-libnm-utils.h \
 	shared/nm-test-utils-impl.c \
 	shared/nm-utils/nm-compat.c \
 	shared/nm-utils/nm-compat.h \
-	shared/nm-utils/nm-jansson.h \
 	shared/nm-utils/nm-test-utils.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
@@ -5275,7 +5401,6 @@ EXTRA_DIST += \
 	tools/test-sudo-wrapper.sh \
 	tools/enums-to-docbook.pl \
 	\
-	src/settings/plugins/README \
 	src/settings/plugins/meson.build \
 	\
 	$(NULL)