diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch index 9fe0126d30..f23235e902 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -1,4 +1,4 @@ -From 9d22fba096cd77101fc45420c918ec748d2cc31b Mon Sep 17 00:00:00 2001 +From 4462efefdd61bff1e39e946b917b01433898be88 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Wed, 18 Nov 2015 10:05:07 +0000 Subject: [PATCH] Use configure to test for feature instead of platform @@ -18,20 +18,20 @@ The features we test for are: This is needed for musl libc. +Upstream-Status: Pending + Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> --- -Upstream-Status: Pending - open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 05f37f275..9a0c63cf6 100644 +index 2f34f6eda..daa0939c3 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( @@ -57,7 +57,7 @@ index 05f37f275..9a0c63cf6 100644 AC_CHECK_HEADERS([sys/io.h]) AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c -index 1bb86f483..41c670cfc 100644 +index 3d7d1e303..0e12ac5bd 100644 --- a/open-vm-tools/lib/misc/idLinux.c +++ b/open-vm-tools/lib/misc/idLinux.c @@ -27,12 +27,9 @@ @@ -74,7 +74,7 @@ index 1bb86f483..41c670cfc 100644 #ifdef __APPLE__ #include <sys/socket.h> #include <TargetConditionals.h> -@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid) // IN: static Bool IdIsSetUGid(void) { @@ -108,10 +108,11 @@ index 1bb86f483..41c670cfc 100644 +#elif HAVE___SECURE_GETENV static const char envName[] = "VMW_SETUGID_TEST"; - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ + /* +@@ -1062,7 +1058,9 @@ IdIsSetUGid(void) + return secure_getenv(envName) == NULL; } - return __secure_getenv(envName) == NULL; + return TRUE; -#endif +#else + /* Android does not have a secure_getenv, so be conservative. */ @@ -120,7 +121,7 @@ index 1bb86f483..41c670cfc 100644 } #endif diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index de57a4a90..c56b73cfe 100644 +index 0135e6a09..6f20547b2 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -35,9 +35,13 @@ |