* Tue Jun 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.5-1

- Rebase to open-vm-tools 12.0.5 [bz#2090275]
- Resolves: bz#2090275
  ([ESXi][RHEL9]Open-vm-tools release 12.0.5 has been released - please rebase)

.gitignore

@@ -23,3 +23,4 @@
 /open-vm-tools-11.3.0-18090558.tar.gz
 /open-vm-tools-11.3.5-18557794.tar.gz
 /open-vm-tools-12.0.0-19345655.tar.gz
+/open-vm-tools-12.0.5-19716617.tar.gz

0002-Fix-asyncsocket-warnings.patch

@@ -1,118 +0,0 @@
-From 5fff493e094bd187580513b1b8469bae1d7d17e8 Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Tue, 29 Mar 2022 02:51:45 -0400
-Subject: Fix asyncsocket warnings
-
-With newer gcc, build of open-vm-tools will fail due to several warnings.
-Adding fixes to allow build to pass.
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- .../lib/asyncsocket/asyncSocketVTable.h       |  4 ++--
- open-vm-tools/lib/asyncsocket/asyncsocket.c   | 20 +++++++++----------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h b/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
-index a69b6567..01d5be9d 100644
---- a/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
-+++ b/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
-@@ -131,8 +131,8 @@ typedef struct AsyncSocketVTable {
-                        int timeoutMS);
-    int (*doOneMsg)(AsyncSocket *s, Bool read, int timeoutMS);
-    int (*waitForConnection)(AsyncSocket *s, int timeoutMS);
--   int (*waitForReadMultiple)(AsyncSocket **asock, int numSock, int timeoutMS,
--                              int *outIdx);
-+   int (*waitForReadMultiple)(AsyncSocket **asock, size_t numSock,
-+                              int timeoutMS, int *outIdx);
-    int (*peek)(AsyncSocket *asock, void *buf, int len, void *cb, void *cbData);
- 
-    /*
-diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
-index efddf99b..b841a45e 100644
---- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
-+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
-@@ -370,7 +370,7 @@ static int AsyncTCPSocketRecvPartialBlocking(AsyncSocket *s, void *buf, int len,
- static int AsyncTCPSocketSendBlocking(AsyncSocket *s, void *buf, int len,
-                                       int *sent, int timeoutMS);
- static int AsyncTCPSocketDoOneMsg(AsyncSocket *s, Bool read, int timeoutMS);
--static int AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, int numSock,
-+static int AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, size_t numSock,
-                                              int timeoutMS, int *outIdx);
- static int AsyncTCPSocketSetOption(AsyncSocket *asyncSocket,
-                                    AsyncSocketOpts_Layer layer,
-@@ -2807,7 +2807,7 @@ AsyncTCPSocketPeek(AsyncSocket *base,   // IN:
- 
- static int
- AsyncTCPSocketPollWork(AsyncTCPSocket **asock,     // IN:
--                       int numSock,                // IN:
-+                       size_t numSock,             // IN:
-                        void *p,                    // IN:
-                        Bool read,                  // IN:
-                        int timeoutMS,              // IN:
-@@ -2827,11 +2827,11 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock,     // IN:
-    struct fd_set rwfds;
-    struct fd_set exceptfds;
- #endif
--   int i;
-+   size_t i;
-    int retval;
- 
-    ASSERT(outAsock != NULL && *outAsock == NULL && asock != NULL &&
--          numSock > 0);
-+          numSock != 0);
- 
-    for (i = 0; i < numSock; i++) {
-       if (read && SSL_Pending(asock[i]->sslSock)) {
-@@ -2852,7 +2852,7 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock,     // IN:
-          retval = poll(pfd, numSock, timeoutMS);
-          AsyncTCPSocketLock(parentSock);
-       } else {
--         for (i = numSock - 1; i >= 0; i--) {
-+         for (i = numSock; i-- > 0; ) {
-             AsyncTCPSocketUnlock(asock[i]);
-          }
-          retval = poll(pfd, numSock, timeoutMS);
-@@ -2878,7 +2878,7 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock,     // IN:
-                          &exceptfds, timeoutMS >= 0 ? &tv : NULL);
-          AsyncTCPSocketLock(parentSock);
-       } else {
--         for (i = numSock - 1; i >= 0; i--) {
-+         for (i = numSock; i-- > 0; ) {
-             AsyncTCPSocketUnlock(asock[i]);
-          }
-          retval = select(1, read ? &rwfds : NULL, read ? NULL : &rwfds,
-@@ -3032,7 +3032,7 @@ AsyncTCPSocketPoll(AsyncTCPSocket *s,          // IN:
- #else
-    void *p = NULL;
- #endif
--   int numSock = 0;
-+   size_t numSock = 0;
- 
-    if (read && s->fd == -1) {
-       if (!s->listenAsock4 && !s->listenAsock6) {
-@@ -3078,11 +3078,11 @@ AsyncTCPSocketPoll(AsyncTCPSocket *s,          // IN:
- 
- static int
- AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock,   // IN:
--                                  int numSock,           // IN:
-+                                  size_t numSock,        // IN:
-                                   int timeoutMS,         // IN:
-                                   int *outIdx)           // OUT:
- {
--   int i;
-+   size_t i;
-    int err;
-    AsyncTCPSocket *outAsock  = NULL;
- #ifndef _WIN32
-@@ -3096,7 +3096,7 @@ AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock,   // IN:
-    }
-    err = AsyncTCPSocketPollWork((AsyncTCPSocket **)asock, numSock, p, TRUE,
-                                 timeoutMS, NULL, &outAsock);
--   for (i = numSock - 1; i >= 0; i--) {
-+   for (i = numSock; i-- > 0; ) {
-       AsyncTCPSocket *tcpAsock = TCPSocket(asock[i]);
-       if (outAsock == tcpAsock) {
-          *outIdx = i;
--- 
-2.31.1
-

open-vm-tools.spec

@@ -20,8 +20,8 @@
 
 %global _hardened_build 1
 %global majorversion    12.0
-%global minorversion    0
+%global minorversion    5
-%global toolsbuild      19345655
+%global toolsbuild      19716617
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
@@ -51,8 +51,6 @@ ExclusiveArch:    x86_64 aarch64
 ExclusiveArch:    %{ix86} x86_64 aarch64
 %endif
 
-Patch0002: 0002-Fix-asyncsocket-warnings.patch
-
 # Source-git patches
 
 BuildRequires:    autoconf
@@ -412,6 +410,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Tue Jun 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.5-1
+- Rebase to open-vm-tools 12.0.5 [bz#2090275]
+- Resolves: bz#2090275
+  ([ESXi][RHEL9]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 12.0.0 [bz#2061193]
 - Resolves: bz#2061193

sources

@@ -1 +1 @@
-SHA512 (open-vm-tools-12.0.0-19345655.tar.gz) = 5c41ed81eb0e2755ca4a4adf8691f60daf016577d4b98ede36916fb95412f5dfdc086a3a42ef87fcb669ce7026ea1383a2dccc49fe30d192b187b8592a25e935
+SHA512 (open-vm-tools-12.0.5-19716617.tar.gz) = d0e842a33e423cb07f86c2c7c9b3d2e7bca85c49c922d14529a72db322931b3baedad386bffc1bb500bb4fe8b572529f3c63fc823732405849edb6344b405714