From 605896230a24f315b2bac83d0df4cd20d5c9a73f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 27 2021 04:13:36 +0000 Subject: import NetworkManager-1.32.0-0.1.el8 --- diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 8dfa229..c4e6e02 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -550918f97f1614532a317465220d6b5cab08d47a SOURCES/NetworkManager-1.30.0.tar.xz +57add5eb54fb27f7693cebf2255e7bb8c02ffa31 SOURCES/NetworkManager-1.31.2.tar.xz diff --git a/.gitignore b/.gitignore index 7cd840b..a26bad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.30.0.tar.xz +SOURCES/NetworkManager-1.31.2.tar.xz diff --git a/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch index 232a0e7..bf8dc6d 100644 --- a/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch +++ b/SOURCES/0001-cloud-setup-systemd-unit-rh1791758.patch @@ -1,19 +1,19 @@ -From 6069af3e7a7d506c02f007c71e2a9271b8ef3d09 Mon Sep 17 00:00:00 2001 +From 2eaf8be60d91a49bee3bf658071bb4a302affa7f Mon Sep 17 00:00:00 2001 From: Thomas Haller 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 809f707da1..78441c74be 100644 +--- a/src/nm-cloud-setup/nm-cloud-setup.service.in ++++ b/src/nm-cloud-setup/nm-cloud-setup.service.in +@@ -27,15 +27,15 @@ PrivateDevices=yes PrivateTmp=yes ProtectControlGroups=yes ProtectHome=yes @@ -33,5 +33,5 @@ index 9866acd8b0ae..a3df3863c4df 100644 [Install] -- -2.26.2 +2.29.2 diff --git a/SOURCES/1000-bond-avoid-logging-warning-to-set-ad_actor_system-00.patch b/SOURCES/1000-bond-avoid-logging-warning-to-set-ad_actor_system-00.patch deleted file mode 100644 index fb34c79..0000000 --- a/SOURCES/1000-bond-avoid-logging-warning-to-set-ad_actor_system-00.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 9f90c590d73eb86e357bf4a854af41b73039342c Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Tue, 23 Feb 2021 13:28:10 +0100 -Subject: [PATCH 1/1] bond: avoid logging warning to set - "ad_actor_system=00:00:00:00:00:00" - -The bond option ad_actor_system only matters (and is available) with -mode=802.3ad. - -When you create a new bond, the sysctl value will be set to "00:00:00:00:00:00". -So this seems to be a valid value, and in fact the default value for -this option. However, kernel will fail with EINVAL to set the sysctl to -"00:00:00:00:00:00". Kernel fails both if the value is already -"00:00:00:00:00:00" (i.e. setting the same value results in an error) and -it also fails otherwise (i.e. we cannot ever reset the value to -"00:00:00:00:00:00", at least not via sysfs). - -Avoid the warning in the common case, where the value is already as -expected. - -Otherwise, we still get the warning and won't be able to set the right -value. But this is really a limitation of the kernel API where we cannot -do anything about it (in NetworkManager). - -https://bugzilla.redhat.com/show_bug.cgi?id=1923999 -(cherry picked from commit 9e7af314546d7912ee23b3850230008902aca4d3) -(cherry picked from commit 199ac9b146b0d7b1d6679a8d703822447abc3ce7) ---- - libnm-core/nm-core-internal.h | 2 ++ - libnm-core/nm-setting-bond.c | 2 +- - src/core/devices/nm-device-bond.c | 18 ++++++++++++++++++ - 3 files changed, 21 insertions(+), 1 deletion(-) - -diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h -index d9374fe5a7a8..e386d5e9d074 100644 ---- a/libnm-core/nm-core-internal.h -+++ b/libnm-core/nm-core-internal.h -@@ -586,6 +586,8 @@ NMBondOptionType _nm_setting_bond_get_option_type(NMSettingBond *setting, const - - const char *nm_setting_bond_get_option_or_default(NMSettingBond *self, const char *option); - -+#define NM_BOND_AD_ACTOR_SYSTEM_DEFAULT "00:00:00:00:00:00" -+ - /*****************************************************************************/ - - /* nm_connection_get_uuid() asserts against NULL, which is the right thing to -diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c -index 2d64ef02b48c..68d4ca88f678 100644 ---- a/libnm-core/nm-setting-bond.c -+++ b/libnm-core/nm-setting-bond.c -@@ -337,7 +337,7 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge - if (nm_streq(option, NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM)) { - /* The default value depends on the current mode */ - if (mode == NM_BOND_MODE_8023AD) -- return "00:00:00:00:00:00"; -+ return NM_BOND_AD_ACTOR_SYSTEM_DEFAULT; - return ""; - } - -diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c -index f68c080b1839..5814aef4518f 100644 ---- a/src/core/devices/nm-device-bond.c -+++ b/src/core/devices/nm-device-bond.c -@@ -109,6 +109,24 @@ _set_bond_attr(NMDevice *device, const char *attr, const char *value) - int ifindex = nm_device_get_ifindex(device); - gboolean ret; - -+ nm_assert(attr && attr[0]); -+ nm_assert(value); -+ -+ if (nm_streq(value, NM_BOND_AD_ACTOR_SYSTEM_DEFAULT) -+ && nm_streq(attr, NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM)) { -+ gs_free char *cur_val = NULL; -+ -+ /* kernel does not allow setting ad_actor_system to "00:00:00:00:00:00". We would thus -+ * log an EINVAL error. Avoid that... at least, if the value is already "00:00:00:00:00:00". */ -+ cur_val = -+ nm_platform_sysctl_master_get_option(nm_device_get_platform(device), ifindex, attr); -+ if (nm_streq0(cur_val, NM_BOND_AD_ACTOR_SYSTEM_DEFAULT)) -+ return TRUE; -+ -+ /* OK, the current value is different, and we will proceed setting "00:00:00:00:00:00". -+ * That will fail, and we will log a warning. There is nothing else to do. */ -+ } -+ - ret = - nm_platform_sysctl_master_set_option(nm_device_get_platform(device), ifindex, attr, value); - if (!ret) --- -2.29.2 - diff --git a/SOURCES/1001-core-increase-limit-of-open-file-descriptors-for-Net.patch b/SOURCES/1001-core-increase-limit-of-open-file-descriptors-for-Net.patch deleted file mode 100644 index de68a7b..0000000 --- a/SOURCES/1001-core-increase-limit-of-open-file-descriptors-for-Net.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a5eb2f55d79b9023fbda6945da09f9bcecea8560 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Sun, 28 Feb 2021 11:18:16 +0100 -Subject: [PATCH 1/1] core: increase limit of open file descriptors for - NetworkManager.service - -Note that POSIX select() can only handle up to 1024 descriptors. That -means, our code (and the libraries that we use) must not use select(). - -Note that libndp uses select(), which means NetworkManager will crash -when using file descriptors larger than 1023. On the other hand, -depriving NetworkManager of file descriptors will also crash it. -So libndp must be fixed ([1]). - -[1] https://listman.redhat.com/archives/libndp-list/2021-February/msg00000.html - -https://bugzilla.redhat.com/show_bug.cgi?id=1926599 -(cherry picked from commit a708a172a6a289d5399897e7da3a0e38721b1b7e) -(cherry picked from commit 2ca405fa9bd047593cd299691b74af7f44184c71) ---- - data/NetworkManager.service.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 91ebd9a36e65..9cf1c3d28f47 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -19,6 +19,10 @@ CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SE - ProtectSystem=true - ProtectHome=read-only - -+# We require file descriptors for DHCP etc. When activating many interfaces, -+# the default limit of 1024 is easily reached. -+LimitNOFILE=65536 -+ - [Install] - WantedBy=multi-user.target - Also=NetworkManager-dispatcher.service --- -2.29.2 - diff --git a/SOURCES/1002-initrd-apply-mtu-to-bond-connection.patch b/SOURCES/1002-initrd-apply-mtu-to-bond-connection.patch deleted file mode 100644 index 22e20b1..0000000 --- a/SOURCES/1002-initrd-apply-mtu-to-bond-connection.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9ab6906ea1c2ddd23a3926b35ed75128dd302d13 Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani -Date: Mon, 1 Mar 2021 21:16:08 +0100 -Subject: [PATCH] initrd: apply the MTU from bond= argument to the bond - connection - -Currently the MTU specified in: - - bond=[::[:[:]]] - -gets applied to the bond ports. Instead it should be applied to the -bond itself. - -Fixes: ecc074b2f8a6 ('initrd: add command line parser') - -https://bugzilla.redhat.com/show_bug.cgi?id=1932502 -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/767 -(cherry picked from commit 8df3ef5063cf0f8ee904f8fd39e9e64cc60836eb) -(cherry picked from commit 43d16d2cd63a3443704ca7bb539ba5cb673ba183) ---- - src/core/initrd/nmi-cmdline-reader.c | 5 +++-- - src/core/initrd/tests/test-cmdline-reader.c | 7 ++++++- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c -index 508ef2b25c..5f40f63ef2 100644 ---- a/src/core/initrd/nmi-cmdline-reader.c -+++ b/src/core/initrd/nmi-cmdline-reader.c -@@ -764,6 +764,9 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const - mtu = get_word(&argument, ':'); - } - -+ if (mtu) -+ connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu); -+ - do { - slave = get_word(&slaves, ','); - if (slave == NULL) -@@ -777,8 +780,6 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const - NM_SETTING_CONNECTION_MASTER, - master, - NULL); -- if (mtu) -- connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu); - } while (slaves && *slaves != '\0'); - - if (argument && *argument) -diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c -index 33fb22d364..4b450aae0f 100644 ---- a/src/core/initrd/tests/test-cmdline-reader.c -+++ b/src/core/initrd/tests/test-cmdline-reader.c -@@ -825,13 +825,14 @@ test_bond(void) - { - gs_unref_hashtable GHashTable *connections = NULL; - const char *const * ARGV = NM_MAKE_STRV("rd.route=192.0.2.53::bong0", -- "bond=bong0:eth0,eth1:mode=balance-rr", -+ "bond=bong0:eth0,eth1:mode=balance-rr:9000", - "nameserver=203.0.113.53"); - NMConnection * connection; - NMSettingConnection * s_con; - NMSettingIPConfig * s_ip4; - NMSettingIPConfig * s_ip6; - NMSettingBond * s_bond; -+ NMSettingWired * s_wired; - NMIPRoute * ip_route; - const char * master_uuid; - -@@ -847,6 +848,10 @@ test_bond(void) - master_uuid = nm_connection_get_uuid(connection); - g_assert(master_uuid); - -+ s_wired = nm_connection_get_setting_wired(connection); -+ g_assert(s_wired); -+ g_assert_cmpint(nm_setting_wired_get_mtu(s_wired), ==, 9000); -+ - s_ip4 = nm_connection_get_setting_ip4_config(connection); - g_assert(s_ip4); - g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO); --- -2.29.2 - diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch index d44f06c..572f351 100644 --- a/SOURCES/9999-fix-pregen-doc.patch +++ b/SOURCES/9999-fix-pregen-doc.patch @@ -1,7 +1,7 @@ -From ce8ee35cb4e94e85ac1ecb268c6fa1ea14b1ae8d Mon Sep 17 00:00:00 2001 +From b0bd54da20c0757c81f9086d187547cb0532a8a0 Mon Sep 17 00:00:00 2001 From: Thomas Haller 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 035fd4811f..00432090db 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 +@@ -628,7 +628,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth are "syslog" and "journal". When NetworkManager is started with "--debug" in addition all messages will be printed to stderr. @@ -27,10 +27,10 @@ index 44b25c4cbc9d..1ee9c2fb1e83 100644 diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 -index 396267e3ec09..7702b84b04fc 100644 +index cf94846780..ac3df6082e 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 -@@ -598,7 +598,7 @@ INFO\&. +@@ -640,7 +640,7 @@ INFO\&. .PP \fIbackend\fR .RS 4 @@ -40,5 +40,5 @@ index 396267e3ec09..7702b84b04fc 100644 .PP \fIaudit\fR -- -2.26.2 +2.29.2 diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 1e7725a..50019d0 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -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 4 +%global rpm_version 1.32.0 +%global real_version 1.31.2 +%global release_version 0.1 %global snapshot %{nil} %global git_sha %{nil} @@ -186,9 +186,7 @@ Source6: 70-nm-connectivity.conf Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch # Bugfixes that are only relevant until next rebase of the package. -Patch1000: 1000-bond-avoid-logging-warning-to-set-ad_actor_system-00.patch -Patch1001: 1001-core-increase-limit-of-open-file-descriptors-for-Net.patch -Patch1002: 1002-initrd-apply-mtu-to-bond-connection.patch +#Patch1000: 1000-some.patch # The pregenerated docs contain default values and paths that depend # on the configure options when creating the source tarball. @@ -1014,6 +1012,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 @@ -1028,7 +1027,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 @@ -1153,6 +1152,12 @@ fi %changelog +* Thu Mar 25 2021 Beniamino Galvani - 1:1.32.0-0.1 +- Update to 1.31.2 (development) + +* Tue Mar 23 2021 Beniamino Galvani - 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 - 1:1.30.0-4 - initrd: apply the MTU from bond= argument to the bond connection (rh #1936610)