New upstream version 1.54.0 upstream/1.54.0

4 files changed, 57 insertions, 5 deletions

diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver
index faa872d7..ad05a4e2 100644
--- a/src/libnm-client-impl/libnm.ver
+++ b/src/libnm-client-impl/libnm.ver
@@ -1979,6 +1979,11 @@ global:
 	nm_sriov_eswitch_mode_get_type;
 } libnm_1_44_0;
 
+libnm_1_46_8 {
+	#nm_ethtool_optname_is_fec@libnm_1_46_8;
+	#nm_setting_ethtool_fec_mode_get_type@libnm_1_46_8;
+} libnm_1_46_0;
+
 libnm_1_48_0 {
 global:
 	nm_setting_connection_down_on_poweroff_get_type;
@@ -2003,12 +2008,22 @@ global:
 	nm_setting_802_1x_get_openssl_ciphers;
 } libnm_1_46_0;
 
+libnm_1_48_18 {
+	#nm_ethtool_optname_is_fec@libnm_1_48_18;
+	#nm_setting_ethtool_fec_mode_get_type@libnm_1_48_18;
+} libnm_1_48_0;
+
 libnm_1_50_0 {
 global:
 	nm_setting_wireless_channel_width_get_type;
 	nm_setting_wireless_get_channel_width;
 } libnm_1_48_0;
 
+libnm_1_50_4 {
+	#nm_ethtool_optname_is_fec@libnm_1_50_4;
+	#nm_setting_ethtool_fec_mode_get_type@libnm_1_50_4;
+} libnm_1_50_0;
+
 libnm_1_52_0 {
 global:
 	nm_device_ipvlan_get_mode;
@@ -2048,3 +2063,16 @@ global:
 	nm_setting_ethtool_fec_mode_get_type;
 	nm_ethtool_optname_is_fec;
 } libnm_1_50_0;
+
+libnm_1_54_0 {
+global:
+	nm_setting_ip_config_forwarding_get_type;
+	nm_setting_ip_config_get_forwarding;
+	nm_setting_ovs_dpdk_get_lsc_interrupt;
+	nm_setting_ovs_dpdk_lsc_interrupt_get_type;
+	nm_setting_prefix_delegation_get_subnet_id;
+	nm_setting_prefix_delegation_get_type;
+	nm_setting_prefix_delegation_new;
+	nm_setting_sriov_get_preserve_on_down;
+	nm_sriov_preserve_on_down_get_type;
+} libnm_1_52_0;
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index e50e8fbd..b4936629 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -209,7 +209,6 @@ if enable_introspection
         'LD_LIBRARY_PATH=' + ld_library_path,
         python_path,
         gen_gir_cmd,
-        '--lib-path', meson.current_build_dir(),
         '--gir', libnm_gir[0],
         '--output', '@OUTPUT@',
         '--target', name
diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c
index fc30cd06..13343cbf 100644
--- a/src/libnm-client-impl/nm-client.c
+++ b/src/libnm-client-impl/nm-client.c
@@ -59,6 +59,7 @@
 #include "nm-object-private.h"
 #include "nm-remote-connection.h"
 #include "nm-utils.h"
+#include "nm-setting-ethtool.h"
 #include "nm-vpn-connection.h"
 
 /*****************************************************************************/
@@ -7684,7 +7685,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
         } else {
             NMClientInstanceFlags flags = v_uint;
 
-            /* After object construction, we only allow to toggle certain flags and
+            /* After object construction, we only allow one to toggle certain flags and
              * ignore all other flags. */
 
             if ((priv->instance_flags ^ flags)
@@ -8204,7 +8205,7 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_settings = NML_DBUS_META_IFACE_IN
             _priv.settings.connections,
             nm_remote_connection_get_type,
             .notify_changed_ao       = _property_ao_notify_changed_connections_cb,
-            .check_nmobj_visible_fcn = (gboolean(*)(GObject *)) nm_remote_connection_get_visible),
+            .check_nmobj_visible_fcn = (gboolean (*)(GObject *)) nm_remote_connection_get_visible),
         NML_DBUS_META_PROPERTY_INIT_S("Hostname",
                                       PROP_HOSTNAME,
                                       NMClient,
@@ -9314,3 +9315,27 @@ NM_BACKPORT_SYMBOL(libnm_1_30_8,
                    (address));
 
 NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route));
+
+NM_BACKPORT_SYMBOL(libnm_1_46_8,
+                   gboolean,
+                   nm_ethtool_optname_is_fec,
+                   (const char *optname),
+                   (optname));
+
+NM_BACKPORT_SYMBOL(libnm_1_46_8, GType, nm_setting_ethtool_fec_mode_get_type, (void), ());
+
+NM_BACKPORT_SYMBOL(libnm_1_48_18,
+                   gboolean,
+                   nm_ethtool_optname_is_fec,
+                   (const char *optname),
+                   (optname));
+
+NM_BACKPORT_SYMBOL(libnm_1_48_18, GType, nm_setting_ethtool_fec_mode_get_type, (void), ());
+
+NM_BACKPORT_SYMBOL(libnm_1_50_4,
+                   gboolean,
+                   nm_ethtool_optname_is_fec,
+                   (const char *optname),
+                   (optname));
+
+NM_BACKPORT_SYMBOL(libnm_1_50_4, GType, nm_setting_ethtool_fec_mode_get_type, (void), ());
diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c
index f9d7329b..1712efa5 100644
--- a/src/libnm-client-impl/nm-device.c
+++ b/src/libnm-client-impl/nm-device.c
@@ -2376,7 +2376,7 @@ nm_device_is_software(NMDevice *device)
  *   settings with or %NULL to reuse existing
  * @version_id: zero or the expected version id of the applied connection.
  *   If specified and the version id mismatches, the call fails without
- *   modification. This allows to catch concurrent accesses.
+ *   modification. This allows one to catch concurrent accesses.
  * @flags: always set this to zero
  * @cancellable: a #GCancellable, or %NULL
  * @error: location for a #GError, or %NULL
@@ -2430,7 +2430,7 @@ nm_device_reapply(NMDevice     *device,
  *   settings with or %NULL to reuse existing
  * @version_id: zero or the expected version id of the applied
  *   connection. If specified and the version id mismatches, the call
- *   fails without modification. This allows to catch concurrent
+ *   fails without modification. This allows one to catch concurrent
  *   accesses.
  * @flags: always set this to zero
  * @cancellable: a #GCancellable, or %NULL