Update upstream source from tag 'upstream/1.58_rc1'

Update to upstream version '1.58~rc1'
with Debian dir 451489c9234e2b6b7c2f41ca6670287ea3ac3efd

1 files changed, 12 insertions, 5 deletions

diff --git a/src/core/meson.build b/src/core/meson.build
index b1d7f2e7..8ff3d9f9 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -32,6 +32,15 @@ install_data(
 
 core_plugins = []
 
+subdir('bpf')
+
+base_sources_addon = []
+base_deps_addon = []
+if enable_clat
+  base_sources_addon += [clat_skel_h]
+  base_deps_addon += [libbpf]
+endif
+
 libNetworkManagerBase = static_library(
   'NetworkManagerBase',
   sources: files(
@@ -55,20 +64,20 @@ libNetworkManagerBase = static_library(
     'nm-l3cfg.c',
     'nm-bond-manager.c',
     'nm-ip-config.c',
-  ),
+  ) + base_sources_addon,
   dependencies: [
     core_default_dep,
     libnm_core_public_dep,
+    libndp_dep,
     libsystemd_dep,
     libudev_dep,
-  ],
+  ] + base_deps_addon,
 )
 
 nm_deps = [
   libnm_core_public_dep,
   core_default_dep,
   dl_dep,
-  libndp_dep,
   libudev_dep,
   logind_dep,
 ]
@@ -119,8 +128,6 @@ libNetworkManager = static_library(
     'devices/nm-device-wireguard.c',
     'devices/nm-device-wpan.c',
     'devices/nm-lldp-listener.c',
-    'dhcp/nm-dhcp-dhclient.c',
-    'dhcp/nm-dhcp-dhclient-utils.c',
     'dhcp/nm-dhcp-dhcpcd.c',
     'dhcp/nm-dhcp-listener.c',
     'dns/nm-dns-dnsmasq.c',