summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch4
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch4
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch21
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch16
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch6
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch10
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch3
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch8
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch5
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch (renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch)5
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch163
-rw-r--r--meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb (renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb)9
17 files changed, 67 insertions, 227 deletions
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 @@
1From c1ee0b0a0a05379d0e6475dfceaaf41876192640 Mon Sep 17 00:00:00 2001 1From 148aadcc1b61da6f6b9ee4bcd35c38b7fbaeb8a8 Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <trevor.gamblin@windriver.com> 2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Wed, 14 Apr 2021 10:24:52 -0400 3Date: Wed, 14 Apr 2021 10:24:52 -0400
4Subject: [PATCH] Add resolv_compat.h for musl builds 4Subject: [PATCH] Add resolv_compat.h for musl builds
@@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
17 create mode 100644 open-vm-tools/lib/nicInfo/resolv_compat.h 17 create mode 100644 open-vm-tools/lib/nicInfo/resolv_compat.h
18 18
19diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c 19diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
20index c56b73cfe..8ae3b2f74 100644 20index 6f20547b2..f5064a9c0 100644
21--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c 21--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
22+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c 22+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
23@@ -70,6 +70,10 @@ 23@@ -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 @@
1From c953564b9f029b31381a2c630b47133ffe6a33e7 Mon Sep 17 00:00:00 2001 1From 547d05ca417c6b75ad06bf3119e1df8869742a70 Mon Sep 17 00:00:00 2001
2From: Martin Kelly <mkelly@xevo.com> 2From: Martin Kelly <mkelly@xevo.com>
3Date: Fri, 7 Apr 2017 15:20:30 -0700 3Date: Fri, 7 Apr 2017 15:20:30 -0700
4Subject: [PATCH] configure.ac: don't use dnet-config 4Subject: [PATCH] configure.ac: don't use dnet-config
@@ -15,7 +15,7 @@ Signed-off-by: Martin Kelly <mkelly@xevo.com>
15 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac 17diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
18index 3c058135a..124781f99 100644 18index 26bfdb682..9e2a1d6e3 100644
19--- a/open-vm-tools/configure.ac 19--- a/open-vm-tools/configure.ac
20+++ b/open-vm-tools/configure.ac 20+++ b/open-vm-tools/configure.ac
21@@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then 21@@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then
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 @@
1From 6384b37cdef4ea868c3cee27bb627e4cfbab7b50 Mon Sep 17 00:00:00 2001 1From 74ab6b05fcba32031255624a31676e2aa0db133f Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org> 2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 18 Nov 2015 09:03:00 +0000 3Date: Wed, 18 Nov 2015 09:03:00 +0000
4Subject: [PATCH] Use configure test for struct timespec 4Subject: [PATCH] Use configure test for struct timespec
@@ -6,16 +6,16 @@ Subject: [PATCH] Use configure test for struct timespec
6Use the configure script to test for struct time spec instead of trying 6Use the configure script to test for struct time spec instead of trying
7to keep track of what platforms has it. 7to keep track of what platforms has it.
8 8
9Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
10---
11Upstream-Status: Pending 9Upstream-Status: Pending
12 10
11Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
12---
13 open-vm-tools/configure.ac | 1 + 13 open-vm-tools/configure.ac | 1 +
14 open-vm-tools/lib/include/hgfsUtil.h | 8 +------- 14 open-vm-tools/lib/include/hgfsUtil.h | 8 +-------
15 2 files changed, 2 insertions(+), 7 deletions(-) 15 2 files changed, 2 insertions(+), 7 deletions(-)
16 16
17diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac 17diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
18index 124781f99..05f37f275 100644 18index 9e2a1d6e3..2f34f6eda 100644
19--- a/open-vm-tools/configure.ac 19--- a/open-vm-tools/configure.ac
20+++ b/open-vm-tools/configure.ac 20+++ b/open-vm-tools/configure.ac
21@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T 21@@ -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 @@
1From 6be6cda5aea42b951212ec5f8a72778b1ef9c2da Mon Sep 17 00:00:00 2001 1From ef466581b53a1e64f53d4839bdacfab1d65cc6b9 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org> 2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 18 Nov 2015 09:10:14 +0000 3Date: Wed, 18 Nov 2015 09:10:14 +0000
4Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS 4Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS
@@ -8,16 +8,16 @@ assume it is not there instead of testing for specific implementations.
8 8
9This is needed for musl libc. 9This is needed for musl libc.
10 10
11Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
12---
13Upstream-Status: Pending 11Upstream-Status: Pending
14 12
13Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
14---
15 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- 15 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++---
16 open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- 16 open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +--
17 2 files changed, 6 insertions(+), 5 deletions(-) 17 2 files changed, 6 insertions(+), 5 deletions(-)
18 18
19diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 19diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
20index 63c4e65f0..87d419a7b 100644 20index 4a0bc9378..6ed49e2b7 100644
21--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 21--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
22+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 22+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
23@@ -105,11 +105,13 @@ typedef struct DirectoryEntry { 23@@ -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 @@
1From 9d22fba096cd77101fc45420c918ec748d2cc31b Mon Sep 17 00:00:00 2001 1From 4462efefdd61bff1e39e946b917b01433898be88 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org> 2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 18 Nov 2015 10:05:07 +0000 3Date: Wed, 18 Nov 2015 10:05:07 +0000
4Subject: [PATCH] Use configure to test for feature instead of platform 4Subject: [PATCH] Use configure to test for feature instead of platform
@@ -18,20 +18,20 @@ The features we test for are:
18 18
19This is needed for musl libc. 19This is needed for musl libc.
20 20
21Upstream-Status: Pending
22
21Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c 23Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c
22 24
23Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> 25Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
24Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> 26Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
25--- 27---
26Upstream-Status: Pending
27
28 open-vm-tools/configure.ac | 4 ++++ 28 open-vm-tools/configure.ac | 4 ++++
29 open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- 29 open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++-------------
30 open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- 30 open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++-
31 3 files changed, 23 insertions(+), 17 deletions(-) 31 3 files changed, 23 insertions(+), 17 deletions(-)
32 32
33diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac 33diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
34index 05f37f275..9a0c63cf6 100644 34index 2f34f6eda..daa0939c3 100644
35--- a/open-vm-tools/configure.ac 35--- a/open-vm-tools/configure.ac
36+++ b/open-vm-tools/configure.ac 36+++ b/open-vm-tools/configure.ac
37@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( 37@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS(
@@ -57,7 +57,7 @@ index 05f37f275..9a0c63cf6 100644
57 AC_CHECK_HEADERS([sys/io.h]) 57 AC_CHECK_HEADERS([sys/io.h])
58 AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD 58 AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD
59diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c 59diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
60index 1bb86f483..41c670cfc 100644 60index 3d7d1e303..0e12ac5bd 100644
61--- a/open-vm-tools/lib/misc/idLinux.c 61--- a/open-vm-tools/lib/misc/idLinux.c
62+++ b/open-vm-tools/lib/misc/idLinux.c 62+++ b/open-vm-tools/lib/misc/idLinux.c
63@@ -27,12 +27,9 @@ 63@@ -27,12 +27,9 @@
@@ -74,7 +74,7 @@ index 1bb86f483..41c670cfc 100644
74 #ifdef __APPLE__ 74 #ifdef __APPLE__
75 #include <sys/socket.h> 75 #include <sys/socket.h>
76 #include <TargetConditionals.h> 76 #include <TargetConditionals.h>
77@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid) // IN: 77@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid) // IN:
78 static Bool 78 static Bool
79 IdIsSetUGid(void) 79 IdIsSetUGid(void)
80 { 80 {
@@ -108,10 +108,11 @@ index 1bb86f483..41c670cfc 100644
108+#elif HAVE___SECURE_GETENV 108+#elif HAVE___SECURE_GETENV
109 static const char envName[] = "VMW_SETUGID_TEST"; 109 static const char envName[] = "VMW_SETUGID_TEST";
110 110
111 if (setenv(envName, "1", TRUE) == -1) { 111 /*
112 return TRUE; /* Conservative */ 112@@ -1062,7 +1058,9 @@ IdIsSetUGid(void)
113 return secure_getenv(envName) == NULL;
113 } 114 }
114 return __secure_getenv(envName) == NULL; 115 return TRUE;
115-#endif 116-#endif
116+#else 117+#else
117+ /* Android does not have a secure_getenv, so be conservative. */ 118+ /* Android does not have a secure_getenv, so be conservative. */
@@ -120,7 +121,7 @@ index 1bb86f483..41c670cfc 100644
120 } 121 }
121 #endif 122 #endif
122diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c 123diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
123index de57a4a90..c56b73cfe 100644 124index 0135e6a09..6f20547b2 100644
124--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c 125--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
125+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c 126+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
126@@ -35,9 +35,13 @@ 127@@ -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 @@
1From 2bc09bc7d933bc3d91c687e1cc2befdaa38d2c86 Mon Sep 17 00:00:00 2001 1From 79675399124b61f4e3da1f64f4b265f83dd26cdc Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org> 2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 18 Nov 2015 10:41:01 +0000 3Date: Wed, 18 Nov 2015 10:41:01 +0000
4Subject: [PATCH] Use configure test for sys/stat.h include 4Subject: [PATCH] Use configure test for sys/stat.h include
5 5
6This is needed for musl libc. 6This is needed for musl libc.
7 7
8Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
9---
10Upstream-Status: Pending 8Upstream-Status: Pending
11 9
10Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
11---
12 open-vm-tools/services/plugins/vix/vixTools.c | 2 +- 12 open-vm-tools/services/plugins/vix/vixTools.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c 15diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
16index 34f3125d2..cebf4dd8d 100644 16index 75d24a29e..d11c42178 100644
17--- a/open-vm-tools/services/plugins/vix/vixTools.c 17--- a/open-vm-tools/services/plugins/vix/vixTools.c
18+++ b/open-vm-tools/services/plugins/vix/vixTools.c 18+++ b/open-vm-tools/services/plugins/vix/vixTools.c
19@@ -66,7 +66,7 @@ 19@@ -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 @@
1From dbe0943011c24d48de3df5a95f4e4606be0ef250 Mon Sep 17 00:00:00 2001 1From 37ad9845b5b8ab7170a2aaba31a505b2a36ba0f8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jun 2018 23:48:04 -0700 3Date: Wed, 13 Jun 2018 23:48:04 -0700
4Subject: [PATCH] Fix subdir objects configure error 4Subject: [PATCH] Fix subdir objects configure error
5 5
6Fix build on musl while here 6Fix build on musl while here
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending 8Upstream-Status: Pending
11 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 open-vm-tools/configure.ac | 3 +-- 12 open-vm-tools/configure.ac | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-) 13 1 file changed, 1 insertion(+), 2 deletions(-)
14 14
15diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac 15diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
16index 9a0c63cf6..5845490f6 100644 16index daa0939c3..497e9459a 100644
17--- a/open-vm-tools/configure.ac 17--- a/open-vm-tools/configure.ac
18+++ b/open-vm-tools/configure.ac 18+++ b/open-vm-tools/configure.ac
19@@ -326,7 +326,6 @@ AC_ARG_ENABLE( 19@@ -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 @@
1From 8c7f5895ed1f98bfc4101f8cfb93af3d13fd6bce Mon Sep 17 00:00:00 2001 1From d138b808a8b47a02a370b411149ef8ce7883ca6f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jun 2018 23:02:50 -0700 3Date: Wed, 13 Jun 2018 23:02:50 -0700
4Subject: [PATCH] include poll.h instead of sys/poll.h 4Subject: [PATCH] include poll.h instead of sys/poll.h
5 5
6including sys/poll.h is deprecated 6including sys/poll.h is deprecated
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending 8Upstream-Status: Pending
11 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 12 open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c 15diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
16index 2bf97b549..b285c59c6 100644 16index 26aee553a..4f413db73 100644
17--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c 17--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
18+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c 18+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
19@@ -70,8 +70,8 @@ 19@@ -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 @@
1From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 1From e86d7b309bdf5b7c6c38faeded157e220d4ccc78 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com> 2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Wed, 24 Mar 2021 16:21:35 -0400 3Date: Wed, 24 Mar 2021 16:21:35 -0400
4Subject: [PATCH] Rename poll.h to vm_poll.h 4Subject: [PATCH] Rename poll.h to vm_poll.h
@@ -13,12 +13,12 @@ we rename poll.h to vm_poll.h.
13 13
14Update for open-vm-tools-11.2.5. 14Update for open-vm-tools-11.2.5.
15 15
16Upstream-Status: Pending
17
16Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> 18Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 19Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 20Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
19--- 21---
20Upstream-Status: Pending
21
22 open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 22 open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +-
23 open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- 23 open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +-
24 open-vm-tools/lib/include/asyncsocket.h | 2 +- 24 open-vm-tools/lib/include/asyncsocket.h | 2 +-
@@ -29,7 +29,7 @@ Upstream-Status: Pending
29 rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) 29 rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%)
30 30
31diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c 31diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
32index b285c59c6..5c528820d 100644 32index 4f413db73..684008d34 100644
33--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c 33--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
34+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c 34+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
35@@ -87,7 +87,7 @@ 35@@ -87,7 +87,7 @@
@@ -42,7 +42,7 @@ index b285c59c6..5c528820d 100644
42 #include "err.h" 42 #include "err.h"
43 #include "hostinfo.h" 43 #include "hostinfo.h"
44diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c 44diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
45index 98f5b3f06..b436f0c7e 100644 45index c7b4cdd0f..d6e0cdc0e 100644
46--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c 46--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
47+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c 47+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
48@@ -51,7 +51,7 @@ 48@@ -51,7 +51,7 @@
@@ -55,10 +55,10 @@ index 98f5b3f06..b436f0c7e 100644
55 #include "vm_basic_asm.h" 55 #include "vm_basic_asm.h"
56 #include "unicodeOperations.h" 56 #include "unicodeOperations.h"
57diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h 57diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h
58index dad848093..b61a2561f 100644 58index 09947002e..3800f5971 100644
59--- a/open-vm-tools/lib/include/asyncsocket.h 59--- a/open-vm-tools/lib/include/asyncsocket.h
60+++ b/open-vm-tools/lib/include/asyncsocket.h 60+++ b/open-vm-tools/lib/include/asyncsocket.h
61@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; 61@@ -177,7 +177,7 @@ typedef struct AsyncSocket AsyncSocket;
62 * Or the client can specify its favorite poll class and locking behavior. 62 * Or the client can specify its favorite poll class and locking behavior.
63 * Use of IVmdbPoll is only supported for regular sockets and for Attach. 63 * Use of IVmdbPoll is only supported for regular sockets and for Attach.
64 */ 64 */
@@ -97,7 +97,7 @@ index ade356b9f..8759fb960 100644
97 #endif 97 #endif
98 #ifdef __ANDROID__ 98 #ifdef __ANDROID__
99diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c 99diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
100index 8b1fe759d..f22fcd402 100644 100index f1709fe03..c1a5dfdba 100644
101--- a/open-vm-tools/lib/rpcIn/rpcin.c 101--- a/open-vm-tools/lib/rpcIn/rpcin.c
102+++ b/open-vm-tools/lib/rpcIn/rpcin.c 102+++ b/open-vm-tools/lib/rpcIn/rpcin.c
103@@ -57,7 +57,7 @@ 103@@ -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 @@
1From 921621a098f242953117747f5852d7e3136ae6c4 Mon Sep 17 00:00:00 2001 1From 666a043be7d6fe07a36599260f7214cbd29a79e7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jun 2018 23:16:53 -0700 3Date: Wed, 13 Jun 2018 23:16:53 -0700
4Subject: [PATCH] use posix strerror_r unless on gnu libc system 4Subject: [PATCH] use posix strerror_r unless on gnu libc system
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending 6Upstream-Status: Pending
9 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 open-vm-tools/lib/err/errPosix.c | 9 ++++++--- 10 open-vm-tools/lib/err/errPosix.c | 9 ++++++---
11 1 file changed, 6 insertions(+), 3 deletions(-) 11 1 file changed, 6 insertions(+), 3 deletions(-)
12 12
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 @@
1From b44d1d4e4ba77f1d9cf7de73a3bd210d02b5ff36 Mon Sep 17 00:00:00 2001 1From b294005f3748c6caee002fd7588964f7bf9b1d09 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 Mar 2021 17:26:53 -0400 3Date: Wed, 24 Mar 2021 17:26:53 -0400
4Subject: [PATCH] Use uintmax_t for handling rlim_t 4Subject: [PATCH] Use uintmax_t for handling rlim_t
@@ -7,22 +7,22 @@ rlimit types are not representable with long or long long
7formats, therefore use uintmax_t to typecast rlim_t types 7formats, therefore use uintmax_t to typecast rlim_t types
8and use %j to print it 8and use %j to print it
9 9
10Upstream-Status: Pending
11
10Refit patch for open-vm-tools-11.2.5. 12Refit patch for open-vm-tools-11.2.5.
11 13
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> 15Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
14Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> 16Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
15--- 17---
16Upstream-Status: Pending
17
18 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- 18 open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-) 19 1 file changed, 2 insertions(+), 2 deletions(-)
20 20
21diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 21diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
22index 87d419a7b..f5cc80b76 100644 22index 6ed49e2b7..0cc7c4094 100644
23--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 23--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
24+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 24+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
25@@ -5301,8 +5301,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: 25@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN:
26 goto exit; 26 goto exit;
27 } 27 }
28 28
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 @@
1From 39a59ab7efe98c880c783b2ccf43e5a137d2b222 Mon Sep 17 00:00:00 2001 1From a8ef33b0623ba3494594a040ff5c77771168fdd6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 27 Aug 2018 23:22:21 -0700 3Date: Mon, 27 Aug 2018 23:22:21 -0700
4Subject: [PATCH] Use off64_t instead of __off64_t 4Subject: [PATCH] Use off64_t instead of __off64_t
@@ -7,6 +7,7 @@ Fixes
7unknown type name '__off64_t' 7unknown type name '__off64_t'
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 12---
12 open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- 13 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 @@
1From 859c21b9a21c53d936301b05044d0c649d6cf32b Mon Sep 17 00:00:00 2001 1From 2904454f3408a3abe3f2b0681504a66ea5ce713c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 Mar 2021 17:36:26 -0400 3Date: Wed, 24 Mar 2021 17:36:26 -0400
4Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility 4Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility
@@ -15,15 +15,15 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
15 1 file changed, 14 deletions(-) 15 1 file changed, 14 deletions(-)
16 16
17diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 17diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
18index f5cc80b76..5a79d6451 100644 18index 0cc7c4094..445a53881 100644
19--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 19--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
20+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c 20+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
21@@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information 21@@ -2559,20 +2559,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information
22 LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, 22 LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__,
23 attr->specialPerms, attr->ownerPerms, attr->groupPerms, 23 attr->specialPerms, attr->ownerPerms, attr->groupPerms,
24 attr->otherPerms, attr->size); 24 attr->otherPerms, attr->size);
25-#ifdef __FreeBSD__ 25-#ifdef __FreeBSD__
26-# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043 26-# if !defined(VM_X86_64) && !defined(VM_ARM_64)
27-# define FMTTIMET "" 27-# define FMTTIMET ""
28-# else 28-# else
29-# define FMTTIMET "l" 29-# 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 @@
1From 7f7e00ce582d72013cb54278548d3320e032b0dc Mon Sep 17 00:00:00 2001 1From eae0a65a9d6c9df20d05b4208aee23656915480b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Feb 2022 13:32:32 -0800 3Date: Mon, 7 Feb 2022 13:32:32 -0800
4Subject: [PATCH] open-vm-tools: Correct include path for poll.h 4Subject: [PATCH] open-vm-tools: Correct include path for poll.h
@@ -13,13 +13,14 @@ Fixes
13| 1 error generated. 13| 1 error generated.
14 14
15Upstream-Status: Pending 15Upstream-Status: Pending
16
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-off-by: Khem Raj <raj.khem@gmail.com>
17--- 18---
18 open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- 19 open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
20 21
21diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c 22diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c
22index 2bba2937e..025339595 100644 23index 96e6d717b..0b8a583b8 100644
23--- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c 24--- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c
24+++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c 25+++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c
25@@ -32,7 +32,7 @@ 26@@ -32,7 +32,7 @@
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/0014-timeSync-Portable-way-to-print-64bit-time_t.patch
index 4a4fae116a..39eea767a0 100644
--- 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/0014-timeSync-Portable-way-to-print-64bit-time_t.patch
@@ -1,4 +1,4 @@
1From dcb5d3e5d47b1e01fdcde575badc51825d4f4681 Mon Sep 17 00:00:00 2001 1From 09cc01b2fa15e319afafa13d7365b399a60f443c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 3 Jan 2023 13:36:01 -0800 3Date: Tue, 3 Jan 2023 13:36:01 -0800
4Subject: [PATCH] timeSync: Portable way to print 64bit time_t 4Subject: [PATCH] timeSync: Portable way to print 64bit time_t
@@ -12,6 +12,7 @@ pllLinux.c:43:20: error: format specifies type 'long' but the argument has type
12| ^~~~~~~~~~ 12| ^~~~~~~~~~
13 13
14Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] 14Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631]
15
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
16--- 17---
17 open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- 18 open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++----
@@ -50,5 +51,5 @@ index 1ab6e3584..0c304b5d7 100644
50 return TRUE; 51 return TRUE;
51 } 52 }
52-- 53--
532.39.0 542.25.1
54 55
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 @@
1From 3028cdd4c0b2461b904cbe5a5868c8e591aa0941 Mon Sep 17 00:00:00 2001
2From: John Wolfe <jwolfe@vmware.com>
3Date: Mon, 8 May 2023 19:04:57 -0700
4Subject: [PATCH] Remove some dead code.
5
6Address CVE-2023-20867.
7Remove some authentication types which were deprecated long
8ago and are no longer in use. These are dead code.
9
10CVE: CVE-2023-20867
11
12Upstream-Status: Backport
13[https://github.com/vmware/open-vm-tools/blob/CVE-2023-20867.patch/2023-20867-Remove-some-dead-code.patch]
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 open-vm-tools/services/plugins/vix/vixTools.c | 102 --------------------------
18 1 file changed, 102 deletions(-)
19
20diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
21index 9f376a7..85c5ba7 100644
22--- a/open-vm-tools/services/plugins/vix/vixTools.c
23+++ b/open-vm-tools/services/plugins/vix/vixTools.c
24@@ -254,8 +254,6 @@ char *gImpersonatedUsername = NULL;
25 #define VIX_TOOLS_CONFIG_API_AUTHENTICATION "Authentication"
26 #define VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS "InfrastructureAgents"
27
28-#define VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT TRUE
29-
30 /*
31 * The switch that controls all APIs
32 */
33@@ -730,9 +728,6 @@ VixError GuestAuthSAMLAuthenticateAndImpersonate(
34
35 void GuestAuthUnimpersonate();
36
37-static Bool VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef,
38- const char *typeName);
39-
40 #if SUPPORT_VGAUTH
41
42 VGAuthError TheVGAuthContext(VGAuthContext **ctx);
43@@ -8013,29 +8008,6 @@ VixToolsImpersonateUser(VixCommandRequestHeader *requestMsg, // IN
44 userToken);
45 break;
46 }
47- case VIX_USER_CREDENTIAL_ROOT:
48- {
49- if ((requestMsg->requestFlags & VIX_REQUESTMSG_HAS_HASHED_SHARED_SECRET) &&
50- !VixToolsCheckIfAuthenticationTypeEnabled(gConfDictRef,
51- VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS)) {
52- /*
53- * Don't accept hashed shared secret if disabled.
54- */
55- g_message("%s: Requested authentication type has been disabled.\n",
56- __FUNCTION__);
57- err = VIX_E_GUEST_AUTHTYPE_DISABLED;
58- goto done;
59- }
60- }
61- // fall through
62-
63- case VIX_USER_CREDENTIAL_CONSOLE_USER:
64- err = VixToolsImpersonateUserImplEx(NULL,
65- credentialType,
66- NULL,
67- loadUserProfile,
68- userToken);
69- break;
70 case VIX_USER_CREDENTIAL_NAME_PASSWORD:
71 case VIX_USER_CREDENTIAL_NAME_PASSWORD_OBFUSCATED:
72 case VIX_USER_CREDENTIAL_NAMED_INTERACTIVE_USER:
73@@ -8205,36 +8177,6 @@ VixToolsImpersonateUserImplEx(char const *credentialTypeStr, // IN
74 }
75
76 /*
77- * If the VMX asks to be root, then we allow them.
78- * The VMX will make sure that only it will pass this value in,
79- * and only when the VM and host are configured to allow this.
80- */
81- if ((VIX_USER_CREDENTIAL_ROOT == credentialType)
82- && (thisProcessRunsAsRoot)) {
83- *userToken = PROCESS_CREATOR_USER_TOKEN;
84-
85- gImpersonatedUsername = Util_SafeStrdup("_ROOT_");
86- err = VIX_OK;
87- goto quit;
88- }
89-
90- /*
91- * If the VMX asks to be root, then we allow them.
92- * The VMX will make sure that only it will pass this value in,
93- * and only when the VM and host are configured to allow this.
94- *
95- * XXX This has been deprecated XXX
96- */
97- if ((VIX_USER_CREDENTIAL_CONSOLE_USER == credentialType)
98- && ((allowConsoleUserOps) || !(thisProcessRunsAsRoot))) {
99- *userToken = PROCESS_CREATOR_USER_TOKEN;
100-
101- gImpersonatedUsername = Util_SafeStrdup("_CONSOLE_USER_NAME_");
102- err = VIX_OK;
103- goto quit;
104- }
105-
106- /*
107 * If the VMX asks us to run commands in the context of the current
108 * user, make sure that the user who requested the command is the
109 * same as the current user.
110@@ -10917,50 +10859,6 @@ VixToolsCheckIfVixCommandEnabled(int opcode, // IN
111 /*
112 *-----------------------------------------------------------------------------
113 *
114- * VixToolsCheckIfAuthenticationTypeEnabled --
115- *
116- * Checks to see if a given authentication type has been
117- * disabled via the tools configuration.
118- *
119- * Return value:
120- * TRUE if enabled, FALSE otherwise.
121- *
122- * Side effects:
123- * None
124- *
125- *-----------------------------------------------------------------------------
126- */
127-
128-static Bool
129-VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, // IN
130- const char *typeName) // IN
131-{
132- char authnDisabledName[64]; // Authentication.<AuthenticationType>.disabled
133- gboolean disabled;
134-
135- Str_Snprintf(authnDisabledName, sizeof(authnDisabledName),
136- VIX_TOOLS_CONFIG_API_AUTHENTICATION ".%s.disabled",
137- typeName);
138-
139- ASSERT(confDictRef != NULL);
140-
141- /*
142- * XXX Skip doing the strcmp() to verify the auth type since we only
143- * have the one typeName (VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS), and default
144- * it to VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT.
145- */
146- disabled = VMTools_ConfigGetBoolean(confDictRef,
147- VIX_TOOLS_CONFIG_API_GROUPNAME,
148- authnDisabledName,
149- VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT);
150-
151- return !disabled;
152-}
153-
154-
155-/*
156- *-----------------------------------------------------------------------------
157- *
158 * VixTools_ProcessVixCommand --
159 *
160 *
161--
1622.6.2
163
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.3.5.bb
index 4873e9d89c..6696e552c7 100644
--- 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.3.5.bb
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only"
25LICENSE:modules/linux = "GPL-2.0-only" 25LICENSE:modules/linux = "GPL-2.0-only"
26LICENSE:modules/solaris = "CDDL-1.0" 26LICENSE:modules/solaris = "CDDL-1.0"
27 27
28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.1.x \ 28SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \
29 file://tools.conf \ 29 file://tools.conf \
30 file://vmtoolsd.service \ 30 file://vmtoolsd.service \
31 file://vmtoolsd.init \ 31 file://vmtoolsd.init \
@@ -42,8 +42,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl
42 file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ 42 file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \
43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ 43 file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \
44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ 44 file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \
45 file://0001-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ 45 file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \
46 file://CVE-2023-20867.patch;patchdir=.. \
47 " 46 "
48 47
49UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" 48UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -51,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
51SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ 50SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \
52" 51"
53 52
54SRCREV = "30339ef6ded308f0147fe80f89b9bca3ace1aef9" 53SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7"
55 54
56S = "${WORKDIR}/git/open-vm-tools" 55S = "${WORKDIR}/git/open-vm-tools"
57 56
@@ -77,7 +76,7 @@ PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}"
77# fuse gets implicitly detected; there is no --without-fuse option. 76# fuse gets implicitly detected; there is no --without-fuse option.
78PACKAGECONFIG[fuse] = ",,fuse" 77PACKAGECONFIG[fuse] = ",,fuse"
79 78
80CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member" 79CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member -Wno-error=unused-function"
81FILES:${PN} += "\ 80FILES:${PN} += "\
82 ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ 81 ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \
83 ${libdir}/open-vm-tools/plugins/common/lib*.so \ 82 ${libdir}/open-vm-tools/plugins/common/lib*.so \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 09:35:27 +0000