From 126ce371ccd34a14755d5960d193821b989b09c6 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Tue, 11 Jul 2023 03:57:31 -0400
Subject: [PATCH] * 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
  ([ESXi][RHEL8]open-vm-tools version 12.2.5 has been released - please rebase)
- Resolves: bz#2216415
  ([ESXi][RHEL8] URL in service unit files are started from http instead of https)
---
 .gitignore         |  1 +
 open-vm-tools.spec | 15 ++++++++++-----
 sources            |  2 +-
 vgauthd.service    |  2 +-
 vmtoolsd.service   |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e6858f..cb85765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 SOURCES/open-vm-tools-12.1.5-20735119.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
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 5030fe3..42b99b8 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -20,8 +20,8 @@
 
 %global _hardened_build 1
 %global majorversion    12.2
-%global minorversion    0
-%global toolsbuild      21223074
+%global minorversion    5
+%global toolsbuild      21855600
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -32,7 +32,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:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -52,8 +52,6 @@ ExclusiveArch:    %{ix86} x86_64 aarch64
 %endif
 
 # Patch0: name.patch
-# For bz#2215563 - [CISA Major Incident] CVE-2023-20867 open-vm-tools: authentication bypass vulnerability in the vgauth module [rhel-8]
-Patch1: ovt-Remove-some-dead-code.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -412,6 +410,13 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* 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
+  ([ESXi][RHEL8]open-vm-tools version 12.2.5 has been released - please rebase)
+- Resolves: bz#2216415
+  ([ESXi][RHEL8] URL in service unit files are started from http instead of https)
+
 * Wed Jun 28 2023 Jon Maloy <jmaloy@redhat.com> - 12.2.0-3
 - ovt-Remove-some-dead-code.patch [bz#2215563]
 - Resolves: bz#2215563
diff --git a/sources b/sources
index a358198..f9368fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-vm-tools-12.2.0-21223074.tar.gz) = d663d8ea455264cad7d3eaac16c5d08672e8e10f7a9171be40fff69e208ae697bc0e8af498c978d8de470ed273351b42c54994b2c552fdc05b828c80f4826b84
+SHA512 (open-vm-tools-12.2.5-21855600.tar.gz) = 72db3b88f61624d26e8ff7e37e4fc52ecd0bec0b6f076d935870c03312321c5e0b406d05eae7012872734a50626ed760dff2cf872e26ec18ebf200aff5ed12ef
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 773040d..b0984be 100644
--- a/vmtoolsd.service
+++ b/vmtoolsd.service
@@ -1,6 +1,6 @@
 [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