From 8de5ce18bdfac5fab745baa91da5ad1eaa5a986e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 07:05:18 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .NetworkManager-libreswan.metadata | 2 +- .gitignore | 2 +- ...es-add-support-for-leftmodecfgclient.patch | 79 ++++++++++ ...-new-API-to-send-configuration-to-NM.patch | 137 ++++++++++++++++++ ...nd-IPv4-config-if-mode-config-client.patch | 72 +++++++++ ...g-refcounting-in-D-Bus-handler-for-C.patch | 67 +++++++++ ...es-support-type-hostaddrfamily-clien.patch | 91 ++++++++++++ SPECS/NetworkManager-libreswan.spec | 43 ++++-- 8 files changed, 482 insertions(+), 11 deletions(-) create mode 100644 SOURCES/0001-service-properties-add-support-for-leftmodecfgclient.patch create mode 100644 SOURCES/0002-service-use-new-API-to-send-configuration-to-NM.patch create mode 100644 SOURCES/0003-service-don-t-send-IPv4-config-if-mode-config-client.patch create mode 100644 SOURCES/0004-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch create mode 100644 SOURCES/0005-service-properties-support-type-hostaddrfamily-clien.patch diff --git a/.NetworkManager-libreswan.metadata b/.NetworkManager-libreswan.metadata index 3075cf7..5f9e2f2 100644 --- a/.NetworkManager-libreswan.metadata +++ b/.NetworkManager-libreswan.metadata @@ -1 +1 @@ -705a4dded50d26bd005bb68ea851f79453ea4252 SOURCES/NetworkManager-libreswan-1.2.14.tar.xz +a57014f8a1c360546cb7fed5231efd7cfbf85bf3 SOURCES/NetworkManager-libreswan-1.2.18.tar.xz diff --git a/.gitignore b/.gitignore index c680b5d..ccdf14f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-libreswan-1.2.14.tar.xz +SOURCES/NetworkManager-libreswan-1.2.18.tar.xz diff --git a/SOURCES/0001-service-properties-add-support-for-leftmodecfgclient.patch b/SOURCES/0001-service-properties-add-support-for-leftmodecfgclient.patch new file mode 100644 index 0000000..f66bf0f --- /dev/null +++ b/SOURCES/0001-service-properties-add-support-for-leftmodecfgclient.patch @@ -0,0 +1,79 @@ +From 0f0b2d375901e302e8a619e3911321f511b52885 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Tue, 9 Jan 2024 23:30:42 +0100 +Subject: [PATCH 1/5] service,properties: add support for leftmodecfgclient + +Previously the plugin always set leftmodecfgclient=yes, which is used +for roaming clients to obtain a dynamic IP. In a server-to-server +scenario we don't want that option; allow omitting it by passing +leftmodecfgclient=no. It's somehow confusing that the new option has +the opposite default value than Libreswan, but that's the only way to +keep backwards compatibility for existing configurations. +--- + properties/nm-libreswan-dialog.ui | 26 +++++++++++++++++++++++++ + properties/nm-libreswan-editor-plugin.c | 2 ++ + properties/nm-libreswan-editor.c | 9 +++++++++ + shared/nm-service-defines.h | 1 + + shared/utils.c | 8 +++++++- + src/nm-libreswan-service.c | 1 + + 6 files changed, 46 insertions(+), 1 deletion(-) + +diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c +index b5c0d9e..89243cc 100644 +--- a/properties/nm-libreswan-editor-plugin.c ++++ b/properties/nm-libreswan-editor-plugin.c +@@ -182,6 +182,8 @@ import_from_file (NMVpnEditorPlugin *self, + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_LEFTUSERNAME, &str[13]); + else if (g_str_has_prefix (str, "leftcert=")) + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_LEFTCERT, &str[9]); ++ else if (nm_streq0 (str, "leftmodecfgclient=no")) ++ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_LEFTMODECFGCLIENT, "no"); + else if (g_str_has_prefix (str, "pfs=no")) + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_PFS, "no"); + else if (g_str_has_prefix (str, "cisco-unity=yes")) +diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h +index 3fdf2ef..14170ad 100644 +--- a/shared/nm-service-defines.h ++++ b/shared/nm-service-defines.h +@@ -41,6 +41,7 @@ + #define NM_LIBRESWAN_KEY_LEFTID "leftid" + #define NM_LIBRESWAN_KEY_LEFTRSASIGKEY "leftrsasigkey" + #define NM_LIBRESWAN_KEY_LEFTCERT "leftcert" ++#define NM_LIBRESWAN_KEY_LEFTMODECFGCLIENT "leftmodecfgclient" + #define NM_LIBRESWAN_KEY_AUTHBY "authby" + #define NM_LIBRESWAN_KEY_PSK_VALUE "pskvalue" + #define NM_LIBRESWAN_KEY_PSK_INPUT_MODES "pskinputmodes" +diff --git a/shared/utils.c b/shared/utils.c +index cbc117c..0bac9e6 100644 +--- a/shared/utils.c ++++ b/shared/utils.c +@@ -191,7 +191,13 @@ nm_libreswan_config_write (gint fd, + else + WRITE_CHECK (fd, debug_write_fcn, error, " left=%%defaultroute"); + +- WRITE_CHECK (fd, debug_write_fcn, error, " leftmodecfgclient=yes"); ++ item = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_KEY_LEFTMODECFGCLIENT); ++ if (nm_streq0 (item, "no")) { ++ WRITE_CHECK (fd, debug_write_fcn, error, " leftmodecfgclient=no"); ++ } else { ++ WRITE_CHECK (fd, debug_write_fcn, error, " leftmodecfgclient=yes"); ++ } ++ + if (leftupdown_script) + WRITE_CHECK (fd, debug_write_fcn, error, " leftupdown=%s", leftupdown_script); + +diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c +index fc470a6..874f767 100644 +--- a/src/nm-libreswan-service.c ++++ b/src/nm-libreswan-service.c +@@ -256,6 +256,7 @@ static ValidProperty valid_properties[] = { + { NM_LIBRESWAN_KEY_LEFTUSERNAME, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_LEFTRSASIGKEY, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_LEFTCERT, G_TYPE_STRING, 0, 0 }, ++ { NM_LIBRESWAN_KEY_LEFTMODECFGCLIENT, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_AUTHBY, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_DOMAIN, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_DHGROUP, G_TYPE_STRING, 0, 0 }, +-- +2.43.0 + diff --git a/SOURCES/0002-service-use-new-API-to-send-configuration-to-NM.patch b/SOURCES/0002-service-use-new-API-to-send-configuration-to-NM.patch new file mode 100644 index 0000000..6c4d2d9 --- /dev/null +++ b/SOURCES/0002-service-use-new-API-to-send-configuration-to-NM.patch @@ -0,0 +1,137 @@ +From 09ee8838162cb6ea097375fb7d8b698566bb1c4d Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 10 Jan 2024 09:29:50 +0100 +Subject: [PATCH 2/5] service: use new API to send configuration to NM + +Instead of emitting the "Ip4Config" signal that contains both generic +and IPv4 configurations, use the more recent API and send two signals: +"Config" for the generic configuration and "Ip4Config" for IPv4 +configuration. + +In this way, it will be possible in the next commit to return no IPv4 +configuration at all. +--- + src/nm-libreswan-service.c | 61 +++++++++++++++++++++++++------------- + 1 file changed, 40 insertions(+), 21 deletions(-) + +diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c +index 874f767..2aca78f 100644 +--- a/src/nm-libreswan-service.c ++++ b/src/nm-libreswan-service.c +@@ -1270,16 +1270,14 @@ handle_callback (NMDBusLibreswanHelper *object, + goto out; + } + ++ /* First build and send the generic config */ + g_variant_builder_init (&config, G_VARIANT_TYPE_VARDICT); + +- /* Right peer (or Gateway) */ +- val = addr4_to_gvariant (lookup_string (env, "PLUTO_PEER")); +- if (val) +- g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val); +- else { +- _LOGW ("IPsec/Pluto Right Peer (VPN Gateway)"); +- goto out; +- } ++ /* ++ * Enabled address families ++ */ ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_HAS_IP4, g_variant_new_boolean (TRUE)); ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_HAS_IP6, g_variant_new_boolean (FALSE)); + + /* + * Tunnel device +@@ -1290,15 +1288,43 @@ handle_callback (NMDBusLibreswanHelper *object, + } else { + val = g_variant_new_string (NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE); + } ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_TUNDEV, val); ++ ++ /* Banner */ ++ val = str_to_gvariant (lookup_string (env, "PLUTO_PEER_BANNER"), TRUE); ++ if (val) ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_BANNER, val); ++ ++ /* Right peer (or Gateway) */ ++ val = addr4_to_gvariant (lookup_string (env, "PLUTO_PEER")); ++ if (val) ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, val); ++ else { ++ _LOGW ("IPsec/Pluto Right Peer (VPN Gateway) is missing"); ++ goto out; ++ } ++ ++ nm_vpn_service_plugin_set_config (NM_VPN_SERVICE_PLUGIN (user_data), ++ g_variant_builder_end (&config)); + +- g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val); ++ /* Then build and send the IPv4 config */ ++ g_variant_builder_init (&config, G_VARIANT_TYPE_VARDICT); ++ ++ /* Right peer (or Gateway) */ ++ val = addr4_to_gvariant (lookup_string (env, "PLUTO_PEER")); ++ if (val) ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, val); ++ else { ++ _LOGW ("IPsec/Pluto Right Peer (VPN Gateway) is missing"); ++ goto out; ++ } + + /* IP address */ + val = addr4_to_gvariant (lookup_string (env, "PLUTO_MY_SOURCEIP")); + if (val) + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, val); + else { +- _LOGW ("IP4 Address"); ++ _LOGW ("IP4 Address is missing"); + goto out; + } + +@@ -1307,7 +1333,7 @@ handle_callback (NMDBusLibreswanHelper *object, + if (val) + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_PTP, val); + else { +- _LOGW ("IP4 PTP Address"); ++ _LOGW ("IP4 PTP Address is missing"); + goto out; + } + +@@ -1324,7 +1350,6 @@ handle_callback (NMDBusLibreswanHelper *object, + if (val) + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_DNS, val); + +- + /* Default domain */ + val = str_to_gvariant (lookup_string (env, "PLUTO_CISCO_DOMAIN_INFO"), TRUE); + if (!val) { +@@ -1334,11 +1359,6 @@ handle_callback (NMDBusLibreswanHelper *object, + if (val) + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, val); + +- /* Banner */ +- val = str_to_gvariant (lookup_string (env, "PLUTO_PEER_BANNER"), TRUE); +- if (val) +- g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_BANNER, val); +- + /* Indicates whether the VPN is using a XFRM interface (via option ipsec-interface=) */ + is_xfrmi = nm_streq0 (lookup_string (env, "PLUTO_XFRMI_ROUTE"), "yes"); + +@@ -1369,12 +1389,11 @@ handle_callback (NMDBusLibreswanHelper *object, + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, g_variant_new_boolean (TRUE)); + + success = TRUE; ++ nm_vpn_service_plugin_set_ip4_config (NM_VPN_SERVICE_PLUGIN (user_data), ++ g_variant_builder_end (&config)); + + out: +- if (success) { +- nm_vpn_service_plugin_set_ip4_config (NM_VPN_SERVICE_PLUGIN (user_data), +- g_variant_builder_end (&config)); +- } else { ++ if (!success) { + connect_failed (NM_LIBRESWAN_PLUGIN (user_data), NULL, + NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED); + } +-- +2.43.0 + diff --git a/SOURCES/0003-service-don-t-send-IPv4-config-if-mode-config-client.patch b/SOURCES/0003-service-don-t-send-IPv4-config-if-mode-config-client.patch new file mode 100644 index 0000000..11d8fcc --- /dev/null +++ b/SOURCES/0003-service-don-t-send-IPv4-config-if-mode-config-client.patch @@ -0,0 +1,72 @@ +From 74ec0f7dc18939dd4a5992584527ab044b284fc0 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Wed, 10 Jan 2024 09:31:48 +0100 +Subject: [PATCH 3/5] service: don't send IPv4 config if mode config client is + disabled + +If the mode config client is disabled (i.e. in server-to-server +scenario) we are not going to receive a dynamic IP. The IP address +already configured on the existing interface is enough. +--- + src/nm-libreswan-service.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c +index 2aca78f..12cf6f2 100644 +--- a/src/nm-libreswan-service.c ++++ b/src/nm-libreswan-service.c +@@ -1253,6 +1253,7 @@ handle_callback (NMDBusLibreswanHelper *object, + gpointer user_data) + { + NMLibreswanPluginPrivate *priv = NM_LIBRESWAN_PLUGIN_GET_PRIVATE (user_data); ++ NMSettingVpn *s_vpn; + GVariantBuilder config; + GVariantBuilder builder; + GVariant *val; +@@ -1260,7 +1261,9 @@ handle_callback (NMDBusLibreswanHelper *object, + guint i; + const char *verb; + const char *virt_if; ++ const char *str; + gboolean is_xfrmi = FALSE; ++ gboolean has_ip4; + + _LOGI ("Configuration from the helper received."); + +@@ -1273,10 +1276,21 @@ handle_callback (NMDBusLibreswanHelper *object, + /* First build and send the generic config */ + g_variant_builder_init (&config, G_VARIANT_TYPE_VARDICT); + ++ if ( priv->connection ++ && (s_vpn = nm_connection_get_setting_vpn (priv->connection)) ++ && (str = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_KEY_LEFTMODECFGCLIENT)) ++ && nm_streq (str, "no")) { ++ has_ip4 = FALSE; ++ } else { ++ has_ip4 = TRUE; ++ } ++ ++ _LOGD ("Configuration has IPv4: %d", has_ip4); ++ + /* + * Enabled address families + */ +- g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_HAS_IP4, g_variant_new_boolean (TRUE)); ++ g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_HAS_IP4, g_variant_new_boolean (has_ip4)); + g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_CONFIG_HAS_IP6, g_variant_new_boolean (FALSE)); + + /* +@@ -1306,6 +1320,10 @@ handle_callback (NMDBusLibreswanHelper *object, + + nm_vpn_service_plugin_set_config (NM_VPN_SERVICE_PLUGIN (user_data), + g_variant_builder_end (&config)); ++ if (!has_ip4) { ++ success = TRUE; ++ goto out; ++ } + + /* Then build and send the IPv4 config */ + g_variant_builder_init (&config, G_VARIANT_TYPE_VARDICT); +-- +2.43.0 + diff --git a/SOURCES/0004-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch b/SOURCES/0004-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch new file mode 100644 index 0000000..d0a3624 --- /dev/null +++ b/SOURCES/0004-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch @@ -0,0 +1,67 @@ +From 8ceb901719acac3778e1d76779d9c14289185157 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Sat, 13 Jan 2024 18:10:02 +0100 +Subject: [PATCH 4/5] service: fix wrong refcounting in D-Bus handler for + Callback() + +The Callback() D-Bus method is handled via a GDBus-generated skeleton +code in nm-libreswan-helper-service-dbus.c, function +_nmdbus_libreswan_helper_skeleton_handle_method_call(). The function +emits signal "handle-callback" to let the program handle the incoming +method. As documented in the GDoc comments, the signal handler must +return TRUE if it handles the call. + +``` + /** + * NMDBusLibreswanHelper::handle-callback: + * @object: A #NMDBusLibreswanHelper. + * @invocation: A #GDBusMethodInvocation. + * @arg_environment: Argument passed by remote caller. + + * Signal emitted when a remote caller is invoking the Callback() + D-Bus method. + + * If a signal handler returns %TRUE, it means the signal handler + will handle the invocation (e.g. take a reference to @invocation + and eventually call nmdbus_libreswan_helper_complete_callback() + or e.g. g_dbus_method_invocation_return_error() on it) and no + other signal handlers will run. If no signal handler handles the + invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + + * Returns: %G_DBUS_METHOD_INVOCATION_HANDLED or %TRUE if the + invocation was handled, %G_DBUS_METHOD_INVOCATION_UNHANDLED or + %FALSE to let other signal handlers run. + */ +``` + +At the moment, in case of error the handler first calls +nmdbus_libreswan_helper_complete_callback() which decreases the +refcount of "invocation", and then returns FALSE which tells the +skeleton code to return an error, also unreferencing the +invocation. This causes a crash. + +Since the G_DBUS_METHOD_INVOCATION_HANDLED alias for TRUE is only +available since GLib 2.68 (while we target 2.36), just return TRUE. + +Fixes: acb9eb9de50b ('service: process the configuration in the service, not the helper') +--- + src/nm-libreswan-service.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c +index 12cf6f2..0d5c4b8 100644 +--- a/src/nm-libreswan-service.c ++++ b/src/nm-libreswan-service.c +@@ -1417,7 +1417,8 @@ out: + } + + nmdbus_libreswan_helper_complete_callback (object, invocation); +- return success; ++ ++ return TRUE; + } + + /****************************************************************/ +-- +2.43.0 + diff --git a/SOURCES/0005-service-properties-support-type-hostaddrfamily-clien.patch b/SOURCES/0005-service-properties-support-type-hostaddrfamily-clien.patch new file mode 100644 index 0000000..d54e26b --- /dev/null +++ b/SOURCES/0005-service-properties-support-type-hostaddrfamily-clien.patch @@ -0,0 +1,91 @@ +From b4ba2add64bd9d362fe2e66748f23449f072216b Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Mon, 15 Jan 2024 13:23:45 +0100 +Subject: [PATCH 5/5] service,properties: support type, hostaddrfamily, + clientaddrfamily + +Add support for: + - type + - hostaddrfamily + - clientaddrfamily + +Since those are very advanced options, don't implement the GUI part +for now. +--- + properties/nm-libreswan-editor-plugin.c | 6 ++++++ + shared/nm-service-defines.h | 3 +++ + shared/utils.c | 12 ++++++++++++ + src/nm-libreswan-service.c | 3 +++ + 4 files changed, 24 insertions(+) + +diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c +index 89243cc..fe85c81 100644 +--- a/properties/nm-libreswan-editor-plugin.c ++++ b/properties/nm-libreswan-editor-plugin.c +@@ -206,6 +206,12 @@ import_from_file (NMVpnEditorPlugin *self, + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_IPSEC_INTERFACE, &str[16]); + else if (g_str_has_prefix (str, "authby=")) + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_AUTHBY, &str[7]); ++ else if (g_str_has_prefix (str, "type=")) ++ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_TYPE, str + NM_STRLEN("type=")); ++ else if (g_str_has_prefix (str, "hostaddrfamily=")) ++ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_HOSTADDRFAMILY, str + NM_STRLEN("hostaddrfamily=")); ++ else if (g_str_has_prefix (str, "clientaddrfamily=")) ++ nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_CLIENTADDRFAMILY, str + NM_STRLEN("clientaddrfamily=")); + else if (g_str_has_prefix (str, "rightsubnet=")) { + if (!g_str_has_prefix (str, "rightsubnet=0.0.0.0/0")) + nm_setting_vpn_add_data_item (s_vpn, NM_LIBRESWAN_KEY_REMOTENETWORK, &str[12]); +diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h +index 14170ad..95e19d4 100644 +--- a/shared/nm-service-defines.h ++++ b/shared/nm-service-defines.h +@@ -68,6 +68,9 @@ + #define NM_LIBRESWAN_KEY_FRAGMENTATION "fragmentation" + #define NM_LIBRESWAN_KEY_MOBIKE "mobike" + #define NM_LIBRESWAN_KEY_IPSEC_INTERFACE "ipsec-interface" ++#define NM_LIBRESWAN_KEY_TYPE "type" ++#define NM_LIBRESWAN_KEY_HOSTADDRFAMILY "hostaddrfamily" ++#define NM_LIBRESWAN_KEY_CLIENTADDRFAMILY "clientaddrfamily" + + #define NM_LIBRESWAN_IKEV2_NO "no" + #define NM_LIBRESWAN_IKEV2_NEVER "never" +diff --git a/shared/utils.c b/shared/utils.c +index 0bac9e6..9e616f8 100644 +--- a/shared/utils.c ++++ b/shared/utils.c +@@ -325,6 +325,18 @@ nm_libreswan_config_write (gint fd, + if (item && strlen (item)) + WRITE_CHECK (fd, debug_write_fcn, error, " ipsec-interface=%s", item); + ++ item = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_KEY_TYPE); ++ if (item && strlen (item)) ++ WRITE_CHECK (fd, debug_write_fcn, error, " type=%s", item); ++ ++ item = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_KEY_HOSTADDRFAMILY); ++ if (item && strlen (item)) ++ WRITE_CHECK (fd, debug_write_fcn, error, " hostaddrfamily=%s", item); ++ ++ item = nm_setting_vpn_get_data_item (s_vpn, NM_LIBRESWAN_KEY_CLIENTADDRFAMILY); ++ if (item && strlen (item)) ++ WRITE_CHECK (fd, debug_write_fcn, error, " clientaddrfamily=%s", item); ++ + WRITE_CHECK (fd, debug_write_fcn, error, " nm-configured=yes"); + + WRITE_CHECK_NEWLINE (fd, trailing_newline, debug_write_fcn, error, " auto=add"); +diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c +index 0d5c4b8..7e96230 100644 +--- a/src/nm-libreswan-service.c ++++ b/src/nm-libreswan-service.c +@@ -277,6 +277,9 @@ static ValidProperty valid_properties[] = { + { NM_LIBRESWAN_KEY_FRAGMENTATION, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_MOBIKE, G_TYPE_STRING, 0, 0 }, + { NM_LIBRESWAN_KEY_IPSEC_INTERFACE, G_TYPE_STRING, 0, 0 }, ++ { NM_LIBRESWAN_KEY_TYPE, G_TYPE_STRING, 0, 0 }, ++ { NM_LIBRESWAN_KEY_HOSTADDRFAMILY, G_TYPE_STRING, 0, 0 }, ++ { NM_LIBRESWAN_KEY_CLIENTADDRFAMILY, G_TYPE_STRING, 0, 0 }, + /* Ignored option for internal use */ + { NM_LIBRESWAN_KEY_PSK_INPUT_MODES, G_TYPE_NONE, 0, 0 }, + { NM_LIBRESWAN_KEY_XAUTH_PASSWORD_INPUT_MODES, G_TYPE_NONE, 0, 0 }, +-- +2.43.0 + diff --git a/SPECS/NetworkManager-libreswan.spec b/SPECS/NetworkManager-libreswan.spec index da36dd5..dae30a1 100644 --- a/SPECS/NetworkManager-libreswan.spec +++ b/SPECS/NetworkManager-libreswan.spec @@ -3,10 +3,15 @@ %else %bcond_with libnm_glib %endif +%if 0%{?fedora} < 36 && 0%{?rhel} < 10 +%bcond_with gtk4 +%else +%bcond_without gtk4 +%endif -%global real_version 1.2.14 -%global rpm_version 1.2.14 -%global release_version 1 +%global real_version 1.2.18 +%global rpm_version 1.2.18 +%global release_version 2 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') @@ -17,12 +22,16 @@ Summary: NetworkManager VPN plug-in for IPsec VPN Name: NetworkManager-libreswan Version: %{rpm_version} -Release: %{release_version}%{?dist}.3 +Release: %{release_version}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source0: https://download.gnome.org/sources/NetworkManager-libreswan/%{real_version_major}/%{name}-%{real_version}.tar.xz -#Patch1: 0001-some.patch +Patch1: 0001-service-properties-add-support-for-leftmodecfgclient.patch +Patch2: 0002-service-use-new-API-to-send-configuration-to-NM.patch +Patch3: 0003-service-don-t-send-IPv4-config-if-mode-config-client.patch +Patch4: 0004-service-fix-wrong-refcounting-in-D-Bus-handler-for-C.patch +Patch5: 0005-service-properties-support-type-hostaddrfamily-clien.patch BuildRequires: make BuildRequires: gcc @@ -39,6 +48,10 @@ BuildRequires: NetworkManager-glib-devel >= %{nm_version} BuildRequires: libnm-gtk-devel >= %{nma_version} %endif +%if %with gtk4 +BuildRequires: libnma-gtk4-devel +%endif + Requires: NetworkManager >= %{nm_version} Requires: dbus Requires: /usr/sbin/ipsec @@ -77,6 +90,9 @@ the libreswan server with NetworkManager (GNOME files). %build %configure \ --disable-static \ +%if %with gtk4 + --with-gtk4 \ +%endif %if %without libnm_glib --without-libnm-glib \ %endif @@ -98,24 +114,33 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_libexecdir}/nm-libreswan-service %{_libexecdir}/nm-libreswan-service-helper %{_mandir}/man5/nm-settings-libreswan.5.gz -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS NEWS %license COPYING %files -n NetworkManager-libreswan-gnome %{_libexecdir}/nm-libreswan-auth-dialog %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so -%dir %{_datadir}/gnome-vpn-properties/libreswan -%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui -%{_datadir}/appdata/network-manager-libreswan.metainfo.xml +%{_metainfodir}/network-manager-libreswan.metainfo.xml %if %with libnm_glib %{_libdir}/NetworkManager/libnm-*-properties.so %{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name %endif +%if %with gtk4 +%{_libdir}/NetworkManager/libnm-gtk4-vpn-plugin-libreswan-editor.so +%endif %changelog +* Wed Jan 17 2024 Fernando Fernandez Mancera - 1.2.18-2 +- Support point-to-point IPSec tunnel (RHEL-20690) +- Fix crash in libreswan_nmstate_iface_dpd_rsa (RHEL-21221) +- Support configuring IPSec mode with 'type' (RHEL-21554) + +* Fri Dec 15 2023 Fernando Fernandez Mancera - 1.2.18-1 +- Update to 1.2.18 release + * Mon Aug 09 2021 Mohan Boddu - 1.2.14-1.3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688