From a560d5f0cab11c1820fb30141c8a6e2d205352ba Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Thu, 18 Apr 2024 04:22:22 -0400
Subject: [PATCH] * Fri Apr 19 2024 Miroslav Rezanina <mrezanin@redhat.com> -
 12.4.0-1

- Rebase to 12.4.0 [RHEL-30345]
- Resolves: RHEL-30345
  ([ESXi][RHEL10]open-vm-tools version 12.4.0 has been released - please rebase)
---
 .gitignore         |  3 +++
 open-vm-tools.spec | 13 +++++++++----
 sources            |  2 +-
 vgauthd.service    |  2 +-
 vmtoolsd.service   |  5 ++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fc404d..ad3c8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,8 @@
 /open-vm-tools-12.0.5-19716617.tar.gz
 /open-vm-tools-12.1.0-20219665.tar.gz
 /open-vm-tools-12.1.5-20735119.tar.gz
+/open-vm-tools-12.2.0-21223074.tar.gz
+/open-vm-tools-12.2.5-21855600.tar.gz
 /open-vm-tools-12.3.0-22234872.tar.gz
 /open-vm-tools-12.3.5-22544099.tar.gz
+/open-vm-tools-12.4.0-23259341.tar.gz
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index c9b6c3d..19e7c64 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -18,9 +18,9 @@
 ### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ################################################################################
 
-%global majorversion    12.3
-%global minorversion    5
-%global toolsbuild      22544099
+%global majorversion    12.4
+%global minorversion    0
+%global toolsbuild      23259341
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -31,7 +31,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          3%{?dist}
+Release:          1%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPL-2.0 AND W3C AND LGPL-2.1 AND ICU AND ISC AND MIT
 URL:              https://github.com/vmware/%{name}
@@ -418,6 +418,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Fri Apr 19 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.4.0-1
+- Rebase to 12.4.0 [RHEL-30345]
+- Resolves: [RHEL-30345]
+  ([ESXi][RHEL10]open-vm-tools version 12.4.0 has been released - please rebase)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 0a2671d..777c14b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-vm-tools-12.3.5-22544099.tar.gz) = 7a81d929ea4871b8af0af0fa3dc62a821ac4286235255103f1bcf014e3b04b5bbbfa178a9328a16d67cfd595c4ce726dc9e195adbe21ec5c68a4d1abb1561ff6
+SHA512 (open-vm-tools-12.4.0-23259341.tar.gz) = 11ea43c64ec534922145f83e2b7ef9254437f80656ad03b596340a78c3698adcc7d84adade9c5d8e1c83b5ebc3bd086601b1d104e0f070274dc2b6bc1f64fb17
diff --git a/vgauthd.service b/vgauthd.service
index d5fef2c..6ca3508 100644
--- a/vgauthd.service
+++ b/vgauthd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=VGAuth Service for open-vm-tools
-Documentation=http://github.com/vmware/open-vm-tools
+Documentation=https://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 PartOf=vmtoolsd.service
 
diff --git a/vmtoolsd.service b/vmtoolsd.service
index 54c7312..7454f90 100644
--- a/vmtoolsd.service
+++ b/vmtoolsd.service
@@ -1,13 +1,16 @@
 [Unit]
 Description=Service for virtual machines hosted on VMware
-Documentation=http://github.com/vmware/open-vm-tools
+Documentation=https://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 Requires=vgauthd.service
 After=vgauthd.service
+StartLimitIntervalSec=30
+StartLimitBurst=3
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
 TimeoutStopSec=5
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target