import NetworkManager-1.36.0-0.7.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
af06fa77d1
commit
22c2b02c09
|
|
@ -1 +1 @@
|
|||
1e56cf4216a4a33ad6255aaca80f6c3c1dc4d21c SOURCES/NetworkManager-1.35.4.tar.xz
|
||||
f7529bb80bd9b82a1012286fd90061ee74cb7746 SOURCES/NetworkManager-1.35.7.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/NetworkManager-1.35.4.tar.xz
|
||||
SOURCES/NetworkManager-1.35.7.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
From e1f76a6472f68c52b90679d9fe679a2b1a93b78b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
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 765ff10ad2..2ea978c0d5 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 "<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.
|
||||
- If unspecified, the default is "<code class="literal">syslog</code>".
|
||||
+ If unspecified, the default is "<code class="literal">journal</code>".
|
||||
</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
|
||||
index fc32393e09..f135e3a9c3 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
|
||||
|
||||
|
|
@ -6,13 +6,14 @@
|
|||
|
||||
%global epoch_version 1
|
||||
%global rpm_version 1.36.0
|
||||
%global real_version 1.35.4
|
||||
%global release_version 0.4
|
||||
%global real_version 1.35.7
|
||||
%global release_version 0.7
|
||||
%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
|
||||
|
|
@ -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
|
||||
|
|
@ -193,13 +193,7 @@ 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: 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
|
||||
# Patch1001: 1001-some.patch
|
||||
|
||||
Requires(post): systemd
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
|
|
@ -219,6 +213,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
|
||||
|
|
@ -566,6 +564,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}
|
||||
|
||||
|
|
@ -879,7 +891,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
|
||||
|
|
@ -922,7 +935,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 || :
|
||||
|
|
@ -945,12 +959,16 @@ if [ $1 -eq 0 ]; then
|
|||
|
||||
# Don't kill networking entirely just on package remove
|
||||
#/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
|
||||
|
||||
/usr/sbin/update-alternatives --remove ifup %{_libexecdir}/nm-ifup >/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
|
||||
|
||||
|
||||
%if %{with nm_cloud_setup}
|
||||
%preun cloud-setup
|
||||
%systemd_preun %{systemd_units_cloud_setup}
|
||||
|
|
@ -999,10 +1017,6 @@ 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
|
||||
|
|
@ -1168,7 +1182,31 @@ 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
|
||||
* Fri Jan 28 2022 Thomas Haller <thaller@redhat.com> - 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 #1983747)
|
||||
- libnm: fix dangling pointer in NMObject (rh #2039331)
|
||||
|
||||
* Wed Jan 26 2022 Thomas Haller <thaller@redhat.com> - 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 <thaller@redhat.com> - 1:1.36.0-0.5
|
||||
- generate docs during build instead of using pre-generated (rh #1995915)
|
||||
|
||||
* Wed Jan 12 2022 Wen Liang <wenliang@redhat.com> - 1:1.36.0-0.4
|
||||
- Upgrade to 1.35.4 release (development)
|
||||
- ipv4ll: fix assert on external LL address removal (rh #2028404)
|
||||
|
|
@ -1189,6 +1227,7 @@ fi
|
|||
- core: make sure Device and AC emit StateChanged a bit later (rh #2006677)
|
||||
- ovsdb: deactivate removed device if does not have a master (rh #2022275)
|
||||
- nmcli: fix setting wake-on-lan property on edit mode (rh #2016348)
|
||||
- core: fix wrong DHCPv6 timeouts due to endianness problem (rh #2027267)
|
||||
|
||||
* Thu Nov 18 2021 Beniamino Galvani <bgalvani@redhat.com> - 1:1.36.0-0.1
|
||||
- Upgrade to 1.35.1 release (development)
|
||||
|
|
|
|||
Loading…
Reference in New Issue