From 732722194e59bcf07067f8dd28f281cf8a60cab7 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 14:59:42 +0000
Subject: [PATCH] import CS open-vm-tools-12.3.5-2.el8

---
 .gitignore               |  2 +-
 .open-vm-tools.metadata  |  2 +-
 SOURCES/vmtoolsd.service |  3 +++
 SPECS/open-vm-tools.spec | 34 ++++++++++++++++++++++++++++++----
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b8e988..a51e0f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/open-vm-tools-12.2.5-21855600.tar.gz
+SOURCES/open-vm-tools-12.3.5-22544099.tar.gz
diff --git a/.open-vm-tools.metadata b/.open-vm-tools.metadata
index eab5035..55c896c 100644
--- a/.open-vm-tools.metadata
+++ b/.open-vm-tools.metadata
@@ -1 +1 @@
-6bc6e77418cc4a039063a7ca40859535b9bbb339 SOURCES/open-vm-tools-12.2.5-21855600.tar.gz
+84ec127c620c46f6cddb5e38ce556a31244a967d SOURCES/open-vm-tools-12.3.5-22544099.tar.gz
diff --git a/SOURCES/vmtoolsd.service b/SOURCES/vmtoolsd.service
index b0984be..7d1bb2f 100644
--- a/SOURCES/vmtoolsd.service
+++ b/SOURCES/vmtoolsd.service
@@ -6,10 +6,13 @@ Requires=vgauthd.service
 After=vgauthd.service
 DefaultDependencies=no
 Before=cloud-init-local.service
+StartLimitIntervalSec=30
+StartLimitBurst=3
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
 TimeoutStopSec=5
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index 42b99b8..21f0e5a 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -19,9 +19,9 @@
 ################################################################################
 
 %global _hardened_build 1
-%global majorversion    12.2
+%global majorversion    12.3
 %global minorversion    5
-%global toolsbuild      21855600
+%global toolsbuild      22544099
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -32,7 +32,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -87,7 +87,7 @@ BuildRequires:    gtk3-devel >= 3.10.0
 BuildRequires:    gtkmm30-devel >= 3.10.0
 BuildRequires:    libtirpc-devel
 BuildRequires:    rpcgen
-BuildRequires:    systemd-rpm-macros
+BuildRequires:    systemd-udev
 %else
 BuildRequires:    gtk2-devel >= 2.4.0
 BuildRequires:    gtkmm24-devel
@@ -410,6 +410,32 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Wed Dec 06 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.3.5-2
+- ovt-Restart-tools-on-failure.patch [RHEL-17683]
+- Resolves: RHEL-17683
+  (Add Restart=on-failure to vmtoolsd.service [rhel-8])
+
+* Thu Nov 09 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.3.5-1
+- Rebase to 12.3.5 [RHEL-15059]
+- Fix CVE-2023-34058 [RHEL-14649]
+- Fix CVE-2023-34059 [RHEL-14683]
+- Resolves: RHEL-15059
+  ([ESXi][RHEL8]open-vm-tools version 12.3.5 has been released - please rebase)
+- Resolves: RHEL-14649
+  (CVE-2023-34058 open-vm-tools: SAML token signature bypass [rhel-8.10.0])
+- Resolves: RHEL-14683
+  (CVE-2023-34059 open-vm-tools: file descriptor hijack vulnerability in the vmware-user-suid-wrapper [rhel-8.10.0])
+
+* Wed Sep 27 2023 Jon Maloy <jmaloy@redhat.com> - 12.2.5-4
+- ovt-Provide-alternate-method-to-allow-expected-pre-froze.patch [RHEL-7012]
+- Resolves: RHEL-7012
+  ([RHEL8.10][ESXi]Latest version of open-vm-tools breaks VM backups)
+
+* Wed Sep 20 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.2.5-3
+- Rebuild CVE-2023-20900 for 8.10
+- Resolves: RHEL-4584
+  (CVE-2023-20900 open-vm-tools: SAML token signature bypass [rhel-8.10.0])
+
 * Tue Jul 11 2023 Miroslav Rezanina <mrezanin@redhat.com> - 12.2.5-1
 - Rebase to open-vm-tools 12.2.5 [bz#2214861]
 - Resolves: bz#2214861