From b22a7b55d0bc5a7999dccaeacdde745f5ace9d66 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 23 Feb 2023 17:11:22 +0100 Subject: New upstream version 1.42.2 --- src/libnm-core-public/nm-setting-ip-config.h | 3 +++ src/libnm-core-public/nm-version-macros.h | 3 ++- src/libnm-core-public/nm-version-macros.h.in | 1 + src/libnm-core-public/nm-version.h | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src/libnm-core-public') diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h index d52cf147..f3bdc796 100644 --- a/src/libnm-core-public/nm-setting-ip-config.h +++ b/src/libnm-core-public/nm-setting-ip-config.h @@ -340,6 +340,7 @@ char *nm_ip_routing_rule_to_string(const NMIPRoutingRule *self, #define NM_SETTING_IP_CONFIG_DHCP_IAID "dhcp-iaid" #define NM_SETTING_IP_CONFIG_DHCP_REJECT_SERVERS "dhcp-reject-servers" #define NM_SETTING_IP_CONFIG_AUTO_ROUTE_EXT_GW "auto-route-ext-gw" +#define NM_SETTING_IP_CONFIG_REPLACE_LOCAL_RULE "replace-local-rule" /* these are not real GObject properties. */ #define NM_SETTING_IP_CONFIG_ROUTING_RULES "routing-rules" @@ -499,6 +500,8 @@ NM_AVAILABLE_IN_1_28 void nm_setting_ip_config_clear_dhcp_reject_servers(NMSettingIPConfig *setting); NM_AVAILABLE_IN_1_42 NMTernary nm_setting_ip_config_get_auto_route_ext_gw(NMSettingIPConfig *setting); +NM_AVAILABLE_IN_1_42_2 +NMTernary nm_setting_ip_config_get_replace_local_rule(NMSettingIPConfig *setting); G_END_DECLS diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index bbdeb2f3..18ad7cf6 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (0) +#define NM_MICRO_VERSION (2) /** * NM_CHECK_VERSION: @@ -72,6 +72,7 @@ #define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0)) #define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0)) +#define NM_VERSION_1_42_2 (NM_ENCODE_VERSION(1, 42, 2)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in index 543edcf0..5cdba608 100644 --- a/src/libnm-core-public/nm-version-macros.h.in +++ b/src/libnm-core-public/nm-version-macros.h.in @@ -72,6 +72,7 @@ #define NM_VERSION_1_38 (NM_ENCODE_VERSION(1, 38, 0)) #define NM_VERSION_1_40 (NM_ENCODE_VERSION(1, 40, 0)) #define NM_VERSION_1_42 (NM_ENCODE_VERSION(1, 42, 0)) +#define NM_VERSION_1_42_2 (NM_ENCODE_VERSION(1, 42, 2)) /* For releases, NM_API_VERSION is equal to NM_VERSION. * diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h index 0b2e6103..249084ae 100644 --- a/src/libnm-core-public/nm-version.h +++ b/src/libnm-core-public/nm-version.h @@ -355,6 +355,12 @@ #define NM_AVAILABLE_IN_1_42 #endif +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_42_2 +#define NM_AVAILABLE_IN_1_42_2 G_UNAVAILABLE(1, 42.2) +#else +#define NM_AVAILABLE_IN_1_42_2 +#endif + /* * Synchronous API for calling D-Bus in libnm is deprecated. See * https://networkmanager.dev/docs/libnm/latest/usage.html#sync-api -- cgit 1.3.0-6-gf8a5