import CS NetworkManager-1.51.90-2.el9
This commit is contained in:
parent
208e437eaf
commit
49fe93beed
@ -1 +1 @@
|
||||
6423adef5f4bb2c0cc20c2173e03a7ac8b8565ca SOURCES/NetworkManager-1.48.10.tar.xz
|
||||
b639c60940c68c7ccb52888786f86393ee482f71 SOURCES/NetworkManager-1.51.90.tar.xz
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/NetworkManager-1.48.10.tar.xz
|
||||
SOURCES/NetworkManager-1.51.90.tar.xz
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
|
||||
index 16f8e1f261..036233e668 100644
|
||||
index 66eba20..ef3d45b 100644
|
||||
--- a/src/core/devices/nm-device.c
|
||||
+++ b/src/core/devices/nm-device.c
|
||||
@@ -1661,7 +1661,7 @@ _prop_get_ipv4_dad_timeout(NMDevice *self)
|
||||
@@ -1664,7 +1664,7 @@ _prop_get_ipv4_dad_timeout(NMDevice *self)
|
||||
self,
|
||||
0,
|
||||
NM_SETTING_IP_CONFIG_DAD_TIMEOUT_MAX,
|
||||
@ -12,10 +12,10 @@ index 16f8e1f261..036233e668 100644
|
||||
|
||||
static guint32
|
||||
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
index bfebe7d13d..de56ed74ea 100644
|
||||
index e79f25a..a7a2b69 100644
|
||||
--- a/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
|
||||
@@ -6655,7 +6655,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass)
|
||||
@@ -6735,7 +6735,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass)
|
||||
*
|
||||
* A zero value means that no duplicate address detection is performed, -1 means
|
||||
* the default value (either the value configured globally in NetworkManger.conf
|
||||
@ -25,10 +25,10 @@ index bfebe7d13d..de56ed74ea 100644
|
||||
* actual duration can be between half and the full time specified in this
|
||||
* property.
|
||||
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
|
||||
index 77cde6620e..e42cb74e7f 100644
|
||||
index 091dcd6..6ab2c44 100644
|
||||
--- a/src/libnmc-setting/settings-docs.h.in
|
||||
+++ b/src/libnmc-setting/settings-docs.h.in
|
||||
@@ -162,7 +162,7 @@
|
||||
@@ -166,7 +166,7 @@
|
||||
#define DESCRIBE_DOC_NM_SETTING_INFINIBAND_TRANSPORT_MODE N_("The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\".")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_ADDRESSES N_("A list of IPv4 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"192.168.1.5/24, 10.1.0.5/24\". The addresses are listed in decreasing priority, meaning the first address will be the primary address.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.")
|
||||
@ -37,8 +37,8 @@ index 77cde6620e..e42cb74e7f 100644
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"ipv6-duid\" uses the DUID from \"ipv6.dhcp-duid\" property as an RFC4361-compliant client identifier. As IAID it uses \"ipv4.dhcp-iaid\" and falls back to \"ipv6.dhcp-iaid\" if unset. The special value \"duid\" generates a RFC4361-compliant client identifier based on \"ipv4.dhcp-iaid\" and uses a DUID generated by hashing /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. The special value \"none\" prevents any client identifier from being sent. Note that this is normally not recommended. If unset, a globally configured default from NetworkManager.conf is used. If still unset, the default depends on the DHCP plugin. The internal dhcp client will default to \"mac\" and the dhclient plugin will try to use one from its config file if present, or won't sent any client-id otherwise.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_DSCP N_("Specifies the value for the DSCP field (traffic class) of the IP header. When empty, the global default value is used; if no global default is specified, it is assumed to be \"CS0\". Allowed values are: \"CS0\", \"CS4\" and \"CS6\". The property is currently valid only for IPv4, and it is supported only by the \"internal\" DHCP plugin.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.")
|
||||
@@ -192,7 +192,7 @@
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the IPv6 interface identifer of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host's presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the \"ipv6.token\" is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to \"stable-privacy\", the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection's \"connection.stable-id\" property and the address prefix. This improves privacy by making it harder to use the address to track the host's presence and the address is stable when the network interface hardware is replaced. The special values \"default\" and \"default-or-eui64\" will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is \"stable-privacy\" or \"eui64\", respectively. If not specified, when creating a new profile the default is \"default\". Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.")
|
||||
@@ -198,7 +198,7 @@
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE N_("Configure method for creating the IPv6 interface identifier of addresses with RFC4862 IPv6 Stateless Address Autoconfiguration and Link Local addresses. The permitted values are: \"eui64\" (0), \"stable-privacy\" (1), \"default\" (3) or \"default-or-eui64\" (2). If the property is set to \"eui64\", the addresses will be generated using the interface token derived from hardware address. This makes the host part of the address to stay constant, making it possible to track the host's presence when it changes networks. The address changes when the interface hardware is replaced. If a duplicate address is detected, there is also no fallback to generate another address. When configured, the \"ipv6.token\" is used instead of the MAC address to generate addresses for stateless autoconfiguration. If the property is set to \"stable-privacy\", the interface identifier is generated as specified by RFC7217. This works by hashing a host specific key (see NetworkManager(8) manual), the interface name, the connection's \"connection.stable-id\" property and the address prefix. This improves privacy by making it harder to use the address to track the host's presence and the address is stable when the network interface hardware is replaced. The special values \"default\" and \"default-or-eui64\" will fallback to the global connection default as documented in the NetworkManager.conf(5) manual. If the global default is not specified, the fallback value is \"stable-privacy\" or \"eui64\", respectively. If not specified, when creating a new profile the default is \"default\". Note that this setting is distinct from the Privacy Extensions as configured by \"ip6-privacy\" property and it does not affect the temporary addresses configured with this option.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_ADDRESSES N_("A list of IPv6 addresses and their prefix length. Multiple addresses can be separated by comma. For example \"2001:db8:85a3::8a2e:370:7334/64, 2001:db8:85a3::5/64\". The addresses are listed in decreasing priority, meaning the first address will be the primary address. This can make a difference with IPv6 source address selection (RFC 6724, section 5).")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_AUTO_ROUTE_EXT_GW N_("VPN connections will default to add the route automatically unless this setting is set to FALSE. For other connection types, adding such an automatic route is currently not supported and setting this to TRUE has no effect.")
|
||||
-#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Maximum timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. The property is currently implemented only for IPv4. A zero value means that no duplicate address detection is performed, -1 means the default value (either the value configured globally in NetworkManger.conf or 200ms). A value greater than zero is a timeout in milliseconds. Note that the time intervals are subject to randomization as per RFC 5227 and so the actual duration can be between half and the full time specified in this property.")
|
||||
@ -47,10 +47,10 @@ index 77cde6620e..e42cb74e7f 100644
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.")
|
||||
diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
|
||||
index 8806bf2550..09648f3ff8 100644
|
||||
index 7f5bc2c..0ffa6fb 100644
|
||||
--- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
|
||||
+++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
|
||||
@@ -1337,7 +1337,7 @@
|
||||
@@ -1369,7 +1369,7 @@
|
||||
values="-1 - 2147483647"
|
||||
special-values="default (-1), infinity (2147483647)" />
|
||||
<property name="dad-timeout"
|
||||
|
210
SOURCES/1001-dnsconfd-fixes-rhel-79693.patch
Normal file
210
SOURCES/1001-dnsconfd-fixes-rhel-79693.patch
Normal file
@ -0,0 +1,210 @@
|
||||
From 736c6c7930c74c653c61379d7258cc1d93973e0a Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Wed, 12 Feb 2025 20:54:51 +0100
|
||||
Subject: [PATCH 1/3] dnsconfd: fix handling of the update-pending flag
|
||||
|
||||
After every state change of the plugin there should be an invocation
|
||||
of _nm_dns_plugin_update_pending_maybe_changed() to re-evaluate
|
||||
whether we are waiting for an update. send_dnsconfd_update() doesn't
|
||||
change the state and so there is need to check again afterwards.
|
||||
|
||||
(cherry picked from commit 8ff1cbf38b53950a6f12239326a1f41eca573915)
|
||||
(cherry picked from commit dc0ff10efb2b9ea370fbe98d0a5720e9e9f15173)
|
||||
---
|
||||
src/core/dns/nm-dns-dnsconfd.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/core/dns/nm-dns-dnsconfd.c b/src/core/dns/nm-dns-dnsconfd.c
|
||||
index b356c2f9ca..38b7558a12 100644
|
||||
--- a/src/core/dns/nm-dns-dnsconfd.c
|
||||
+++ b/src/core/dns/nm-dns-dnsconfd.c
|
||||
@@ -61,7 +61,11 @@ G_DEFINE_TYPE(NMDnsDnsconfd, nm_dns_dnsconfd, NM_TYPE_DNS_PLUGIN)
|
||||
|
||||
#define DNSCONFD_DBUS_SERVICE "com.redhat.dnsconfd"
|
||||
|
||||
-typedef enum { CONNECTION_FAIL, CONNECTION_SUCCESS, CONNECTION_WAIT } ConnectionState;
|
||||
+typedef enum {
|
||||
+ CONNECTION_FAIL,
|
||||
+ CONNECTION_SUCCESS,
|
||||
+ CONNECTION_WAIT,
|
||||
+} ConnectionState;
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
@@ -704,6 +708,8 @@ update(NMDnsPlugin *plugin,
|
||||
_LOGT("connected, waiting for update to finish");
|
||||
}
|
||||
|
||||
+ _nm_dns_plugin_update_pending_maybe_changed(plugin);
|
||||
+
|
||||
if (all_connected == CONNECTION_FAIL) {
|
||||
nm_utils_error_set(error,
|
||||
NM_UTILS_ERROR_UNKNOWN,
|
||||
@@ -717,8 +723,6 @@ update(NMDnsPlugin *plugin,
|
||||
|
||||
send_dnsconfd_update(self);
|
||||
|
||||
- _nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
|
||||
-
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
--
|
||||
2.48.1
|
||||
|
||||
From 3784576e6f967b1c70c7364fe55ee0b73a06dd8b Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Wed, 12 Feb 2025 20:58:27 +0100
|
||||
Subject: [PATCH 2/3] dnsconfd: set the state to idle when connection fails
|
||||
|
||||
If the plugin can't connect to D-Bus, it is not waiting for an update;
|
||||
set the state to idle.
|
||||
|
||||
(cherry picked from commit 2bfd27f74d869a529a14e478019399075ca37d03)
|
||||
(cherry picked from commit e20794989b0bea80a120888a34d4d9915cbd8529)
|
||||
---
|
||||
src/core/dns/nm-dns-dnsconfd.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/dns/nm-dns-dnsconfd.c b/src/core/dns/nm-dns-dnsconfd.c
|
||||
index 38b7558a12..b4c935db62 100644
|
||||
--- a/src/core/dns/nm-dns-dnsconfd.c
|
||||
+++ b/src/core/dns/nm-dns-dnsconfd.c
|
||||
@@ -700,7 +700,10 @@ update(NMDnsPlugin *plugin,
|
||||
|
||||
/* We need to consider only whether we are connected, because newer update call
|
||||
* overrides the old one */
|
||||
- if (all_connected != CONNECTION_SUCCESS) {
|
||||
+ if (all_connected == CONNECTION_FAIL) {
|
||||
+ priv->plugin_state = DNSCONFD_PLUGIN_IDLE;
|
||||
+ _LOGT("failed to connect");
|
||||
+ } else if (all_connected == CONNECTION_WAIT) {
|
||||
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT;
|
||||
_LOGT("not connected, waiting to connect");
|
||||
} else {
|
||||
--
|
||||
2.48.1
|
||||
|
||||
From cc90aa81383d816ff9bb2dcd2080868787d3e776 Mon Sep 17 00:00:00 2001
|
||||
From: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Date: Thu, 13 Feb 2025 09:54:21 +0100
|
||||
Subject: [PATCH 3/3] dnsconfd: drop "connection-*" entries from the update
|
||||
method
|
||||
|
||||
Stop passing "connection-*" entries in the update method to
|
||||
dnsconfd. The plugin tries to determine the connection from the
|
||||
ifindex, but it's not possible to do it right at the moment because
|
||||
the same ifindex can be used at the same time e.g. by a policy-based
|
||||
VPN like ipsec and a normal device. Instead, it should be NM that
|
||||
explicitly passes the information about the connection to the DNS
|
||||
plugin. Anyway, these variables are not used at the moment by
|
||||
dnsconfd.
|
||||
|
||||
Fixes: c6e1925decd8 ('dns: Add dnsconfd DNS plugin')
|
||||
(cherry picked from commit 4d84e6cddf38754e04ca112f79b2e8937f60b01e)
|
||||
(cherry picked from commit 5e18da31a45971a11fa0c12978f9685cca429862)
|
||||
---
|
||||
src/core/dns/nm-dns-dnsconfd.c | 65 +++++-----------------------------
|
||||
1 file changed, 8 insertions(+), 57 deletions(-)
|
||||
|
||||
diff --git a/src/core/dns/nm-dns-dnsconfd.c b/src/core/dns/nm-dns-dnsconfd.c
|
||||
index b4c935db62..ea23760634 100644
|
||||
--- a/src/core/dns/nm-dns-dnsconfd.c
|
||||
+++ b/src/core/dns/nm-dns-dnsconfd.c
|
||||
@@ -333,29 +333,8 @@ get_networks(NMDnsConfigIPData *ip_data, char ***networks)
|
||||
static void
|
||||
server_builder_append_interface_info(GVariantBuilder *argument_builder,
|
||||
const char *interface,
|
||||
- char **networks,
|
||||
- const char *connection_id,
|
||||
- const char *connection_uuid,
|
||||
- const char *dbus_path)
|
||||
+ char **networks)
|
||||
{
|
||||
- if (connection_id) {
|
||||
- g_variant_builder_add(argument_builder,
|
||||
- "{sv}",
|
||||
- "connection-id",
|
||||
- g_variant_new("s", connection_id));
|
||||
- }
|
||||
- if (connection_uuid) {
|
||||
- g_variant_builder_add(argument_builder,
|
||||
- "{sv}",
|
||||
- "connection-uuid",
|
||||
- g_variant_new("s", connection_uuid));
|
||||
- }
|
||||
- if (dbus_path) {
|
||||
- g_variant_builder_add(argument_builder,
|
||||
- "{sv}",
|
||||
- "connection-object",
|
||||
- g_variant_new("s", dbus_path));
|
||||
- }
|
||||
if (interface) {
|
||||
g_variant_builder_add(argument_builder, "{sv}", "interface", g_variant_new("s", interface));
|
||||
}
|
||||
@@ -593,18 +572,11 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
|
||||
const CList *ip_data_lst_head,
|
||||
const char *ca)
|
||||
{
|
||||
- NMDnsConfigIPData *ip_data;
|
||||
- const char *const *dns_server_strings;
|
||||
- guint nameserver_count;
|
||||
- const char *ifname;
|
||||
- NMDevice *device;
|
||||
- NMActiveConnection *active_connection;
|
||||
- NMSettingsConnection *settings_connection;
|
||||
- NMActRequest *act_request;
|
||||
- const char *connection_id;
|
||||
- const char *connection_uuid;
|
||||
- const char *dbus_path;
|
||||
- gboolean explicit_default = is_default_interface_explicit(ip_data_lst_head);
|
||||
+ NMDnsConfigIPData *ip_data;
|
||||
+ const char *const *dns_server_strings;
|
||||
+ guint nameserver_count;
|
||||
+ const char *ifname;
|
||||
+ gboolean explicit_default = is_default_interface_explicit(ip_data_lst_head);
|
||||
|
||||
c_list_for_each_entry (ip_data, ip_data_lst_head, ip_data_lst) {
|
||||
/* No need to free insides of routing and search domains, as they point to data
|
||||
@@ -619,23 +591,7 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
|
||||
&nameserver_count);
|
||||
if (!nameserver_count)
|
||||
continue;
|
||||
- ifname = nm_platform_link_get_name(NM_PLATFORM_GET, ip_data->data->ifindex);
|
||||
- device = nm_manager_get_device_by_ifindex(NM_MANAGER_GET, ip_data->data->ifindex);
|
||||
- act_request = nm_device_get_act_request(device);
|
||||
- active_connection = NM_ACTIVE_CONNECTION(act_request);
|
||||
-
|
||||
- /* Presume that when we have server of this interface then the interface has to have
|
||||
- * an active connection */
|
||||
- nm_assert(active_connection);
|
||||
-
|
||||
- settings_connection = nm_active_connection_get_settings_connection(active_connection);
|
||||
- connection_id = nm_settings_connection_get_id(settings_connection);
|
||||
- connection_uuid = nm_settings_connection_get_uuid(settings_connection);
|
||||
- dbus_path = nm_dbus_object_get_path_still_exported(NM_DBUS_OBJECT(act_request));
|
||||
-
|
||||
- /* dbus_path also should be set, because if we are parsing this connection then we
|
||||
- * expect it to be active and exported on dbus */
|
||||
- nm_assert(dbus_path && dbus_path[0] != 0);
|
||||
+ ifname = nm_platform_link_get_name(NM_PLATFORM_GET, ip_data->data->ifindex);
|
||||
|
||||
gather_interface_domains(ip_data, explicit_default, &routing_domains, &search_domains);
|
||||
get_networks(ip_data, &networks);
|
||||
@@ -647,12 +603,7 @@ parse_all_interface_config(GVariantBuilder *argument_builder,
|
||||
routing_domains,
|
||||
search_domains,
|
||||
ca)) {
|
||||
- server_builder_append_interface_info(argument_builder,
|
||||
- ifname,
|
||||
- networks,
|
||||
- connection_id,
|
||||
- connection_uuid,
|
||||
- dbus_path);
|
||||
+ server_builder_append_interface_info(argument_builder, ifname, networks);
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.48.1
|
||||
|
@ -4,9 +4,10 @@
|
||||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
|
||||
%global epoch_version 1
|
||||
%global real_version 1.48.10
|
||||
%global real_version 1.51.90
|
||||
%global git_tag_version_suffix -dev
|
||||
%global rpm_version %{real_version}
|
||||
%global release_version 1
|
||||
%global release_version 2
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
%global bcond_default_debug 0
|
||||
@ -39,12 +40,19 @@
|
||||
%global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
|
||||
|
||||
###############################################################################
|
||||
|
||||
%bcond_with meson
|
||||
%if 0%{?fedora} > 40 || 0%{?rhel} >= 10
|
||||
%bcond_with dhclient
|
||||
%else
|
||||
%bcond_without dhclient
|
||||
%endif
|
||||
%bcond_without adsl
|
||||
%bcond_without bluetooth
|
||||
%bcond_without wwan
|
||||
%if 0%{?rhel} >= 10
|
||||
%bcond_with team
|
||||
%else
|
||||
%bcond_without team
|
||||
%endif
|
||||
%bcond_without wifi
|
||||
%bcond_without ovs
|
||||
%bcond_without ppp
|
||||
@ -62,7 +70,7 @@
|
||||
%bcond_with test
|
||||
%endif
|
||||
%if "%{?bcond_default_lto}" == ""
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%bcond_without lto
|
||||
%else
|
||||
%bcond_with lto
|
||||
@ -80,44 +88,21 @@
|
||||
%else
|
||||
%bcond_with connectivity_fedora
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} >= 8
|
||||
%if 0%{?rhel}
|
||||
%bcond_without connectivity_redhat
|
||||
%else
|
||||
%bcond_with connectivity_redhat
|
||||
%endif
|
||||
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
|
||||
%bcond_without crypto_gnutls
|
||||
%else
|
||||
%bcond_with crypto_gnutls
|
||||
%endif
|
||||
%if 0%{?rhel}
|
||||
%bcond_with iwd
|
||||
%else
|
||||
%bcond_without iwd
|
||||
%endif
|
||||
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
|
||||
%bcond_without firewalld_zone
|
||||
%else
|
||||
%bcond_with firewalld_zone
|
||||
%endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%global dbus_version 1.9.18
|
||||
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
|
||||
%else
|
||||
%global dbus_version 1.1
|
||||
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
|
||||
%endif
|
||||
|
||||
# Older libndp versions use select() (rh#1933041). On well known distros,
|
||||
# choose a version that has the necessary fix.
|
||||
%if 0%{?rhel} && 0%{?rhel} == 8
|
||||
%global libndp_version 1.7-4
|
||||
%else
|
||||
%global libndp_version %{nil}
|
||||
%endif
|
||||
|
||||
%if %{with bluetooth} || %{with wwan}
|
||||
%global with_modem_manager_1 1
|
||||
@ -125,46 +110,39 @@
|
||||
%global with_modem_manager_1 0
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
|
||||
%global dhcp_default internal
|
||||
%else
|
||||
%global dhcp_default dhclient
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
%global logging_backend_default journal
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 9
|
||||
%global dns_rc_manager_default auto
|
||||
%else
|
||||
%global dns_rc_manager_default symlink
|
||||
%endif
|
||||
%else
|
||||
%global logging_backend_default syslog
|
||||
%global dns_rc_manager_default file
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||
%global config_plugins_default_ifcfg_rh 0
|
||||
%bcond_with default_ifcfg_rh
|
||||
%else
|
||||
%global config_plugins_default_ifcfg_rh 1
|
||||
%bcond_without default_ifcfg_rh
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 36 || 0%{?rhel} >= 10
|
||||
%global split_ifcfg_rh 1
|
||||
%if 0%{?rhel} >= 10 || 0%{?fedora} >= 41
|
||||
%bcond_with ifcfg_rh
|
||||
%bcond_with split_ifcfg_rh
|
||||
%elif 0%{?fedora} >= 36
|
||||
%bcond_without ifcfg_rh
|
||||
%bcond_without split_ifcfg_rh
|
||||
%else
|
||||
%global split_ifcfg_rh 0
|
||||
%bcond_without ifcfg_rh
|
||||
%bcond_with split_ifcfg_rh
|
||||
%endif
|
||||
|
||||
%if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} >= 9
|
||||
%global ifcfg_warning 1
|
||||
%if (0%{?fedora} >= 36 && 0%{?fedora} < 39) || 0%{?rhel} == 9
|
||||
%bcond_without ifcfg_warning
|
||||
%else
|
||||
%global ifcfg_warning 0
|
||||
%bcond_with ifcfg_warning
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 39
|
||||
%global ifcfg_migrate 1
|
||||
%if %{with ifcfg_rh} && 0%{?fedora} >= 39
|
||||
%bcond_without ifcfg_migrate
|
||||
%else
|
||||
%global ifcfg_migrate 0
|
||||
%bcond_with ifcfg_migrate
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
@ -194,7 +172,7 @@ Group: System Environment/Base
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://networkmanager.dev/
|
||||
|
||||
Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
|
||||
Source: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/%{real_version}%{git_tag_version_suffix}/downloads/%{name}-%{real_version}.tar.xz
|
||||
Source1: NetworkManager.conf
|
||||
Source2: 00-server.conf
|
||||
Source4: 20-connectivity-fedora.conf
|
||||
@ -212,11 +190,10 @@ Patch0001: 0001-revert-change-default-value-for-ipv4.dad-timeout-from-0-to-200ms
|
||||
|
||||
# Bugfixes that are only relevant until next rebase of the package.
|
||||
# Patch1001: 1001-some.patch
|
||||
Patch1001: 1001-dnsconfd-fixes-rhel-79693.patch
|
||||
|
||||
Requires(post): systemd
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
Requires(post): systemd-udev
|
||||
%endif
|
||||
Requires(post): /usr/sbin/update-alternatives
|
||||
Requires(preun): systemd
|
||||
Requires(preun): /usr/sbin/update-alternatives
|
||||
@ -225,23 +202,40 @@ Requires(postun): systemd
|
||||
Requires: dbus >= %{dbus_version}
|
||||
Requires: glib2 >= %{glib2_version}
|
||||
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
%if "%{libndp_version}" != ""
|
||||
Requires: libndp >= %{libndp_version}
|
||||
|
||||
Recommends: iputils
|
||||
|
||||
%if 0%{?rhel} == 8
|
||||
# Older libndp versions use select() (rh#1933041). On well known distros,
|
||||
# choose a version that has the necessary fix.
|
||||
Requires: libndp >= 1.7-4
|
||||
%endif
|
||||
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
|
||||
Obsoletes: NetworkManager-wimax < 1:1.2
|
||||
%if 0%{?rhel} && 0%{?rhel} == 8
|
||||
%if 0%{?rhel} == 8
|
||||
Suggests: NetworkManager-initscripts-updown
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%if %{with split_ifcfg_rh}
|
||||
Obsoletes: NetworkManager < %{obsoletes_ifcfg_rh}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# Kept for RHEL to ensure that wired 802.1x works out of the box
|
||||
Requires: wpa_supplicant >= 1:1.1
|
||||
%if 0%{?rhel} >= 10
|
||||
%if 0%{without team}
|
||||
Obsoletes: NetworkManager-team < 1:1.47.5-3
|
||||
%endif
|
||||
Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.47.5-3
|
||||
Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.47.5-3
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} >= 41
|
||||
%if %{without ifcfg_rh}
|
||||
Obsoletes: NetworkManager-initscripts-ifcfg-rh < 1:1.49-3.1
|
||||
Obsoletes: NetworkManager-dispatcher-routing-rules < 1:1.49.3-1
|
||||
Obsoletes: NetworkManager-initscripts-updown < 1:1.49.3-1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
|
||||
@ -249,17 +243,18 @@ Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
|
||||
Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
|
||||
Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
|
||||
Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
|
||||
%if 0%{?rhel} >= 10
|
||||
%if 0%{without team}
|
||||
Conflicts: NetworkManager-team <= 1:1.47.5-3
|
||||
%endif
|
||||
Conflicts: NetworkManager-initscripts-ifcfg-rh <= 1:1.47.5-3
|
||||
Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
%if %{with meson}
|
||||
BuildRequires: meson
|
||||
%else
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
%endif
|
||||
BuildRequires: gettext-devel >= 0.19.8
|
||||
|
||||
BuildRequires: dbus-devel >= %{dbus_version}
|
||||
@ -268,11 +263,7 @@ BuildRequires: gobject-introspection-devel >= 0.10.3
|
||||
%if %{with ppp}
|
||||
BuildRequires: ppp-devel >= 2.4.5
|
||||
%endif
|
||||
%if %{with crypto_gnutls}
|
||||
BuildRequires: gnutls-devel >= 2.12
|
||||
%else
|
||||
BuildRequires: nss-devel >= 3.11.7
|
||||
%endif
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: audit-libs-devel
|
||||
%if %{with regen_docs}
|
||||
@ -310,17 +301,11 @@ BuildRequires: polkit-devel
|
||||
BuildRequires: jansson-devel
|
||||
%if %{with sanitizer}
|
||||
BuildRequires: libasan
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: libubsan
|
||||
%endif
|
||||
%endif
|
||||
%if %{with firewalld_zone}
|
||||
BuildRequires: firewalld-filesystem
|
||||
%endif
|
||||
BuildRequires: iproute
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: iproute-tc
|
||||
%endif
|
||||
|
||||
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
@ -363,12 +348,7 @@ Summary: Bluetooth device plugin for NetworkManager
|
||||
Group: System Environment/Base
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# No Requires:bluez to prevent it being installed when updating
|
||||
# to the split NM package
|
||||
%else
|
||||
Requires: bluez >= 4.101-5
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
|
||||
%description bluetooth
|
||||
@ -383,12 +363,10 @@ Group: System Environment/Base
|
||||
BuildRequires: teamd-devel
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
# Team was split from main NM binary between 0.9.10 and 1.0
|
||||
# We need this Obsoletes in addition to the one above
|
||||
# (git:3aede801521ef7bff039e6e3f1b3c7b566b4338d).
|
||||
Obsoletes: NetworkManager < 1:1.0.0
|
||||
%endif
|
||||
|
||||
%description team
|
||||
This package contains NetworkManager support for team devices.
|
||||
@ -407,13 +385,10 @@ Requires: wireless-regdb
|
||||
Requires: crda
|
||||
%endif
|
||||
|
||||
%if %{with iwd} && (0%{?fedora} >= 25 || 0%{?rhel} >= 8)
|
||||
%if %{with iwd}
|
||||
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
|
||||
Suggests: wpa_supplicant
|
||||
%else
|
||||
# Just require wpa_supplicant on platforms that don't support boolean
|
||||
# dependencies even though the plugin supports both supplicant and
|
||||
# iwd backend.
|
||||
Requires: wpa_supplicant >= %{wpa_supplicant_version}
|
||||
%endif
|
||||
|
||||
@ -429,12 +404,7 @@ This package contains NetworkManager support for Wifi and OLPC devices.
|
||||
Summary: Mobile broadband device plugin for NetworkManager
|
||||
Group: System Environment/Base
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# No Requires:ModemManager to prevent it being installed when updating
|
||||
# to the split NM package
|
||||
%else
|
||||
Requires: ModemManager
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
|
||||
%description wwan
|
||||
@ -537,10 +507,11 @@ This package is intended to be installed by default for server
|
||||
deployments.
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%package dispatcher-routing-rules
|
||||
Summary: NetworkManager dispatcher file for advanced routing rules
|
||||
Group: System Environment/Base
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%if %{with split_ifcfg_rh}
|
||||
Requires: %{name}-initscripts-ifcfg-rh
|
||||
%endif
|
||||
Requires: ipcalc
|
||||
@ -552,6 +523,7 @@ Obsoletes: %{name}-config-routing-rules < 1:1.31.0
|
||||
This adds a NetworkManager dispatcher file to support networking
|
||||
configurations using "/etc/sysconfig/network-scripts/rule-NAME" files
|
||||
(eg, to do policy-based routing).
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nmtui}
|
||||
@ -568,7 +540,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
|
||||
%endif
|
||||
|
||||
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%if %{with split_ifcfg_rh}
|
||||
%package initscripts-ifcfg-rh
|
||||
Summary: NetworkManager plugin for reading and writing connections in ifcfg-rh format
|
||||
Group: System Environment/Base
|
||||
@ -595,6 +567,7 @@ like Aliyun, Azure, EC2, GCP are supported.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%package initscripts-updown
|
||||
Summary: Legacy ifup/ifdown scripts for NetworkManager that replace initscripts (network-scripts)
|
||||
Group: System Environment/Base
|
||||
@ -607,6 +580,7 @@ Obsoletes: NetworkManager < %{obsoletes_initscripts_updown}
|
||||
Installs alternative ifup/ifdown scripts that talk to NetworkManager.
|
||||
This is only for backward compatibility with initscripts (network-scripts).
|
||||
Preferably use nmcli instead.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
@ -614,7 +588,6 @@ Preferably use nmcli instead.
|
||||
|
||||
|
||||
%build
|
||||
%if %{with meson}
|
||||
%meson \
|
||||
-Db_ndebug=false \
|
||||
--warnlevel 2 \
|
||||
@ -623,15 +596,13 @@ Preferably use nmcli instead.
|
||||
%endif
|
||||
-Dnft=%{_sbindir}/nft \
|
||||
-Diptables=%{_sbindir}/iptables \
|
||||
%if %{with dhclient}
|
||||
-Ddhclient=%{_sbindir}/dhclient \
|
||||
-Ddhcpcanon=no \
|
||||
-Ddhcpcd=no \
|
||||
-Dconfig_dhcp_default=%{dhcp_default} \
|
||||
%if %{with crypto_gnutls}
|
||||
-Dcrypto=gnutls \
|
||||
%else
|
||||
-Dcrypto=nss \
|
||||
-Ddhclient=no \
|
||||
%endif
|
||||
-Ddhcpcd=no \
|
||||
-Dcrypto=gnutls \
|
||||
%if %{with debug}
|
||||
-Dmore_logging=true \
|
||||
-Dmore_asserts=10000 \
|
||||
@ -721,7 +692,11 @@ Preferably use nmcli instead.
|
||||
-Ddbus_conf_dir=%{dbus_sys_dir} \
|
||||
-Dtests=yes \
|
||||
-Dvalgrind=no \
|
||||
%if %{with ifcfg_rh}
|
||||
-Difcfg_rh=true \
|
||||
%else
|
||||
-Difcfg_rh=false \
|
||||
%endif
|
||||
-Difupdown=false \
|
||||
%if %{with ppp}
|
||||
-Dppp=true \
|
||||
@ -729,183 +704,30 @@ Preferably use nmcli instead.
|
||||
-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
|
||||
%else
|
||||
-Dppp=false \
|
||||
%endif
|
||||
%if %{with firewalld_zone}
|
||||
-Dfirewalld_zone=true \
|
||||
%else
|
||||
-Dfirewalld_zone=false \
|
||||
%endif
|
||||
-Ddist_version=%{version}-%{release} \
|
||||
%if %{?config_plugins_default_ifcfg_rh}
|
||||
%if %{with default_ifcfg_rh}
|
||||
-Dconfig_plugins_default=ifcfg-rh \
|
||||
%endif
|
||||
%if %{?ifcfg_migrate}
|
||||
%if %{with ifcfg_migrate}
|
||||
-Dconfig_migrate_ifcfg_rh_default=true \
|
||||
%endif
|
||||
-Dresolvconf=no \
|
||||
-Dnetconfig=no \
|
||||
-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
|
||||
-Dconfig_logging_backend_default=%{logging_backend_default}
|
||||
-Dconfig_logging_backend_default=journal
|
||||
|
||||
%meson_build
|
||||
# Limit number of jobs on ppc64 to prevent high RAM usage
|
||||
%ifarch ppc64le
|
||||
%global numjobs 4
|
||||
%else
|
||||
%global numjobs %{_smp_build_ncpus}
|
||||
%endif
|
||||
|
||||
%else
|
||||
# autotools
|
||||
%if %{with regen_docs}
|
||||
gtkdocize
|
||||
%endif
|
||||
autoreconf --install --force
|
||||
%configure \
|
||||
--with-runstatedir=%{_rundir} \
|
||||
--enable-silent-rules=no \
|
||||
--enable-static=no \
|
||||
--with-nft=%{_sbindir}/nft \
|
||||
--with-iptables=%{_sbindir}/iptables \
|
||||
--with-dhclient=%{_sbindir}/dhclient \
|
||||
--with-dhcpcd=no \
|
||||
--with-dhcpcanon=no \
|
||||
--with-config-dhcp-default=%{dhcp_default} \
|
||||
%if %{with crypto_gnutls}
|
||||
--with-crypto=gnutls \
|
||||
%else
|
||||
--with-crypto=nss \
|
||||
%endif
|
||||
%if %{with sanitizer}
|
||||
--with-address-sanitizer=exec \
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
--enable-undefined-sanitizer=yes \
|
||||
%else
|
||||
--enable-undefined-sanitizer=no \
|
||||
%endif
|
||||
%else
|
||||
--with-address-sanitizer=no \
|
||||
--enable-undefined-sanitizer=no \
|
||||
%endif
|
||||
%if %{with debug}
|
||||
--enable-more-logging=yes \
|
||||
--with-more-asserts=10000 \
|
||||
%else
|
||||
--enable-more-logging=no \
|
||||
--with-more-asserts=0 \
|
||||
%endif
|
||||
--enable-ld-gc=yes \
|
||||
%if %{with lto}
|
||||
--enable-lto=yes \
|
||||
%else
|
||||
--enable-lto=no \
|
||||
%endif
|
||||
--with-libaudit=yes-disabled-by-default \
|
||||
%if 0%{?with_modem_manager_1}
|
||||
--with-modem-manager-1=yes \
|
||||
%else
|
||||
--with-modem-manager-1=no \
|
||||
%endif
|
||||
%if %{with wifi}
|
||||
--enable-wifi=yes \
|
||||
%if 0%{?fedora}
|
||||
--with-wext=yes \
|
||||
%else
|
||||
--with-wext=no \
|
||||
%endif
|
||||
%else
|
||||
--enable-wifi=no \
|
||||
%endif
|
||||
%if %{with iwd}
|
||||
--with-iwd=yes \
|
||||
%else
|
||||
--with-iwd=no \
|
||||
%endif
|
||||
%if %{with bluetooth}
|
||||
--enable-bluez5-dun=yes \
|
||||
%else
|
||||
--enable-bluez5-dun=no \
|
||||
%endif
|
||||
%if %{with nmtui}
|
||||
--with-nmtui=yes \
|
||||
%else
|
||||
--with-nmtui=no \
|
||||
%endif
|
||||
%if %{with nm_cloud_setup}
|
||||
--with-nm-cloud-setup=yes \
|
||||
%else
|
||||
--with-nm-cloud-setup=no \
|
||||
%endif
|
||||
--enable-vala=yes \
|
||||
--enable-introspection=yes \
|
||||
%if %{with regen_docs}
|
||||
--enable-gtk-doc=yes \
|
||||
%else
|
||||
--enable-gtk-doc=no \
|
||||
%endif
|
||||
%if %{with team}
|
||||
--enable-teamdctl=yes \
|
||||
%else
|
||||
--enable-teamdctl=no \
|
||||
%endif
|
||||
%if %{with ovs}
|
||||
--enable-ovs=yes \
|
||||
%else
|
||||
--enable-ovs=no \
|
||||
%endif
|
||||
--with-selinux=yes \
|
||||
--enable-polkit=yes \
|
||||
--enable-modify-system=yes \
|
||||
--enable-concheck=yes \
|
||||
%if 0%{?fedora}
|
||||
--with-libpsl=yes \
|
||||
%else
|
||||
--with-libpsl=no \
|
||||
%endif
|
||||
--with-ebpf=%{ebpf_enabled} \
|
||||
--with-session-tracking=systemd \
|
||||
--with-suspend-resume=systemd \
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-system-ca-path=/etc/pki/tls/cert.pem \
|
||||
--with-dbus-sys-dir=%{dbus_sys_dir} \
|
||||
--with-tests=yes \
|
||||
%if %{with test}
|
||||
--enable-more-warnings=error \
|
||||
%else
|
||||
--enable-more-warnings=yes \
|
||||
%endif
|
||||
--with-valgrind=no \
|
||||
--enable-ifcfg-rh=yes \
|
||||
--enable-ifupdown=no \
|
||||
%if %{with ppp}
|
||||
--enable-ppp=yes \
|
||||
--with-pppd="%{_sbindir}/pppd" \
|
||||
--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \
|
||||
%else
|
||||
--enable-ppp=no \
|
||||
%endif
|
||||
%if %{with firewalld_zone}
|
||||
--enable-firewalld-zone=yes \
|
||||
%else
|
||||
--enable-firewalld-zone=no \
|
||||
%endif
|
||||
--with-dist-version=%{version}-%{release} \
|
||||
%if %{?config_plugins_default_ifcfg_rh}
|
||||
--with-config-plugins-default=ifcfg-rh \
|
||||
%endif
|
||||
%if %{?ifcfg_migrate}
|
||||
--with-config-migrate-ifcfg-rh-default=yes \
|
||||
%endif
|
||||
--with-resolvconf=no \
|
||||
--with-netconfig=no \
|
||||
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
|
||||
--with-config-logging-backend-default=%{logging_backend_default} \
|
||||
--disable-autotools-deprecation
|
||||
|
||||
%make_build
|
||||
|
||||
%endif
|
||||
%meson_build -j %{numjobs}
|
||||
|
||||
%install
|
||||
%if %{with meson}
|
||||
%meson_install
|
||||
%else
|
||||
%make_install
|
||||
%endif
|
||||
|
||||
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
|
||||
|
||||
@ -925,16 +747,18 @@ cp %{SOURCE7} %{buildroot}%{_sysctldir}
|
||||
cp %{SOURCE6} %{buildroot}%{nmlibdir}/conf.d/
|
||||
%endif
|
||||
|
||||
%if 0%{?ifcfg_warning}
|
||||
%if %{with ifcfg_warning}
|
||||
cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
|
||||
%endif
|
||||
%if 0%{?ifcfg_migrate}
|
||||
%if %{with ifcfg_migrate}
|
||||
cp %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
|
||||
%endif
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
|
||||
ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
|
||||
ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/no-wait.d/
|
||||
%endif
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -943,33 +767,25 @@ rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
|
||||
rm -f %{buildroot}%{nmplugindir}/*.la
|
||||
|
||||
# Ensure the documentation timestamps are constant to avoid multilib conflicts
|
||||
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
|
||||
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference meson.build '{}' \+
|
||||
|
||||
%if 0%{?__debug_package} && ! 0%{?flatpak}
|
||||
mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
||||
cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
||||
%endif
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
touch %{buildroot}%{_sbindir}/ifup
|
||||
touch %{buildroot}%{_sbindir}/ifdown
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
%if %{with meson}
|
||||
%if %{with test}
|
||||
%meson_test
|
||||
%else
|
||||
%ninja_test -C %{_vpath_builddir} || :
|
||||
%endif
|
||||
%else
|
||||
# autotools
|
||||
%if %{with test}
|
||||
make -k %{?_smp_mflags} check
|
||||
%else
|
||||
make -k %{?_smp_mflags} check || :
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%pre
|
||||
if [ -f "%{_unitdir}/network-online.target.wants/NetworkManager-wait-online.service" ] ; then
|
||||
@ -988,13 +804,12 @@ if [ -S /run/udev/control ]; then
|
||||
/usr/bin/udevadm control --reload-rules || :
|
||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||
fi
|
||||
%if %{with firewalld_zone}
|
||||
%firewalld_reload
|
||||
%endif
|
||||
|
||||
%systemd_post %{systemd_units}
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%post initscripts-updown
|
||||
if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then
|
||||
# initscripts package too old, won't let us set an alternative
|
||||
@ -1003,6 +818,7 @@ else
|
||||
/usr/sbin/update-alternatives --install %{_sbindir}/ifup ifup %{_libexecdir}/nm-ifup 50 \
|
||||
--slave %{_sbindir}/ifdown ifdown %{_libexecdir}/nm-ifdown
|
||||
fi
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
@ -1022,10 +838,12 @@ fi
|
||||
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%preun initscripts-updown
|
||||
if [ $1 -eq 0 ]; then
|
||||
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
@ -1037,19 +855,11 @@ fi
|
||||
%postun
|
||||
/usr/bin/udevadm control --reload-rules || :
|
||||
/usr/bin/udevadm trigger --subsystem-match=net || :
|
||||
%if %{with firewalld_zone}
|
||||
%firewalld_reload
|
||||
%endif
|
||||
|
||||
%systemd_postun %{systemd_units}
|
||||
|
||||
|
||||
%if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel}
|
||||
%post libnm -p /sbin/ldconfig
|
||||
%postun libnm -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%postun cloud-setup
|
||||
%systemd_postun %{systemd_units_cloud_setup}
|
||||
@ -1060,7 +870,7 @@ fi
|
||||
%{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
|
||||
%{dbus_sys_dir}/nm-dispatcher.conf
|
||||
%{dbus_sys_dir}/nm-priv-helper.conf
|
||||
%if 0%{?split_ifcfg_rh} == 0
|
||||
%if %{with ifcfg_rh} && %{without split_ifcfg_rh}
|
||||
%{dbus_sys_dir}/nm-ifcfg-rh.conf
|
||||
%endif
|
||||
%{_sbindir}/%{name}
|
||||
@ -1088,7 +898,7 @@ fi
|
||||
%{_libexecdir}/nm-priv-helper
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{nmplugindir}
|
||||
%if 0%{?split_ifcfg_rh} == 0
|
||||
%if %{with ifcfg_rh} && %{without split_ifcfg_rh}
|
||||
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
|
||||
%endif
|
||||
%if %{with nmtui}
|
||||
@ -1110,14 +920,14 @@ fi
|
||||
%{_mandir}/man8/NetworkManager-dispatcher.8*
|
||||
%{_mandir}/man8/NetworkManager-wait-online.service.8*
|
||||
%dir %{_localstatedir}/lib/NetworkManager
|
||||
%if %{with ifcfg_rh}
|
||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||
%endif
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
|
||||
%{_datadir}/polkit-1/actions/*.policy
|
||||
%{_prefix}/lib/udev/rules.d/*.rules
|
||||
%if %{with firewalld_zone}
|
||||
%{_prefix}/lib/firewalld/zones/nm-shared.xml
|
||||
%endif
|
||||
# systemd stuff
|
||||
%{_unitdir}/NetworkManager.service
|
||||
%{_unitdir}/NetworkManager-wait-online.service
|
||||
@ -1125,7 +935,7 @@ fi
|
||||
%{_unitdir}/nm-priv-helper.service
|
||||
%dir %{_datadir}/doc/NetworkManager/examples
|
||||
%{_datadir}/doc/NetworkManager/examples/server.conf
|
||||
%if 0%{?ifcfg_warning} || 0%{?ifcfg_migrate}
|
||||
%if %{with ifcfg_warning} || %{with ifcfg_migrate}
|
||||
%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
|
||||
%endif
|
||||
%doc NEWS AUTHORS README.md CONTRIBUTING.md
|
||||
@ -1225,10 +1035,12 @@ fi
|
||||
%{nmlibdir}/conf.d/00-server.conf
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%files dispatcher-routing-rules
|
||||
%{nmlibdir}/dispatcher.d/10-ifcfg-rh-routes.sh
|
||||
%{nmlibdir}/dispatcher.d/no-wait.d/10-ifcfg-rh-routes.sh
|
||||
%{nmlibdir}/dispatcher.d/pre-up.d/10-ifcfg-rh-routes.sh
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with nmtui}
|
||||
@ -1241,7 +1053,7 @@ fi
|
||||
%endif
|
||||
|
||||
|
||||
%if 0%{?split_ifcfg_rh}
|
||||
%if %{with split_ifcfg_rh}
|
||||
%files initscripts-ifcfg-rh
|
||||
%{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so
|
||||
%{dbus_sys_dir}/nm-ifcfg-rh.conf
|
||||
@ -1260,14 +1072,86 @@ fi
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with ifcfg_rh}
|
||||
%files initscripts-updown
|
||||
%{_libexecdir}/nm-ifup
|
||||
%ghost %attr(755, root, root) %{_sbindir}/ifup
|
||||
%{_libexecdir}/nm-ifdown
|
||||
%ghost %attr(755, root, root) %{_sbindir}/ifdown
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Fed 17 2025 Beniamino Galvani <bgalvani@redhat.com> - 1:1.51.90-2
|
||||
- Fix state handling in the dnsconfd DNS plugin (RHEL-79693)
|
||||
|
||||
* Wed Feb 12 2025 Filip Pokryvka <fpokryvk@redhat.com> - 1:1.51.90-1
|
||||
- Fix balance-slb ports rarely not being active after reboot (RHEL-77167)
|
||||
|
||||
* Mon Feb 10 2025 Íñigo Huguet <ihuguet@redhat.com> - 1:1.51.7-2
|
||||
- Remove the build argument -flto-partition to avoid compilation crashes due
|
||||
to high memory usage.
|
||||
|
||||
* Fri Feb 07 2025 Vladimír Beneš <vbenes@redhat.com> - 1:1.51.7-1
|
||||
- Update to 1.51.7 (dev)
|
||||
- Add support in initramfs generator for parsing NM eDNS configuration (RHEL-70420)
|
||||
- Add new dnsconfd DNS backend (RHEL-67917)
|
||||
|
||||
* Mon Jan 20 2025 Beniamino Galvani <bgalvani@redhat.com> - 1:1.51.6-1
|
||||
- Update to 1.51.6 (dev)
|
||||
- Honor the routing-rules property for VPN connections (RHEL-69899)
|
||||
- Fix potential crash when ipv4.dhcp-send-release is enabled (RHEL-67918)
|
||||
- Support encrypted DNS servers (RHEL-66260)
|
||||
- Fix configuration of VLAN ingress/egress QoS mapping (RHEL-72475)
|
||||
|
||||
* Fri Dec 27 2024 Íñigo Huguet <ihuguet@redhat.com> - 1:1.51.5-1
|
||||
- Upgrade to 1.51.5 (dev)
|
||||
- Never retry ACD on NOARP interfaces (RHEL-47301)
|
||||
- Delete routes added by NM to tables different than main (RHEL-67324)
|
||||
- Honor route-table property for the route to VPN server (RHEL-69901)
|
||||
- Send GARP on bonding-slb failover (RHEL-59558)
|
||||
|
||||
* Fri Nov 15 2024 Íñigo Huguet <ihuguet@redhat.com> - 1:1.51.4-1
|
||||
- Upgrade to 1.51.4 (dev)
|
||||
- Add iputils as recommended dependency for ping command
|
||||
- Fix configs shown with NetworkManger --print-config (RHEL-14438)
|
||||
- Added ip-ping-addresses to check other hosts presence on activation (RHEL-21160)
|
||||
- Support ethtool Forward Error Correction (FEC) (RHEL-24055)
|
||||
|
||||
* Mon Nov 04 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.51.3-1
|
||||
- Upgrade to 1.51.3 (dev)
|
||||
- Support configuring dhcp-send-hostname globally (RHEL-32685)
|
||||
- cloud-setup: Support OCI (Oracle Cloud) provider (RHEL-62729)
|
||||
- Support automatically adding DNS routes (RHEL-56555)
|
||||
- Support IPv6-Only Preferred DHCPv4 option (RHEL-58660)
|
||||
- Only validate SR-IOV capacity when enabled (RHEL-58397)
|
||||
- Steer IGMP/MLD queries to the active bond balance-slb primary port (RHEL-59559)
|
||||
|
||||
* Fri Oct 11 2024 Íñigo Huguet <ihuguet@redhat.com> - 1:1.51.2-2
|
||||
- Add ipcalc as dependency of NetworkManager-dispatcher-routing-rules again (RHEL-62201)
|
||||
|
||||
* Mon Sep 30 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.51.2-1
|
||||
- Upgrade to 1.51.2 (dev)
|
||||
- Fix race condition on OVS interface deletion (RHEL-50747)
|
||||
- Fix validation of DPDK interface name (RHEL-60022)
|
||||
- Support IPVLAN interface (RHEL-47334)
|
||||
|
||||
* Mon Sep 16 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.51.1-1
|
||||
- Upgrade to 1.51.1 (dev)
|
||||
- Use meson and remove autotools configuration
|
||||
- Fix crashes (SIGABRT) in several functions (RHEL-17840)
|
||||
|
||||
* Tue Sep 10 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.51.0-1
|
||||
- Upgrade to 1.51.0
|
||||
- cloud-setup: Fix primary and secondary address swap in Azure (RHEL-50855)
|
||||
|
||||
* Fri Aug 30 2024 Lubomir Rintel <lkundrak@v3.sk> - 1:1.49.90-1
|
||||
- Upgrade to 1.50 pre-release (rc1)
|
||||
- Retry reverse hostname resolution when it fails (RHEL-17972)
|
||||
- Allow VPNs to supply IP configurations with routes but no addresses (RHEL-21875)
|
||||
- Warn of dhclient deprecation when it's explicitly chose (RHEL-24622)
|
||||
- Allow cloud-setup to restart more rapidly (RHEL-49694)
|
||||
|
||||
* Thu Aug 22 2024 Íñigo Huguet <ihuguet@redhat.com> - 1:1.48.10-1
|
||||
- Unblock the autoconnect for children when parent is available (RHEL-46904)
|
||||
- Fix crash produced by malformed LLDP package when debug logging (RHEL-46199)
|
||||
|
Loading…
Reference in New Issue
Block a user