From 04bb97d4c15c1f3d30d84284bf9edfc5996bffcf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 17 Feb 2020 15:16:23 +0100 Subject: [PATCH] libnm: move nm_setting_ip6_config_get_ra_timeout() to "libnm_1_22_8" symbol version nm_setting_ip6_config_get_ra_timeout() was backported to nm-1-22 branch, and will be released as 1.22.8. As such, on the stable branch the symbol will be placed in a separate symbol version ("libnm_1_22_8"). To support the upgrade path from 1.22.8+ to 1.23+, we want this symbol also present on master. At that point, we don't need to duplicate the symbol. Just add the same linker symbol version also to master. --- libnm/libnm.ver | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index dbe75e897..9229a1fc7 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1658,6 +1658,11 @@ global: nm_client_get_capabilities; } libnm_1_22_0; +libnm_1_22_8 { +global: + nm_setting_ip6_config_get_ra_timeout; +} libnm_1_22_2; + libnm_1_24_0 { global: nm_client_get_instance_flags; @@ -1673,8 +1678,7 @@ global: nm_secret_agent_old_get_dbus_connection; nm_secret_agent_old_get_dbus_name_owner; nm_secret_agent_old_get_main_context; - nm_setting_ip6_config_get_ra_timeout; nm_setting_vrf_get_table; nm_setting_vrf_get_type; nm_setting_vrf_new; -} libnm_1_22_0; +} libnm_1_22_8;