From ffd3a042d9c8dd55b993eafee72bcd48edcce361 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 24 Dec 2023 15:36:47 +0800 Subject: open-vm-tools: upgrade 12.1.5 -> 12.3.5 Release Notes: https://github.com/vmware/open-vm-tools/blob/stable-12.3.5/ReleaseNotes.md ChangeLog: https://github.com/vmware/open-vm-tools/blob/stable-12.3.5/open-vm-tools/ChangeLog Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../0001-Add-resolv_compat.h-for-musl-builds.patch | 4 +- .../0001-configure.ac-don-t-use-dnet-config.patch | 4 +- ...meSync-Portable-way-to-print-64bit-time_t.patch | 54 ------- ...02-Use-configure-test-for-struct-timespec.patch | 8 +- ...ix-definition-of-ALLPERMS-and-ACCESSPERMS.patch | 8 +- ...re-to-test-for-feature-instead-of-platfor.patch | 21 +-- ...Use-configure-test-for-sys-stat.h-include.patch | 8 +- .../0006-Fix-subdir-objects-configure-error.patch | 8 +- ...0007-include-poll.h-instead-of-sys-poll.h.patch | 8 +- .../0008-Rename-poll.h-to-vm_poll.h.patch | 16 +- ...osix-strerror_r-unless-on-gnu-libc-system.patch | 6 +- .../0010-Use-uintmax_t-for-handling-rlim_t.patch | 10 +- .../0011-Use-off64_t-instead-of-__off64_t.patch | 3 +- ...erLinux-Consider-64bit-time_t-possibility.patch | 8 +- ...-vm-tools-Correct-include-path-for-poll.h.patch | 5 +- ...meSync-Portable-way-to-print-64bit-time_t.patch | 55 +++++++ .../open-vm-tools/CVE-2023-20867.patch | 163 --------------------- .../open-vm-tools/open-vm-tools_12.1.5.bb | 123 ---------------- .../open-vm-tools/open-vm-tools_12.3.5.bb | 122 +++++++++++++++ 19 files changed, 237 insertions(+), 397 deletions(-) delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch create mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb create mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb (limited to 'meta-networking/recipes-support/open-vm-tools') diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch index 4a97c26185..96270f860b 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch @@ -1,4 +1,4 @@ -From c1ee0b0a0a05379d0e6475dfceaaf41876192640 Mon Sep 17 00:00:00 2001 +From 148aadcc1b61da6f6b9ee4bcd35c38b7fbaeb8a8 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 14 Apr 2021 10:24:52 -0400 Subject: [PATCH] Add resolv_compat.h for musl builds @@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin create mode 100644 open-vm-tools/lib/nicInfo/resolv_compat.h diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index c56b73cfe..8ae3b2f74 100644 +index 6f20547b2..f5064a9c0 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -70,6 +70,10 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch index 3aa21e3ec3..69c8253117 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch @@ -1,4 +1,4 @@ -From c953564b9f029b31381a2c630b47133ffe6a33e7 Mon Sep 17 00:00:00 2001 +From 547d05ca417c6b75ad06bf3119e1df8869742a70 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 7 Apr 2017 15:20:30 -0700 Subject: [PATCH] configure.ac: don't use dnet-config @@ -15,7 +15,7 @@ Signed-off-by: Martin Kelly 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 3c058135a..124781f99 100644 +index 26bfdb682..9e2a1d6e3 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch deleted file mode 100644 index 4a4fae116a..0000000000 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dcb5d3e5d47b1e01fdcde575badc51825d4f4681 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 3 Jan 2023 13:36:01 -0800 -Subject: [PATCH] timeSync: Portable way to print 64bit time_t - -This ensures when 64bit time_t is used on 32bit architectures ( --D_TIME_BITS=64 ) then it can print it correctly as well. - -Fixes -pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] -| prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, -| ^~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] -Signed-off-by: Khem Raj ---- - open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- - open-vm-tools/services/plugins/timeSync/slewLinux.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c -index e9c8e61de..90ba8c63f 100644 ---- a/open-vm-tools/services/plugins/timeSync/pllLinux.c -+++ b/open-vm-tools/services/plugins/timeSync/pllLinux.c -@@ -38,10 +38,10 @@ - static void - TimeSyncLogPLLState(const char *prefix, struct timex *tx) - { -- g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d " -- "const %ld precision %ld tolerance %ld tick %ld\n", -- prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, -- tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick); -+ g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d " -+ "const %jd precision %jd tolerance %jd tick %jd\n", -+ prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, -+ tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick); - } - - /* -diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c -index 1ab6e3584..0c304b5d7 100644 ---- a/open-vm-tools/services/plugins/timeSync/slewLinux.c -+++ b/open-vm-tools/services/plugins/timeSync/slewLinux.c -@@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta, - g_debug("adjtimex failed: %s\n", strerror(errno)); - return FALSE; - } -- g_debug("time slew start: %ld\n", tx.tick); -+ g_debug("time slew start: %jd\n", (intmax_t)tx.tick); - return TRUE; - } --- -2.39.0 - diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch index c6af3d5ff7..1029252c76 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch @@ -1,4 +1,4 @@ -From 6384b37cdef4ea868c3cee27bb627e4cfbab7b50 Mon Sep 17 00:00:00 2001 +From 74ab6b05fcba32031255624a31676e2aa0db133f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 09:03:00 +0000 Subject: [PATCH] Use configure test for struct timespec @@ -6,16 +6,16 @@ Subject: [PATCH] Use configure test for struct timespec Use the configure script to test for struct time spec instead of trying to keep track of what platforms has it. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/configure.ac | 1 + open-vm-tools/lib/include/hgfsUtil.h | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 124781f99..05f37f275 100644 +index 9e2a1d6e3..2f34f6eda 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch index 4b6e089ace..b4bd646d61 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -1,4 +1,4 @@ -From 6be6cda5aea42b951212ec5f8a72778b1ef9c2da Mon Sep 17 00:00:00 2001 +From ef466581b53a1e64f53d4839bdacfab1d65cc6b9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 09:10:14 +0000 Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS @@ -8,16 +8,16 @@ assume it is not there instead of testing for specific implementations. This is needed for musl libc. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 63c4e65f0..87d419a7b 100644 +index 4a0bc9378..6ed49e2b7 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c @@ -105,11 +105,13 @@ typedef struct DirectoryEntry { diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch b/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-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/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 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 Signed-off-by: Randy MacLeod --- -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 #include -@@ -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 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch index ec9aa7d2ed..fda4c37e59 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch @@ -1,19 +1,19 @@ -From 2bc09bc7d933bc3d91c687e1cc2befdaa38d2c86 Mon Sep 17 00:00:00 2001 +From 79675399124b61f4e3da1f64f4b265f83dd26cdc Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 10:41:01 +0000 Subject: [PATCH] Use configure test for sys/stat.h include This is needed for musl libc. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/services/plugins/vix/vixTools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index 34f3125d2..cebf4dd8d 100644 +index 75d24a29e..d11c42178 100644 --- a/open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -66,7 +66,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch index e83fb36214..4c6f6ce022 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch @@ -1,19 +1,19 @@ -From dbe0943011c24d48de3df5a95f4e4606be0ef250 Mon Sep 17 00:00:00 2001 +From 37ad9845b5b8ab7170a2aaba31a505b2a36ba0f8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:48:04 -0700 Subject: [PATCH] Fix subdir objects configure error Fix build on musl while here -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 9a0c63cf6..5845490f6 100644 +index daa0939c3..497e9459a 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -326,7 +326,6 @@ AC_ARG_ENABLE( diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch index 7eac04ab56..fc0ce961c2 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch @@ -1,19 +1,19 @@ -From 8c7f5895ed1f98bfc4101f8cfb93af3d13fd6bce Mon Sep 17 00:00:00 2001 +From d138b808a8b47a02a370b411149ef8ce7883ca6f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:02:50 -0700 Subject: [PATCH] include poll.h instead of sys/poll.h including sys/poll.h is deprecated -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index 2bf97b549..b285c59c6 100644 +index 26aee553a..4f413db73 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -70,8 +70,8 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch index d9000b4f13..2654767099 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch @@ -1,4 +1,4 @@ -From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 +From e86d7b309bdf5b7c6c38faeded157e220d4ccc78 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Wed, 24 Mar 2021 16:21:35 -0400 Subject: [PATCH] Rename poll.h to vm_poll.h @@ -13,12 +13,12 @@ we rename poll.h to vm_poll.h. Update for open-vm-tools-11.2.5. +Upstream-Status: Pending + Signed-off-by: Natanael Copa Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod --- -Upstream-Status: Pending - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- open-vm-tools/lib/include/asyncsocket.h | 2 +- @@ -29,7 +29,7 @@ Upstream-Status: Pending rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index b285c59c6..5c528820d 100644 +index 4f413db73..684008d34 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -87,7 +87,7 @@ @@ -42,7 +42,7 @@ index b285c59c6..5c528820d 100644 #include "err.h" #include "hostinfo.h" diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c -index 98f5b3f06..b436f0c7e 100644 +index c7b4cdd0f..d6e0cdc0e 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -51,7 +51,7 @@ @@ -55,10 +55,10 @@ index 98f5b3f06..b436f0c7e 100644 #include "vm_basic_asm.h" #include "unicodeOperations.h" diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h -index dad848093..b61a2561f 100644 +index 09947002e..3800f5971 100644 --- a/open-vm-tools/lib/include/asyncsocket.h +++ b/open-vm-tools/lib/include/asyncsocket.h -@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; +@@ -177,7 +177,7 @@ typedef struct AsyncSocket AsyncSocket; * Or the client can specify its favorite poll class and locking behavior. * Use of IVmdbPoll is only supported for regular sockets and for Attach. */ @@ -97,7 +97,7 @@ index ade356b9f..8759fb960 100644 #endif #ifdef __ANDROID__ diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c -index 8b1fe759d..f22fcd402 100644 +index f1709fe03..c1a5dfdba 100644 --- a/open-vm-tools/lib/rpcIn/rpcin.c +++ b/open-vm-tools/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch index 9800194920..a6638adb9a 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch @@ -1,12 +1,12 @@ -From 921621a098f242953117747f5852d7e3136ae6c4 Mon Sep 17 00:00:00 2001 +From 666a043be7d6fe07a36599260f7214cbd29a79e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:16:53 -0700 Subject: [PATCH] use posix strerror_r unless on gnu libc system -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/lib/err/errPosix.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch index d3c9149f77..6d0f8a3ae0 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,4 +1,4 @@ -From b44d1d4e4ba77f1d9cf7de73a3bd210d02b5ff36 Mon Sep 17 00:00:00 2001 +From b294005f3748c6caee002fd7588964f7bf9b1d09 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 Mar 2021 17:26:53 -0400 Subject: [PATCH] Use uintmax_t for handling rlim_t @@ -7,22 +7,22 @@ rlimit types are not representable with long or long long formats, therefore use uintmax_t to typecast rlim_t types and use %j to print it +Upstream-Status: Pending + Refit patch for open-vm-tools-11.2.5. Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod Signed-off-by: Trevor Gamblin --- -Upstream-Status: Pending - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 87d419a7b..f5cc80b76 100644 +index 6ed49e2b7..0cc7c4094 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -5301,8 +5301,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: +@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: goto exit; } diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch index 98eecebcfb..c6ab4d44d6 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch @@ -1,4 +1,4 @@ -From 39a59ab7efe98c880c783b2ccf43e5a137d2b222 Mon Sep 17 00:00:00 2001 +From a8ef33b0623ba3494594a040ff5c77771168fdd6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 27 Aug 2018 23:22:21 -0700 Subject: [PATCH] Use off64_t instead of __off64_t @@ -7,6 +7,7 @@ Fixes unknown type name '__off64_t' Upstream-Status: Pending + Signed-off-by: Khem Raj --- open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch index c7e62da7ee..388857fc10 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch @@ -1,4 +1,4 @@ -From 859c21b9a21c53d936301b05044d0c649d6cf32b Mon Sep 17 00:00:00 2001 +From 2904454f3408a3abe3f2b0681504a66ea5ce713c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 Mar 2021 17:36:26 -0400 Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility @@ -15,15 +15,15 @@ Signed-off-by: Trevor Gamblin 1 file changed, 14 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index f5cc80b76..5a79d6451 100644 +index 0cc7c4094..445a53881 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information +@@ -2559,20 +2559,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, attr->specialPerms, attr->ownerPerms, attr->groupPerms, attr->otherPerms, attr->size); -#ifdef __FreeBSD__ --# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043 +-# if !defined(VM_X86_64) && !defined(VM_ARM_64) -# define FMTTIMET "" -# else -# define FMTTIMET "l" diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch index 83687460bf..f2f6893db0 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch @@ -1,4 +1,4 @@ -From 7f7e00ce582d72013cb54278548d3320e032b0dc Mon Sep 17 00:00:00 2001 +From eae0a65a9d6c9df20d05b4208aee23656915480b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Feb 2022 13:32:32 -0800 Subject: [PATCH] open-vm-tools: Correct include path for poll.h @@ -13,13 +13,14 @@ Fixes | 1 error generated. Upstream-Status: Pending + Signed-off-by: Khem Raj --- open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c -index 2bba2937e..025339595 100644 +index 96e6d717b..0b8a583b8 100644 --- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c +++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c @@ -32,7 +32,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch new file mode 100644 index 0000000000..39eea767a0 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch @@ -0,0 +1,55 @@ +From 09cc01b2fa15e319afafa13d7365b399a60f443c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 3 Jan 2023 13:36:01 -0800 +Subject: [PATCH] timeSync: Portable way to print 64bit time_t + +This ensures when 64bit time_t is used on 32bit architectures ( +-D_TIME_BITS=64 ) then it can print it correctly as well. + +Fixes +pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] +| prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +| ^~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] + +Signed-off-by: Khem Raj +--- + open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- + open-vm-tools/services/plugins/timeSync/slewLinux.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c +index e9c8e61de..90ba8c63f 100644 +--- a/open-vm-tools/services/plugins/timeSync/pllLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/pllLinux.c +@@ -38,10 +38,10 @@ + static void + TimeSyncLogPLLState(const char *prefix, struct timex *tx) + { +- g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d " +- "const %ld precision %ld tolerance %ld tick %ld\n", +- prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, +- tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick); ++ g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d " ++ "const %jd precision %jd tolerance %jd tick %jd\n", ++ prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, ++ tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick); + } + + /* +diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c +index 1ab6e3584..0c304b5d7 100644 +--- a/open-vm-tools/services/plugins/timeSync/slewLinux.c ++++ b/open-vm-tools/services/plugins/timeSync/slewLinux.c +@@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta, + g_debug("adjtimex failed: %s\n", strerror(errno)); + return FALSE; + } +- g_debug("time slew start: %ld\n", tx.tick); ++ g_debug("time slew start: %jd\n", (intmax_t)tx.tick); + return TRUE; + } +-- +2.25.1 + diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch deleted file mode 100644 index 170dddf688..0000000000 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 3028cdd4c0b2461b904cbe5a5868c8e591aa0941 Mon Sep 17 00:00:00 2001 -From: John Wolfe -Date: Mon, 8 May 2023 19:04:57 -0700 -Subject: [PATCH] Remove some dead code. - -Address CVE-2023-20867. -Remove some authentication types which were deprecated long -ago and are no longer in use. These are dead code. - -CVE: CVE-2023-20867 - -Upstream-Status: Backport -[https://github.com/vmware/open-vm-tools/blob/CVE-2023-20867.patch/2023-20867-Remove-some-dead-code.patch] - -Signed-off-by: Yi Zhao ---- - open-vm-tools/services/plugins/vix/vixTools.c | 102 -------------------------- - 1 file changed, 102 deletions(-) - -diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index 9f376a7..85c5ba7 100644 ---- a/open-vm-tools/services/plugins/vix/vixTools.c -+++ b/open-vm-tools/services/plugins/vix/vixTools.c -@@ -254,8 +254,6 @@ char *gImpersonatedUsername = NULL; - #define VIX_TOOLS_CONFIG_API_AUTHENTICATION "Authentication" - #define VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS "InfrastructureAgents" - --#define VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT TRUE -- - /* - * The switch that controls all APIs - */ -@@ -730,9 +728,6 @@ VixError GuestAuthSAMLAuthenticateAndImpersonate( - - void GuestAuthUnimpersonate(); - --static Bool VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, -- const char *typeName); -- - #if SUPPORT_VGAUTH - - VGAuthError TheVGAuthContext(VGAuthContext **ctx); -@@ -8013,29 +8008,6 @@ VixToolsImpersonateUser(VixCommandRequestHeader *requestMsg, // IN - userToken); - break; - } -- case VIX_USER_CREDENTIAL_ROOT: -- { -- if ((requestMsg->requestFlags & VIX_REQUESTMSG_HAS_HASHED_SHARED_SECRET) && -- !VixToolsCheckIfAuthenticationTypeEnabled(gConfDictRef, -- VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS)) { -- /* -- * Don't accept hashed shared secret if disabled. -- */ -- g_message("%s: Requested authentication type has been disabled.\n", -- __FUNCTION__); -- err = VIX_E_GUEST_AUTHTYPE_DISABLED; -- goto done; -- } -- } -- // fall through -- -- case VIX_USER_CREDENTIAL_CONSOLE_USER: -- err = VixToolsImpersonateUserImplEx(NULL, -- credentialType, -- NULL, -- loadUserProfile, -- userToken); -- break; - case VIX_USER_CREDENTIAL_NAME_PASSWORD: - case VIX_USER_CREDENTIAL_NAME_PASSWORD_OBFUSCATED: - case VIX_USER_CREDENTIAL_NAMED_INTERACTIVE_USER: -@@ -8205,36 +8177,6 @@ VixToolsImpersonateUserImplEx(char const *credentialTypeStr, // IN - } - - /* -- * If the VMX asks to be root, then we allow them. -- * The VMX will make sure that only it will pass this value in, -- * and only when the VM and host are configured to allow this. -- */ -- if ((VIX_USER_CREDENTIAL_ROOT == credentialType) -- && (thisProcessRunsAsRoot)) { -- *userToken = PROCESS_CREATOR_USER_TOKEN; -- -- gImpersonatedUsername = Util_SafeStrdup("_ROOT_"); -- err = VIX_OK; -- goto quit; -- } -- -- /* -- * If the VMX asks to be root, then we allow them. -- * The VMX will make sure that only it will pass this value in, -- * and only when the VM and host are configured to allow this. -- * -- * XXX This has been deprecated XXX -- */ -- if ((VIX_USER_CREDENTIAL_CONSOLE_USER == credentialType) -- && ((allowConsoleUserOps) || !(thisProcessRunsAsRoot))) { -- *userToken = PROCESS_CREATOR_USER_TOKEN; -- -- gImpersonatedUsername = Util_SafeStrdup("_CONSOLE_USER_NAME_"); -- err = VIX_OK; -- goto quit; -- } -- -- /* - * If the VMX asks us to run commands in the context of the current - * user, make sure that the user who requested the command is the - * same as the current user. -@@ -10917,50 +10859,6 @@ VixToolsCheckIfVixCommandEnabled(int opcode, // IN - /* - *----------------------------------------------------------------------------- - * -- * VixToolsCheckIfAuthenticationTypeEnabled -- -- * -- * Checks to see if a given authentication type has been -- * disabled via the tools configuration. -- * -- * Return value: -- * TRUE if enabled, FALSE otherwise. -- * -- * Side effects: -- * None -- * -- *----------------------------------------------------------------------------- -- */ -- --static Bool --VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, // IN -- const char *typeName) // IN --{ -- char authnDisabledName[64]; // Authentication..disabled -- gboolean disabled; -- -- Str_Snprintf(authnDisabledName, sizeof(authnDisabledName), -- VIX_TOOLS_CONFIG_API_AUTHENTICATION ".%s.disabled", -- typeName); -- -- ASSERT(confDictRef != NULL); -- -- /* -- * XXX Skip doing the strcmp() to verify the auth type since we only -- * have the one typeName (VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS), and default -- * it to VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT. -- */ -- disabled = VMTools_ConfigGetBoolean(confDictRef, -- VIX_TOOLS_CONFIG_API_GROUPNAME, -- authnDisabledName, -- VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT); -- -- return !disabled; --} -- -- --/* -- *----------------------------------------------------------------------------- -- * - * VixTools_ProcessVixCommand -- - * - * --- -2.6.2 - diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb deleted file mode 100644 index 4873e9d89c..0000000000 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb +++ /dev/null @@ -1,123 +0,0 @@ -# This recipe is modified from the recipe originally found in the Open-Switch -# repository: -# -# https://github.com/open-switch/ops-build -# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb -# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 -# -# The recipe packaging has been relicensed under the MIT license for inclusion -# in meta-openembedded by agreement of the author (Diego Dompe). -# - -SUMMARY = "Tools to enhance VMWare guest integration and performance" -HOMEPAGE = "https://github.com/vmware/open-vm-tools" -DESCRIPTION = "\ -open-vm-tools is a set of services and modules that enable several features in VMware products \ -for better management of and seamless user interactions with guests.\ -" -SECTION = "vmware-tools" - -LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" -LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" -LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" -LICENSE:modules/linux = "GPL-2.0-only" -LICENSE:modules/solaris = "CDDL-1.0" - -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.1.x \ - file://tools.conf \ - file://vmtoolsd.service \ - file://vmtoolsd.init \ - file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ - file://0002-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ - file://0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ - file://0004-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ - file://0005-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ - file://0006-Fix-subdir-objects-configure-error.patch;patchdir=.. \ - file://0007-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ - file://0008-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ - file://0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ - file://0010-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ - file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ - file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ - file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ - file://0001-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ - file://CVE-2023-20867.patch;patchdir=.. \ - " - -UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)" - -SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ -" - -SRCREV = "30339ef6ded308f0147fe80f89b9bca3ace1aef9" - -S = "${WORKDIR}/git/open-vm-tools" - -DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" - -# open-vm-tools is supported only on x86. -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -inherit autotools pkgconfig systemd update-rc.d - -SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" - -EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-vgauth --disable-deploypkg --disable-containerinfo \ - --without-root-privileges --without-kernel-modules --with-tirpc \ - --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" - -NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" -X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" -PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" - -# fuse gets implicitly detected; there is no --without-fuse option. -PACKAGECONFIG[fuse] = ",,fuse" - -CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member" -FILES:${PN} += "\ - ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ - ${libdir}/open-vm-tools/plugins/common/lib*.so \ - ${sysconfdir}/vmware-tools/tools.conf \ -" -FILES:${PN}-locale += "${datadir}/open-vm-tools/messages" -FILES:${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" - -CONFFILES:${PN} += "${sysconfdir}/vmware-tools/tools.conf" - -RDEPENDS:${PN} = "util-linux libdnet fuse" - -do_install:append() { - if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then - install -d ${D}/sbin - ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs - fi - install -d ${D}${sysconfdir}/vmware-tools - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd - fi - install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf -} - -do_configure:prepend() { - export CUSTOM_DNET_NAME=dnet - export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so -} - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "vmtoolsd" -INITSCRIPT_PARAMS:${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." - -python() { - if 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-filesystems to be present to provide fuse.') -} - -CVE_PRODUCT = "open-vm-tools vmware:tools" diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb new file mode 100644 index 0000000000..6696e552c7 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb @@ -0,0 +1,122 @@ +# This recipe is modified from the recipe originally found in the Open-Switch +# repository: +# +# https://github.com/open-switch/ops-build +# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb +# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 +# +# The recipe packaging has been relicensed under the MIT license for inclusion +# in meta-openembedded by agreement of the author (Diego Dompe). +# + +SUMMARY = "Tools to enhance VMWare guest integration and performance" +HOMEPAGE = "https://github.com/vmware/open-vm-tools" +DESCRIPTION = "\ +open-vm-tools is a set of services and modules that enable several features in VMware products \ +for better management of and seamless user interactions with guests.\ +" +SECTION = "vmware-tools" + +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD-2-Clause & CDDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" +LICENSE:modules/freebsd/vmblock = "BSD-2-Clause" +LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" +LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" +LICENSE:modules/linux = "GPL-2.0-only" +LICENSE:modules/solaris = "CDDL-1.0" + +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ + file://tools.conf \ + file://vmtoolsd.service \ + file://vmtoolsd.init \ + file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ + file://0002-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ + file://0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ + file://0004-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ + file://0005-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ + file://0006-Fix-subdir-objects-configure-error.patch;patchdir=.. \ + file://0007-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ + file://0008-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ + file://0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ + file://0010-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ + file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ + file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ + file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ + file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ + " + +UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)" + +SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ +" + +SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" + +S = "${WORKDIR}/git/open-vm-tools" + +DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" + +# open-vm-tools is supported only on x86. +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +inherit autotools pkgconfig systemd update-rc.d + +SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" + +EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ + --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-vgauth --disable-deploypkg --disable-containerinfo \ + --without-root-privileges --without-kernel-modules --with-tirpc \ + --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" + +NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" +X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" +PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" + +# fuse gets implicitly detected; there is no --without-fuse option. +PACKAGECONFIG[fuse] = ",,fuse" + +CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member -Wno-error=unused-function" +FILES:${PN} += "\ + ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ + ${libdir}/open-vm-tools/plugins/common/lib*.so \ + ${sysconfdir}/vmware-tools/tools.conf \ +" +FILES:${PN}-locale += "${datadir}/open-vm-tools/messages" +FILES:${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" + +CONFFILES:${PN} += "${sysconfdir}/vmware-tools/tools.conf" + +RDEPENDS:${PN} = "util-linux libdnet fuse" + +do_install:append() { + if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + install -d ${D}/sbin + ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs + fi + install -d ${D}${sysconfdir}/vmware-tools + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd + fi + install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf +} + +do_configure:prepend() { + export CUSTOM_DNET_NAME=dnet + export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so +} + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "vmtoolsd" +INITSCRIPT_PARAMS:${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." + +python() { + if 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-filesystems to be present to provide fuse.') +} + +CVE_PRODUCT = "open-vm-tools vmware:tools" -- cgit v1.2.3-54-g00ecf