1*4882a593SmuzhiyunFrom 31ae6f42458f90d4994a4ad8e2b7673691612c36 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Natanael Copa <ncopa@alpinelinux.org> 3*4882a593SmuzhiyunDate: Wed, 18 Nov 2015 09:10:14 +0000 4*4882a593SmuzhiyunSubject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe ALLPERMS and ACCESSPERMS defines are not specified in POSIX so 7*4882a593Smuzhiyunassume it is not there instead of testing for specific implementations. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThis is needed for musl libc. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Natanael Copa <ncopa@alpinelinux.org> 12*4882a593Smuzhiyun[Retrieved from: 13*4882a593Smuzhiyunhttp://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch?h=sumo] 14*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- 17*4882a593Smuzhiyun open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- 18*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 5 deletions(-) 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunIndex: open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 21*4882a593Smuzhiyun=================================================================== 22*4882a593Smuzhiyun--- open-vm-tools.orig/lib/hgfsServer/hgfsServerLinux.c 23*4882a593Smuzhiyun+++ open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 24*4882a593Smuzhiyun@@ -107,11 +107,13 @@ typedef struct DirectoryEntry { 25*4882a593Smuzhiyun #endif 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun /* 28*4882a593Smuzhiyun- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the 29*4882a593Smuzhiyun- * Solaris version of <sys/stat.h>. 30*4882a593Smuzhiyun+ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in 31*4882a593Smuzhiyun+ * POSIX. 32*4882a593Smuzhiyun */ 33*4882a593Smuzhiyun-#ifdef sun 34*4882a593Smuzhiyun+#ifndef ACCESSPERMS 35*4882a593Smuzhiyun # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) 36*4882a593Smuzhiyun+#endif 37*4882a593Smuzhiyun+#ifndef ALLPERMS 38*4882a593Smuzhiyun # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) 39*4882a593Smuzhiyun #endif 40*4882a593Smuzhiyun 41*4882a593SmuzhiyunIndex: open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c 42*4882a593Smuzhiyun=================================================================== 43*4882a593Smuzhiyun--- open-vm-tools.orig/services/plugins/dndcp/dnd/dndLinux.c 44*4882a593Smuzhiyun+++ open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c 45*4882a593Smuzhiyun@@ -51,7 +51,7 @@ 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) 48*4882a593Smuzhiyun #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) 49*4882a593Smuzhiyun-#ifdef sun 50*4882a593Smuzhiyun+#ifndef ACCESSPERMS 51*4882a593Smuzhiyun #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) 52*4882a593Smuzhiyun #endif 53*4882a593Smuzhiyun #ifdef __ANDROID__ 54*4882a593Smuzhiyun@@ -60,7 +60,6 @@ 55*4882a593Smuzhiyun */ 56*4882a593Smuzhiyun #define NO_SETMNTENT 57*4882a593Smuzhiyun #define NO_ENDMNTENT 58*4882a593Smuzhiyun-#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) 59*4882a593Smuzhiyun #endif 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun 62