diff --git a/.NetworkManager.metadata b/.NetworkManager.metadata index 0068079..0a1cdec 100644 --- a/.NetworkManager.metadata +++ b/.NetworkManager.metadata @@ -1 +1 @@ -28ce99d2b8a60fb92c40c647d2ed0c3264bda1f9 SOURCES/NetworkManager-1.35.3.tar.xz +2a25bc5642fd70750f98f252e95196739dc24a61 SOURCES/NetworkManager-1.35.92.tar.xz diff --git a/.gitignore b/.gitignore index e4d1453..62795b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/NetworkManager-1.35.3.tar.xz +SOURCES/NetworkManager-1.35.92.tar.xz diff --git a/SOURCES/9999-fix-pregen-doc.patch b/SOURCES/9999-fix-pregen-doc.patch deleted file mode 100644 index 1418eb9..0000000 --- a/SOURCES/9999-fix-pregen-doc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9d61f1890d01c53d35203c49a5a06349320e242a Mon Sep 17 00:00:00 2001 -From: Ana Cabral -Date: Fri, 24 Sep 2021 18:47:51 +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 e8efb5e7fe7d..f432f6736691 100644 ---- a/docs/api/html/NetworkManager.conf.html -+++ b/docs/api/html/NetworkManager.conf.html -@@ -658,7 +658,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 75215918a9d5..2251c95a11b5 100644 ---- a/man/NetworkManager.conf.5 -+++ b/man/NetworkManager.conf.5 -@@ -664,7 +664,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 03fc06b..d7a412a 100644 --- a/SPECS/NetworkManager.spec +++ b/SPECS/NetworkManager.spec @@ -6,13 +6,14 @@ %global epoch_version 1 %global rpm_version 1.36.0 -%global real_version 1.35.3 -%global release_version 0.3 +%global real_version 1.35.92 +%global release_version 0.10 %global snapshot %{nil} %global git_sha %{nil} -%global obsoletes_device_plugins 1:0.9.9.95-1 -%global obsoletes_ppp_plugin 1:1.5.3 +%global obsoletes_device_plugins 1:0.9.9.95-1 +%global obsoletes_ppp_plugin 1:1.5.3 +%global obsoletes_initscripts_updown 1:1.36.0-0.6 %global systemd_dir %{_prefix}/lib/systemd/system %global sysctl_dir %{_prefix}/lib/sysctl.d @@ -32,7 +33,7 @@ %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[0-9][0-9]*\\)\\.[0-9][0-9]*$/\\1/p') -%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service +%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service %global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer @@ -60,8 +61,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 @@ -194,12 +194,6 @@ Source6: 70-nm-connectivity.conf # 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 @@ -218,6 +212,10 @@ Requires: libndp >= %{libndp_version} Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager-wimax < 1.2 +%if 0%{?rhel} && 0%{?rhel} == 8 +Suggests: NetworkManager-initscripts-updown +%endif +Obsoletes: NetworkManager < %{obsoletes_initscripts_updown} %if 0%{?rhel} && 0%{?rhel} <= 7 # Kept for RHEL to ensure that wired 802.1x works out of the box @@ -565,6 +563,20 @@ This tool is still experimental. %endif +%package initscripts-updown +Summary: Legacy ifup/ifdown scripts for NetworkManager that replace initscripts (network-scripts) +Group: System Environment/Base +BuildArch: noarch +Requires: NetworkManager +Requires: /usr/bin/nmcli +Obsoletes: NetworkManager < %{obsoletes_initscripts_updown} + +%description 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. + + %prep %autosetup -p1 -n NetworkManager-%{real_version} @@ -878,7 +890,8 @@ mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} %endif -touch %{buildroot}%{_sbindir}/ifup %{buildroot}%{_sbindir}/ifdown +touch %{buildroot}%{_sbindir}/ifup +touch %{buildroot}%{_sbindir}/ifdown %check @@ -921,7 +934,8 @@ fi %systemd_post %{systemd_units} -%triggerin -- initscripts + +%post initscripts-updown if [ -f %{_sbindir}/ifup -a ! -L %{_sbindir}/ifup ]; then # initscripts package too old, won't let us set an alternative /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || : @@ -944,10 +958,14 @@ if [ $1 -eq 0 ]; then # Don't kill networking entirely just on package remove #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || : +fi +%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service + +%preun initscripts-updown +if [ $1 -eq 0 ]; then /usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/dev/null 2>&1 || : fi -%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-sudo.service %if %{with nm_cloud_setup} @@ -981,7 +999,7 @@ fi %files %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf %{dbus_sys_dir}/nm-dispatcher.conf -%{dbus_sys_dir}/nm-sudo.conf +%{dbus_sys_dir}/nm-priv-helper.conf %{dbus_sys_dir}/nm-ifcfg-rh.conf %{_sbindir}/%{name} %{_bindir}/nmcli @@ -998,15 +1016,11 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf %ghost %{_sysconfdir}/%{name}/VPN %{_bindir}/nm-online -%{_libexecdir}/nm-ifup -%ghost %attr(755, root, root) %{_sbindir}/ifup -%{_libexecdir}/nm-ifdown -%ghost %attr(755, root, root) %{_sbindir}/ifdown %{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dispatcher %{_libexecdir}/nm-initrd-generator %{_libexecdir}/nm-daemon-helper -%{_libexecdir}/nm-sudo +%{_libexecdir}/nm-priv-helper %dir %{_libdir}/%{name} %dir %{nmplugindir} %{nmplugindir}/libnm-settings-plugin*.so @@ -1030,7 +1044,7 @@ fi %dir %{_localstatedir}/lib/NetworkManager %dir %{_sysconfdir}/sysconfig/network-scripts %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service -%{_datadir}/dbus-1/system-services/org.freedesktop.nm.sudo.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} @@ -1040,7 +1054,7 @@ fi %{systemd_dir}/NetworkManager.service %{systemd_dir}/NetworkManager-wait-online.service %{systemd_dir}/NetworkManager-dispatcher.service -%{systemd_dir}/nm-sudo.service +%{systemd_dir}/nm-priv-helper.service %dir %{_datadir}/doc/NetworkManager/examples %{_datadir}/doc/NetworkManager/examples/server.conf %doc NEWS AUTHORS README CONTRIBUTING.md TODO @@ -1167,7 +1181,57 @@ fi %endif +%files initscripts-updown +%{_libexecdir}/nm-ifup +%ghost %attr(755, root, root) %{_sbindir}/ifup +%{_libexecdir}/nm-ifdown +%ghost %attr(755, root, root) %{_sbindir}/ifdown + + %changelog +* Sat Feb 19 2022 Lubomir Rintel - 1:1.36.0-0.10 +- Upgrade to 1.35.92 (release candidate) +- ppp: increase disconnect timeout (rh #2049596) +- core: finish activation after all objects are committed (rh #2043133) +- ipv6: add support for multipath routes (rh #1837254) +- keyfile: do not write empty string list properties (rh #2022623) + +* Fri Feb 04 2022 Lubomir Rintel - 1:1.36.0-0.9 +- Upgrade to 1.35.91 release (release candidate) +- bond: fix duplicate IPv4 address detection (rh #2028751) +- core: add support for blackhole routes (rh #1937823) (rh #2013587) +- core: re-assess IP configuration if one IP family times out (rh #2051904) + +* Fri Feb 04 2022 Lubomir Rintel - 1:1.36.0-0.8 +- Upgrade to 1.35.90 release (release candidate) +- ovs: remove ovsdb entry on interface removal (rh #2047302) +- ovs: properly clean up devices on daemon shutdown (rh #2029937) +- core: avoid losing addresses on handover from initrd to ral root (rh #2047302) +- core: fix a possibe assertion failure in ACD (rh #2047788) + +* Fri Jan 28 2022 Thomas Haller - 1:1.36.0-0.7 +- Upgrade to 1.35.7 release (development) +- core: fix crash related to DHCPv6 leases (rh #2028849) +- wifi: fix stale ActiveAccessPoint in D-Bus (rh #1983735) +- libnm: fix dangling pointer in NMObject (rh #2039331) + +* Wed Jan 26 2022 Thomas Haller - 1:1.36.0-0.6 +- Upgrade to 1.35.6 release (development) +- Move ifup/ifdown scripts to new NetworkManager-initscripts-updown package (rh #2022418) +- wwan: fix assertion failure in modem/ppp code (rh #2028385) +- core: fix performance regression with 500vlans test (rh #2028849) +- core: drop defective BPF filter for netlink sockets that caused hangs (rh #2037411) +- initrd: add support for rd.znet_ifnames (rh #1980387) + +* Thu Jan 20 2022 Thomas Haller - 1:1.36.0-0.5 +- generate docs during build instead of using pre-generated (rh #2042875) + +* Wed Jan 12 2022 Wen Liang - 1:1.36.0-0.4 +- Upgrade to 1.35.4 release (development) +- core: don't reset assume state if the device is unmanaged by parent (rh #2012182) +- nm-device: clean up IP methods if we lose ifindex (rh #2012934) +- core: log variant properties in connection diff (rh #2034086) + * Thu Dec 16 2021 Wen Liang - 1:1.36.0-0.3 - Upgrade to 1.35.3 release (development) - device: fix update of the ip-iface property (rh #2026024)