diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index d27e533..95e6839 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -7c06b3a311430ac39629dbdc35e3d84fc3b6a931 SOURCES/NetworkManager-1.32.2.tar.xz +5673766ea76c3b867a5ec89876a05a2efe23cab7 SOURCES/NetworkManager-1.32.3-0.z.2.20e3975fd2.tar.xz diff --git a/.gitignore b/.gitignore index cbb7912..96f312e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.32.2.tar.xz +SOURCES/NetworkManager-1.32.3-0.z.2.20e3975fd2.tar.xz diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch deleted file mode 100644 index 572f351..0000000 --- a/SOURCES/9999-fix-pregen-doc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b0bd54da20c0757c81f9086d187547cb0532a8a0 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 035fd4811f..00432090db 100644 ---- a/docs/api/html/NetworkManager.conf.html -+++ b/docs/api/html/NetworkManager.conf.html -@@ -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. -- 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 cf94846780..ac3df6082e 100644 ---- a/man/NetworkManager.conf.5 -+++ b/man/NetworkManager.conf.5 -@@ -640,7 +640,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.29.2 - diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index e9e742f..0ef8aa0 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.32.2 -%global real_version 1.32.2 -%global release_version 1 +%global rpm_version 1.32.3 +%global real_version 1.32.3 +%global release_version 0.z.2.20e3975fd2 %global snapshot %{nil} %global git_sha %{nil} @@ -179,7 +179,7 @@ Group: System Environment/Base License: GPLv2+ and LGPLv2+ URL: https://networkmanager.dev/ -Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz +Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}-%{release_version}.tar.xz Source1: NetworkManager.conf Source2: 00-server.conf Source4: 20-connectivity-fedora.conf @@ -195,12 +195,6 @@ Patch2: 0002-firewall-Default-to-iptables-backend-to-preserve-behavior.patch # Bugfixes that are only relevant until next rebase of the package. #Patch1000: 1000-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 Requires(post): /usr/sbin/update-alternatives Requires(preun): systemd @@ -1163,12 +1157,23 @@ fi %changelog +* Wed Jul 14 2021 Gris Ge - 1.32.3-0.z.2.20e3975fd2 +- Update to prerelese of 1.32.3 (commit 20e3975fd2). RHBZ#1934465 + +* Fri Jul 09 2021 Gris Ge - 1:1.32.3-0.z.1.d90baeecd8 +- Fix the dist version for future prereleases. RHBZ#1934465 + +* Fri Jul 09 2021 Gris Ge - 1:1.32.3-0.d90baeecd8 +- Updata to prerelese of 1.32.3 (commit d90baeecd8). RHBZ#1934465 + * Thu Jul 1 2021 Wen Liang - 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 - 1:1.32.0-1 - update to 1.32.0 release