From 2585e34e598074e41445e4dd25d1b496ffbcea3f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 15 Jun 2021 19:04:39 +0200
Subject: [PATCH] libnm: expose nm_ip_address_dup(), nm_ip_route_dup() API in
 libnm

This fixes commit 21c8a6b20eff ('libnm-core, all: merge IPv4 and IPv6
address/route types'), which introduced this API but didn't export it
in the library. In practice this API is thus only usable since 1.32.0.

(cherry picked from commit 05f2a0b0247ee4aa3da371658f310bc655cbf1af)
(cherry picked from commit eea912dfb31a40909cad7b784a82bbfbe56ef486)
---
 libnm-core/nm-setting-ip-config.c | 12 ++++++++++++
 libnm-core/nm-setting-ip-config.h |  3 +++
 libnm/libnm.ver                   |  2 ++
 3 files changed, 17 insertions(+)

diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index eaee2c5533..4ef73273ed 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -363,6 +363,12 @@ nm_ip_address_equal(NMIPAddress *address, NMIPAddress *other)
  * Creates a copy of @address
  *
  * Returns: (transfer full): a copy of @address
+ *
+ * This API was part of public headers before 1.32.0 but
+ * was erroneously not exported in the ABI. It is thus only
+ * usable since 1.32.0, 1.30.8.
+ *
+ * Since: 1.32, 1.30.8
  **/
 NMIPAddress *
 nm_ip_address_dup(NMIPAddress *address)
@@ -820,6 +826,12 @@ nm_ip_route_equal(NMIPRoute *route, NMIPRoute *other)
  * Creates a copy of @route
  *
  * Returns: (transfer full): a copy of @route
+ *
+ * This API was part of public headers before 1.32.0 but
+ * was erroneously not exported in the ABI. It is thus only
+ * usable since 1.32.0, 1.30.8.
+ *
+ * Since: 1.32, 1.30.8
  **/
 NMIPRoute *
 nm_ip_route_dup(NMIPRoute *route)
diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h
index 27c14f392e..50eee0561c 100644
--- a/libnm-core/nm-setting-ip-config.h
+++ b/libnm-core/nm-setting-ip-config.h
@@ -49,6 +49,8 @@ gboolean nm_ip_address_equal(NMIPAddress *address, NMIPAddress *other);
 NM_AVAILABLE_IN_1_22
 int
 nm_ip_address_cmp_full(const NMIPAddress *a, const NMIPAddress *b, NMIPAddressCmpFlags cmp_flags);
+
+NM_AVAILABLE_IN_1_30_8
 NMIPAddress *nm_ip_address_dup(NMIPAddress *address);
 
 int         nm_ip_address_get_family(NMIPAddress *address);
@@ -92,6 +94,7 @@ enum { /*< flags >*/
 NM_AVAILABLE_IN_1_10
 gboolean nm_ip_route_equal_full(NMIPRoute *route, NMIPRoute *other, guint cmp_flags);
 
+NM_AVAILABLE_IN_1_30_8
 NMIPRoute *nm_ip_route_dup(NMIPRoute *route);
 
 int         nm_ip_route_get_family(NMIPRoute *route);
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 7cdcf8104f..8451a493a9 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1787,5 +1787,7 @@ global:
 
 libnm_1_30_8 {
 global:
+	nm_ip_address_dup;
+	nm_ip_route_dup;
 	nm_setting_ip_config_get_required_timeout;
 } libnm_1_30_0;