public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/open-vm-tools] rawhide: Merge remote-tracking branch 'origin/eln' into rawhide
@ 2026-09-03 15:05 Stephen Gallagher
  0 siblings, 0 replies; only message in thread
From: Stephen Gallagher @ 2026-09-03 15:05 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/open-vm-tools
Branch : rawhide
Commit : fbbad012e2105f4f4be42ff3bcad549b5a4ea781
Author : Stephen Gallagher <sgallagh@redhat.com>
Date   : 2026-09-03T10:43:30-04:00
Stats  : +726/-1381 in 11 file(s)
URL    : https://src.fedoraproject.org/rpms/open-vm-tools/c/fbbad012e2105f4f4be42ff3bcad549b5a4ea781?branch=rawhide

Log:
Merge remote-tracking branch 'origin/eln' into rawhide

---
diff --git a/.gitignore b/.gitignore
index 84881fb..335ec95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1 @@
-/open-vm-tools-9.2.2-893683.tar.gz
-/open-vm-tools-9.2.3-1031360.tar.gz
-/open-vm-tools-9.4.0-1280544.tar.gz
-/open-vm-tools-9.4.6-1770165.tar.gz
-/open-vm-tools-9.10.0-2476743.tar.gz
-/open-vm-tools-9.10.2-2822639.tar.gz
-/open-vm-tools-10.0.0-3000743.tar.gz
-/open-vm-tools-10.0.5-3227872.tar.gz
-/open-vm-tools-10.1.0-4449150.tar.gz
-/open-vm-tools-10.1.5-5055683.tar.gz
-/open-vm-tools-10.1.10-6082533.tar.gz
-/open-vm-tools-10.2.0-7253323.tar.gz
-/open-vm-tools-10.2.5-8068406.tar.gz
-/open-vm-tools-10.3.0-8931395.tar.gz
-/open-vm-tools-10.3.5-10430147.tar.gz
-/open-vm-tools-10.3.10-12406962.tar.gz
-/open-vm-tools-11.0.0-14549434.tar.gz
-/open-vm-tools-11.0.5-15389592.tar.gz
-/open-vm-tools-11.1.0-16036546.tar.gz
-/open-vm-tools-11.1.5-16724464.tar.gz
-/open-vm-tools-11.2.0-16938113.tar.gz
-/open-vm-tools-11.2.5-17337674.tar.gz
-/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
-/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
-/atkmm-2.28.4-2.el10.src.rpm
-/cairomm-1.14.5-5.el10.src.rpm
-/glibmm2.4-2.66.6-5.el10.src.rpm
-/gtkmm3.0-3.24.8-6.el10.src.rpm
-/libsigc++20-2.12.1-4.el9.src.rpm
-/pangomm-2.46.4-2.el10.src.rpm
-/open-vm-tools-12.4.5-23787635.tar.gz
-/open-vm-tools-12.5.0-24276846.tar.gz
-/open-vm-tools-13.0.0-24696409.tar.gz
-/open-vm-tools-13.0.5-24915695.tar.gz
-/open-vm-tools-13.0.10-25056151.tar.gz
+*.tar.gz

diff --git a/0001-Fix-discarded-qualifiers-warning-error.patch b/0001-Fix-discarded-qualifiers-warning-error.patch
deleted file mode 100644
index 2a9c74f..0000000
--- a/0001-Fix-discarded-qualifiers-warning-error.patch
+++ /dev/null
@@ -1,776 +0,0 @@
-From 0e80cb86bb475f667daf7eb63a42162bb84ab07a Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Tue, 9 Dec 2025 12:22:02 +0100
-Subject: [PATCH] Fix discarded-qualifiers warning error
-
-New gcc reports warning when pointer looses const qualifier.
-
-In addition, handle new g_free definition.
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- open-vm-tools-13.0.5-24915695/config/ltmain.sh     |  4 ++--
- .../lib/file/fileLockPosix.c                       |  4 ++--
- .../lib/file/fileLockPrimitive.c                   |  2 +-
- open-vm-tools-13.0.5-24915695/lib/file/filePosix.c |  4 ++--
- .../lib/file/fileStandAlone.c                      |  8 ++++----
- .../lib/glibUtils/fileLogger.c                     |  8 ++++----
- .../lib/hgfs/hgfsEscape.c                          | 14 +++++++-------
- .../lib/hgfsServer/hgfsServerLinux.c               |  4 ++--
- open-vm-tools-13.0.5-24915695/lib/misc/codeset.c   |  2 +-
- .../lib/misc/codesetOld.c                          |  2 +-
- .../lib/misc/hostinfoPosix.c                       | 14 +++++++-------
- open-vm-tools-13.0.5-24915695/lib/misc/machineID.c |  2 +-
- open-vm-tools-13.0.5-24915695/lib/misc/strutil.c   |  8 ++++----
- .../lib/nicInfo/nicInfoPosix.c                     |  2 +-
- .../lib/procMgr/procMgrPosix.c                     |  8 ++++----
- .../lib/procMgr/procMgrSolaris.c                   |  2 +-
- .../lib/rpcChannel/glib_stubs.c                    |  3 +++
- open-vm-tools-13.0.5-24915695/lib/user/util.c      |  2 +-
- .../libguestStoreClient/guestStoreClientLib.c      |  4 ++--
- open-vm-tools-13.0.5-24915695/libvmtools/i18n.c    |  4 ++--
- .../modules/solaris/vmhgfs/vnode.c                 |  2 +-
- .../componentMgr/componentMgrInstallAction.c       |  4 ++--
- .../services/plugins/dndcp/copyPasteUIX11.cpp      |  2 +-
- .../services/plugins/dndcp/dnd/dndXdg.c            |  2 +-
- .../plugins/dndcp/dndGuest/guestCopyPasteSrc.cc    |  2 +-
- .../plugins/dndcp/dndGuest/vmGuestDnDSrc.cc        |  2 +-
- .../services/plugins/dndcp/dndUIX11.cpp            |  2 +-
- .../services/plugins/guestInfo/perfMonLinux.c      |  2 +-
- .../services/plugins/vix/vixTools.c                |  8 ++++----
- .../tests/vmrpcdbg/debugChannel.c                  |  2 +-
- open-vm-tools-13.0.5-24915695/vgauth/common/i18n.c |  2 +-
- .../vmblockmounter/vmblockmounter.c                |  2 +-
- open-vm-tools-13.0.5-24915695/vmhgfs-fuse/config.c |  2 +-
- open-vm-tools-13.0.5-24915695/xferlogs/xferlogs.c  |  8 ++++----
- 34 files changed, 73 insertions(+), 70 deletions(-)
-
-diff --git a/open-vm-tools-13.0.5-24915695/config/ltmain.sh b/open-vm-tools-13.0.5-24915695/config/ltmain.sh
-index 2c15309..09899f1 100755
---- a/open-vm-tools-13.0.5-24915695/config/ltmain.sh
-+++ b/open-vm-tools-13.0.5-24915695/config/ltmain.sh
-@@ -4476,11 +4476,11 @@ EOF
- 	    cat <<"EOF"
-   {
-     char* p;
--    while ((p = strchr (newargz[0], '\\')) != NULL)
-+    while ((p = (char *) strchr (newargz[0], '\\')) != NULL)
-       {
- 	*p = '/';
-       }
--    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-+    while ((p = (char *) strchr (lt_argv_zero, '\\')) != NULL)
-       {
- 	*p = '/';
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/file/fileLockPosix.c b/open-vm-tools-13.0.5-24915695/lib/file/fileLockPosix.c
-index a7373b4..0eecc42 100644
---- a/open-vm-tools-13.0.5-24915695/lib/file/fileLockPosix.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/file/fileLockPosix.c
-@@ -172,7 +172,7 @@ FileReadSlashProc(const char *procPath,  // IN:
- 
-    buffer[len] = '\0';
- 
--   p = strchr(buffer, '\n');
-+   p = (char *) strchr(buffer, '\n');
- 
-    if (p != NULL) {
-       *p = '\0';
-@@ -248,7 +248,7 @@ FileLockProcessDescriptor(pid_t pid)  // IN:
- 
-       *(p - 1) = '\0';
- 
--      q = strrchr(p + 1, ')');
-+      q = (char *) strrchr(p + 1, ')');
-       if (q == NULL) {
-          goto bail;
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/file/fileLockPrimitive.c b/open-vm-tools-13.0.5-24915695/lib/file/fileLockPrimitive.c
-index 193fc36..7571ced 100644
---- a/open-vm-tools-13.0.5-24915695/lib/file/fileLockPrimitive.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/file/fileLockPrimitive.c
-@@ -238,7 +238,7 @@ FileLockParseArgs(char *argv[],       // IN:
- 
-    while (argCount) {
-       uint32 i;
--      char *p = strchr(argv[argPos], '=');
-+      char *p = (char *) strchr(argv[argPos], '=');
- 
-       /* Validate the "name=value" form */
-       if ((p == NULL) || (p == argv[argPos]) || (p[1] == '\0')) {
-diff --git a/open-vm-tools-13.0.5-24915695/lib/file/filePosix.c b/open-vm-tools-13.0.5-24915695/lib/file/filePosix.c
-index 3b500eb..5d0f772 100644
---- a/open-vm-tools-13.0.5-24915695/lib/file/filePosix.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/file/filePosix.c
-@@ -1510,7 +1510,7 @@ File_GetVMFSMountInfo(const char *pathName,    // IN:
-        * This will cover both NFSv3 and NFSv4.1.
-        */
-       if (strncmp(fsAttrs->fsType, FS_NFS_ON_ESX, FS_NFS_PREFIX_LEN) == 0) {
--         char *sep = strchr(fsAttrs->logicalDevice, ' ');
-+         char *sep = (char *) strchr(fsAttrs->logicalDevice, ' ');
- 
-          if (sep) {
-             *sep++ = 0;
-@@ -2339,7 +2339,7 @@ FilePosixNearestExistingAncestor(char const *path)  // IN: File path
-          break;
-       }
- 
--      ptr = strrchr(result, DIRSEPC);
-+      ptr = (char *) strrchr(result, DIRSEPC);
-       if (ptr == NULL) {
-          ptr = result;
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/file/fileStandAlone.c b/open-vm-tools-13.0.5-24915695/lib/file/fileStandAlone.c
-index 6d3cba2..1fa4ab6 100644
---- a/open-vm-tools-13.0.5-24915695/lib/file/fileStandAlone.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/file/fileStandAlone.c
-@@ -715,9 +715,9 @@ File_ReplaceExtension(const char *pathName,      // IN:
- 
-    p = FileFindLastDirsep(result, pathNameLen);
-    if (p == NULL) {
--       p = strrchr(result, '.');
-+       p = (char *) strrchr(result, '.');
-    } else {
--       p = strrchr(p, '.');
-+       p = (char *) strrchr(p, '.');
-    }
- 
-    if (p == NULL) {
-@@ -790,9 +790,9 @@ File_RemoveExtension(const char *pathName)  // IN:
- 
-    p = FileFindLastDirsep(result, strlen(pathName));
-    if (p == NULL) {
--       p = strrchr(result, '.');
-+       p = (char *) strrchr(result, '.');
-    } else {
--       p = strrchr(p, '.');
-+       p = (char *) strrchr(p, '.');
-    }
- 
-    ASSERT(p != NULL);
-diff --git a/open-vm-tools-13.0.5-24915695/lib/glibUtils/fileLogger.c b/open-vm-tools-13.0.5-24915695/lib/glibUtils/fileLogger.c
-index f1b0dc7..59605bb 100644
---- a/open-vm-tools-13.0.5-24915695/lib/glibUtils/fileLogger.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/glibUtils/fileLogger.c
-@@ -167,7 +167,7 @@ FileLoggerGetPath(FileLogger *data,
-    for (i = 0; i < G_N_ELEMENTS(vars); i += 2) {
-       char *last = logpath;
-       char *start;
--      while ((start = strstr(last, vars[i])) != NULL) {
-+      while ((start = (char *) strstr(last, vars[i])) != NULL) {
-          gchar *tmp;
-          char *end = start + strlen(vars[i]);
-          size_t offset = (start - last) + strlen(vars[i+1]);
-@@ -192,11 +192,11 @@ FileLoggerGetPath(FileLogger *data,
-     * backing up old log files.
-     */
-    if (index != 0 && !hasIndex) {
--      char *sep = strrchr(logpath, '.');
--      char *pathsep = strrchr(logpath, '/');
-+      char *sep = (char *) strrchr(logpath, '.');
-+      char *pathsep = (char *) strrchr(logpath, '/');
- 
-       if (pathsep == NULL) {
--         pathsep = strrchr(logpath, '\\');
-+         pathsep = (char *) strrchr(logpath, '\\');
-       }
- 
-       if (sep != NULL && sep > pathsep) {
-diff --git a/open-vm-tools-13.0.5-24915695/lib/hgfs/hgfsEscape.c b/open-vm-tools-13.0.5-24915695/lib/hgfs/hgfsEscape.c
-index c4d39b1..ce475d9 100644
---- a/open-vm-tools-13.0.5-24915695/lib/hgfs/hgfsEscape.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/hgfs/hgfsEscape.c
-@@ -198,7 +198,7 @@ HgfsAddEscapeCharacter(char const * bufIn,      // IN: input name
-       if (outputSpace < 2) {
-          return FALSE;
-       }
--      illegal = strchr(HGFS_ILLEGAL_CHARS, bufIn[escapeContext->processedOffset]);
-+      illegal = (char *) strchr(HGFS_ILLEGAL_CHARS, bufIn[escapeContext->processedOffset]);
-       escapeContext->processedOffset++;  // Skip illegal input character
-       ASSERT(illegal != NULL);
-       escapeContext->outputBuffer[escapeContext->outputOffset] =
-@@ -583,12 +583,12 @@ HgfsIsEscapeSequence(char const *bufIn,   // IN: input name
-          if (bufIn[offset - 2] == HGFS_ESCAPE_SUBSTITUE_CHAR) {
-             return TRUE;
-          }
--         substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 2]);
-+         substitute = (char *) strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 2]);
-          if (substitute != NULL) {
-             return TRUE;
-          }
-       }
--      substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
-+      substitute = (char *) strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
-       if (substitute != NULL) {
-          return TRUE;
-       }
-@@ -882,12 +882,12 @@ HgfsEscapeUndoComponent(char   *bufIn,             // IN: Characters to be unesc
- 
-    curOutBuffer = bufIn;
-    sizeIn = strlen(curOutBuffer);
--   escapePointer = strchr(curOutBuffer, HGFS_ESCAPE_CHAR);
-+   escapePointer = (char *) strchr(curOutBuffer, HGFS_ESCAPE_CHAR);
-    while (escapePointer != NULL) {
-       size_t offset = escapePointer - bufIn;
- 
-       if (HgfsIsEscapeSequence(bufIn, offset, sizeIn)) {
--         char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
-+         char* substitute = (char *) strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
-          if (substitute != NULL) {
-             bufIn[offset - 1] = HGFS_ILLEGAL_CHARS[substitute - HGFS_SUBSTITUTE_CHARS];
-          } else if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR) {
-@@ -897,12 +897,12 @@ HgfsEscapeUndoComponent(char   *bufIn,             // IN: Characters to be unesc
-          (*unprocessedLength)--;
-          sizeIn--;
-          if (sizeIn > 0) {
--            escapePointer = strchr(escapePointer, HGFS_ESCAPE_CHAR);
-+            escapePointer = (char *) strchr(escapePointer, HGFS_ESCAPE_CHAR);
-          } else {
-             escapePointer = NULL;
-          }
-       } else {
--         escapePointer = strchr(escapePointer + 1, HGFS_ESCAPE_CHAR);
-+         escapePointer = (char *) strchr(escapePointer + 1, HGFS_ESCAPE_CHAR);
-       }
-    }
-    ASSERT((*unprocessedLength) > sizeIn);
-diff --git a/open-vm-tools-13.0.5-24915695/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools-13.0.5-24915695/lib/hgfsServer/hgfsServerLinux.c
-index 4a0bc93..ac62c1b 100644
---- a/open-vm-tools-13.0.5-24915695/lib/hgfsServer/hgfsServerLinux.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/hgfsServer/hgfsServerLinux.c
-@@ -1369,7 +1369,7 @@ HgfsGetHiddenAttr(char const *fileName,         // IN:  Input filename
-    ASSERT(fileName);
-    ASSERT(attr);
- 
--   baseName = strrchr(fileName, DIRSEPC);
-+   baseName = (char *) strrchr(fileName, DIRSEPC);
- 
-    if ((baseName != NULL) &&
-        (baseName[1] == '.') &&
-@@ -1647,7 +1647,7 @@ HgfsCaseInsensitiveLookup(const char *sharePath,           // IN
- 
-    while (TRUE) {
-       /* Get the next component. */
--      nextComponent = strchr(currentComponent, DIRSEPC);
-+      nextComponent = (char *) strchr(currentComponent, DIRSEPC);
-       if (nextComponent != NULL) {
-          *nextComponent = '\0';
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/misc/codeset.c b/open-vm-tools-13.0.5-24915695/lib/misc/codeset.c
-index 25221f6..afc615b 100644
---- a/open-vm-tools-13.0.5-24915695/lib/misc/codeset.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/misc/codeset.c
-@@ -589,7 +589,7 @@ CodeSet_Init(const char *icuDataDir) // IN: ICU data file location in Current co
-        */
-       modPath = CodeSetGetModulePath(HGMP_PRIVILEGE);
-       if (modPath) {
--         lastSlash = strrchr(modPath, DIRSEPC);
-+         lastSlash = (char *) strrchr(modPath, DIRSEPC);
-          if (lastSlash) {
-             *lastSlash = '\0';
- 
-diff --git a/open-vm-tools-13.0.5-24915695/lib/misc/codesetOld.c b/open-vm-tools-13.0.5-24915695/lib/misc/codesetOld.c
-index fb4f194..ed86d03 100644
---- a/open-vm-tools-13.0.5-24915695/lib/misc/codesetOld.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/misc/codesetOld.c
-@@ -755,7 +755,7 @@ CodeSetOld_GetCurrentCodeSet(void)
-          char *p;
- 
-          gFilenameEncoding = Util_SafeStrdup(gFilenameEncoding);
--         p = strchr(gFilenameEncoding, ',');
-+         p = (char *) strchr(gFilenameEncoding, ',');
- 
-          if (p != NULL) {
-             *p = '\0';
-diff --git a/open-vm-tools-13.0.5-24915695/lib/misc/hostinfoPosix.c b/open-vm-tools-13.0.5-24915695/lib/misc/hostinfoPosix.c
-index dc99d83..22dbb48 100644
---- a/open-vm-tools-13.0.5-24915695/lib/misc/hostinfoPosix.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/misc/hostinfoPosix.c
-@@ -1620,7 +1620,7 @@ HostinfoReadDistroFile(Bool osReleaseRules,   // IN: osRelease rules
- 
-              if (lineBuf[len] == '"') {
-                 data = &lineBuf[len + 1];
--                p = strrchr(data, '"');
-+                p = (char *) strrchr(data, '"');
- 
-                 if (p == NULL) {
-                    Warning("%s: Invalid os-release file.", __FUNCTION__);
-@@ -1629,7 +1629,7 @@ HostinfoReadDistroFile(Bool osReleaseRules,   // IN: osRelease rules
-              } else {
-                 data = &lineBuf[len];
- 
--                p = strchr(data, '\n');
-+                p = (char *) strchr(data, '\n');
- 
-                 if (p == NULL) {
-                    Warning("%s: os-release file line too long.",
-@@ -1894,7 +1894,7 @@ HostinfoLsbRemoveQuotes(char *lsbOutput)  // IN/OUT:
-    ASSERT(lsbStart != NULL);
- 
-    if (lsbStart[0] == '"') {
--      char *quoteEnd = strchr(++lsbStart, '"');
-+      char *quoteEnd = (char *) strchr(++lsbStart, '"');
- 
-       if (quoteEnd != NULL) {
-          *quoteEnd = '\0';
-@@ -3472,8 +3472,8 @@ HostinfoGetCpuInfo(int nCpu,         // IN:
-           StdIO_ReadNextLine(f, &line, 0, NULL) == StdIO_Success) {
-       char *s;
- 
--      if ((s = strstr(line, name)) &&
--          (s = strchr(s, ':'))) {
-+      if ((s = (char *) strstr(line, name)) &&
-+          (s = (char *) strchr(s, ':'))) {
-          char *e;
- 
-          s++;
-@@ -4039,7 +4039,7 @@ HostinfoFindEntry(char *buffer,         // IN: Buffer
-                   const char *string,   // IN: String sought
-                   unsigned int *value)  // OUT: Value
- {
--   char *p = strstr(buffer, string);
-+   char *p = (char *) strstr(buffer, string);
-    unsigned int val;
- 
-    if (p == NULL) {
-@@ -4570,7 +4570,7 @@ Hostinfo_GetLibraryPath(void *addr)  // IN
-             continue;
-          }
- 
--         sep = strchr(entry->d_name, '-');
-+         sep = (char *) strchr(entry->d_name, '-');
-          if (sep == NULL) {
-             continue; // The file name does NOT in `1234abcd-abcd1234` format
-          }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/misc/machineID.c b/open-vm-tools-13.0.5-24915695/lib/misc/machineID.c
-index 7c29a1c..1e04a9c 100644
---- a/open-vm-tools-13.0.5-24915695/lib/misc/machineID.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/misc/machineID.c
-@@ -88,7 +88,7 @@ FindWindowsAdapter(IP_ADAPTER_INFO *head,  // IN:
-              (*adapterInfo->Description == '\0')) {
-             takeIt = TRUE;
-          } else {
--            char *p = strstr(adapterInfo->Description, pattern);
-+            char *p = (char *) strstr(adapterInfo->Description, pattern);
- 
-             if (((p != NULL) && findPattern) ||
-                 ((p == NULL) && !findPattern)) {
-diff --git a/open-vm-tools-13.0.5-24915695/lib/misc/strutil.c b/open-vm-tools-13.0.5-24915695/lib/misc/strutil.c
-index 4fc6502..8d64d27 100644
---- a/open-vm-tools-13.0.5-24915695/lib/misc/strutil.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/misc/strutil.c
-@@ -1467,7 +1467,7 @@ StrUtil_ReplaceAll(const char *orig, // IN
-     lenWith = strlen(with);
- 
-     current = orig;
--    while ((tmp = strstr(current, what)) != NULL) {
-+    while ((tmp = (char *) strstr(current, what)) != NULL) {
-        current = tmp + lenWhat;
-        ++occurrences;
-     }
-@@ -1620,7 +1620,7 @@ StrUtil_GetNextItem(char **list, // IN/OUT:
-       return NULL;
-    }
- 
--   foundDelim = strchr(*list, delim);
-+   foundDelim = (char *) strchr(*list, delim);
-    if (foundDelim != NULL) {
-       foundDelim[0] = '\0';
-       *list = foundDelim + 1;
-@@ -1660,7 +1660,7 @@ StrUtil_GetLastItem(char **list, // IN/OUT:
-       return NULL;
-    }
- 
--   foundDelim = strrchr(*list, delim);
-+   foundDelim = (char *) strrchr(*list, delim);
-    if (foundDelim != NULL) {
-       foundDelim[0] = '\0';
-       token = foundDelim + 1;
-@@ -1705,7 +1705,7 @@ StrUtilHasListItem(char const *list,                               // IN:
-    do {
-       int tokenLen;
- 
--      foundDelim = strchr(list, delim);
-+      foundDelim = (char *) strchr(list, delim);
-       if (foundDelim == NULL) { // either single or last element
-          tokenLen = strlen(list);
-       } else { // ! last element
-diff --git a/open-vm-tools-13.0.5-24915695/lib/nicInfo/nicInfoPosix.c b/open-vm-tools-13.0.5-24915695/lib/nicInfo/nicInfoPosix.c
-index 0135e6a..aaaf75a 100644
---- a/open-vm-tools-13.0.5-24915695/lib/nicInfo/nicInfoPosix.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/nicInfo/nicInfoPosix.c
-@@ -266,7 +266,7 @@ IpEntryMatchesDevice(const char *devName,
-    char *p;
-    size_t n;
- 
--   if ((p = strchr(label, ':')) != NULL) {
-+   if ((p = (char *) strchr(label, ':')) != NULL) {
-       n = p - label;
-    } else {
-       n = strlen(label);
-diff --git a/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrPosix.c b/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrPosix.c
-index 9496e21..f174c64 100644
---- a/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrPosix.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrPosix.c
-@@ -626,7 +626,7 @@ ProcMgr_ListProcesses(void)
-                    *   gdm-session-worker [pam/gdm-autologin]
-                    *
-                    */
--                  char *cmdNameBegin = strrchr(cmdLineTemp, '/');
-+                  char *cmdNameBegin = (char *) strrchr(cmdLineTemp, '/');
-                   if (NULL != cmdNameBegin && cmdLineTemp[0] == '/') {
-                      /*
-                       * Skip over the last separator.
-@@ -764,7 +764,7 @@ ProcMgr_ListProcesses(void)
-       /*
-        * Skip over initial process id and process name.  "123 (bash) [...]".
-        */
--      stringBegin = strchr(cmdStatTemp, ')') + 2;
-+      stringBegin = (char *) strchr(cmdStatTemp, ')') + 2;
- 
-       numberFound = sscanf(stringBegin, "%c %d %d %d %d %d "
-                            "%lu %lu %lu %lu %lu %Lu %Lu %Lu %Lu %ld %ld "
-@@ -990,7 +990,7 @@ ProcMgr_ListProcesses(void)
-                 * Find the last path separator, to get the cmd name.
-                 * If no separator is found, then use the whole name.
-                 */
--               cmdNameBegin = strrchr(*cmdLineTemp, '/');
-+               cmdNameBegin = (char *) strrchr(*cmdLineTemp, '/');
-                if (NULL == cmdNameBegin) {
-                   cmdNameBegin = *cmdLineTemp;
-                } else {
-@@ -1219,7 +1219,7 @@ ProcMgrGetCommandLineArgs(long pid,               // IN:  process id
-              * Find the last path separator, to get the cmd name.
-              * If no separator is found, then use the whole name.
-              */
--            cmdNameBegin = strrchr(cmdLineTemp, '/');
-+            cmdNameBegin = (char *) strrchr(cmdLineTemp, '/');
-             if (NULL == cmdNameBegin) {
-                cmdNameBegin = cmdLineTemp;
-             } else {
-diff --git a/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrSolaris.c b/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrSolaris.c
-index ede52d6..8e01606 100644
---- a/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrSolaris.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/procMgr/procMgrSolaris.c
-@@ -357,7 +357,7 @@ ExtractCommandLineFromAddressSpaceFile(psinfo_t *procInfo, //IN: psinfo struct
-              * Find the last path separator, to get the cmd name.
-              * If no separator is found, then use the whole name.
-              */
--            cmdNameBegin = strrchr(buf, '/');
-+            cmdNameBegin = (char *) strrchr(buf, '/');
-             if (NULL == cmdNameBegin) {
-                cmdNameBegin = buf;
-             } else {
-diff --git a/open-vm-tools-13.0.5-24915695/lib/rpcChannel/glib_stubs.c b/open-vm-tools-13.0.5-24915695/lib/rpcChannel/glib_stubs.c
-index c32deb0..edb3fc4 100644
---- a/open-vm-tools-13.0.5-24915695/lib/rpcChannel/glib_stubs.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/rpcChannel/glib_stubs.c
-@@ -32,6 +32,9 @@
- #if !defined(USE_RPCI_ONLY)
- #error "This file should be compiled for RPCI-only channel!"
- #endif
-+#if defined(g_free)
-+#undef g_free
-+#endif
- 
- void *g_malloc0(size_t s) { return Util_SafeCalloc(1, s); }
- void *g_malloc0_n(size_t n, size_t s) { return Util_SafeCalloc(n, s); }
-diff --git a/open-vm-tools-13.0.5-24915695/lib/user/util.c b/open-vm-tools-13.0.5-24915695/lib/user/util.c
-index bbd29c5..dd103ba 100644
---- a/open-vm-tools-13.0.5-24915695/lib/user/util.c
-+++ b/open-vm-tools-13.0.5-24915695/lib/user/util.c
-@@ -857,7 +857,7 @@ Util_DeriveFileName(const char *source, // IN: path to dict file (incl filename)
- 
-    /* strip off the existing file extension, if present */
-    {
--      char *p = Str_Strrchr(base, '.');
-+      char *p = (char *) Str_Strrchr(base, '.');
-       if (p != NULL) {
- 	 *p = '\0';
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/libguestStoreClient/guestStoreClientLib.c b/open-vm-tools-13.0.5-24915695/libguestStoreClient/guestStoreClientLib.c
-index 9f74e84..dc248c8 100644
---- a/open-vm-tools-13.0.5-24915695/libguestStoreClient/guestStoreClientLib.c
-+++ b/open-vm-tools-13.0.5-24915695/libguestStoreClient/guestStoreClientLib.c
-@@ -735,7 +735,7 @@ GuestStoreRecvHTTPResponseHeader(CallCtx *ctx)  // IN
- 
-       totalBytesReceived += bytesReceived;
-       ctx->buf[totalBytesReceived] = '\0';
--      httpHeaderEnd = strstr(ctx->buf, HTTP_HEADER_END);
-+      httpHeaderEnd = (char *) strstr(ctx->buf, HTTP_HEADER_END);
-       if (httpHeaderEnd != NULL) {
-          *httpHeaderEnd = '\0';
-          break;
-@@ -776,7 +776,7 @@ GuestStoreRecvHTTPResponseHeader(CallCtx *ctx)  // IN
-       return GSLIBERR_SERVER;
-    }
- 
--   contentLengthHeader = strstr(httpStatus + strlen(httpStatus) + 1,
-+   contentLengthHeader = (char *) strstr(httpStatus + strlen(httpStatus) + 1,
-                                 CONTENT_LENGTH_HEADER);
-    if (NULL == contentLengthHeader) {
-       LOG_ERR(ctx, "Protocol content length not found.");
-diff --git a/open-vm-tools-13.0.5-24915695/libvmtools/i18n.c b/open-vm-tools-13.0.5-24915695/libvmtools/i18n.c
-index 3085f72..d6c8eae 100644
---- a/open-vm-tools-13.0.5-24915695/libvmtools/i18n.c
-+++ b/open-vm-tools-13.0.5-24915695/libvmtools/i18n.c
-@@ -240,7 +240,7 @@ MsgGetUserLanguage(void)
-       char *dot;
- 
-       lang = g_strdup(tmp);
--      dot = strchr(lang, '.');
-+      dot = (char *) strchr(lang, '.');
-       if (dot != NULL) {
-          *dot = '\0';
-       }
-@@ -698,7 +698,7 @@ VMTools_BindTextDomain(const char *domain,
-        * If we couldn't find the catalog file for the user's language, see if
-        * we can find a more generic language (e.g., for "en_US", also try "en").
-        */
--      char *sep = Str_Strrchr(lang, '_');
-+      char *sep = (char *) Str_Strrchr(lang, '_');
-       if (sep != NULL) {
-          if (usrlang == NULL) {
-             usrlang = Util_SafeStrdup(lang);
-diff --git a/open-vm-tools-13.0.5-24915695/modules/solaris/vmhgfs/vnode.c b/open-vm-tools-13.0.5-24915695/modules/solaris/vmhgfs/vnode.c
-index 53dd549..df2e1f2 100644
---- a/open-vm-tools-13.0.5-24915695/modules/solaris/vmhgfs/vnode.c
-+++ b/open-vm-tools-13.0.5-24915695/modules/solaris/vmhgfs/vnode.c
-@@ -5421,7 +5421,7 @@ HgfsMakeFullName(const char *path,      // IN:  Path of directory containing fil
-        * Replace the last path separator with a NUL terminator, then return the
-        * size of the buffer.
-        */
--      char *newEnd = strrchr(outBuf, '/');
-+      char *newEnd = (char *) strrchr(outBuf, '/');
-       if (!newEnd) {
-          /*
-           * We should never get here since we name the root vnode "/" in
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/componentMgr/componentMgrInstallAction.c b/open-vm-tools-13.0.5-24915695/services/plugins/componentMgr/componentMgrInstallAction.c
-index e051f41..9ddb239 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/componentMgr/componentMgrInstallAction.c
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/componentMgr/componentMgrInstallAction.c
-@@ -476,7 +476,7 @@ ComponentMgrConstructCommandline(gchar *scriptPath,            // IN
-    }
- 
-    if (customArguments != NULL) {
--      mandatoryParamsExists = strstr(customArguments, mandatoryParams);
-+      mandatoryParamsExists = (char *) strstr(customArguments, mandatoryParams);
-       if (mandatoryParamsExists == NULL) {
-          commandline = Str_SafeAsprintf(NULL, "\"%s%s\" %s \"%s\" %s %s %s",
-                                         sysDir, powershellExecutable,
-@@ -504,7 +504,7 @@ ComponentMgrConstructCommandline(gchar *scriptPath,            // IN
-    free(sysDir);
- #else
-    if (customArguments != NULL) {
--      mandatoryParamsExists = strstr(customArguments, mandatoryParams);
-+      mandatoryParamsExists = (char *) strstr(customArguments, mandatoryParams);
-       if (mandatoryParamsExists == NULL) {
-          commandline = Str_SafeAsprintf(NULL, "%s %s %s %s", scriptPath,
-                                         defaultArguments, customArguments,
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/copyPasteUIX11.cpp
-index a4a02c5..ef47b76 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/copyPasteUIX11.cpp
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/copyPasteUIX11.cpp
-@@ -1040,7 +1040,7 @@ CopyPasteUIX11::LocalGetSelectionFileList(const Gtk::SelectionData& sd)      //
-       /*
-        * Parse relative path.
-        */
--      newRelPath = Str_Strrchr(newPath, DIRSEPC) + 1; // Point to char after '/'
-+      newRelPath = (char *) Str_Strrchr(newPath, DIRSEPC) + 1; // Point to char after '/'
- 
-       /* Keep track of how big the fcp files are. */
-       if ((size = File_GetSizeEx(newPath)) >= 0) {
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dnd/dndXdg.c b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dnd/dndXdg.c
-index da54ee5..8f490f6 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dnd/dndXdg.c
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dnd/dndXdg.c
-@@ -428,7 +428,7 @@ CreateStagingDirectory(
-       char *realStagingDir = Str_SafeAsprintf(NULL, "%sXXXXXX", realRoot);
- 
-       if (mkdtemp(realStagingDir) != NULL) {
--         char *randomPart = strrchr(realStagingDir, '/') + 1;
-+         char *randomPart = (char *) strrchr(realStagingDir, '/') + 1;
-          VERIFY(*randomPart != '\0');
- 
-          apparentStagingDir = Unicode_Append(apparentRoot, randomPart);
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/guestCopyPasteSrc.cc b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/guestCopyPasteSrc.cc
-index 42b14a7..0303625 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/guestCopyPasteSrc.cc
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/guestCopyPasteSrc.cc
-@@ -198,7 +198,7 @@ GuestCopyPasteSrc::SetupDestDir(const std::string &destDir)
-       if (newDir != NULL) {
-          mStagingDir = newDir;
- 
--         char *lastSep = Str_Strrchr(newDir, DIRSEPC);
-+         char *lastSep = (char *) Str_Strrchr(newDir, DIRSEPC);
-          if (lastSep && lastSep[1] != '\0') {
-             mStagingDir += DIRSEPS;
-          }
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/vmGuestDnDSrc.cc b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/vmGuestDnDSrc.cc
-index 11c9fd5..2f366c7 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/vmGuestDnDSrc.cc
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndGuest/vmGuestDnDSrc.cc
-@@ -70,7 +70,7 @@ VMGuestDnDSrc::SetupDestDir(const std::string &destDir)
-       if (newDir != NULL) {
-          mStagingDir = newDir;
- 
--         char *lastSep = Str_Strrchr(newDir, DIRSEPC);
-+         char *lastSep = (char *) Str_Strrchr(newDir, DIRSEPC);
-          if (lastSep && lastSep[1] != '\0') {
-             mStagingDir += DIRSEPS;
-          }
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndUIX11.cpp
-index e084dc4..83c2c60 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndUIX11.cpp
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/dndcp/dndUIX11.cpp
-@@ -1491,7 +1491,7 @@ DnDUIX11::SetCPClipboardFromGtk(const Gtk::SelectionData& sd) // IN
-          /*
-           * Parse relative path.
-           */
--         newRelPath = Str_Strrchr(newPath, DIRSEPC) + 1; // Point to char after '/'
-+         newRelPath = (char *) Str_Strrchr(newPath, DIRSEPC) + 1; // Point to char after '/'
- 
-          /* Keep track of how big the dnd files are. */
-          if ((size = File_GetSizeEx(newPath)) >= 0) {
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/guestInfo/perfMonLinux.c b/open-vm-tools-13.0.5-24915695/services/plugins/guestInfo/perfMonLinux.c
-index 3c51fae..7248b6f 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/guestInfo/perfMonLinux.c
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/guestInfo/perfMonLinux.c
-@@ -477,7 +477,7 @@ GuestInfoProcData(const char *pathName,           // IN: path name
-       }
- 
-       if (fieldSeparator != '\0') {
--         char *p = strrchr(fieldName, fieldSeparator);
-+         char *p = (char *) strrchr(fieldName, fieldSeparator);
-          if (p == NULL) {
-             /*
-              * When fieldSeparator is specified, fieldName is expected
-diff --git a/open-vm-tools-13.0.5-24915695/services/plugins/vix/vixTools.c b/open-vm-tools-13.0.5-24915695/services/plugins/vix/vixTools.c
-index 654512c..6b97233 100644
---- a/open-vm-tools-13.0.5-24915695/services/plugins/vix/vixTools.c
-+++ b/open-vm-tools-13.0.5-24915695/services/plugins/vix/vixTools.c
-@@ -933,7 +933,7 @@ VixToolsBuildUserEnvironmentTable(const char * const *envp)   // IN: optional
-       char *whereToSplit;
-       size_t nameLen;
- 
--      whereToSplit = strchr(*envp, '=');
-+      whereToSplit = (char *) strchr(*envp, '=');
-       if (NULL == whereToSplit) {
-          /* Our code generated this list, so this shouldn't happen. */
-          ASSERT(0);
-@@ -1498,7 +1498,7 @@ VixToolsRunProgramImpl(char *requestName,      // IN
-    }
-    if ('\"' == *startProgramFileName) {
-       startProgramFileName++;
--      stopProgramFileName = strstr(startProgramFileName, "\"");
-+      stopProgramFileName = (char *) strstr(startProgramFileName, "\"");
-    } else {
-       stopProgramFileName = NULL;
-    }
-@@ -1716,7 +1716,7 @@ VixToolsStartProgramImpl(const char *requestName,            // IN
-    }
-    if ('\"' == *startProgramFileName) {
-       startProgramFileName++;
--      stopProgramFileName = strstr(startProgramFileName, "\"");
-+      stopProgramFileName = (char *) strstr(startProgramFileName, "\"");
-    } else {
-       stopProgramFileName = NULL;
-    }
-@@ -4582,7 +4582,7 @@ VixToolsGetAllEnvVarsForUser(void *userToken,     // IN
-          char *whereToSplit;
-          size_t nameLen;
- 
--         whereToSplit = strchr(envVar, '=');
-+         whereToSplit = (char *) strchr(envVar, '=');
-          if (NULL == whereToSplit) {
-             /* Our code generated this list, so this shouldn't happen. */
-             ASSERT(0);
-diff --git a/open-vm-tools-13.0.5-24915695/tests/vmrpcdbg/debugChannel.c b/open-vm-tools-13.0.5-24915695/tests/vmrpcdbg/debugChannel.c
-index 399dedd..eb55cf2 100644
---- a/open-vm-tools-13.0.5-24915695/tests/vmrpcdbg/debugChannel.c
-+++ b/open-vm-tools-13.0.5-24915695/tests/vmrpcdbg/debugChannel.c
-@@ -222,7 +222,7 @@ RpcDebugSend(RpcChannel *chan,
-          ASSERT(mapping->xdrSize > 0);
- 
-          /* Find out where the XDR data starts. */
--         start = strchr(copy, ' ');
-+         start = (char *) strchr(copy, ' ');
-          if (start == NULL) {
-             RpcDebug_SetResult("Can't find command delimiter.", result, resultLen);
-             ret = FALSE;
-diff --git a/open-vm-tools-13.0.5-24915695/vgauth/common/i18n.c b/open-vm-tools-13.0.5-24915695/vgauth/common/i18n.c
-index 6d1292d..ba2ca28 100644
---- a/open-vm-tools-13.0.5-24915695/vgauth/common/i18n.c
-+++ b/open-vm-tools-13.0.5-24915695/vgauth/common/i18n.c
-@@ -484,7 +484,7 @@ MsgGetUserLanguage(void)
-       char *dot;
- 
-       lang = g_strdup(tmp);
--      dot = strchr(lang, '.');
-+      dot = (char *) strchr(lang, '.');
-       if (dot != NULL) {
-          *dot = '\0';
-       }
-diff --git a/open-vm-tools-13.0.5-24915695/vmblockmounter/vmblockmounter.c b/open-vm-tools-13.0.5-24915695/vmblockmounter/vmblockmounter.c
-index 429b124..63b5bef 100644
---- a/open-vm-tools-13.0.5-24915695/vmblockmounter/vmblockmounter.c
-+++ b/open-vm-tools-13.0.5-24915695/vmblockmounter/vmblockmounter.c
-@@ -140,7 +140,7 @@ main(int argc,          // IN
-    thisProgram = argv[0];
- 
-    /* Compute the base name of the program, too. */
--   thisProgramBase = strrchr(thisProgram, '/');
-+   thisProgramBase = (char *) strrchr(thisProgram, '/');
-    if (thisProgramBase != NULL) {
-       thisProgramBase++;
-    } else {
-diff --git a/open-vm-tools-13.0.5-24915695/vmhgfs-fuse/config.c b/open-vm-tools-13.0.5-24915695/vmhgfs-fuse/config.c
-index 19535fd..3f68ff6 100644
---- a/open-vm-tools-13.0.5-24915695/vmhgfs-fuse/config.c
-+++ b/open-vm-tools-13.0.5-24915695/vmhgfs-fuse/config.c
-@@ -248,7 +248,7 @@ SysCompatIsInstalledFuse(char *utsRelease)  // IN: kernel release
-    }
- 
-    modulesDepData[modulesDepDataSize] = '\0';
--   fuseFilesystem = strstr(modulesDepData,
-+   fuseFilesystem = (char *) strstr(modulesDepData,
-                            FUSER_KERNEL_FS);
- 
-    installedFuse = (fuseFilesystem != NULL);
-diff --git a/open-vm-tools-13.0.5-24915695/xferlogs/xferlogs.c b/open-vm-tools-13.0.5-24915695/xferlogs/xferlogs.c
-index a29a25a..7fc8671 100644
---- a/open-vm-tools-13.0.5-24915695/xferlogs/xferlogs.c
-+++ b/open-vm-tools-13.0.5-24915695/xferlogs/xferlogs.c
-@@ -208,9 +208,9 @@ extractFile(char *filename) //IN: vmx log filename e.g. vmware.log
-              * read the input filename, which was the filename written by the
-              * guest.
-              */
--            logInpFilename = strstr(buf, LOG_START_MARK);
-+            logInpFilename = (char *) strstr(buf, LOG_START_MARK);
-             logInpFilename += sizeof LOG_START_MARK;
--            ptrStr = strstr(logInpFilename, ": ver ");
-+            ptrStr = (char *) strstr(logInpFilename, ": ver ");
-             if (ptrStr == NULL) {
-                fprintf(stderr, "Invalid start log mark.");
-                break;
-@@ -243,7 +243,7 @@ extractFile(char *filename) //IN: vmx log filename e.g. vmware.log
-              * dont write anything.
-              */
-             ptrStr++;
--            ver = strstr(ptrStr, "ver - ");
-+            ver = (char *) strstr(ptrStr, "ver - ");
-             if (!ver) {
-                Warning("No version information detected\n");
-             } else {
-@@ -276,7 +276,7 @@ extractFile(char *filename) //IN: vmx log filename e.g. vmware.log
-          } else { // write to the output file
-             if (outfp) {
-                ASSERT(state == IN_GUEST_LOGGING);
--               ptrStr = strstr(buf, LOG_GUEST_MARK);
-+               ptrStr = (char *) strstr(buf, LOG_GUEST_MARK);
-                ptrStr += sizeof LOG_GUEST_MARK - 1;
-                if (Base64_Decode(ptrStr, base64Out, BUF_OUT_SIZE, &lenOut)) {
-                   if (fwrite(base64Out, 1, lenOut, outfp) != lenOut) {
--- 
-2.51.1
-

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..033ae01
--- /dev/null
+++ b/changelog
@@ -0,0 +1,204 @@
+* Thu Mar 20 2025 Richard W.M. Jones <rjones@redhat.com> - 12.4.0-4
+- Bump and rebuild
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 12.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 05 2024 John Wolfe <john.wolfe@broadcom.com> - 12.4.0-1
+- Package a new upstream version of open-vm-tools-12.4.0-23259341.
+  - A number of Coverity reported issues have been addressed.
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Nov 8 2023 John Wolfe <jwolfe@vmware.com> - 12.3.5-1
+- Package new upstream version of open-vm-tools-12.3.5-22544099.
+  . fix for CVE-2023-34058 - another SAML token signature bypass vulnerability.
+  . fix for CVE-2023-34059 - a file descriptor hijack vulnerability in the
+                             vmware-user-suid-wrapper.
+  . address https://github.com/vmware/open-vm-tools/issues/310
+- Remove CVE-2023-34058.patch and CVE-2023-34059.patch as no longer needed.
+
+* Mon Oct 30 2023 John Wolfe <jwolfe@vmware.com> - 12.3.0-3
+- Address CVE-2023-34058 - BZ 2246963 - SAML token signature token bypass.
+- Address CVE-2023-34059 - BZ 2246962 - vmware-user-suid-wrapper
+  file descriptor hijack vulnerability
+* Thu Oct 05 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 12.3.0-2
+- Use fuse3 on new RHEL
+
+* Sat Sep 9 2023 John Wolfe <jwolfe@vmware.com> - 12.3.0-1
+- Package new upstream version of open-vm-tools-12.3.0-22234872.
+  - Fix for CVE-2023-20900 - a SAML token signature bypass vulnerability.
+  - Fix for CVE-2023-20867 - an Authentication Bypass vulnerability.
+  - Linux quiesced snapshots have been updated to avoid intermittent hangs
+    of the vmtoolsd process.
+    - File systems prefrozen by custom quiescing scripts must be listed on the
+      "excludedFileSystems" setting in the "vmbackup" section of the tools.conf
+      file.
+    - A tools.conf configuration setting is available to temporaily direct
+      Linux quiesced snaphots to restore pre open-vm-tools 12.2.0 behavior
+      of ignoring file systems already frozen.
+  - A number of Coverity reported issues have been addressed.
+  - A number of GitHub issues and pull requests have been handled.
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Jan 1 2023 John Wolfe <jwolfe@vmware.com> - 12.1.5-2
+- Update the copyright date in the open-vm-tools.spec file.
+
+* Sun Jan 1 2023 John Wolfe <jwolfe@vmware.com> - 12.1.5-1
+- Package new upstream version of open-vm-tools-12.1.5-20735119.
+  - The deployPkg plugin may prematurely reboot the guest VM before cloud-init
+    has completed user data setup
+  - A SIGSEGV may be encountered when a non-quiescing snapshot times out.
+  - A number of Coverity reported issues have been addressed.
+
+* Thu Sep 8 2022 John Wolfe <jwolfe@VMWARE.COM> - 12.1.0-1
+- Package new upstream version open-vm-tools-12.1.0-20219665.
+  . fix for CVE-2022-31676 - a local privilege escalation vulnerability.
+  . address a number of Coverity reported issues.
+- Remove patch 1205-Properly-check-authorization-on-incoming-guestOps-re.patch
+  as no longer needed.
+
+* Sun Sep 4 2022 John Wolfe <jwolfe@vmware.com> - 12.0.5-3
+- Add patch 1205-Properly-check-authorization-on-incoming-guestOps-re.patch
+  to fix CVE-2022-31676 in open-vm-tools 12.0.5 tracked in PR 120976.
+- Correct build requirements - replace systemd-rpm-macros with systemd_udev.
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 John Wolfe <jwolfe@vmware.com> - 12.0.5-1
+- Package new upstream version open-vm-tools-12.0.5-19716617.
+ - Maintenance release addressing some potential FTBFS issues.
+- Remove asyncsocket.patch as no longer needed.
+
+* Mon May 9 2022 John Wolfe <jwolfe@vmware.com> - 12.0.0-1
+- Package new upstream version open-vm-tools-12.0.0-19345655.
+- Enable build of the new salt-minion plugin package.
+- Deferring enablement of new containerInfo plugin until a later revision.
+- Build with fuse3 on Fedora.
+
+* Thu Feb 24 2022 John Wolfe <jwolfe@vmware.com> - 11.3.5-1
+- Package new upstream version open-vm-tools-11.3.5-18557794.
+
+* Wed Feb 9 2022 John Wolfe <jwolfe@vmware.com> - 11.3.0-6
+- Refactored asyncsocket.c patch to use size_t size and index variables.
+
+* Tue Feb 1 2022 John Wolfe <jwolfe@vmware.com> - 11.3.0-5
+- Address (fix) strings or array bounds warnings from GCC 12.0.x.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 11.3.0-3
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jul 15 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.3.0-1
+- Package new upstream version open-vm-tools-11.3.0-18090558.
+- Add vmware-alias-import, vmwgfxctrl, libgdp.so, libguestStore.so
+  and libguestStoreClient.so.*.
+- Remove open-vm-tools-fix-kms-autodetection.patch,
+  open-vm-tools-gcc11.patch and open-vm-tools-gdk-glib.patch
+  as no longer needed.
+
+* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-9
+- Backport patch for KMS autodetection.
+
+* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-8
+- Trim changelog.
+- Fix libdrm/udev build requirement.
+
+* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-7
+- Fix build on CentOS/RHEL 7.
+- Allow building on aarch64 for CentOS/RHEL 8+ and Fedora.
+- Clean up SPEC file (conditionals, build requirements, scriptlets, formatting).
+
+* Mon Apr 05 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-6
+- Added missing escape char in run-vmblock\\x2dfuse.mount service name.
+- Enabled run-vmblock\\x2dfuse.mount service during post-install.
+- Moved run-vmblock\x2dfuse.mount service unit to desktop package.
+
+* Fri Mar 19 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-5
+- Added open-vm-tools-gdk-glib.patch to fix RHBZ#1939718.
+
+* Tue Mar 16 2021 Neal Gompa <ngompa13@gmail.com> - 11.2.5-4
+- Add missing BRs
+- Clean up conditionals to build correctly with EL8+
+- Simplify systemd scriptlets
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.2.5-3
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 15 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-1
+- Package new upstream version open-vm-tools-11.2.5-17337674.
+- libdnet dependency was removed in open-vm-tools 11.0.0. So,
+  removed the stale BuildRequires for libdnet.
+
+* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 11.2.0-2
+- Bump and rebuild against libdnet 1.14 (RHBZ#1915838).
+
+* Fri Nov 06 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.0-1
+- Package new upstream version open-vm-tools-11.2.0-16938113.
+
+* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 11.1.5-2
+- Fix incorrect volatile exposed by gcc-11
+
+* Tue Sep 08 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.5-1
+- Package new upstream version open-vm-tools-11.1.5-16724464.
+- Removed gcc10-warning.patch and sdmp-fixes.patch (no longer needed).
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 09 2020 Merlin Mathesius <mmathesi@redhat.com> - 11.1.0-3
+- Conditional fixes to build for ELN
+
+* Sun Jun 21 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.0-2
+- Added sdmp-fixes.patch from upstream to remove net-tools dependency
+  and couple of important fixes
+
+* Mon May 25 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.0-1
+- Package new upstream version open-vm-tools-11.1.0-16036546.
+- Added new open-vm-tools-sdmp package.
+- Workaround for vm-support script path is no longer needed.
+- Added missing dependencies for vm-support script.
+- Updated gcc10-warning.patch.
+- Removed gcc9-static-inline.patch and diskinfo-log-spew.patch that
+  are no longer needed.
+
+* Sun May 17 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-4
+- Updated PAM configuration file to follow configured authn scheme.
+
+* Tue Mar 24 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-3
+- Use /sbin/ldconfig on older than Fedora 28 and RHEL 8 platforms.
+
+* Fri Feb 07 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-2
+- Added patch diskinfo-log-spew.patch.
+
+* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-1
+- Package new upstream version open-vm-tools-11.0.5-15389592.
+- Removed vix-memleak.patch which is no longer needed.
+
+* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-6
+- Added gcc10-warning.patch for fixing compilation issues.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 9b9388c..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: 3rd-esxi-x86_64.brew-build.tier1.functional}

diff --git a/open-vm-tools-gcc16.patch b/open-vm-tools-gcc16.patch
new file mode 100644
index 0000000..c97d1be
--- /dev/null
+++ b/open-vm-tools-gcc16.patch
@@ -0,0 +1,119 @@
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/hgfs/hgfsEscape.c open-vm-tools-13.1.0-25218885/lib/hgfs/hgfsEscape.c
+--- open-vm-tools-13.1.0-25218885.old/lib/hgfs/hgfsEscape.c	2026-05-20 09:29:22.785922590 +0200
++++ open-vm-tools-13.1.0-25218885/lib/hgfs/hgfsEscape.c	2026-05-20 09:29:29.882931070 +0200
+@@ -198,7 +198,7 @@
+       if (outputSpace < 2) {
+          return FALSE;
+       }
+-      illegal = strchr(HGFS_ILLEGAL_CHARS, bufIn[escapeContext->processedOffset]);
++      illegal = (char *)strchr(HGFS_ILLEGAL_CHARS, bufIn[escapeContext->processedOffset]);
+       escapeContext->processedOffset++;  // Skip illegal input character
+       ASSERT(illegal != NULL);
+       escapeContext->outputBuffer[escapeContext->outputOffset] =
+@@ -583,12 +583,12 @@
+          if (bufIn[offset - 2] == HGFS_ESCAPE_SUBSTITUE_CHAR) {
+             return TRUE;
+          }
+-         substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 2]);
++         substitute = (char *)strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 2]);
+          if (substitute != NULL) {
+             return TRUE;
+          }
+       }
+-      substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
++      substitute = (char *)strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
+       if (substitute != NULL) {
+          return TRUE;
+       }
+@@ -887,7 +887,7 @@
+       size_t offset = escapePointer - bufIn;
+ 
+       if (HgfsIsEscapeSequence(bufIn, offset, sizeIn)) {
+-         char* substitute = strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
++         char* substitute = (char *)strchr(HGFS_SUBSTITUTE_CHARS, bufIn[offset - 1]);
+          if (substitute != NULL) {
+             bufIn[offset - 1] = HGFS_ILLEGAL_CHARS[substitute - HGFS_SUBSTITUTE_CHARS];
+          } else if (bufIn[offset - 1] == HGFS_ESCAPE_SUBSTITUE_CHAR) {
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/hgfsServer/hgfsServerLinux.c open-vm-tools-13.1.0-25218885/lib/hgfsServer/hgfsServerLinux.c
+--- open-vm-tools-13.1.0-25218885.old/lib/hgfsServer/hgfsServerLinux.c	2026-05-20 09:29:22.786213938 +0200
++++ open-vm-tools-13.1.0-25218885/lib/hgfsServer/hgfsServerLinux.c	2026-05-20 09:29:29.883560326 +0200
+@@ -1369,7 +1369,7 @@
+    ASSERT(fileName);
+    ASSERT(attr);
+ 
+-   baseName = strrchr(fileName, DIRSEPC);
++   baseName = (char *)strrchr(fileName, DIRSEPC);
+ 
+    if ((baseName != NULL) &&
+        (baseName[1] == '.') &&
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/misc/strutil.c open-vm-tools-13.1.0-25218885/lib/misc/strutil.c
+--- open-vm-tools-13.1.0-25218885.old/lib/misc/strutil.c	2026-05-20 09:29:22.787198213 +0200
++++ open-vm-tools-13.1.0-25218885/lib/misc/strutil.c	2026-05-20 09:29:29.884475230 +0200
+@@ -1467,7 +1467,7 @@
+     lenWith = strlen(with);
+ 
+     current = orig;
+-    while ((tmp = strstr(current, what)) != NULL) {
++    while ((tmp = (char *)strstr(current, what)) != NULL) {
+        current = tmp + lenWhat;
+        ++occurrences;
+     }
+@@ -1705,7 +1705,7 @@
+    do {
+       int tokenLen;
+ 
+-      foundDelim = strchr(list, delim);
++      foundDelim = (char *)strchr(list, delim);
+       if (foundDelim == NULL) { // either single or last element
+          tokenLen = strlen(list);
+       } else { // ! last element
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/nicInfo/nicInfoPosix.c open-vm-tools-13.1.0-25218885/lib/nicInfo/nicInfoPosix.c
+--- open-vm-tools-13.1.0-25218885.old/lib/nicInfo/nicInfoPosix.c	2026-05-20 09:29:22.789626138 +0200
++++ open-vm-tools-13.1.0-25218885/lib/nicInfo/nicInfoPosix.c	2026-05-20 09:29:29.884883278 +0200
+@@ -266,7 +266,7 @@
+    char *p;
+    size_t n;
+ 
+-   if ((p = strchr(label, ':')) != NULL) {
++   if ((p = (char *)strchr(label, ':')) != NULL) {
+       n = p - label;
+    } else {
+       n = strlen(label);
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/rpcChannel/glib_stubs.c open-vm-tools-13.1.0-25218885/lib/rpcChannel/glib_stubs.c
+--- open-vm-tools-13.1.0-25218885.old/lib/rpcChannel/glib_stubs.c	2026-05-20 09:29:22.782975617 +0200
++++ open-vm-tools-13.1.0-25218885/lib/rpcChannel/glib_stubs.c	2026-05-20 09:29:29.885301226 +0200
+@@ -33,6 +33,10 @@
+ #error "This file should be compiled for RPCI-only channel!"
+ #endif
+ 
++#undef g_malloc0
++#undef g_malloc0_n
++#undef g_free
++
+ void *g_malloc0(size_t s) { return Util_SafeCalloc(1, s); }
+ void *g_malloc0_n(size_t n, size_t s) { return Util_SafeCalloc(n, s); }
+ void g_free(void *p) { free(p); }
+diff -Naur open-vm-tools-13.1.0-25218885.old/libvmtools/i18n.c open-vm-tools-13.1.0-25218885/libvmtools/i18n.c
+--- open-vm-tools-13.1.0-25218885.old/libvmtools/i18n.c	2026-05-20 09:29:22.805164016 +0200
++++ open-vm-tools-13.1.0-25218885/libvmtools/i18n.c	2026-05-20 09:29:29.885430219 +0200
+@@ -711,7 +711,7 @@
+        * If we couldn't find the catalog file for the user's language, see if
+        * we can find a more generic language (e.g., for "en_US", also try "en").
+        */
+-      char *sep = Str_Strrchr(lang, '_');
++      char *sep = (char *)Str_Strrchr(lang, '_');
+       if (sep != NULL) {
+          if (usrlang == NULL) {
+             usrlang = Util_SafeStrdup(lang);
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/vix/vixTools.c open-vm-tools-13.1.0-25218885/services/plugins/vix/vixTools.c
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/vix/vixTools.c	2026-05-20 09:29:22.802952859 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/vix/vixTools.c	2026-05-20 09:29:29.885903651 +0200
+@@ -928,7 +928,7 @@
+       char *whereToSplit;
+       size_t nameLen;
+ 
+-      whereToSplit = strchr(*envp, '=');
++      whereToSplit = (char *)strchr(*envp, '=');
+       if (NULL == whereToSplit) {
+          /* Our code generated this list, so this shouldn't happen. */
+          ASSERT(0);

diff --git a/open-vm-tools-openssl4.patch b/open-vm-tools-openssl4.patch
new file mode 100644
index 0000000..4574fea
--- /dev/null
+++ b/open-vm-tools-openssl4.patch
@@ -0,0 +1,39 @@
+diff --git a/vgauth/common/certverify.c b/vgauth/common/certverify.c
+index 845f59b..ec5faf7 100644
+--- a/vgauth/common/certverify.c
++++ b/vgauth/common/certverify.c
+@@ -793,7 +793,7 @@ CertVerify_CheckSignatureUsingCert(VGAuthHashAlg hash,
+ {
+    VGAuthError err;
+    X509 *cert;
+-   X509_PUBKEY *x509PubKey;
++   const X509_PUBKEY *x509PubKey;
+    EVP_PKEY *publicKey;
+ 
+    cert = CertStringToX509(pemCert);
+@@ -924,12 +924,12 @@ done:
+ 
+ static X509 *
+ FindCert(GList *cList,
+-         X509_NAME *val,
++         const X509_NAME *val,
+          int checkSubj)
+ {
+    GList *l;
+    X509 *c;
+-   X509_NAME *v;
++   const X509_NAME *v;
+ 
+    l = cList;
+    while (l != NULL) {
+@@ -974,8 +974,8 @@ CertVerify_CheckForUnrelatedCerts(int numCerts,
+    GList *rawList = NULL;
+    X509 *baseCert;
+    X509 *curCert;
+-   X509_NAME *subject;
+-   X509_NAME *issuer;
++   const X509_NAME *subject;
++   const X509_NAME *issuer;
+ 
+    /* common single cert case; nothing to do */
+    if (numCerts == 1) {

diff --git a/open-vm-tools-sigc++3.patch b/open-vm-tools-sigc++3.patch
new file mode 100644
index 0000000..55ca8cf
--- /dev/null
+++ b/open-vm-tools-sigc++3.patch
@@ -0,0 +1,329 @@
+diff -Naur open-vm-tools-13.1.0-25218885.old/lib/include/sigc++2to3.h open-vm-tools-13.1.0-25218885/lib/include/sigc++2to3.h
+--- open-vm-tools-13.1.0-25218885.old/lib/include/sigc++2to3.h	2026-05-20 09:29:22.776385646 +0200
++++ open-vm-tools-13.1.0-25218885/lib/include/sigc++2to3.h	2026-05-20 09:43:29.750369887 +0200
+@@ -36,85 +36,6 @@
+ namespace sigc {
+ 
+ 
+-// Bridge slot syntax change
+-template <typename T_ret, typename... T_args>
+-class slot : public slot<T_ret(T_args...)> {
+-private:
+-   using _true_slot = slot<T_ret(T_args...)>;
+-public:
+-   inline slot() = default;
+-   inline slot(const _true_slot& src) : _true_slot(src) {}
+-   template<typename T_functor>
+-   inline slot(const T_functor& func) : _true_slot(func) {}
+-};
+-
+-template <typename T_ret>
+-using slot0 = slot<T_ret()>;
+-template <typename T_ret, typename T_arg1>
+-using slot1 = slot<T_ret(T_arg1)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2>
+-using slot2 = slot<T_ret(T_arg1, T_arg2)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3>
+-using slot3 = slot<T_ret(T_arg1, T_arg2, T_arg3)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4>
+-using slot4 = slot<T_ret(T_arg1, T_arg2, T_arg3, T_arg4)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5>
+-using slot5 = slot<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6>
+-using slot6 = slot<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6, typename T_arg7>
+-using slot7 = slot<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6, T_arg7)>;
+-
+-
+-// Bridge signal syntax change
+-template <typename T_ret, typename... T_args>
+-class signal : public signal<T_ret(T_args...)>, public trackable {
+-public:
+-   signal() = default;
+-
+-   decltype(auto) make_slot() const {
+-      return mem_fun(*this, &signal::emit);
+-   }
+-};
+-
+-template <typename T_ret>
+-using signal0 = signal<T_ret()>;
+-template <typename T_ret, typename T_arg1>
+-using signal1 = signal<T_ret(T_arg1)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2>
+-using signal2 = signal<T_ret(T_arg1, T_arg2)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3>
+-using signal3 = signal<T_ret(T_arg1, T_arg2, T_arg3)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4>
+-using signal4 = signal<T_ret(T_arg1, T_arg2, T_arg3, T_arg4)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5>
+-using signal5 = signal<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6>
+-using signal6 = signal<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6)>;
+-template <typename T_ret, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6, typename T_arg7>
+-using signal7 = signal<T_ret(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6, T_arg7)>;
+-
+-
+-//Bridge bound_mem_functor
+-template <typename T_ret, typename T_obj>
+-using bound_mem_functor0 = bound_mem_functor<T_ret (T_obj::*)()>;
+-template <typename T_ret, typename T_obj, typename T_arg1>
+-using bound_mem_functor1 = bound_mem_functor<T_ret (T_obj::*)(T_arg1), T_arg1>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2>
+-using bound_mem_functor2 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2), T_arg1, T_arg2>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2, typename T_arg3>
+-using bound_mem_functor3 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2, T_arg3), T_arg1, T_arg2, T_arg3>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4>
+-using bound_mem_functor4 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2, T_arg3, T_arg4), T_arg1, T_arg2, T_arg3, T_arg4>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5>
+-using bound_mem_functor5 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5), T_arg1, T_arg2, T_arg3, T_arg4, T_arg5>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6>
+-using bound_mem_functor6 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6), T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6>;
+-template <typename T_ret, typename T_obj, typename T_arg1, typename T_arg2, typename T_arg3, typename T_arg4, typename T_arg5, typename T_arg6, typename T_arg7>
+-using bound_mem_functor7 = bound_mem_functor<T_ret (T_obj::*)(T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6, T_arg7), T_arg1, T_arg2, T_arg3, T_arg4, T_arg5, T_arg6, T_arg7>;
+-
+-
+-
+ // Add old mem_fun API for pointer
+ template<typename T_return, typename T_obj, typename... T_arg>
+ inline decltype(auto)
+@@ -131,13 +52,6 @@
+ }
+ 
+ 
+-// Stub sigc::ref impl
+-template <typename T>
+-inline decltype(auto) ref(T& t) { return std::ref(t); }
+-template <typename T>
+-inline decltype(auto) ref(const T& t) { return std::cref(t); }
+-
+-
+ } //namespace sigc
+ 
+ #endif // SIGCXX_MAJOR_VERSION >= 3
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/copyPasteRpc.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/copyPasteRpc.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/copyPasteRpc.hh	2026-05-20 09:29:22.798851742 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/copyPasteRpc.hh	2026-05-20 09:43:45.076288192 +0200
+@@ -39,18 +39,18 @@
+    virtual ~CopyPasteRpc(void) {};
+ 
+    /* sigc signals for CopyPaste source callback. */
+-   sigc::signal<void, uint32, bool, const CPClipboard*> srcRecvClipChanged;
+-   sigc::signal<void, uint32, const uint8 *, uint32> requestFilesChanged;
+-   sigc::signal<void, uint32, bool, const uint8 *, uint32> getFilesDoneChanged;
++   sigc::signal<void(uint32, bool, const CPClipboard*)> srcRecvClipChanged;
++   sigc::signal<void(uint32, const uint8 *, uint32)> requestFilesChanged;
++   sigc::signal<void(uint32, bool, const uint8 *, uint32)> getFilesDoneChanged;
+ 
+    /* sigc signal for CopyPaste destination callback. */
+-   sigc::signal<void, uint32, bool> destRequestClipChanged;
++   sigc::signal<void(uint32, bool)> destRequestClipChanged;
+ 
+    /* sigc signal for ping reply callback. */
+-   sigc::signal<void, uint32> pingReplyChanged;
++   sigc::signal<void(uint32)> pingReplyChanged;
+ 
+    /* sigc signal for rpc command reply received. */
+-   sigc::signal<void, uint32, uint32> cmdReplyChanged;
++   sigc::signal<void(uint32, uint32)> cmdReplyChanged;
+ 
+    virtual void Init(void) = 0;
+    virtual void SendPing(uint32 caps) = 0;
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/dndRpc.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/dndRpc.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/dndRpc.hh	2026-05-20 09:29:22.798851742 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/dndRpc.hh	2026-05-20 09:43:45.076633914 +0200
+@@ -40,30 +40,30 @@
+    virtual ~DnDRpc(void) {};
+ 
+    /* sigc signals for DnD source callback. */
+-   sigc::signal<void, uint32, const CPClipboard *> srcDragBeginChanged;
+-   sigc::signal<void, uint32> srcCancelChanged;
+-   sigc::signal<void, uint32, uint32, uint32> srcDropChanged;
++   sigc::signal<void(uint32, const CPClipboard *)> srcDragBeginChanged;
++   sigc::signal<void(uint32)> srcCancelChanged;
++   sigc::signal<void(uint32, uint32, uint32)> srcDropChanged;
+ 
+    /* sigc signals for DnD destination callback. */
+-   sigc::signal<void, uint32, int32> destDragEnterReplyChanged;
+-   sigc::signal<void, uint32> destPrivDragEnterChanged;
+-   sigc::signal<void, uint32, int32, int32> destPrivDragLeaveChanged;
+-   sigc::signal<void, uint32, int32, int32> destPrivDropChanged;
+-   sigc::signal<void, uint32, int32, int32> destDropChanged;
+-   sigc::signal<void, uint32> destCancelChanged;
+-
+-   sigc::signal<void, uint32, int32, int32> moveMouseChanged;
+-   sigc::signal<void, uint32, uint32> updateFeedbackChanged;
+-   sigc::signal<void, uint32, int32, int32> queryExitingChanged;
+-   sigc::signal<void, uint32> dragNotPendingChanged;
+-   sigc::signal<void, uint32, const uint8 *, uint32> requestFileChanged;
+-   sigc::signal<void, uint32, bool, const uint8 *, uint32> getFilesDoneChanged;
++   sigc::signal<void(uint32, int32)> destDragEnterReplyChanged;
++   sigc::signal<void(uint32)> destPrivDragEnterChanged;
++   sigc::signal<void(uint32, int32, int32)> destPrivDragLeaveChanged;
++   sigc::signal<void(uint32, int32, int32)> destPrivDropChanged;
++   sigc::signal<void(uint32, int32, int32)> destDropChanged;
++   sigc::signal<void(uint32)> destCancelChanged;
++
++   sigc::signal<void(uint32, int32, int32)> moveMouseChanged;
++   sigc::signal<void(uint32, uint32)> updateFeedbackChanged;
++   sigc::signal<void(uint32, int32, int32)> queryExitingChanged;
++   sigc::signal<void(uint32)> dragNotPendingChanged;
++   sigc::signal<void(uint32, const uint8 *, uint32)> requestFileChanged;
++   sigc::signal<void(uint32, bool, const uint8 *, uint32)> getFilesDoneChanged;
+ 
+    /* sigc signal for responding to ping reply */
+-   sigc::signal<void, uint32> pingReplyChanged;
++   sigc::signal<void(uint32)> pingReplyChanged;
+ 
+    /* sigc signal for rpc cmd reply received. */
+-   sigc::signal<void, uint32, uint32> cmdReplyChanged;
++   sigc::signal<void(uint32, uint32)> cmdReplyChanged;
+ 
+    /* DnD source. */
+    virtual bool SrcDragBeginDone(uint32 sessionId) = 0;
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/fileTransferRpc.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/fileTransferRpc.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dnd/fileTransferRpc.hh	2026-05-20 09:29:22.798851742 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dnd/fileTransferRpc.hh	2026-05-20 09:43:45.076405233 +0200
+@@ -38,8 +38,8 @@
+ public:
+    virtual ~FileTransferRpc(void) {};
+ 
+-   sigc::signal<void, uint32, const uint8 *, size_t> HgfsPacketReceived;
+-   sigc::signal<void, uint32, const uint8 *, size_t> HgfsReplyReceived;
++   sigc::signal<void(uint32, const uint8 *, size_t)> HgfsPacketReceived;
++   sigc::signal<void(uint32, const uint8 *, size_t)> HgfsReplyReceived;
+ 
+    virtual void Init(void) = 0;
+    virtual bool SendHgfsPacket(uint32 sessionId,
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dndGuestBase/guestCopyPaste.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dndGuestBase/guestCopyPaste.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dndGuestBase/guestCopyPaste.hh	2026-05-20 09:29:22.799454507 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dndGuestBase/guestCopyPaste.hh	2026-05-20 09:43:45.076349949 +0200
+@@ -48,9 +48,9 @@
+    GuestCopyPasteMgr(DnDCPTransport *transport);
+    ~GuestCopyPasteMgr(void);
+ 
+-   sigc::signal<void, const CPClipboard*> srcRecvClipChanged;
+-   sigc::signal<void> destRequestClipChanged;
+-   sigc::signal<void, bool> getFilesDoneChanged;
++   sigc::signal<void(const CPClipboard*)> srcRecvClipChanged;
++   sigc::signal<void()> destRequestClipChanged;
++   sigc::signal<void(bool)> getFilesDoneChanged;
+ 
+    GUEST_CP_STATE GetState(void) { return mCPState; }
+    void SetState(GUEST_CP_STATE state);
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dndGuestBase/guestDnD.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dndGuestBase/guestDnD.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/dndGuestBase/guestDnD.hh	2026-05-20 09:29:22.799454507 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/dndGuestBase/guestDnD.hh	2026-05-20 09:43:45.076109786 +0200
+@@ -73,18 +73,18 @@
+                ToolsAppCtx *ctx);
+    virtual ~GuestDnDMgr(void);
+ 
+-   sigc::signal<void, int, int> moveMouseChanged;
+-   sigc::signal<void, bool, int, int> updateDetWndChanged;
+-   sigc::signal<void, GUEST_DND_STATE> stateChanged;
++   sigc::signal<void(int, int)> moveMouseChanged;
++   sigc::signal<void(bool, int, int)> updateDetWndChanged;
++   sigc::signal<void(GUEST_DND_STATE)> stateChanged;
+ 
+-   sigc::signal<void, const CPClipboard*, std::string> srcDragBeginChanged;
+-   sigc::signal<void> srcDropChanged;
+-   sigc::signal<void> srcCancelChanged;
+-   sigc::signal<void, bool> getFilesDoneChanged;
++   sigc::signal<void(const CPClipboard*, std::string)> srcDragBeginChanged;
++   sigc::signal<void()> srcDropChanged;
++   sigc::signal<void()> srcCancelChanged;
++   sigc::signal<void(bool)> getFilesDoneChanged;
+ 
+-   sigc::signal<void> destCancelChanged;
+-   sigc::signal<void, int32, int32> privDropChanged;
+-   sigc::signal<void> destMoveDetWndToMousePosChanged;
++   sigc::signal<void()> destCancelChanged;
++   sigc::signal<void(int32, int32)> privDropChanged;
++   sigc::signal<void()> destMoveDetWndToMousePosChanged;
+ 
+    GuestDnDSrc *GetDnDSrc(void) { return mSrc; }
+    GuestDnDDest *GetDnDDest(void) { return mDest; }
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/xutils/xutils.cc open-vm-tools-13.1.0-25218885/services/plugins/dndcp/xutils/xutils.cc
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/xutils/xutils.cc	2026-05-20 09:29:22.800725292 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/xutils/xutils.cc	2026-05-20 09:43:45.076835564 +0200
+@@ -42,14 +42,14 @@
+ 
+ 
+ /* Actual definitions of the signals in this class. */
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > currentDesktopChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopLayoutChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopGeometryChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopViewportChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > windowStackChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > windowManagerChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > activeWindowChanged;
+-sigc::signal<void, Glib::RefPtr<Gdk::Screen> > workAreaChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> currentDesktopChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopLayoutChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopGeometryChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopViewportChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> windowStackChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> windowManagerChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> activeWindowChanged;
++sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> workAreaChanged;
+ 
+ /* Necessary for calculating per-monitor _NET_WORKAREA in GetMonitorWorkArea() */
+ struct NETWMStrutPartial {
+diff -Naur open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/xutils/xutils.hh open-vm-tools-13.1.0-25218885/services/plugins/dndcp/xutils/xutils.hh
+--- open-vm-tools-13.1.0-25218885.old/services/plugins/dndcp/xutils/xutils.hh	2026-05-20 09:29:22.800725292 +0200
++++ open-vm-tools-13.1.0-25218885/services/plugins/dndcp/xutils/xutils.hh	2026-05-20 09:43:45.076492938 +0200
+@@ -65,22 +65,22 @@
+ 
+ uint32 GetNumDesktops(Glib::RefPtr<Gdk::Screen> screen);
+ uint32 GetCurrentDesktop(Glib::RefPtr<Gdk::Screen> screen);
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > currentDesktopChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> currentDesktopChanged;
+ 
+ bool GetDesktopLayout(Glib::RefPtr<Gdk::Screen> screen,
+                       uint32& rows, uint32& columns, Gtk::CornerType& corner,
+                       Gtk::Orientation& orientation);
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopLayoutChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopLayoutChanged;
+ 
+ bool GetDesktopGeometry(Glib::RefPtr<Gdk::Screen> screen,
+                         uint32& width, uint32& height);
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopGeometryChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopGeometryChanged;
+ 
+ bool GetDesktopViewport(Glib::RefPtr<Gdk::Screen> screen,
+                         uint32 desktopIndex, VMPoint& viewport);
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > desktopViewportChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> desktopViewportChanged;
+ 
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > activeWindowChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> activeWindowChanged;
+ 
+ /* Window stacking */
+ void RaiseWindow(Glib::RefPtr<Gdk::Window> window,
+@@ -88,7 +88,7 @@
+                     Glib::RefPtr<Gdk::Window>(),
+                  guint32 timestamp = 0);
+ HostWindowList GetHostWindowStack();
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > windowStackChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> windowStackChanged;
+ 
+ 
+ /* Multi-head */
+@@ -96,7 +96,7 @@
+                         int monitor, Gdk::Rectangle& rect);
+ 
+ utf::string GetWindowManagerName(Glib::RefPtr<Gdk::Screen> screen);
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > windowManagerChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> windowManagerChanged;
+ 
+ void SetFullscreenMonitorsHint(Glib::RefPtr<Gdk::Window> window,
+                                std::vector<long> topology);
+@@ -109,7 +109,7 @@
+                         int& x, int& y, Gdk::ModifierType& mask);
+ 
+ 
+-extern sigc::signal<void, Glib::RefPtr<Gdk::Screen> > workAreaChanged;
++extern sigc::signal<void(Glib::RefPtr<Gdk::Screen>)> workAreaChanged;
+ 
+ bool GetXWindowSize(const Glib::RefPtr<Gdk::Window>& window, int& width,
+                     int& height);

diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index fab4426..818f10f 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -1,49 +1,12 @@
-################################################################################
-### Copyright 2013-2023 VMware, Inc.  All rights reserved.
-###
-### RPM SPEC file for building open-vm-tools packages.
-###
-###
-### This program is free software; you can redistribute it and/or modify
-### it under the terms of version 2 of the GNU General Public License as
-### published by the Free Software Foundation.
-###
-### This program is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
-###
-### You should have received a copy of the GNU General Public License
-### along with this program; if not, write to the Free Software
-### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-################################################################################
-
-%global majorversion    13.0
-%global minorversion    10
-%global toolsbuild      25056151
-%global toolsversion    %{majorversion}.%{minorversion}
+%global toolsbuild      25218885
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
 
-# gtkmm3 is removed from RHEL 10, bundle it until the project is ported
-# GTK 4, see RHEL-35537
-%global bundle_gtkmm3   1
-
 Name:             open-vm-tools
-Version:          %{toolsversion}
-Release:          1%{?dist}
+Version:          13.1.0
+Release:          %autorelease
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
-%if 0%{?bundle_gtkmm3}
-# atkmm: LGPL-2.1-or-later
-# cairomm: LGPL-2.0-or-later
-# glibmm2.4: LGPL-2.1-or-later AND GPL-2.0-or-later
-# gtkmm3.0: LGPL-2.1-or-later AND GPL-2.0-or-later
-# libsigc++20: LGPL-2.1-or-later
-# pangomm: LGPL-2.1-or-later AND GPL-2.0-only
-License:          GPL-2.0-only AND W3C AND LGPL-2.1-only AND ICU AND ISC AND MIT AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-2.0-or-later
-%else
 License:          GPL-2.0-only AND W3C AND LGPL-2.1-only AND ICU AND ISC AND MIT
-%endif
 URL:              https://github.com/vmware/%{name}
 
 Source0:          https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
@@ -53,32 +16,11 @@ Source3:          run-vmblock\x2dfuse.mount
 Source4:          open-vm-tools.conf
 Source5:          vmtoolsd.pam
 
-%if 0%{?bundle_gtkmm3}
-%global bundled_install_path %{_libdir}/%{name}
-
-%global __provides_exclude_from ^%{bundled_install_path}
-%global __requires_exclude ^(libatkmm|libcairomm|libgdkmm|libgiomm|libglibmm|libgtkmm|libpangomm|libsigc).*$
-
-# Generally use the content that was already part of RHEL 10 apart from libsigc++20
-# as it was modified to not build documentation because of docbook5, see i.e. RHEL-45565
-# In order of use:
-Source101:        libsigc++20-2.12.1-4.el9.src.rpm
-Source102:        https://kojihub.stream.centos.org/kojifiles/vol/koji02/packages/glibmm2.4/2.66.6/5.el10/src/glibmm2.4-2.66.6-5.el10.src.rpm
-Source103:        https://kojihub.stream.centos.org/kojifiles/vol/koji02/packages/atkmm/2.28.4/2.el10/src/atkmm-2.28.4-2.el10.src.rpm
-Source104:        https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/packages/cairomm/1.14.5/5.el10/src/cairomm-1.14.5-5.el10.src.rpm
-Source105:        https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/packages/pangomm/2.46.4/2.el10/src/pangomm-2.46.4-2.el10.src.rpm
-Source106:        https://kojihub.stream.rdu2.redhat.com/kojifiles/vol/koji02/packages/gtkmm3.0/3.24.8/6.el10/src/gtkmm3.0-3.24.8-6.el10.src.rpm
-%endif
+Patch0:           open-vm-tools-gcc16.patch
+Patch1:           open-vm-tools-sigc++3.patch
+Patch2:           open-vm-tools-openssl4.patch
 
-%if 0%{?rhel} >= 7
-ExclusiveArch:    x86_64 aarch64
-%else
 ExclusiveArch:    %{ix86} x86_64 aarch64
-%endif
-
-# Patches
-#Patch0:           <patch-name0>.patch
-Patch2: 0001-Fix-discarded-qualifiers-warning-error.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -86,18 +28,7 @@ BuildRequires:    libtool
 BuildRequires:    make
 BuildRequires:    gcc-c++
 BuildRequires:    doxygen
-# Fuse is optional and enables vmblock-fuse
-# Switching Fedora to use fuse3.   Red Hat to switch on their own schedule.
-%if 0%{?fedora} || 0%{?rhel} > 8
-BuildRequires:    fuse3-devel
-%else
-BuildRequires:    fuse-devel
-%endif
-BuildRequires:    glib2-devel >= 2.14.0
-BuildRequires:    libicu-devel
-BuildRequires:    libmspack-devel
-# Unfortunately, xmlsec1-openssl does not add libtool-ltdl dependency, so we
-# need to add it ourselves.
+BuildRequires:    fuse3-devel >= 3.10.0
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    libX11-devel
 BuildRequires:    libXext-devel
@@ -106,56 +37,37 @@ BuildRequires:    libXinerama-devel
 BuildRequires:    libXrandr-devel
 BuildRequires:    libXrender-devel
 BuildRequires:    libXtst-devel
-BuildRequires:    openssl-devel
 BuildRequires:    pam-devel
+BuildRequires:    pkgconfig(glib-2.0) >= 2.34.0
+BuildRequires:    pkgconfig(gmodule-2.0) >= 2.34.0
+BuildRequires:    pkgconfig(gobject-2.0) >= 2.34.0
+BuildRequires:    pkgconfig(gthread-2.0) >= 2.34.0
+BuildRequires:    pkgconfig(gtk4) >= 4.0.0
+BuildRequires:    pkgconfig(gtkmm-4.0) >= 4.0.0
+BuildRequires:    pkgconfig(icu-i18n)
 BuildRequires:    pkgconfig(libdrm)
+BuildRequires:    pkgconfig(libmspack) >= 0.0.20040308alpha
 BuildRequires:    pkgconfig(libudev)
+BuildRequires:    pkgconfig(libtirpc)
+BuildRequires:    pkgconfig(openssl)
+BuildRequires:    pkgconfig(protobuf) >= 3.0.0
 BuildRequires:    procps-devel
-BuildRequires:    xmlsec1-openssl-devel
-
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires:    gtk3-devel >= 3.10.0
-%if 0%{?bundle_gtkmm3}
-BuildRequires:    atk-devel
-# For cairomm tests, could be dropped
-BuildRequires:    boost-devel
-BuildRequires:    libxslt
-BuildRequires:    m4
-BuildRequires:    meson
-BuildRequires:    mm-common
-BuildRequires:    perl-generators
-BuildRequires:    perl-interpreter
-BuildRequires:    perl(Getopt::Long)
-%else
-BuildRequires:    gtkmm30-devel >= 3.10.0
-%endif
-BuildRequires:    libtirpc-devel
 BuildRequires:    rpcgen
+# Required otherwise udev rules are not built:
 BuildRequires:    systemd-udev
-%else
-BuildRequires:    gtk2-devel >= 2.4.0
-BuildRequires:    gtkmm24-devel
-BuildRequires:    systemd
-%endif
+BuildRequires:    xmlsec1-openssl-devel
 
 Requires:         coreutils
-%if 0%{?fedora} || 0%{?rhel} > 8
 Requires:         fuse3
-%else
-Requires:         fuse
-%endif
-Requires:         iproute
 Requires:         grep
+Requires:         iproute
 Requires:         pciutils
 Requires:         sed
-Requires:         systemd
 Requires:         tar
 Requires:         util-linux
 Requires:         which
 # xmlsec1-openssl needs to be added explicitly
 Requires:         xmlsec1-openssl
-# DeployPkg pluggin require dbus-uuidgen
-Requires:         dbus-tools
 
 # open-vm-tools >= 10.0.0 do not require open-vm-tools-deploypkg provided by
 # VMware. That functionality is now available as part of open-vm-tools package
@@ -195,7 +107,6 @@ 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
 
@@ -221,188 +132,29 @@ useful for verifying the functioning of %{name} in VMware virtual
 machines.
 
 %prep
-%autosetup -p2 -n %{name}-%{version}-%{toolsbuild}
+%autosetup -p1 -n %{name}-%{version}-%{toolsbuild}
 
 %build
-%if 0%{?bundle_gtkmm3}
-export PATH="%{_buildrootdir}/bin:$PATH"
-
-function install_rpms_to_current_dir() {
-    PACKAGE_RPM=$(eval echo $1)
-    PACKAGE_DIR=%{_rpmdir}
-
-    echo "install_rpms_to_current_dir() for $PACKAGE_DIR/$PACKAGE_RPM"
-    if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then
-        # Hack for tps tests
-        ARCH_STR=%{_arch}
-        %ifarch %{ix86}
-            ARCH_STR="i?86"
-        %endif
-        PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR"
-     fi
-
-     for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM)
-     do
-         echo "$package"
-         rpm2cpio "$package" | cpio -ivdu
-     done
-}
-
-rpmbuild_bundled() {
-    rpmbuild --nodeps \
-             --define '_prefix %{bundled_install_path}' \
-             --define '__perl /usr/bin/perl' \
-             $@
-}
-
-export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
-export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
-export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig
-export PATH="%{_buildrootdir}%{bundled_install_path}/bin:$PATH"
-
-# libsigc++20
-rpm -ivh %{SOURCE101}
-rpmbuild_bundled -ba %{_specdir}/libsigc++20.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir libsigc++20*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# glibmm2.4
-rpm -ivh %{SOURCE102}
-rpmbuild_bundled -ba %{_specdir}/glibmm2.4.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir glibmm2.4*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# atkmm
-rpm -ivh %{SOURCE103}
-rpmbuild_bundled -ba %{_specdir}/atkmm.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir atkmm*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# cairomm
-rpm -ivh %{SOURCE104}
-rpmbuild_bundled --without=doc_pdf -ba %{_specdir}/cairomm.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir cairomm*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# pangomm
-rpm -ivh %{SOURCE105}
-rpmbuild_bundled -ba %{_specdir}/pangomm.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir pangomm*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# gtkmm3.0
-rpm -ivh %{SOURCE106}
-rpmbuild_bundled -ba %{_specdir}/gtkmm3.0.spec
-pushd %{_buildrootdir}
-install_rpms_to_current_dir gtkmm*.rpm
-popd
-
-sed -i 's@prefix=%{bundled_install_path}@prefix=%{_buildrootdir}%{bundled_install_path}@g' \
-  %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/*.pc
-
-# Remove the doc subpackages as we don't need them
-find %{_rpmdir} -name "*doc*.rpm" -delete
-%endif
-
 autoreconf -vif
 
 %configure \
-    --without-kernel-modules \
-    --enable-xmlsec1 \
+    --disable-static \
     --enable-resolutionkms \
-    --enable-servicediscovery \
 %ifarch x86_64
     --enable-salt-minion \
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 8
+    --enable-servicediscovery \
+    --enable-vmwgfxctrl \
+    --with-fuse \
+    --with-gtk4 \
     --with-tirpc \
-    --without-gtk2 \
-    --without-gtkmm \
-%if 0%{?bundle_gtk3mm}
-    --without-gtkmm3 \
-%endif
-%else
-    --without-tirpc \
-    --without-gtk3 \
-    --without-gtkmm3 \
-%endif
-    --disable-static
+    --with-xmlsec1 \
+    --without-kernel-modules
 
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 %make_build
 
 %install
-export DONT_STRIP=1
-
-%if 0%{?bundle_gtkmm3}
-set -e
-function install_rpms_to_current_dir() {
-    PACKAGE_RPM=$(eval echo $1)
-    PACKAGE_DIR=%{_rpmdir}
-
-    echo "install_rpms_to_current_dir() for $PACKAGE_DIR/$PACKAGE_RPM"
-    if [ ! -f $PACKAGE_DIR/$PACKAGE_RPM ]; then
-        # Hack for tps tests
-        ARCH_STR=%{_arch}
-        %ifarch %{ix86}
-            ARCH_STR="i?86"
-        %endif
-        PACKAGE_DIR="$PACKAGE_DIR/$ARCH_STR"
-     fi
-
-     for package in $(ls $PACKAGE_DIR/$PACKAGE_RPM)
-     do
-         echo "$package"
-         rpm2cpio "$package" | cpio -ivdu
-     done
-}
-
-pushd %{buildroot}
-# Install only what we need in runtime
-install_rpms_to_current_dir atkmm-2.28.4-*.rpm
-install_rpms_to_current_dir cairomm-1.14.5-*.rpm
-install_rpms_to_current_dir glibmm2.4-2.66*.rpm
-install_rpms_to_current_dir gtkmm3.0-3.24.8*.rpm
-install_rpms_to_current_dir libsigc++20-2.12.1*.rpm
-install_rpms_to_current_dir pangomm-2.46.4*.rpm
-popd
-
-# clean the created bundled rpms if there are any
-rm -rf %{_srcrpmdir}/libsigc++20*.src.rpm
-find %{_rpmdir} -name "libsigc++20*.rpm" -delete
-rm -rf %{_srcrpmdir}/glibmm2.4*.src.rpm
-find %{_rpmdir} -name "glibmm2.4*.rpm" -delete
-rm -rf %{_srcrpmdir}/atkmm*.src.rpm
-find %{_rpmdir} -name "atkmm*.rpm" -delete
-rm -rf %{_srcrpmdir}/cairomm*.src.rpm
-find %{_rpmdir} -name "cairomm*.rpm" -delete
-rm -rf %{_srcrpmdir}/pangomm*.src.rpm
-find %{_rpmdir} -name "pangomm*.rpm" -delete
-rm -rf %{_srcrpmdir}/gtkmm*.src.rpm
-find %{_rpmdir} -name "gtkmm*.rpm" -delete
-%endif
-
 %make_install
 
 # Remove exec bit from config files
@@ -435,7 +187,6 @@ install -p -m 644 -D %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/vmtoolsd
 # file. We can add %%check secion once 'make check' is fixed upstream.
 
 %post
-%?ldconfig
 # Setup mount point for Shared Folders
 # NOTE: Use systemd-detect-virt to detect VMware platform because
 #       vmware-checkvm might misbehave on non-VMware platforms.
@@ -481,7 +232,6 @@ if %{_bindir}/systemctl is-active %{toolsdaemon}.service &> /dev/null; then
 fi
 
 %preun
-%?ldconfig
 %systemd_preun %{toolsdaemon}.service %{vgauthdaemon}.service
 
 if [ "$1" = "0" -a                                       \
@@ -506,7 +256,6 @@ fi
 %systemd_preun run-vmblock\\x2dfuse.mount
 
 %postun
-%?ldconfig
 %systemd_postun_with_restart %{toolsdaemon}.service %{vgauthdaemon}.service
 
 %postun desktop
@@ -583,19 +332,6 @@ fi
 %{_libdir}/%{name}/plugins/vmusr/
 %{_unitdir}/run-vmblock\x2dfuse.mount
 
-%if 0%{?bundle_gtkmm3}
-%{bundled_install_path}/share/doc/
-%{bundled_install_path}/share/licenses/
-%{bundled_install_path}/%{_lib}/libatkmm*
-%{bundled_install_path}/%{_lib}/libcairomm*
-%{bundled_install_path}/%{_lib}/libgdkmm*
-%{bundled_install_path}/%{_lib}/libgiomm*
-%{bundled_install_path}/%{_lib}/libglibmm*
-%{bundled_install_path}/%{_lib}/libgtkmm*
-%{bundled_install_path}/%{_lib}/libpangomm*
-%{bundled_install_path}/%{_lib}/libsigc*
-%endif
-
 %files sdmp
 %{_libdir}/%{name}/plugins/vmsvc/libserviceDiscovery.so
 %{_libdir}/%{name}/serviceDiscovery
@@ -623,253 +359,4 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
-* Mon Feb 16 2026 Bo Yang <boyang@redhat.com> - 13.0.10-1
-- Rebase to 13.0.10 [RHEL-144577]
-- Resolves: RHEL-144577
-  ([ESXi][RHEL10] open-vm-tools version 13.0.10 has been released - please rebase)
-
-* Mon Nov 03 2025 Bo Yang <boyang@redhat.com> - 13.0.5-1
-- Rebase to 13.0.5 [RHEL-118504]
-- Resolves: RHEL-118504
-  ([ESXi][RHEL10] open-vm-tools version 13.0.5 has been released - please rebase)
-
-* Mon Oct 06 2025 Miroslav Rezanina <mrezanin@redhat.com> - 13.0.0-2
-- ovt-Handle-new-cloud-init-error-code-and-status.patch [RHEL-99781]
-- ovt-Address-CVE-2025-41244.patch [RHEL-117382]
-- Resolves: RHEL-99781
-  (Cloud-init receives TERM signal from PID 1 in the middle of running user data [rhel-10])
-- Resolves: RHEL-117382
-  ([CISA Major Incident] CVE-2025-41244 open-vm-tools: Local privilege escalation in open-vm-tools [rhel-10.2])
-
-* Thu Jul 24 2025 Bo Yang <boyang@redhat.com> - 13.0.0-1
-- Rebase to 13.0.0 [RHEL-99156]
-- Resolves: RHEL-99156
-  ([ESXi][RHEL10] open-vm-tools version 13.0.0 has been released - please rebase)
-
-* Tue Dec 03 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.5.0-1
-- Rebase to 12.5.0 [RHEL-63092]
-- Resolves: RHEL-63092
-  ([ESXi][RHEL10] open-vm-tools version 12.5.0 has been released - please rebase)
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 12.4.5-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Thu Sep 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.4.5-1
-- Rebase to 12.4.1 [RHEL-45549]
-- Resolves: RHEL-45549
-  ([ESXi][RHEL10] open-vm-tools version 12.4.5 has been released - please rebase)
-
-* Thu Aug 22 2024 Tomas Popela <tpopela@redhat.com> - 12.4.0-5
-- Bundle gtkmm3.0 stack on RHEL 10 to allow its removal
-- Update license string to SPDX format
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 12.4.0-4
-- Bump release for June 2024 mass rebuild
-
-* Wed Jun 12 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.4.0-3
-- ovt-Drop-now-unneeded-gdk-pixbuf-xlib-dependency.patch [RHEL-40732]
-- Resolves: RHEL-40732
-  (Drop unneeded gdk-pixbuf-xlib dependency)
-
-* Mon May 20 2024 Miroslav Rezanina <mrezanin@redhat.com> - 12.4.0-2
-- ovt-Require-dbus-tools.patch [RHEL-36292]
-- Resolves: RHEL-36292
-  ([ESXi][open-vm-tools]The open-vm-tools should depend on dbus-tools [rhel-10])
-
-* 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
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 12.3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Nov 8 2023 John Wolfe <jwolfe@vmware.com> - 12.3.5-1
-- Package new upstream version of open-vm-tools-12.3.5-22544099.
-  . fix for CVE-2023-34058 - another SAML token signature bypass vulnerability.
-  . fix for CVE-2023-34059 - a file descriptor hijack vulnerability in the
-                             vmware-user-suid-wrapper.
-  . address https://github.com/vmware/open-vm-tools/issues/310
-- Remove CVE-2023-34058.patch and CVE-2023-34059.patch as no longer needed.
-
-* Mon Oct 30 2023 John Wolfe <jwolfe@vmware.com> - 12.3.0-3
-- Address CVE-2023-34058 - BZ 2246963 - SAML token signature token bypass.
-- Address CVE-2023-34059 - BZ 2246962 - vmware-user-suid-wrapper
-  file descriptor hijack vulnerability
-* Thu Oct 05 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 12.3.0-2
-- Use fuse3 on new RHEL
-
-* Sat Sep 9 2023 John Wolfe <jwolfe@vmware.com> - 12.3.0-1
-- Package new upstream version of open-vm-tools-12.3.0-22234872.
-  - Fix for CVE-2023-20900 - a SAML token signature bypass vulnerability.
-  - Fix for CVE-2023-20867 - an Authentication Bypass vulnerability.
-  - Linux quiesced snapshots have been updated to avoid intermittent hangs
-    of the vmtoolsd process.
-    - File systems prefrozen by custom quiescing scripts must be listed on the
-      "excludedFileSystems" setting in the "vmbackup" section of the tools.conf
-      file.
-    - A tools.conf configuration setting is available to temporaily direct
-      Linux quiesced snaphots to restore pre open-vm-tools 12.2.0 behavior
-      of ignoring file systems already frozen.
-  - A number of Coverity reported issues have been addressed.
-  - A number of GitHub issues and pull requests have been handled.
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.1.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 12.1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Jan 1 2023 John Wolfe <jwolfe@vmware.com> - 12.1.5-2
-- Update the copyright date in the open-vm-tools.spec file.
-
-* Sun Jan 1 2023 John Wolfe <jwolfe@vmware.com> - 12.1.5-1
-- Package new upstream version of open-vm-tools-12.1.5-20735119.
-  - The deployPkg plugin may prematurely reboot the guest VM before cloud-init
-    has completed user data setup
-  - A SIGSEGV may be encountered when a non-quiescing snapshot times out.
-  - A number of Coverity reported issues have been addressed.
-
-* Thu Sep 8 2022 John Wolfe <jwolfe@VMWARE.COM> - 12.1.0-1
-- Package new upstream version open-vm-tools-12.1.0-20219665.
-  . fix for CVE-2022-31676 - a local privilege escalation vulnerability.
-  . address a number of Coverity reported issues.
-- Remove patch 1205-Properly-check-authorization-on-incoming-guestOps-re.patch
-  as no longer needed.
-
-* Sun Sep 4 2022 John Wolfe <jwolfe@vmware.com> - 12.0.5-3
-- Add patch 1205-Properly-check-authorization-on-incoming-guestOps-re.patch
-  to fix CVE-2022-31676 in open-vm-tools 12.0.5 tracked in PR 120976.
-- Correct build requirements - replace systemd-rpm-macros with systemd_udev.
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 30 2022 John Wolfe <jwolfe@vmware.com> - 12.0.5-1
-- Package new upstream version open-vm-tools-12.0.5-19716617.
- - Maintenance release addressing some potential FTBFS issues.
-- Remove asyncsocket.patch as no longer needed.
-
-* Mon May 9 2022 John Wolfe <jwolfe@vmware.com> - 12.0.0-1
-- Package new upstream version open-vm-tools-12.0.0-19345655.
-- Enable build of the new salt-minion plugin package.
-- Deferring enablement of new containerInfo plugin until a later revision.
-- Build with fuse3 on Fedora.
-
-* Thu Feb 24 2022 John Wolfe <jwolfe@vmware.com> - 11.3.5-1
-- Package new upstream version open-vm-tools-11.3.5-18557794.
-
-* Wed Feb 9 2022 John Wolfe <jwolfe@vmware.com> - 11.3.0-6
-- Refactored asyncsocket.c patch to use size_t size and index variables.
-
-* Tue Feb 1 2022 John Wolfe <jwolfe@vmware.com> - 11.3.0-5
-- Address (fix) strings or array bounds warnings from GCC 12.0.x.
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 11.3.0-3
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 15 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.3.0-1
-- Package new upstream version open-vm-tools-11.3.0-18090558.
-- Add vmware-alias-import, vmwgfxctrl, libgdp.so, libguestStore.so
-  and libguestStoreClient.so.*.
-- Remove open-vm-tools-fix-kms-autodetection.patch,
-  open-vm-tools-gcc11.patch and open-vm-tools-gdk-glib.patch
-  as no longer needed.
-
-* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-9
-- Backport patch for KMS autodetection.
-
-* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-8
-- Trim changelog.
-- Fix libdrm/udev build requirement.
-
-* Tue Jun 01 2021 Simone Caronni <negativo17@gmail.com> - 11.2.5-7
-- Fix build on CentOS/RHEL 7.
-- Allow building on aarch64 for CentOS/RHEL 8+ and Fedora.
-- Clean up SPEC file (conditionals, build requirements, scriptlets, formatting).
-
-* Mon Apr 05 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-6
-- Added missing escape char in run-vmblock\\x2dfuse.mount service name.
-- Enabled run-vmblock\\x2dfuse.mount service during post-install.
-- Moved run-vmblock\x2dfuse.mount service unit to desktop package.
-
-* Fri Mar 19 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-5
-- Added open-vm-tools-gdk-glib.patch to fix RHBZ#1939718.
-
-* Tue Mar 16 2021 Neal Gompa <ngompa13@gmail.com> - 11.2.5-4
-- Add missing BRs
-- Clean up conditionals to build correctly with EL8+
-- Simplify systemd scriptlets
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 11.2.5-3
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.2.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 15 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-1
-- Package new upstream version open-vm-tools-11.2.5-17337674.
-- libdnet dependency was removed in open-vm-tools 11.0.0. So,
-  removed the stale BuildRequires for libdnet.
-
-* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 11.2.0-2
-- Bump and rebuild against libdnet 1.14 (RHBZ#1915838).
-
-* Fri Nov 06 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.0-1
-- Package new upstream version open-vm-tools-11.2.0-16938113.
-
-* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 11.1.5-2
-- Fix incorrect volatile exposed by gcc-11
-
-* Tue Sep 08 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.5-1
-- Package new upstream version open-vm-tools-11.1.5-16724464.
-- Removed gcc10-warning.patch and sdmp-fixes.patch (no longer needed).
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 09 2020 Merlin Mathesius <mmathesi@redhat.com> - 11.1.0-3
-- Conditional fixes to build for ELN
-
-* Sun Jun 21 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.0-2
-- Added sdmp-fixes.patch from upstream to remove net-tools dependency
-  and couple of important fixes
-
-* Mon May 25 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.0-1
-- Package new upstream version open-vm-tools-11.1.0-16036546.
-- Added new open-vm-tools-sdmp package.
-- Workaround for vm-support script path is no longer needed.
-- Added missing dependencies for vm-support script.
-- Updated gcc10-warning.patch.
-- Removed gcc9-static-inline.patch and diskinfo-log-spew.patch that
-  are no longer needed.
-
-* Sun May 17 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-4
-- Updated PAM configuration file to follow configured authn scheme.
-
-* Tue Mar 24 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-3
-- Use /sbin/ldconfig on older than Fedora 28 and RHEL 8 platforms.
-
-* Fri Feb 07 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-2
-- Added patch diskinfo-log-spew.patch.
-
-* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-1
-- Package new upstream version open-vm-tools-11.0.5-15389592.
-- Removed vix-memleak.patch which is no longer needed.
-
-* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-6
-- Added gcc10-warning.patch for fixing compilation issues.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+%autochangelog

diff --git a/sources b/sources
index ef725cf..0385c6f 100644
--- a/sources
+++ b/sources
@@ -1,7 +1 @@
-SHA512 (open-vm-tools-13.0.10-25056151.tar.gz) = c332fd2efb3bc16f2fbb77b7b0d0f4a5bb251b5b4828260bb6cbd96903a38d492f90727dad54ef95e442cf3dcc043032e5581e64e3aee4afb55b9db568a29259
-SHA512 (atkmm-2.28.4-2.el10.src.rpm) = 55953c3221c228433e720b28517c1d23faba1091eb5d81be6522c096b7cf42828eaefe1c330aa2ca0b058188cf4ddd8549463d5817949a5a31efead72097d04e
-SHA512 (cairomm-1.14.5-5.el10.src.rpm) = 2d036e83c63dd29a1933542de2274d74b4e63100d90dfd559eabdd00333ac4dd1ca25d810f5180c1c1afd71cd985376e7700beaff4f385132200c75633bfc980
-SHA512 (glibmm2.4-2.66.6-5.el10.src.rpm) = 78cd5d54f1ef9faf2be75f22550b5ec60b55f6c4345df91db95889762f606a0649905077934527b98ba325212bb460a19deadef9eea15bb0c50915e560621d4c
-SHA512 (gtkmm3.0-3.24.8-6.el10.src.rpm) = e0e4c3c57cf384928c39b22ae81276ff9f2f34e7aa6914f7d9a3ce65b5e170d7d2edaa61678b8f2ac2e5b16072d796af74ca51ad560b6fc539c7796f318fa6eb
-SHA512 (libsigc++20-2.12.1-4.el9.src.rpm) = cdb1800b2413794e83623871b2ca2cade0b444e0a90f6948e1f3f449cd92e10beb3dd76471023f95e4f795693b3ded09bc83f551a54dab065fdee5dbf67e9a40
-SHA512 (pangomm-2.46.4-2.el10.src.rpm) = ab9a723b4a90504101d544335333d9a2ec3c7558101c7005cc69aa05c115f4639d7e4110fb5a856f48e35ea062a5450adddca05f6866263fa8f20b8cecd12e6e
+SHA512 (open-vm-tools-13.1.0-25218885.tar.gz) = 07086e2403bc4ab9727822ccfb7152e479f326a1d33c533bdcfb38b5ade8aa2ed3bc244130ab794ad5b99d9a0b3c3caecf0f37e2e1695bd97213f2236490bbb4

diff --git a/vgauthd.service b/vgauthd.service
index 6ca3508..d5fef2c 100644
--- a/vgauthd.service
+++ b/vgauthd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=VGAuth Service for open-vm-tools
-Documentation=https://github.com/vmware/open-vm-tools
+Documentation=http://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 PartOf=vmtoolsd.service
 

diff --git a/vmtoolsd.service b/vmtoolsd.service
index 7454f90..6788f99 100644
--- a/vmtoolsd.service
+++ b/vmtoolsd.service
@@ -1,16 +1,14 @@
 [Unit]
 Description=Service for virtual machines hosted on VMware
-Documentation=https://github.com/vmware/open-vm-tools
+Documentation=http://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 Requires=vgauthd.service
 After=vgauthd.service
-StartLimitIntervalSec=30
-StartLimitBurst=3
+Before=display-manager.service
 
 [Service]
 ExecStart=/usr/bin/vmtoolsd
 TimeoutStopSec=5
-Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-03 15:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-03 15:05 [rpms/open-vm-tools] rawhide: Merge remote-tracking branch 'origin/eln' into rawhide Stephen Gallagher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox