rpms/NetworkManager
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert OL modifications

Browse Source
This commit is contained in:
Andrew Lukoshko 2025-08-07 12:10:37 +00:00
parent 30aa091eff
commit 2d77189a81
4 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SOURCES/10-disable-mptcp.conf
View File

@ -1,3 +0,0 @@
# This is the config setting to disable NetworkManager's MPTCP handling by default.
[connection.no-mptcp]
connection.mptcp-flags=0x1

6
SOURCES/10-persist.conf
View File

@ -1,6 +0,0 @@
[Unit]
Before=NetworkManager.service
[Service]
ExecStart=
ExecStart=/usr/libexec/nm-dispatcher --persist

2
SOURCES/20-connectivity-oracle.conf → SOURCES/20-connectivity-redhat.conf
View File

@ -5,6 +5,6 @@
# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
[connectivity]
enabled=true
uri=http://yum.oracle.com/static/oracle-networkmanager.txt
uri=http://static.redhat.com/test/rhel-networkmanager.txt
response=OK
interval=300

45
SPECS/NetworkManager.spec
View File

@ -89,9 +89,9 @@
%bcond_with connectivity_fedora
%endif
%if 0%{?rhel}
%bcond_without connectivity_oracle
%bcond_without connectivity_redhat
%else
%bcond_with connectivity_oracle
%bcond_with connectivity_redhat
%endif
%if 0%{?rhel}
%bcond_with iwd
@ -167,7 +167,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: %{epoch_version}
Version: %{rpm_version}
Release: %{release_version}%{?snap}.0.1%{?dist}
Release: %{release_version}%{?snap}%{?dist}
Group: System Environment/Base
License: GPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://networkmanager.dev/
@ -176,13 +176,11 @@ Source: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/
Source1: NetworkManager.conf
Source2: 00-server.conf
Source4: 20-connectivity-fedora.conf
Source5: 20-connectivity-oracle.conf
Source5: 20-connectivity-redhat.conf
Source6: 22-wifi-mac-addr.conf
Source7: 70-nm-connectivity.conf
Source8: readme-ifcfg-rh.txt
Source9: readme-ifcfg-rh-migrated.txt
Source10: 10-disable-mptcp.conf
Source11: 10-persist.conf
# RHEL downstream patches that change behavior from upstream.
# These are not bugfixes, hence they are also relevant after
@ -485,18 +483,16 @@ via Fedora infrastructure.
%endif
%if %{with connectivity_oracle}
%package config-connectivity-oracle
Summary: NetworkManager config file for connectivity checking via Oracle servers
%if %{with connectivity_redhat}
%package config-connectivity-redhat
Summary: NetworkManager config file for connectivity checking via Red Hat servers
Group: System Environment/Base
BuildArch: noarch
Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
Provides: NetworkManager-config-connectivity-redhat
Obsoletes: NetworkManager-config-connectivity-redhat
%description config-connectivity-oracle
%description config-connectivity-redhat
This adds a NetworkManager configuration file to enable connectivity checking
via Oracle infrastructure.
via Red Hat infrastructure.
%endif
@ -742,14 +738,11 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/
#copying the config to disable MPTCP
cp %{SOURCE10} %{buildroot}%{nmlibdir}/conf.d/
%if %{with connectivity_fedora}
cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/
%endif
%if %{with connectivity_oracle}
%if %{with connectivity_redhat}
cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/
mkdir -p %{buildroot}%{_sysctldir}
cp %{SOURCE7} %{buildroot}%{_sysctldir}
@ -766,9 +759,6 @@ cp %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
cp %{SOURCE9} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
%endif
mkdir -p %{buildroot}%{_unitdir}/NetworkManager-dispatcher.service.d/
cp %{SOURCE11} %{buildroot}%{_unitdir}/NetworkManager-dispatcher.service.d/
%if %{with ifcfg_rh}
cp examples/dispatcher/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/
ln -s ../no-wait.d/10-ifcfg-rh-routes.sh %{buildroot}%{nmlibdir}/dispatcher.d/pre-up.d/
@ -904,7 +894,6 @@ fi
%if 0%{?fedora} >= 40
%{nmlibdir}/conf.d/22-wifi-mac-addr.conf
%endif
%config %{nmlibdir}/conf.d/10-disable-mptcp.conf
%ghost %{_sysconfdir}/%{name}/VPN
%{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-helper
@ -928,7 +917,6 @@ fi
%dir %{nmlibdir}/dispatcher.d/no-wait.d
%dir %{nmlibdir}/VPN
%dir %{nmlibdir}/system-connections
%dir %{_unitdir}/NetworkManager-dispatcher.service.d/
%{_mandir}/man1/*
%{_mandir}/man5/*
%{_mandir}/man7/nmcli-examples.7*
@ -950,7 +938,6 @@ fi
%{_unitdir}/NetworkManager-wait-online.service
%{_unitdir}/NetworkManager-dispatcher.service
%{_unitdir}/nm-priv-helper.service
%{_unitdir}/NetworkManager-dispatcher.service.d/10-persist.conf
%dir %{_datadir}/doc/NetworkManager/examples
%{_datadir}/doc/NetworkManager/examples/server.conf
%if %{with ifcfg_warning} || %{with ifcfg_migrate}
@ -1038,11 +1025,11 @@ fi
%endif
%if %{with connectivity_oracle}
%files config-connectivity-oracle
%if %{with connectivity_redhat}
%files config-connectivity-redhat
%dir %{nmlibdir}
%dir %{nmlibdir}/conf.d
%{nmlibdir}/conf.d/20-connectivity-oracle.conf
%{nmlibdir}/conf.d/20-connectivity-redhat.conf
%{_sysctldir}/70-nm-connectivity.conf
%endif
@ -1100,12 +1087,6 @@ fi
%changelog
* Tue Aug 05 2025 Darren Archibald <darren.archibald@oracle.com> - 1:1.52.0-5.0.1
- disable MPTCP handling by default [Orabug: 34801142]
- add connectivity check via Oracle servers [Orabug: 32051972]
- Add a dropin file to make Networkmanager-dispatcher persistent [Orabug: 36989910]
- Drop 777 permissions from the NetworkManager-dispatcher drop-in directory [Orabug: 37581907]
* Fri Jul 18 2025 Íñigo Huguet <ihuguet@redhat.com> - 1:1.52.0-5
- Fix crash in DNS options evaluation (RHEL-92313)