From 08d78b393441940b7287e6b8c057b665fc39ccf1 Mon Sep 17 00:00:00 2001
From: James Antill <jantill@redhat.com>
Date: Mon, 27 Feb 2023 14:36:41 -0500
Subject: [PATCH] Import rpm: c8s

---
 .gitignore         |  3 ++-
 open-vm-tools.spec | 52 +++++++++++++++++++++++++++++++++++++++++++---
 sources            |  2 +-
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69b451b..52a58d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/open-vm-tools-11.3.5-18557794.tar.gz
+SOURCES/open-vm-tools-12.1.5-20735119.tar.gz
+/open-vm-tools-12.1.5-20735119.tar.gz
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 37fa2d7..1cfa405 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -19,9 +19,9 @@
 ################################################################################
 
 %global _hardened_build 1
-%global majorversion    11.3
+%global majorversion    12.1
 %global minorversion    5
-%global toolsbuild      18557794
+%global toolsbuild      20735119
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -51,6 +51,7 @@ ExclusiveArch:    x86_64
 ExclusiveArch:    %{ix86} x86_64 aarch64
 %endif
 
+#Patch0: name.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -142,6 +143,15 @@ This package contains only the user-space programs and utility scripts of
 %{name} that are essential for performing service discovery in VMware
 virtual machines by vRealize Operations Service Discovery Management Pack.
 
+%package          salt-minion
+Summary:          Script file to install/uninstall salt-minion
+Group:            System Environment/Libraries
+Requires:         %{name}%{?_isa} = %{version}-%{release}, systemd, curl, coreutils, gawk, grep
+ExclusiveArch:    x86_64
+
+%description      salt-minion
+This package contains a script to setup Salt Minion on VMware virtual machines.
+
 %package          devel
 Summary:          Development libraries for Open Virtual Machine Tools
 Requires:         %{name}%{?_isa} = %{version}-%{release}
@@ -171,6 +181,9 @@ autoreconf -vif
     --enable-xmlsec1 \
     --enable-resolutionkms \
     --enable-servicediscovery \
+%ifarch x86_64
+    --enable-salt-minion \
+%endif
 %if 0%{?fedora} || 0%{?rhel} >= 8
     --with-tirpc \
     --without-gtk2 \
@@ -345,6 +358,7 @@ fi
 %{_libdir}/%{name}/plugins/common/*.so
 %dir %{_libdir}/%{name}/plugins/vmsvc
 %{_libdir}/%{name}/plugins/vmsvc/libappInfo.so
+%{_libdir}/%{name}/plugins/vmsvc/libcomponentMgr.so
 %{_libdir}/%{name}/plugins/vmsvc/libdeployPkgPlugin.so
 %{_libdir}/%{name}/plugins/vmsvc/libgdp.so
 %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
@@ -373,6 +387,13 @@ fi
 %{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
 %{_libdir}/%{name}/serviceDiscovery
 
+%ifarch x86_64
+%files salt-minion
+%dir %{_libdir}/%{name}/componentMgr/
+%dir %{_libdir}/%{name}/componentMgr/saltMinion/
+%{_libdir}/%{name}/componentMgr/saltMinion/svtminion.sh
+%endif
+
 %files devel
 %doc docs/api/build/*
 %exclude %{_includedir}/libDeployPkg/
@@ -389,7 +410,32 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
-* Mon Oct 18 2021 Miroslav Rezanian <mrezanin@redhat.com> - 11.3.5-1.el9
+* Fri Dec 09 2022 Miroslav Rezanina <mrezanin@redhat.com> 12.1.5-1
+- Rebase to open-vm-tools 12.1.5 [bz#2150188]
+- Resolves: bz#2150188
+  (ESXi][RHEL8]Open-vm-tools release 12.1.5 has been released - please rebase)
+
+* Tue Sep 13 2022 Miroslav Rezanina <mrezanin@redhat.com> 12.1.0-1
+- Rebase to open-vm-tools 12.1.0
+- Resolves: bz#2121196
+  ([ESXi][RHEL8]Open-vm-tools release 12.1.0 has been released - please rebase)
+
+* Tue Sep 06 2022 Jon Maloy <jmaloy@redhat.com> - 12.0.5-2
+- ovt-Properly-check-authorization-on-incoming-guestOps-re.patch [bz#2119284]
+- Resolves: bz#2119284
+  (CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-8.7.0])
+
+* Tue Jun 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.5-1
+- Rebase to open-vm-tools 12.0.5 [bz#2090273]
+- Resolves: bz#2090273
+  ([ESXi][RHEL8]Open-vm-tools release 12.0.5 has been released - please rebase)
+
+* Thu Apr 28 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.0-1
+- Rebase to open-vm-tools 12.0.0 [bz#2061189]
+- Resolves: bz#2061189
+  ([ESXi][RHEL8]Open-vm-tools release 12.0.0 has been released - please rebase)
+
+* Mon Oct 18 2021 Miroslav Rezanian <mrezanin@redhat.com> - 11.3.5-1
 - Rebase to open-vm-tools 11.3.5 [bz#2008244]
 - Resolves: bz#2008244
   ([ESXi][RHEL8]Open-vm-tools release 11.3.5 has been released - please rebase)
diff --git a/sources b/sources
index 6a060df..418e936 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
+SHA512 (open-vm-tools-12.1.5-20735119.tar.gz) = d85fec73a58cb1c9b2956aff886825b9d47d00dc6d0d8a3d2ecdfac3fa982c27463b9cc2f42bf3dd18fe542b30f751850e8051e270c547e897f06a4e1c12d639