From d71e62f83d3de8fdffb77d369eb1189a80ae5ed5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 30 2022 08:10:19 +0000 Subject: import NetworkManager-1.39.2-2.el8 --- diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 913c275..15ab7a0 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -7b1d470d7af05ea541f2dbf3e934b16e1ceb5adf SOURCES/NetworkManager-1.39.0.tar.xz +5af6035d523a85ac1a8690301e8d306adb16c263 SOURCES/NetworkManager-1.39.2.tar.xz diff --git a/.gitignore b/.gitignore index bc24f16..577b45f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.39.0.tar.xz +SOURCES/NetworkManager-1.39.2.tar.xz diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch deleted file mode 100644 index c759e3f..0000000 --- a/SOURCES/9999-fix-pregen-doc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9603d930557bcd8268c3e36897db9941ea3af0b7 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Tue, 27 Aug 2019 15:47:32 +0200 -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 -of defaults. - -Patch the man pages with the proper values. ---- - docs/api/html/NetworkManager.conf.html | 2 +- - man/NetworkManager.conf.5 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html -index 02029c2e336a..cf9269c7bef4 100644 ---- a/docs/api/html/NetworkManager.conf.html -+++ b/docs/api/html/NetworkManager.conf.html -@@ -663,7 +663,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. -- If unspecified, the default is "syslog". -+ If unspecified, the default is "journal". -

- - -diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 -index 4f62ed7c0cde..74daf4c8dc02 100644 ---- a/man/NetworkManager.conf.5 -+++ b/man/NetworkManager.conf.5 -@@ -669,7 +669,7 @@ INFO\&. - .PP - \fIbackend\fR - .RS 4 --The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "syslog"\&. -+The logging backend\&. Supported values are "syslog" and "journal"\&. When NetworkManager is started with "\-\-debug" in addition all messages will be printed to stderr\&. If unspecified, the default is "journal"\&. - .RE - .PP - \fIaudit\fR --- -2.31.1 - diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index 1c71dd8..be5c4b2 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.39.0 -%global real_version %{rpm_version} -%global release_version 1 +%global real_version 1.39.2 +%global rpm_version %{real_version} +%global release_version 2 %global snapshot %{nil} %global git_sha %{nil} @@ -60,8 +60,7 @@ %bcond_without ppp %bcond_without nmtui %bcond_without nm_cloud_setup -# on RHEL we don't regenerate the documentation -%bcond_with regen_docs +%bcond_without regen_docs %if %{bcond_default_debug} %bcond_without debug %else @@ -201,12 +200,6 @@ Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch # Bugfixes that are only relevant until next rebase of the package. # Patch1001: 1001-some.patch -# The pregenerated docs contain default values and paths that depend -# on the configure options when creating the source tarball. -# As last step, patch the documentation with the proper defaults -# for RHEL. -Patch9999: 9999-fix-pregen-doc.patch - Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} > 7 Requires(post): systemd-udev @@ -1237,7 +1230,17 @@ fi %changelog -* Wed Apr 6 2022 Ana Cabral - 1:1.39.0-1 +* Thu Apr 21 2022 Thomas Haller - 1:1.39.2-2 +- generate docs during build instead of using pre-generated (2) (rh #1995915) + +* Thu Apr 21 2022 Thomas Haller - 1:1.39.2-1 +- Update to 1.39.2 release (development) +- dhcp: set "src" attribute for DHCP routes (rh #1995372) +- dhcp: drop internal DHCPv4 client based on systemd code (rh #2073067) +- core: delay startup complete for DNS update (rh #2049421) +- nmcli: support offline mode to create and edit keyfiles (rh #1361145) + +* Wed Apr 6 2022 Ana Cabral - 1:1.39.0-1 - Update to 1.39.0 release (development) - ovs, dpdk: fix creating ovs-interface when the ovs-bridge is netdev (rh #2001792)