summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffmancera@riseup.net>2023-05-09 19:05:28 +0200
committerFernando Fernandez Mancera <ffmancera@riseup.net>2023-05-15 15:16:49 +0200
commitbc0818fe1339bfd25b1b30cd7e86772cc8bee9c5 (patch)
treea8d2468c542040f174cf3016841b6cd8bf790da5
parent9b8220c9fa6c26257fe809171355b29219efe26a (diff)
libnm: adjust symbol versioning of bond port prio in 1.40.20ff/bond_port_version_symbol
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.
-rw-r--r--src/libnm-client-impl/libnm.ver6
-rwxr-xr-xsrc/libnm-client-impl/tests/test-gir.py4
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