public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/open-vm-tools] rawhide: Fixing buiding on newest version
@ 2026-09-03 15:05 Miroslav Rezanina
0 siblings, 0 replies; only message in thread
From: Miroslav Rezanina @ 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 : 9fa6e2a468ca59a5b050c506672f752a6c499a4e
Author : Miroslav Rezanina <mrezanin@redhat.com>
Date : 2025-12-10T14:29:13+01:00
Stats : +777/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/open-vm-tools/c/9fa6e2a468ca59a5b050c506672f752a6c499a4e?branch=rawhide
Log:
Fixing buiding on newest version
Fixing two issues:
- Pointer type is now raising warning when const is discarded (usually
case when working with string functions).
- new glib2 define g_free as macro that's breaking our stub code.
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
diff --git a/0001-Fix-discarded-qualifiers-warning-error.patch b/0001-Fix-discarded-qualifiers-warning-error.patch
new file mode 100644
index 0000000..2a9c74f
--- /dev/null
+++ b/0001-Fix-discarded-qualifiers-warning-error.patch
@@ -0,0 +1,776 @@
+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/open-vm-tools.spec b/open-vm-tools.spec
index 7ba5a75..0041d2f 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -80,6 +80,7 @@ ExclusiveArch: %{ix86} x86_64 aarch64
#Patch0: <patch-name0>.patch
# For RHEL-99781 - Cloud-init receives TERM signal from PID 1 in the middle of running user data [rhel-10]
Patch1: ovt-Handle-new-cloud-init-error-code-and-status.patch
+Patch2: 0001-Fix-discarded-qualifiers-warning-error.patch
BuildRequires: autoconf
BuildRequires: automake
^ 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: Fixing buiding on newest version Miroslav Rezanina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox