MSVSphere debranding

SOURCES/20-connectivity-msvsphere.conf

@@ -0,0 +1,10 @@
+# Enable connectivity checking for NetworkManager.
+# See `man NetworkManager.conf`.
+#
+# Note that connectivity checking works badly with rp_filter set to
+# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
+[connectivity]
+enabled=true
+uri=http://static.inferitos.ru/test/check-networkmanager.txt
+response=OK
+interval=300

SPECS/NetworkManager.spec

@@ -71,11 +71,16 @@
 %else
 %bcond_with connectivity_fedora
 %endif
+%if 0%{?msvsphere} && 0%{?msvsphere} >= 8
+%bcond_without connectivity_msvsphere
+%else
+%bcond_with connectivity_msvsphere
 %if 0%{?rhel} && 0%{?rhel} >= 8
 %bcond_without connectivity_redhat
 %else
 %bcond_with connectivity_redhat
 %endif
+%endif # end of MSVSphere block
 %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 %bcond_without crypto_gnutls
 %else
@@ -174,7 +179,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: %{epoch_version}
 Version: %{rpm_version}
-Release: %{release_version}%{?snap}%{?dist}
+Release: %{release_version}%{?snap}%{?dist}.inferit
 Group: System Environment/Base
 License: GPLv2+ and LGPLv2+
 URL: https://networkmanager.dev/
@@ -187,6 +192,9 @@ Source5: 20-connectivity-redhat.conf
 Source6: 70-nm-connectivity.conf
 Source7: readme-ifcfg-rh.txt
 
+# MSVSphere sources
+Source1000: 20-connectivity-msvsphere.conf
+
 # RHEL downstream patches that change behavior from upstream.
 # These are not bugfixes, hence they are also relevant after
 # the next rebase of the source tarball.
@@ -526,6 +534,17 @@ This adds a NetworkManager configuration file to enable connectivity checking
 via Red Hat infrastructure.
 %endif
 
+%if %{with connectivity_msvsphere}
+%package config-connectivity-msvsphere
+Summary: NetworkManager config file for connectivity checking via MSVSphere servers
+Group: System Environment/Base
+BuildArch: noarch
+Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
+
+%description config-connectivity-msvsphere
+This adds a NetworkManager configuration file to enable connectivity checking
+via MSVSphere infrastructure.
+%endif
 
 %package config-server
 Summary: NetworkManager config file for "server-like" defaults
@@ -909,6 +928,12 @@ mkdir -p %{buildroot}%{_sysctldir}
 cp %{SOURCE6} %{buildroot}%{_sysctldir}
 %endif
 
+%if %{with connectivity_msvsphere}
+cp %{SOURCE1000} %{buildroot}%{nmlibdir}/conf.d/
+mkdir -p %{buildroot}%{_sysctldir}
+cp %{SOURCE6} %{buildroot}%{_sysctldir}
+%endif
+
 %if 0%{?ifcfg_warning}
 cp %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts
 %endif
@@ -1197,6 +1222,15 @@ fi
 %endif
 
 
+%if %{with connectivity_msvsphere}
+%files config-connectivity-msvsphere
+%dir %{nmlibdir}
+%dir %{nmlibdir}/conf.d
+%{nmlibdir}/conf.d/20-connectivity-msvsphere.conf
+%{_sysctldir}/70-nm-connectivity.conf
+%endif
+
+
 %files config-server
 %dir %{nmlibdir}
 %dir %{nmlibdir}/conf.d
@@ -1245,12 +1279,15 @@ fi
 
 
 %changelog
-* Fri Mar 29 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.40.16-15
+* Thu Apr 04 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1:1.40.16-15.inferit
 - Rebuilt for MSVSphere 8.10 beta
 
 * Fri Feb 09 2024 Íñigo Huguet <ihuguet@redhat.com> - 1:1.40.16-15
 - Suppress NetworkManager's harmless warning when IPv6 is disabled at kernel level (RHEL-10450)
 
+* Wed Dec 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 1:1.40.16-9.inferit
+- Implemented connectivity checking via MSVSphere infrastructure
+
 * Tue Dec 12 2023 Wen Liang <wenliang@redhat.com> - 1:1.40.16-14
 - Fix matching existing connection by UUID on restart (RHEL-5119)
 
@@ -1266,6 +1303,9 @@ fi
 * Wed Oct 04 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.40.16-10
 - manager: allow controller activation if device is deactivating (RHEL-5119) 
 
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1:1.40.16-9
+- Rebuilt for MSVSphere 8.8
+
 * Wed Jul 19 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.40.16-9
 - cloud-setup: fix terminating in the middle of reconfiguration (rh #2221903)