cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reintegrate accidentally removed patch

Browse Source 
Along the way remove a patch that is no longer
needed.

Reported by:	John Wolfe <jwolfe@vmware.com>
Pointyhat:	jpaetzel
This commit is contained in:
Josh Paetzel 2018-03-13 14:20:24 +00:00
parent 241359a3e1
commit 9caf09de92
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=464378
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/open-vm-tools/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
PORTREVISION= 4
PORTREVISION= 5
PORTEPOCH= 2
CATEGORIES= emulators

15
emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c
View File

@ -1,15 +0,0 @@
--- lib/hgfsServer/hgfsServerLinux.c.orig 2017-07-28 21:59:15 UTC
+++ lib/hgfsServer/hgfsServerLinux.c
@@ -178,6 +178,12 @@ getdents_linux(unsigned int fd,
# endif
}
# define getdents getdents_linux
+#elif defined(__FreeBSD__) && defined(__INO64)
+#define getdents(fd, dirp, count) \
+({ \
+ off_t basep; \
+ getdirentries(fd, dirp, count, &basep); \
+})
#elif defined(__FreeBSD__)
#define getdents(fd, dirp, count) \
({ \

33
emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
View File

@ -1,6 +1,33 @@
--- services/plugins/vix/vixTools.c.orig 2018-02-24 17:50:37 UTC
--- services/plugins/vix/vixTools.c.orig 2017-12-15 21:11:49 UTC
+++ services/plugins/vix/vixTools.c
@@ -10135,7 +10135,7 @@ abort:
@@ -52,6 +52,7 @@
#include <stdarg.h>
#include <fcntl.h>
#include <errno.h>
+#include <limits.h>
#ifdef _WIN32
#include <WTypes.h>
@@ -7330,7 +7331,7 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
goto abort;
}
}
- for (var = 0; var <= 0xFFFFFFFF; var++) {
+ for (var = 0; ; var++) {
free(tempScriptFilePath);
tempScriptFilePath = Str_SafeAsprintf(NULL,
"%s"DIRSEPS"%s%d%s",
@@ -7373,6 +7374,9 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
*/
break;
}
+ if (var == INT_MAX) {
+ break;
+ }
}
if (fd < 0) {
/*
@@ -10131,7 +10135,7 @@ abort:
struct passwd pwd;
struct passwd *ppwd = &pwd;
char *buffer = NULL; // a pool of memory for Posix_Getpwnam_r() to use.
@ -9,7 +36,7 @@
/*
* For POSIX systems, look up the uid of 'username', and compare
@@ -10148,9 +10148,15 @@ abort:
@@ -10144,9 +10148,15 @@ abort:
* Multiply by 4 to compensate for the conversion to UTF-8 by
* the Posix_Getpwnam_r() wrapper.
*/