From bc0818fe1339bfd25b1b30cd7e86772cc8bee9c5 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Tue, 9 May 2023 19:05:28 +0200 Subject: libnm: adjust symbol versioning of bond port prio in 1.40.20 This ABI was backported all the way to 1.42.8 and 1.40.20 and to rhel-8.9. Move the ABI to a separate symbol version, which we have in all those versions. --- src/libnm-client-impl/libnm.ver | 6 +++++- src/libnm-client-impl/tests/test-gir.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index f473da2041..67a564fb2e 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -1879,6 +1879,11 @@ global: nm_vpn_plugin_info_supports_multiple; } libnm_1_40_0; +libnm_1_40_20_bondp { +global: + nm_setting_bond_port_get_prio; +} libnm_1_40_0; + libnm_1_42_0 { global: nm_client_get_version_info; @@ -1928,7 +1933,6 @@ global: libnm_1_44_0 { global: - nm_setting_bond_port_get_prio; nm_setting_gsm_get_initial_eps_apn; nm_setting_gsm_get_initial_eps_config; nm_setting_ip6_config_get_dhcp_pd_hint; diff --git a/src/libnm-client-impl/tests/test-gir.py b/src/libnm-client-impl/tests/test-gir.py index f8e06c59b4..9b42431c1e 100755 --- a/src/libnm-client-impl/tests/test-gir.py +++ b/src/libnm-client-impl/tests/test-gir.py @@ -89,8 +89,10 @@ def syms_from_ver(verfile): ): c_syms[str_removesuffix(line, ";")] = version - # This one is... messy. + # These are exceptions and we cannot know the version for the symbol so we + # hardcode it. c_syms["nm_ethtool_optname_is_feature"] = "1.20" + c_syms["nm_setting_bond_port_get_prio"] = "1.44" return c_syms -- cgit v1.2.1