import NetworkManager-1.32.10-2.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
58a0474b56
commit
7511ee8b26
|
|
@ -1 +1 @@
|
|||
550918f97f1614532a317465220d6b5cab08d47a SOURCES/NetworkManager-1.30.0.tar.xz
|
||||
d2b4c08e920b5c96c128041948e3092eedcbba80 SOURCES/NetworkManager-1.32.10.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/NetworkManager-1.30.0.tar.xz
|
||||
SOURCES/NetworkManager-1.32.10.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
From 6069af3e7a7d506c02f007c71e2a9271b8ef3d09 Mon Sep 17 00:00:00 2001
|
||||
From 45f33b5379c41f34fb1a27452e5f62e2d571e85e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 16 Jan 2020 13:40:26 +0100
|
||||
Subject: [PATCH 1/1] cloud-setup: avoid unsupported systemd settings in
|
||||
Subject: [PATCH] cloud-setup: avoid unsupported systemd settings in
|
||||
nm-cloud-setup.service init for rhel-8.2
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1791758
|
||||
---
|
||||
clients/cloud-setup/nm-cloud-setup.service.in | 6 +++---
|
||||
src/nm-cloud-setup/nm-cloud-setup.service.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in
|
||||
index 9866acd8b0ae..a3df3863c4df 100644
|
||||
--- a/clients/cloud-setup/nm-cloud-setup.service.in
|
||||
+++ b/clients/cloud-setup/nm-cloud-setup.service.in
|
||||
@@ -22,15 +22,15 @@ PrivateDevices=yes
|
||||
diff --git a/src/nm-cloud-setup/nm-cloud-setup.service.in b/src/nm-cloud-setup/nm-cloud-setup.service.in
|
||||
index f4b0e2638f14..c59bd47574ba 100644
|
||||
--- a/src/nm-cloud-setup/nm-cloud-setup.service.in
|
||||
+++ b/src/nm-cloud-setup/nm-cloud-setup.service.in
|
||||
@@ -28,15 +28,15 @@ PrivateDevices=yes
|
||||
PrivateTmp=yes
|
||||
ProtectControlGroups=yes
|
||||
ProtectHome=yes
|
||||
|
|
@ -33,5 +33,5 @@ index 9866acd8b0ae..a3df3863c4df 100644
|
|||
|
||||
[Install]
|
||||
--
|
||||
2.26.2
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
From af25d85a43eb2aa59a80c13aa214cbc5509b6815 Mon Sep 17 00:00:00 2001
|
||||
From: Wen Liang <wenliang@redhat.com>
|
||||
Date: Wed, 16 Jun 2021 22:43:32 +0200
|
||||
Subject: [PATCH] firewall: Default to iptables backend to preserve behavior
|
||||
|
||||
For upsteam, the default is "nftables" (if nft is installed). On RHEL8, we will
|
||||
always default to "iptables" to preserve behavior.
|
||||
---
|
||||
src/core/nm-firewall-utils.c | 9 +++------
|
||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c
|
||||
index a2446553b76f..5525a677cb1d 100644
|
||||
--- a/src/core/nm-firewall-utils.c
|
||||
+++ b/src/core/nm-firewall-utils.c
|
||||
@@ -744,12 +744,9 @@ nm_firewall_config_apply(NMFirewallConfig *self, gboolean shared)
|
||||
static NMFirewallBackend
|
||||
_firewall_backend_detect(void)
|
||||
{
|
||||
- if (g_file_test(NFT_PATH, G_FILE_TEST_IS_EXECUTABLE))
|
||||
- return NM_FIREWALL_BACKEND_NFTABLES;
|
||||
- if (g_file_test(IPTABLES_PATH, G_FILE_TEST_IS_EXECUTABLE))
|
||||
- return NM_FIREWALL_BACKEND_IPTABLES;
|
||||
-
|
||||
- return NM_FIREWALL_BACKEND_NFTABLES;
|
||||
+ /* For upsteam, the default is "nftables" (if nft is installed). On RHEL8, we will
|
||||
+ * always default to "iptables" to preserve behavior. */
|
||||
+ return NM_FIREWALL_BACKEND_IPTABLES;
|
||||
}
|
||||
|
||||
NMFirewallBackend
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
From af06ca8b1190240146f746f8aeca6fd11bfbe6ad Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 13:35:27 +0200
|
||||
Subject: [PATCH] platform: fix capturing addresses from platform for assuming
|
||||
after restart
|
||||
|
||||
Commit c631aa48f034 ('platform: capture NMIP[46]Config from platform
|
||||
with correct (reversed) order of IP addresses') changed this for IPv6
|
||||
and IPv4, but it's not correct for IPv4.
|
||||
|
||||
For IPv6, later `ip addr add` calls adds a new primary address, which
|
||||
is also listed in `ip addr show` first. Hence, as NMIP6Config tracks
|
||||
addresses in increasing priority, while NMPlatform tracks them as
|
||||
exposed by kernel, the order when appending addresses form platform
|
||||
to NMIP6Config must be reversed.
|
||||
|
||||
That is not the case for IPv4. For IPv4, later `ip addr add` calls
|
||||
add a secondary IP address. Also, in `ip addr show` output they are
|
||||
appended. Consequently, IPv4 addresses are tracked by NMPlatform with
|
||||
decreasing priority (in the reverse order than for IPv6).
|
||||
|
||||
Fix constructing the NMIP4Config by fixing the address order. This is
|
||||
important, because during restart devices get assumed and our code would
|
||||
configure the order of addresses as it finds them.
|
||||
|
||||
Fixes: c631aa48f034 ('platform: capture NMIP[46]Config from platform with correct (reversed) order of IP addresses')
|
||||
(cherry picked from commit c380893dc6757e30b429f968bc90bc1edda68998)
|
||||
(cherry picked from commit 605373b38ab463826bd7eb80408fb2cfae07ee91)
|
||||
---
|
||||
src/core/nm-ip4-config.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c
|
||||
index 90531d0291..52a8faa791 100644
|
||||
--- a/src/core/nm-ip4-config.c
|
||||
+++ b/src/core/nm-ip4-config.c
|
||||
@@ -543,7 +543,7 @@ nm_ip4_config_capture(NMDedupMultiIndex *multi_idx, NMPlatform *platform, int if
|
||||
|
||||
head_entry = nm_platform_lookup_object(platform, NMP_OBJECT_TYPE_IP4_ADDRESS, ifindex);
|
||||
if (head_entry) {
|
||||
- nmp_cache_iter_for_each_reverse (&iter, head_entry, &plobj) {
|
||||
+ nmp_cache_iter_for_each (&iter, head_entry, &plobj) {
|
||||
if (!_nm_ip_config_add_obj(priv->multi_idx,
|
||||
&priv->idx_ip4_addresses_,
|
||||
ifindex,
|
||||
--
|
||||
2.26.3
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
From d0ba892917461659b5b1e429fb217218ff204379 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Thu, 19 Aug 2021 13:53:29 +0200
|
||||
Subject: [PATCH] nmcli/docs: fix address order in ipv46.addresses
|
||||
documentation for `man nm-settings-nmcli`
|
||||
|
||||
For IPv4, the order is not like for IPv6. Of course not.
|
||||
|
||||
Fixes: 7aa4ad0fa22c ('nmcli/docs: better describe ipv[46].addresses in `man nm-settings-nmcli`')
|
||||
(cherry picked from commit 2f3c2647d2263bf565fd21d14a3db56f6a063b91)
|
||||
(cherry picked from commit dd8bc31fdb37acc2780f94defeb54e80bb1acf53)
|
||||
---
|
||||
src/libnm-core-impl/nm-setting-ip4-config.c | 2 +-
|
||||
src/libnmc-setting/settings-docs.h.in | 2 +-
|
||||
src/nmcli/generate-docs-nm-settings-nmcli.xml.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
index b3a18bcae7..a24ebcfb5c 100644
|
||||
--- a/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
+++ b/src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
@@ -967,7 +967,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
|
||||
* format: a comma separated list of addresses
|
||||
* description: 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 increasing priority, meaning the last address will
|
||||
+ * The addresses are listed in decreasing priority, meaning the first address will
|
||||
* be the primary address.
|
||||
* ---end---
|
||||
*/
|
||||
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
|
||||
index 12625d4459..85c5aca1e4 100644
|
||||
--- a/src/libnmc-setting/settings-docs.h.in
|
||||
+++ b/src/libnmc-setting/settings-docs.h.in
|
||||
@@ -226,7 +226,7 @@
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_REMOTE N_("The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TOS N_("The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.")
|
||||
#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_TTL N_("The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.")
|
||||
-#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 increasing priority, meaning the last address will be the primary address.")
|
||||
+#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_DAD_TIMEOUT N_("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. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.")
|
||||
#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. If unset, a globally configured default is used. If still unset, the default depends on the 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.")
|
||||
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
index 88803094d6..ca5225ba28 100644
|
||||
--- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
+++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in
|
||||
@@ -650,7 +650,7 @@
|
||||
description="DNS servers priority. The relative priority for DNS servers specified by this setting. A lower numerical value is better (higher priority). Negative values have the special effect of excluding other configurations with a greater numerical priority value; so in presence of at least one negative priority, only DNS servers from connections with the lowest priority value will be used. To avoid all DNS leaks, set the priority of the profile that should be used to the most negative value of all active connections profiles. Zero selects a globally configured default value. If the latter is missing or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for other connections. Note that the priority is to order DNS settings for multiple active connections. It does not disambiguate multiple DNS servers within the same connection profile. When multiple devices have configurations with the same priority, VPNs will be considered first, then devices with the best (lowest metric) default route and then all other devices. When using dns=default, servers with higher priority will be on top of resolv.conf. To prioritize a given server over another one within the same connection, just specify them in the desired order. Note that commonly the resolver tries name servers in /etc/resolv.conf in the order listed, proceeding with the next server in the list on failure. See for example the "rotate" option of the dns-options setting. If there are any negative DNS priorities, then only name servers from the devices with that lowest priority will be considered. When using a DNS resolver that supports Conditional Forwarding or Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection is used to query domains in its search list. The search domains determine which name servers to ask, and the DNS priority is used to prioritize name servers based on the domain. Queries for domains not present in any search list are routed through connections having the '~.' special wildcard domain, which is added automatically to connections with the default route (or can be added manually). When multiple connections specify the same domain, the one with the best priority (lowest numerical value) wins. If a sub domain is configured on another interface it will be accepted regardless the priority, unless parent domain on the other interface has a negative priority, which causes the sub domain to be shadowed. With Split DNS one can avoid undesired DNS leaks by properly configuring DNS priorities and the search domains, so that only name servers of the desired interface are configured." />
|
||||
<property name="addresses"
|
||||
alias="ip4"
|
||||
- description="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 increasing priority, meaning the last address will be the primary address." />
|
||||
+ description="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." />
|
||||
<property name="gateway"
|
||||
alias="gw4"
|
||||
description="The gateway associated with this configuration. This is only meaningful if "addresses" is also set. The gateway's main purpose is to control the next hop of the standard default route on the device. Hence, the gateway property conflicts with "never-default" and will be automatically dropped if the IP configuration is set to never-default. As an alternative to set the gateway, configure a static default route with /0 as prefix length." />
|
||||
--
|
||||
2.26.3
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From ce8ee35cb4e94e85ac1ecb268c6fa1ea14b1ae8d Mon Sep 17 00:00:00 2001
|
||||
From f7019f666002878544e2d9de23321bd19a60a808 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Tue, 27 Aug 2019 15:47:32 +0200
|
||||
Subject: [PATCH 1/1] patch documentation with the proper default values
|
||||
Subject: [PATCH] patch documentation with the proper default values
|
||||
|
||||
We don't regenerate the documentation for RHEL builds, but
|
||||
the docs from the tarball are generated with a certain set
|
||||
|
|
@ -14,10 +14,10 @@ Patch the man pages with the proper values.
|
|||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
|
||||
index 44b25c4cbc9d..1ee9c2fb1e83 100644
|
||||
index e348806a1eb1..377d4f7d56cc 100644
|
||||
--- a/docs/api/html/NetworkManager.conf.html
|
||||
+++ b/docs/api/html/NetworkManager.conf.html
|
||||
@@ -574,7 +574,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
|
||||
@@ -658,7 +658,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
|
||||
are "<code class="literal">syslog</code>" and "<code class="literal">journal</code>".
|
||||
When NetworkManager is started with "<code class="literal">--debug</code>"
|
||||
in addition all messages will be printed to stderr.
|
||||
|
|
@ -27,10 +27,10 @@ index 44b25c4cbc9d..1ee9c2fb1e83 100644
|
|||
</tr>
|
||||
<tr>
|
||||
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
|
||||
index 396267e3ec09..7702b84b04fc 100644
|
||||
index efb79accfd2a..07d8dda62147 100644
|
||||
--- a/man/NetworkManager.conf.5
|
||||
+++ b/man/NetworkManager.conf.5
|
||||
@@ -598,7 +598,7 @@ INFO\&.
|
||||
@@ -664,7 +664,7 @@ INFO\&.
|
||||
.PP
|
||||
\fIbackend\fR
|
||||
.RS 4
|
||||
|
|
@ -40,5 +40,5 @@ index 396267e3ec09..7702b84b04fc 100644
|
|||
.PP
|
||||
\fIaudit\fR
|
||||
--
|
||||
2.26.2
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -3,20 +3,18 @@
|
|||
# See "man 5 NetworkManager.conf" for details.
|
||||
#
|
||||
# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/
|
||||
# can contain additional configuration snippets installed by packages. These files are
|
||||
# can contain additional .conf snippets installed by packages. These files are
|
||||
# read before NetworkManager.conf and have thus lowest priority.
|
||||
# The directory /etc/NetworkManager/conf.d/ can contain additional configuration
|
||||
# The directory /etc/NetworkManager/conf.d/ can contain additional .conf
|
||||
# snippets. Those snippets are merged last and overwrite the settings from this main
|
||||
# file.
|
||||
#
|
||||
# The files within one conf.d/ directory are read in asciibetical order.
|
||||
#
|
||||
# If /etc/NetworkManager/conf.d/ contains a file with the same name as
|
||||
# /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored.
|
||||
# Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can
|
||||
# put an empty file to /etc with the same name. The same applies with respect
|
||||
# to the directory /run/NetworkManager/conf.d where files in /run shadow
|
||||
# /usr/lib and are themselves shadowed by files under /etc.
|
||||
# You can prevent loading a file /usr/lib/NetworkManager/conf.d/NAME.conf
|
||||
# by having a file NAME.conf in either /run/NetworkManager/conf.d/ or /etc/NetworkManager/conf.d/.
|
||||
# Likewise, snippets from /run can be prevented from loading by placing
|
||||
# a file with the same name in /etc/NetworkManager/conf.d/.
|
||||
#
|
||||
# If two files define the same key, the one that is read afterwards will overwrite
|
||||
# the previous one.
|
||||
|
|
@ -30,8 +28,7 @@
|
|||
#
|
||||
# Logfiles contain no passwords and little sensitive information. But please
|
||||
# check before posting the file online. You can also personally hand over the
|
||||
# logfile to a NM developer to treat it confidential. Meet us on #nm on freenode.
|
||||
# Please post full logfiles except minimal modifications of private data.
|
||||
# logfile to a NM developer to treat it confidential. Meet us on #nm on Libera.Chat.
|
||||
#
|
||||
# You can also change the log-level at runtime via
|
||||
# $ nmcli general logging level TRACE domains ALL
|
||||
|
|
@ -42,9 +39,14 @@
|
|||
# You will find the logfiles in syslog, for example via
|
||||
# $ journalctl -u NetworkManager
|
||||
#
|
||||
# Please post full logfiles for bug reports without pre-filtering or truncation.
|
||||
# Also, for debugging the entire `journalctl` output can be interesting. Don't
|
||||
# limit unnecessarily with `journalctl -u`. Exceptions are if you are worried
|
||||
# about private data. Check before posting logfiles!
|
||||
#
|
||||
# Note that debug logging of NetworkManager can be quite verbose. Some messages
|
||||
# might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst
|
||||
# in man journald.conf). Please disable rate-limiting before collecting debug logs.
|
||||
# in man journald.conf). Please disable rate-limiting before collecting debug logs!
|
||||
#
|
||||
#level=TRACE
|
||||
#domains=ALL
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
||||
|
||||
%global epoch_version 1
|
||||
%global rpm_version 1.30.0
|
||||
%global real_version 1.30.0
|
||||
%global release_version 1
|
||||
%global rpm_version 1.32.10
|
||||
%global real_version 1.32.10
|
||||
%global release_version 2
|
||||
%global snapshot %{nil}
|
||||
%global git_sha %{nil}
|
||||
|
||||
|
|
@ -60,10 +60,8 @@
|
|||
%bcond_without ppp
|
||||
%bcond_without nmtui
|
||||
%bcond_without nm_cloud_setup
|
||||
|
||||
# on RHEL we don't regenerate the documentation
|
||||
%bcond_with regen_docs
|
||||
|
||||
%if %{bcond_default_debug}
|
||||
%bcond_without debug
|
||||
%else
|
||||
|
|
@ -108,7 +106,7 @@
|
|||
|
||||
###############################################################################
|
||||
|
||||
%if 0%{?fedora}
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%global dbus_version 1.9.18
|
||||
%global dbus_sys_dir %{_datadir}/dbus-1/system.d
|
||||
%else
|
||||
|
|
@ -116,6 +114,14 @@
|
|||
%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
|
||||
%else
|
||||
|
|
@ -184,9 +190,11 @@ Source6: 70-nm-connectivity.conf
|
|||
# These are not bugfixes, hence they are also relevant after
|
||||
# the next rebase of the source tarball.
|
||||
Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch
|
||||
Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch
|
||||
|
||||
# Bugfixes that are only relevant until next rebase of the package.
|
||||
# Patch1000: some.patch
|
||||
Patch1000: 1000-platform-fix-capturing-addresses-from-platform-for-assuming-after-restart.patch
|
||||
Patch1001: 1001-nmcli-docs-fix-address-order-in-ipv46-addresses-documentation-for-nm-settings-nmcli.patch
|
||||
|
||||
# The pregenerated docs contain default values and paths that depend
|
||||
# on the configure options when creating the source tarball.
|
||||
|
|
@ -203,7 +211,9 @@ Requires(postun): systemd
|
|||
Requires: dbus >= %{dbus_version}
|
||||
Requires: glib2 >= %{glib2_version}
|
||||
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: dhcdbd
|
||||
%if "%{libndp_version}" != ""
|
||||
Requires: libndp >= %{libndp_version}
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
Obsoletes: NetworkManager < %{obsoletes_ppp_plugin}
|
||||
Obsoletes: NetworkManager-wimax < 1.2
|
||||
|
|
@ -252,7 +262,6 @@ BuildRequires: gtk-doc
|
|||
BuildRequires: libudev-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: /usr/bin/valac
|
||||
BuildRequires: iptables
|
||||
BuildRequires: libxslt
|
||||
%if %{with bluetooth}
|
||||
BuildRequires: bluez-libs-devel
|
||||
|
|
@ -310,7 +319,7 @@ Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
|
|||
# that the scripts that would parse the SPEC file naively would be unlikely
|
||||
# to fail. Refer to git log for the real date and commit number of last
|
||||
# synchronization:
|
||||
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/master/src/systemd
|
||||
# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commits/main/src/
|
||||
Provides: bundled(systemd) = 0
|
||||
|
||||
|
||||
|
|
@ -328,7 +337,6 @@ Summary: ADSL device plugin for NetworkManager
|
|||
Group: System Environment/Base
|
||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
Obsoletes: NetworkManager-atm
|
||||
|
||||
%description adsl
|
||||
This package contains NetworkManager support for ADSL devices.
|
||||
|
|
@ -348,7 +356,6 @@ Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
|
|||
Requires: bluez >= 4.101-5
|
||||
%endif
|
||||
Obsoletes: NetworkManager < %{obsoletes_device_plugins}
|
||||
Obsoletes: NetworkManager-bt
|
||||
|
||||
%description bluetooth
|
||||
This package contains NetworkManager support for Bluetooth devices.
|
||||
|
|
@ -453,7 +460,7 @@ This package contains NetworkManager support for PPP.
|
|||
%package libnm
|
||||
Summary: Libraries for adding NetworkManager support to applications.
|
||||
Group: Development/Libraries
|
||||
Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
|
||||
Conflicts: NetworkManager-glib < 1:1.31.0
|
||||
License: LGPLv2+
|
||||
|
||||
%description libnm
|
||||
|
|
@ -521,7 +528,7 @@ Summary: NetworkManager dispatcher file for advanced routing rules
|
|||
Group: System Environment/Base
|
||||
BuildArch: noarch
|
||||
Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-config-routing-rules < 1:1.31.0
|
||||
|
||||
%description dispatcher-routing-rules
|
||||
This adds a NetworkManager dispatcher file to support networking
|
||||
|
|
@ -569,6 +576,8 @@ This tool is still experimental.
|
|||
%if %{with test}
|
||||
--werror \
|
||||
%endif
|
||||
-Dnft=/usr/sbin/nft \
|
||||
-Diptables=/usr/sbin/iptables \
|
||||
-Ddhcpcanon=no \
|
||||
-Ddhcpcd=no \
|
||||
-Dconfig_dhcp_default=%{dhcp_default} \
|
||||
|
|
@ -697,6 +706,8 @@ intltoolize --automake --copy --force
|
|||
--with-runstatedir=%{_rundir} \
|
||||
--disable-silent-rules \
|
||||
--disable-static \
|
||||
--with-nft=/usr/sbin/nft \
|
||||
--with-iptables=/usr/sbin/iptables \
|
||||
--with-dhclient=yes \
|
||||
--with-dhcpcd=no \
|
||||
--with-dhcpcanon=no \
|
||||
|
|
@ -983,6 +994,7 @@ fi
|
|||
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
|
||||
%dir %{_sysconfdir}/%{name}/system-connections
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
|
||||
%ghost %{_sysconfdir}/%{name}/VPN
|
||||
%{_bindir}/nm-online
|
||||
%{_libexecdir}/nm-ifup
|
||||
%ghost %attr(755, root, root) %{_sbindir}/ifup
|
||||
|
|
@ -992,6 +1004,7 @@ fi
|
|||
%{_libexecdir}/nm-dispatcher
|
||||
%{_libexecdir}/nm-iface-helper
|
||||
%{_libexecdir}/nm-initrd-generator
|
||||
%{_libexecdir}/nm-daemon-helper
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{nmplugindir}
|
||||
%{nmplugindir}/libnm-settings-plugin*.so
|
||||
|
|
@ -1011,6 +1024,7 @@ fi
|
|||
%{_mandir}/man7/nmcli-examples.7*
|
||||
%{_mandir}/man8/nm-initrd-generator.8.gz
|
||||
%{_mandir}/man8/NetworkManager.8.gz
|
||||
%{_mandir}/man8/NetworkManager-dispatcher.8.gz
|
||||
%dir %{_localstatedir}/lib/NetworkManager
|
||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||
|
|
@ -1025,7 +1039,7 @@ fi
|
|||
%{systemd_dir}/NetworkManager-dispatcher.service
|
||||
%dir %{_datadir}/doc/NetworkManager/examples
|
||||
%{_datadir}/doc/NetworkManager/examples/server.conf
|
||||
%doc NEWS AUTHORS README CONTRIBUTING TODO
|
||||
%doc NEWS AUTHORS README CONTRIBUTING.md TODO
|
||||
%license COPYING
|
||||
%license COPYING.LGPL
|
||||
%license COPYING.GFDL
|
||||
|
|
@ -1150,6 +1164,91 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 19 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.10-2
|
||||
- platform: fix capturing IPv4 addresses from platform for assuming after restart (rh #1988751)
|
||||
|
||||
* Wed Aug 18 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.10-1
|
||||
- update to 1.32.10 release
|
||||
- nm-initrd-generator: add kernel command line options ethtool autoneg and speed (rh #1940934)
|
||||
- IP: fix the order of IP addresses during service restart (rh #1988751)
|
||||
|
||||
* Tue Aug 10 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.32.8-1
|
||||
- Upgrade to 1.32.8 release
|
||||
- firewalld: configure zones on "Reloaded" signal (rh #1982403)
|
||||
- ethtool: support configuring newer gigabit ethernet speeds (rh #1897004)
|
||||
- core: fix wrong MTU for bridge interfaces (rh #1973536)
|
||||
- cloud-setup: fix gateway address for Aliyun cloud (rh #1823315)
|
||||
|
||||
* Thu Jul 29 2021 Gris Ge <fge@redhat.com> - 1:1.32.6-1
|
||||
- Upgrade to 1.32.6 release
|
||||
- core: fix adding stale local routes when address changes (rh #1979192)
|
||||
- dhcp: handle filename/bootfile_name DHCP option and write it to device state
|
||||
file for initrd/kickstart (rh #1979387)
|
||||
- initrd: add "ib.pkey=" command line option (rh #1805708)
|
||||
- core: introduce "keep-configuration" device option to forcefully activate a
|
||||
profile on start (rh #1934122)
|
||||
|
||||
* Wed Jul 21 2021 Gris Ge <fge@redhat.com> - 1:1.32.4-1
|
||||
- Upgrade to 1.32.4 with fixes of:
|
||||
- nmcli: show DNS SEARCH field in device information. (rh #1852317)
|
||||
- device: avoid crash setting VPN config during unrealize. (rh #1912423)
|
||||
- core: send ARP announcements when there is carrier. (rh #1956793)
|
||||
- core: add ipv[46].required-timeout option to wait for IP configuration while activating. (rh #1961666)
|
||||
- core: start DHCPv6 when a prefix delegation is needed for shared mode. (rh #1973199)
|
||||
- ifcfg: log warning about invalid keys in ifcfg files. (rh #1959656)
|
||||
- cloud-setup: add support for Aliyun cloud. (rh #1823315)
|
||||
|
||||
* Thu Jul 1 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.2-1
|
||||
- update to 1.32.2 release
|
||||
- device: prefer IPv6 not-deprecated addresses for hostname lookup (rh #1820770)
|
||||
- docs: describe qdiscs and tfilters in nm-settings manpage (rh #1847894)
|
||||
- cloud-setup: preserve IPv4 addresses/routes/rules from profile (rh #1971527)
|
||||
- daemon: performance improvements (rh #1847125)
|
||||
- dhcp/systemd: ignore FORCERENEW requests for DHCPV4 (rh #1961251, CVE-2020-13529)
|
||||
- Add bridge_role in 802-3-ethernet.s390-options using nmcli (rh #1935842)
|
||||
|
||||
* Fri Jun 18 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.0-1
|
||||
- update to 1.32.0 release
|
||||
- veth: fix null error when deleting the device (rh #1915278)
|
||||
- veth: fix crash when deleting the device profile (rh #1915276)
|
||||
- firewall: add new "nftables" firewall-backend (rh #1548825)
|
||||
- DNS: fix lookup of hostname via DNS (rh #1970335)
|
||||
|
||||
* Mon Jun 7 2021 Thomas Haller <thaller@redhat.com> - 1:1.32.0-0.5
|
||||
- update to 1.32-rc1 (1.31.90) (release candidate)
|
||||
- core: allow to preserved external TFilter and QDisc settings (rh #1928078)
|
||||
- bond: support "tlb_dynamic_lb" in "balance-alb" mode (rh #1959934)
|
||||
|
||||
* Thu May 20 2021 Wen Liang <wenliang@redhat.com> - 1:1.32.0-0.4
|
||||
- Update to 1.31.5 (development)
|
||||
- core: configure MTU early before DHCP completes (rh #1890234)
|
||||
- core: fix activation handling for ports (rh #1955101, rh #1959961)
|
||||
- core: add support for ethtool pause parameters (rh #1899372)
|
||||
- dhcp: support option 249 (Microsoft Classless Static Route) (rh #1959461)
|
||||
|
||||
* Wed May 5 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.32.0-0.3
|
||||
- Update to 1.31.4 (development)
|
||||
- core: fix assertion failure in activation handling (rh #1933719)
|
||||
|
||||
* Thu Apr 22 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.32.0-0.2
|
||||
- Update to 1.31.3 (development)
|
||||
|
||||
* Thu Mar 25 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.32.0-0.1
|
||||
- Update to 1.31.2 (development)
|
||||
|
||||
* Tue Mar 23 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.30.0-5
|
||||
- bond: restore MAC on release only when there is a cloned MAC address (rh #1933292)
|
||||
|
||||
* Fri Mar 12 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.30.0-4
|
||||
- initrd: apply the MTU from bond= argument to the bond connection (rh #1936610)
|
||||
|
||||
* Fri Mar 12 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-3
|
||||
- Increase LimitNOFILE to allow more than 1024 file descriptors (rh #1926599).
|
||||
This requires a suitable libndp version that can handle many file descriptors (rh #1933041).
|
||||
|
||||
* Tue Feb 23 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-2
|
||||
- Avoid logging warning setting bond ad_actor_system (rh #1923999)
|
||||
|
||||
* Thu Feb 18 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-1
|
||||
- Update to 1.30.0 release
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue