From 72e025c33e37e7bab21fe73678d0e52a81445660 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 24 Dec 2019 14:43:47 +0100 Subject: [PATCH] libnm: move nm_client_get_capabilities() to separate linker version nm_client_get_capabilities() was backported to 1.22.2. Add to to the appropriate linker version. Officially (and according to docs) nm_client_get_capabilities() still appears first in libnm 1.24.0. However, as it got backported to 1.22.2, it needs to be part of a different symbol version on 1.22. Instead of adding the symbol twice (once for libnm_1_24_0 and libnm_1_22_2), move it only to the libnm_1_22_2 symbol version, also on master. --- libnm/libnm.ver | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index eaa7f30ed1..1a25f046dd 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1653,9 +1653,13 @@ global: nm_setting_ip_config_get_dhcp_hostname_flags; } libnm_1_20_0; -libnm_1_24_0 { +libnm_1_22_2 { global: nm_client_get_capabilities; +} libnm_1_22_0; + +libnm_1_24_0 { +global: nm_client_get_instance_flags; nm_client_get_permissions_state; nm_client_instance_flags_get_type;