SOURCES/0001-Initial-msvsphere-build-configuation.patch

@@ -0,0 +1,36 @@
+From 06e033c1d069c9a09751989735c5e2785567b4fd Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <sergey.cherevko@softline.com>
+Date: Fri, 31 Mar 2023 11:19:53 +0300
+Subject: [PATCH] Initial msvsphere build configuation
+
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 12c9e1d..0ae7d4e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -96,8 +96,8 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
+     systemd_dir_path = osutil.get_systemd_unit_file_install_path()
+     agent_bin_path = osutil.get_agent_bin_path()
+ 
+-    if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'):  # pylint: disable=R1714
+-        if version.startswith("8.2"):
++    if name in ('redhat', 'centos', 'almalinux', 'cloudlinux', 'msvsphere'):  # pylint: disable=R1714
++        if version.startswith("9"):
+             # redhat8+ default to py3
+             set_bin_files(data_files, dest=agent_bin_path,
+                           src=["bin/py3/waagent", "bin/waagent2.0"])
+@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
+         set_conf_files(data_files)
+         set_logrotate_files(data_files)
+         set_udev_files(data_files)
+-        if version.startswith("8.2"):
++        if version.startswith("9"):
+             # redhat 8+ uses systemd and python3
+             set_systemd_files(data_files, dest=systemd_dir_path,
+                               src=["init/redhat/waagent.service",
+-- 
+2.39.2
+

SOURCES/0001-Initial-redhat-build-configuation.patch

@@ -1,75 +0,0 @@
-From 9d071a9b4b40f0f86bb0b739b72c0b9b4870f060 Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Fri, 14 May 2021 09:42:08 +0200
-Subject: Initial redhat build configuation.
-
-Using .distro repository to hold redhat tools and configuration.
-
-Package can be built on brew using rh-rhel-koji command.
-
-Note: Old rh-brew target is supported.
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-Merged patches (2.7.0.6):
-- 896c5c83 Require iptables package
-- a702a0d1 (origin/rhel-9.0.0-beta) source-git: Use dynamic SRPM_NAME
----
- .distro/Makefile                     |  73 ++++++
- .distro/Makefile.common              |  18 ++
- .distro/WALinuxAgent.spec.template   | 254 +++++++++++++++++++++
- .distro/module-setup.sh              |  16 ++
- .distro/rpmbuild/BUILD/.gitignore    |   2 +
- .distro/rpmbuild/RPMS/.gitignore     |   2 +
- .distro/rpmbuild/SOURCES/.gitignore  |   2 +
- .distro/rpmbuild/SPECS/.gitignore    |   2 +
- .distro/rpmbuild/SRPMS/.gitignore    |   2 +
- .distro/scripts/extract_build_cmd.py |  83 +++++++
- .distro/scripts/frh.py               |  24 ++
- .distro/scripts/git-backport-diff    | 327 +++++++++++++++++++++++++++
- .distro/scripts/git-compile-check    | 215 ++++++++++++++++++
- .distro/scripts/process-patches.sh   |  92 ++++++++
- .distro/scripts/tarball_checksum.sh  |   3 +
- setup.py                             |   4 +-
- 16 files changed, 1117 insertions(+), 2 deletions(-)
- create mode 100644 .distro/Makefile
- create mode 100644 .distro/Makefile.common
- create mode 100644 .distro/WALinuxAgent.spec.template
- create mode 100644 .distro/module-setup.sh
- create mode 100644 .distro/rpmbuild/BUILD/.gitignore
- create mode 100644 .distro/rpmbuild/RPMS/.gitignore
- create mode 100644 .distro/rpmbuild/SOURCES/.gitignore
- create mode 100644 .distro/rpmbuild/SPECS/.gitignore
- create mode 100644 .distro/rpmbuild/SRPMS/.gitignore
- create mode 100755 .distro/scripts/extract_build_cmd.py
- create mode 100755 .distro/scripts/frh.py
- create mode 100755 .distro/scripts/git-backport-diff
- create mode 100755 .distro/scripts/git-compile-check
- create mode 100755 .distro/scripts/process-patches.sh
- create mode 100755 .distro/scripts/tarball_checksum.sh
-
-diff --git a/setup.py b/setup.py
-index 12c9e1d6..e4d7cf7e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
-     agent_bin_path = osutil.get_agent_bin_path()
- 
-     if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'):  # pylint: disable=R1714
--        if version.startswith("8.2"):
-+        if version.startswith("9"):
-             # redhat8+ default to py3
-             set_bin_files(data_files, dest=agent_bin_path,
-                           src=["bin/py3/waagent", "bin/waagent2.0"])
-@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
-         set_conf_files(data_files)
-         set_logrotate_files(data_files)
-         set_udev_files(data_files)
--        if version.startswith("8.2"):
-+        if version.startswith("9"):
-             # redhat 8+ uses systemd and python3
-             set_systemd_files(data_files, dest=systemd_dir_path,
-                               src=["init/redhat/waagent.service",
--- 
-2.31.1
-

SOURCES/Add-MSVSphere-support.patch

@@ -0,0 +1,58 @@
+From 2099a56b545769dd6d65a074e1c7d36dbd678822 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <sergey.cherevko@softline.com>
+Date: Fri, 31 Mar 2023 11:26:17 +0300
+Subject: [PATCH] Add MSVSphere support
+
+---
+ azurelinuxagent/common/osutil/factory.py | 2 +-
+ azurelinuxagent/pa/rdma/factory.py       | 2 +-
+ tests/common/osutil/test_factory.py      | 7 +++++++
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py
+index b8f4291..8b71d29 100644
+--- a/azurelinuxagent/common/osutil/factory.py
++++ b/azurelinuxagent/common/osutil/factory.py
+@@ -102,7 +102,7 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
+ 
+         return DebianOSBaseUtil()
+ 
+-    if distro_name in ("redhat", "rhel", "centos", "oracle", "almalinux", "cloudlinux"):
++    if distro_name in ("redhat", "rhel", "centos", "oracle", "almalinux", "cloudlinux", "msvsphere"):
+         if Version(distro_version) < Version("7"):
+             return Redhat6xOSUtil()
+ 
+diff --git a/azurelinuxagent/pa/rdma/factory.py b/azurelinuxagent/pa/rdma/factory.py
+index 8fb5066..7990c49 100644
+--- a/azurelinuxagent/pa/rdma/factory.py
++++ b/azurelinuxagent/pa/rdma/factory.py
+@@ -38,7 +38,7 @@ def get_rdma_handler(
+     ):
+         return SUSERDMAHandler()
+ 
+-    if distro_full_name in ('CentOS Linux', 'CentOS', 'Red Hat Enterprise Linux Server', 'AlmaLinux', 'CloudLinux'):
++    if distro_full_name in ('CentOS Linux', 'CentOS', 'Red Hat Enterprise Linux Server', 'AlmaLinux', 'CloudLinux', 'MSVSphere'):
+         return CentOSRDMAHandler(distro_version)
+ 
+     if distro_full_name == 'Ubuntu':
+diff --git a/tests/common/osutil/test_factory.py b/tests/common/osutil/test_factory.py
+index 9a76eb8..aee20a1 100644
+--- a/tests/common/osutil/test_factory.py
++++ b/tests/common/osutil/test_factory.py
+@@ -258,6 +258,13 @@ class TestOsUtilFactory(AgentTestCase):
+         self.assertTrue(isinstance(ret, RedhatOSUtil))
+         self.assertEqual(ret.get_service_name(), "waagent")
+ 
++        ret = _get_osutil(distro_name="msvsphere",
++                          distro_code_name="",
++                          distro_full_name="",
++                          distro_version="9")
++        self.assertTrue(isinstance(ret, RedhatOSUtil))
++        self.assertEqual(ret.get_service_name(), "waagent")
++
+     def test_get_osutil_it_should_return_euleros(self):
+         ret = _get_osutil(distro_name="euleros",
+                           distro_code_name="",
+-- 
+2.39.2
+

SOURCES/wla-Disable-automatic-log-collector.patch

@@ -0,0 +1,39 @@
+From 21616a198bee14a9a95a6dacedcd1b1eca175fc6 Mon Sep 17 00:00:00 2001
+From: Ani Sinha <anisinha@redhat.com>
+Date: Mon, 6 May 2024 11:50:49 +0530
+Subject: [PATCH] Disable automatic log collector
+
+RH-Author: Ani Sinha <anisinha@redhat.com>
+RH-MergeRequest: 11: Disable automatic log collector
+RH-Jira: RHEL-7273
+RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 7a8002c626b45eb5e90fa0fe82694639d1e5b93d (anisinha/centos-wa-linux-agent)
+
+Log collector is enabled by default. Due to security concerns from our customers
+disable it.
+
+Jira: https://issues.redhat.com/browse/RHEL-7273
+Upstream: RHEL only.
+
+Signed-off-by: Ani Sinha <anisinha@redhat.com>
+---
+ config/waagent.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/waagent.conf b/config/waagent.conf
+index 14cd01c8..25ee83d3 100644
+--- a/config/waagent.conf
++++ b/config/waagent.conf
+@@ -73,7 +73,7 @@ Logs.Verbose=n
+ # Logs.Console=y
+ 
+ # Enable periodic log collection, default is y
+-Logs.Collect=y
++Logs.Collect=n
+ 
+ # How frequently to collect logs, default is each hour
+ Logs.CollectPeriod=3600
+-- 
+2.39.3
+

SPECS/WALinuxAgent.spec

@@ -4,7 +4,7 @@
 
 Name:           WALinuxAgent
 Version:        2.7.0.6
-Release:        9%{?dist}.1
+Release:        10%{?dist}.inferit
 Summary:        The Microsoft Azure Linux Agent
 
 License:        ASL 2.0
@@ -16,7 +16,7 @@ Source3:        90-tpm2-import.rules
 Source4:        tpm2-luks-import.sh
 
 # Python3.9 fixes
-Patch0001: 0001-Initial-redhat-build-configuation.patch
+Patch0001: 0001-Initial-msvsphere-build-configuation.patch
 Patch0002: 0002-Implement-restart_if-for-RedHat-OS.patch
 # For bz#2098233 - [Azure][WALA][RHEL-9] [9.1] walinuxagent kills network during boot
 Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
@@ -24,6 +24,10 @@ Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
 Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
 # For bz#2093965 - [Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect
 Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch
+# For RHEL-7273 - [Azure][WALA] Consider to disable Log collector
+Patch6: wla-Disable-automatic-log-collector.patch
+
+Patch100: Add-MSVSphere-support.patch
 
 # Source-git patches
 
@@ -159,9 +163,13 @@ rm -rf %{_unitdir}/waagent.service.d/
 %endif
 
 %changelog
-* Tue Jul 18 2023 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-9.el9_2.1
+* Thu May 09 2024 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-10
-- Rebuild for BZ 2222947
+- wla-Disable-automatic-log-collector.patch [RHEL-7273]
-- Resolves: bz#2222947
+- Resolves: RHEL-7273
+  ([Azure][WALA] Consider to disable Log collector)
+
+* Thu Apr 13 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.7.0.6-9
+- Rebuilt for MSVSphere 9.2 beta
 
 * Wed Feb 08 2023 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-9
 - wla-redhat-Adjust-tpm2_createprimary-key-attributes-to-m.patch [bz#2167322]