open-vm-tools: upgrade 11.3.5 -> 12.1.0
PATCH 1/1 open-vm-tools: upgrade 11.3.5 -> 12.1.0
* Drop 0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch and 0013-misc-Do-not-print-NULL-string-into-logs.patch which have been merged upstream.
* Refresh patches.
* Do not build containerinfo plugin as it requries containerd.
Signed-off-by Yi Zhao <[email protected]>
---
...-Add-resolv_compat.h-for-musl-builds.patch | 10 ++-
...FromNtTimeNsec-aware-of-64-bit-time_.patch | 78 -------------------
...1-configure.ac-don-t-use-dnet-config.patch | 11 ++-
...-configure-test-for-struct-timespec.patch} | 11 ++-
...inition-of-ALLPERMS-and-ACCESSPERMS.patch} | 13 ++--
...test-for-feature-instead-of-platfor.patch} | 14 ++--
...nfigure-test-for-sys-stat.h-include.patch} | 7 +-
...-Fix-subdir-objects-configure-error.patch} | 8 +-
...nclude-poll.h-instead-of-sys-poll.h.patch} | 9 ++-
... => 0008-Rename-poll.h-to-vm_poll.h.patch} | 16 ++--
...trerror_r-unless-on-gnu-libc-system.patch} | 7 +-
...0-Use-uintmax_t-for-handling-rlim_t.patch} | 10 +--
...11-Use-off64_t-instead-of-__off64_t.patch} | 10 ++-
...x-Consider-64bit-time_t-possibility.patch} | 8 +-
...c-Do-not-print-NULL-string-into-logs.patch | 27 -------
...ols-Correct-include-path-for-poll.h.patch} | 4 +-
...ools_11.3.5.bb => open-vm-tools_12.1.0.bb} | 30 ++++---
17 files changed, 97 insertions(+), 176 deletions(-)
delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0003-Use-configure-test-for-struct-timespec.patch => 0002-Use-configure-test-for-struct-timespec.patch} (88%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch => 0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch} (91%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0005-Use-configure-to-test-for-feature-instead-of-platfor.patch => 0004-Use-configure-to-test-for-feature-instead-of-platfor.patch} (94%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0006-Use-configure-test-for-sys-stat.h-include.patch => 0005-Use-configure-test-for-sys-stat.h-include.patch} (86%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0007-Fix-subdir-objects-configure-error.patch => 0006-Fix-subdir-objects-configure-error.patch} (86%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0008-include-poll.h-instead-of-sys-poll.h.patch => 0007-include-poll.h-instead-of-sys-poll.h.patch} (84%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0009-Rename-poll.h-to-vm_poll.h.patch => 0008-Rename-poll.h-to-vm_poll.h.patch} (92%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch => 0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch} (90%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0011-Use-uintmax_t-for-handling-rlim_t.patch => 0010-Use-uintmax_t-for-handling-rlim_t.patch} (83%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0012-Use-off64_t-instead-of-__off64_t.patch => 0011-Use-off64_t-instead-of-__off64_t.patch} (87%)
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch => 0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch} (93%)
delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch
rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0001-open-vm-tools-Correct-include-path-for-poll.h.patch => 0013-open-vm-tools-Correct-include-path-for-poll.h.patch} (94%)
rename meta-networking/recipes-support/open-vm-tools/{open-vm-tools_11.3.5.bb => open-vm-tools_12.1.0.bb} (80%)meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch +6 -4
@@ -1,4 +1,4 @@ -From f93b680ec1a816ffe90d5f1bce609f8bf68a456e Mon Sep 17 00:00:00 2001 +From c1ee0b0a0a05379d0e6475dfceaaf41876192640 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin <[email protected]> Date: Wed, 14 Apr 2021 10:24:52 -0400 Subject: [PATCH] Add resolv_compat.h for musl builds
@@ -10,7 +10,6 @@ https://gitweb.gentoo.org/proj/musl.git/tree/dev-qt/qtwebengine/files/qtwebengin Upstream-Status: Pending Signed-off-by: Trevor Gamblin <[email protected]> - --- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 4 +++ open-vm-tools/lib/nicInfo/resolv_compat.h | 30 +++++++++++++++++++++++
@@ -18,7 +17,7 @@ Signed-off-by: Trevor Gamblin <[email protected]> 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 c56b73cf..8ae3b2f7 100644 +index c56b73cfe..8ae3b2f74 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -70,6 +70,10 @@
@@ -34,7 +33,7 @@ index c56b73cf..8ae3b2f7 100644 * diff --git a/open-vm-tools/lib/nicInfo/resolv_compat.h b/open-vm-tools/lib/nicInfo/resolv_compat.h new file mode 100644 -index 00000000..d768464b +index 000000000..d768464b9 --- /dev/null +++ b/open-vm-tools/lib/nicInfo/resolv_compat.h @@ -0,0 +1,30 @@
@@ -68,3 +67,6 @@ index 00000000..d768464b +} +#endif + +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch deleted +0 -78
78 lines not on this page · raw message
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +8 -3
@@ -1,4 +1,4 @@ -From fc9bf1ce9f1a21150b10736a1c968d4ca6d4eaa3 Mon Sep 17 00:00:00 2001 +From c953564b9f029b31381a2c630b47133ffe6a33e7 Mon Sep 17 00:00:00 2001 From: Martin Kelly <[email protected]> Date: Fri, 7 Apr 2017 15:20:30 -0700 Subject: [PATCH] configure.ac: don't use dnet-config
@@ -14,9 +14,11 @@ Signed-off-by: Martin Kelly <[email protected]> open-vm-tools/configure.ac | 4 ++-- 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 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -937,7 +937,7 @@ if test "$with_dnet" = "yes"; then +@@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then AC_VMW_CHECK_LIB([dnet], [DNET], [],
@@ -25,7 +27,7 @@ Signed-off-by: Martin Kelly <[email protected]> [], [dnet.h], [intf_open], -@@ -947,7 +947,7 @@ if test "$with_dnet" = "yes"; then +@@ -1237,7 +1237,7 @@ if test "$with_dnet" = "yes"; then if test $have_dnet = "no"; then AC_MSG_ERROR(
@@ -34,3 +36,6 @@ Signed-off-by: Martin Kelly <[email protected]> fi fi +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch +7 -4
@@ -1,4 +1,4 @@ -From bf9292ff9bd25467a014d6c2070805d163daa4c9 Mon Sep 17 00:00:00 2001 +From 6384b37cdef4ea868c3cee27bb627e4cfbab7b50 Mon Sep 17 00:00:00 2001 From: Natanael Copa <[email protected]> Date: Wed, 18 Nov 2015 09:03:00 +0000 Subject: [PATCH] Use configure test for struct timespec
@@ -13,10 +13,10 @@ Signed-off-by: Natanael Copa <[email protected]> 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 713ea683..48ff1ef3 100644 +index 124781f99..05f37f275 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T +@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev])
@@ -25,7 +25,7 @@ index 713ea683..48ff1ef3 100644 AC_STRUCT_TM AC_C_VOLATILE diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h -index 609f4c00..a3a022d4 100644 +index 609f4c000..a3a022d42 100644 --- a/open-vm-tools/lib/include/hgfsUtil.h +++ b/open-vm-tools/lib/include/hgfsUtil.h @@ -53,13 +53,7 @@
@@ -43,3 +43,6 @@ index 609f4c00..a3a022d4 100644 struct timespec { time_t tv_sec; long tv_nsec; +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +8 -5
@@ -1,4 +1,4 @@ -From 5a795b234c617150915a607776c76377948870a6 Mon Sep 17 00:00:00 2001 +From 6be6cda5aea42b951212ec5f8a72778b1ef9c2da Mon Sep 17 00:00:00 2001 From: Natanael Copa <[email protected]> Date: Wed, 18 Nov 2015 09:10:14 +0000 Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS
@@ -15,7 +15,7 @@ Signed-off-by: Natanael Copa <[email protected]> 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 f2b7ce67..0e6351a9 100644 +index 63c4e65f0..87d419a7b 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c @@ -105,11 +105,13 @@ typedef struct DirectoryEntry {
@@ -36,10 +36,10 @@ index f2b7ce67..0e6351a9 100644 #endif diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -index 89133652..7e9c3a91 100644 +index 219065f74..b5b7e6203 100644 --- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
@@ -48,7 +48,7 @@ index 89133652..7e9c3a91 100644 #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) #endif #ifdef __ANDROID__ -@@ -61,7 +61,6 @@ +@@ -62,7 +62,6 @@ */ #define NO_SETMNTENT #define NO_ENDMNTENT
@@ -56,3 +56,6 @@ index 89133652..7e9c3a91 100644 #endif +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch +7 -7
@@ -1,4 +1,4 @@ -From b653a81da70c44af002dcbc7489ad9f4588ed11d Mon Sep 17 00:00:00 2001 +From 9d22fba096cd77101fc45420c918ec748d2cc31b Mon Sep 17 00:00:00 2001 From: Natanael Copa <[email protected]> Date: Wed, 18 Nov 2015 10:05:07 +0000 Subject: [PATCH] Use configure to test for feature instead of platform
@@ -29,10 +29,10 @@ Signed-off-by: Randy MacLeod <[email protected]> 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 27f3717f..6baab9e3 100644 +index 05f37f275..9a0c63cf6 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac -@@ -923,6 +923,7 @@ AC_CHECK_FUNCS( +@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt])
@@ -40,7 +40,7 @@ index 27f3717f..6baab9e3 100644 AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1132,10 +1133,13 @@ fi +@@ -1378,10 +1379,13 @@ fi ### AC_CHECK_HEADERS([crypt.h])
@@ -55,7 +55,7 @@ index 27f3717f..6baab9e3 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 1bb86f48..41c670cf 100644 +index 1bb86f483..41c670cfc 100644 --- a/open-vm-tools/lib/misc/idLinux.c +++ b/open-vm-tools/lib/misc/idLinux.c @@ -27,12 +27,9 @@
@@ -118,7 +118,7 @@ index 1bb86f48..41c670cf 100644 } #endif diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index cc5fa281..8710c542 100644 +index de57a4a90..c56b73cfe 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -35,9 +35,13 @@
@@ -137,5 +137,5 @@ index cc5fa281..8710c542 100644 #endif #ifndef NO_DNET -- -2.27.0 +2.25.1
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch +5 -2
@@ -1,4 +1,4 @@ -From 11adcf43a1e7aa39ee4d82fa567f37e5b0c6ca81 Mon Sep 17 00:00:00 2001 +From 2bc09bc7d933bc3d91c687e1cc2befdaa38d2c86 Mon Sep 17 00:00:00 2001 From: Natanael Copa <[email protected]> Date: Wed, 18 Nov 2015 10:41:01 +0000 Subject: [PATCH] Use configure test for sys/stat.h include
@@ -11,7 +11,7 @@ Signed-off-by: Natanael Copa <[email protected]> 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 e5273786..cabc4137 100644 +index 34f3125d2..cebf4dd8d 100644 --- a/open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -66,7 +66,7 @@
@@ -23,3 +23,6 @@ index e5273786..cabc4137 100644 #include <sys/stat.h> #endif +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch +5 -3
@@ -1,4 +1,4 @@ -From 294a3f14b74f2020a5cf3ccc2b6adabbcfce4151 Mon Sep 17 00:00:00 2001 +From dbe0943011c24d48de3df5a95f4e4606be0ef250 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 13 Jun 2018 23:48:04 -0700 Subject: [PATCH] Fix subdir objects configure error
@@ -6,13 +6,12 @@ Subject: [PATCH] Fix subdir objects configure error Fix build on musl while here Signed-off-by: Khem Raj <[email protected]> - --- 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 005814ef..edf1f21a 100644 +index 9a0c63cf6..5845490f6 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -326,7 +326,6 @@ AC_ARG_ENABLE(
@@ -32,3 +31,6 @@ index 005814ef..edf1f21a 100644 ### ### Constants +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch +6 -3
@@ -1,4 +1,4 @@ -From e4f0b99d90e26b15106f634caad1c3dea9e09cb8 Mon Sep 17 00:00:00 2001 +From 8c7f5895ed1f98bfc4101f8cfb93af3d13fd6bce Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 13 Jun 2018 23:02:50 -0700 Subject: [PATCH] include poll.h instead of sys/poll.h
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <[email protected]> 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 65b07109..b41aa29d 100644 +index 2bf97b549..b285c59c6 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -69,8 +69,8 @@ +@@ -70,8 +70,8 @@ #else #include <stddef.h> #include <ctype.h>
@@ -24,3 +24,6 @@ index 65b07109..b41aa29d 100644 #include <sys/socket.h> #include <sys/un.h> #include <netdb.h> +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch +8 -8
@@ -1,4 +1,4 @@ -From 7a5db1cf47e70e72d78a42468912c276e57f865e Mon Sep 17 00:00:00 2001 +From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 From: Randy MacLeod <[email protected]> Date: Wed, 24 Mar 2021 16:21:35 -0400 Subject: [PATCH] Rename poll.h to vm_poll.h
@@ -27,7 +27,7 @@ Signed-off-by: Randy MacLeod <[email protected]> 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 9914ffc5..89679f7a 100644 +index b285c59c6..5c528820d 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -87,7 +87,7 @@
@@ -40,7 +40,7 @@ index 9914ffc5..89679f7a 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 3a18a7e1..acdda54d 100644 +index 98f5b3f06..b436f0c7e 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -51,7 +51,7 @@
@@ -53,7 +53,7 @@ index 3a18a7e1..acdda54d 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 746dd78b..82c22f46 100644 +index dad848093..b61a2561f 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;
@@ -66,7 +66,7 @@ index 746dd78b..82c22f46 100644 typedef struct AsyncSocketPollParams { int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ diff --git a/open-vm-tools/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h -index 46442e55..8bc66997 100644 +index 46442e556..8bc669970 100644 --- a/open-vm-tools/lib/include/pollImpl.h +++ b/open-vm-tools/lib/include/pollImpl.h @@ -44,7 +44,7 @@
@@ -82,7 +82,7 @@ diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/vm_pol similarity index 99% rename from open-vm-tools/lib/include/poll.h rename to open-vm-tools/lib/include/vm_poll.h -index c90f5dcd..73a56204 100644 +index ade356b9f..8759fb960 100644 --- a/open-vm-tools/lib/include/poll.h +++ b/open-vm-tools/lib/include/vm_poll.h @@ -60,7 +60,7 @@ extern "C" {
@@ -95,7 +95,7 @@ index c90f5dcd..73a56204 100644 #endif #ifdef __ANDROID__ diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c -index 8b1fe759..f22fcd40 100644 +index 8b1fe759d..f22fcd402 100644 --- a/open-vm-tools/lib/rpcIn/rpcin.c +++ b/open-vm-tools/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@
@@ -108,5 +108,5 @@ index 8b1fe759..f22fcd40 100644 # include "vmci_defs.h" #include "dataMap.h" -- -2.27.0 +2.25.1
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch +5 -2
@@ -1,4 +1,4 @@ -From e86a259e1ce19c70ecfdece69ab53a07c63a34e1 Mon Sep 17 00:00:00 2001 +From 921621a098f242953117747f5852d7e3136ae6c4 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 13 Jun 2018 23:16:53 -0700 Subject: [PATCH] use posix strerror_r unless on gnu libc system
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c -index c81b4c13..7a403640 100644 +index c81b4c13f..7a4036402 100644 --- a/open-vm-tools/lib/err/errPosix.c +++ b/open-vm-tools/lib/err/errPosix.c @@ -31,6 +31,7 @@
@@ -37,3 +37,6 @@ index c81b4c13..7a403640 100644 ASSERT(p != NULL); return p; } +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch +5 -5
@@ -1,7 +1,7 @@ -From 4b69d8fd78bf6edbc8b4ace58e621d46071fd8dc Mon Sep 17 00:00:00 2001 +From b44d1d4e4ba77f1d9cf7de73a3bd210d02b5ff36 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 24 Mar 2021 17:26:53 -0400 -Subject: [PATCH 2/2] Use uintmax_t for handling rlim_t +Subject: [PATCH] Use uintmax_t for handling rlim_t rlimit types are not representable with long or long long formats, therefore use uintmax_t to typecast rlim_t types
@@ -17,10 +17,10 @@ Signed-off-by: Trevor Gamblin <[email protected]> 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 ba2e5624..889f730a 100644 +index 87d419a7b..f5cc80b76 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -5292,8 +5292,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: +@@ -5301,8 +5301,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: goto exit; }
@@ -32,5 +32,5 @@ index ba2e5624..889f730a 100644 /* * Check the offset is within the file size range. -- -2.30.2 +2.25.1
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch +6 -4
@@ -1,4 +1,4 @@ -From 80b1c4236549b0194d1f0d6e9be887e3a5850843 Mon Sep 17 00:00:00 2001 +From 39a59ab7efe98c880c783b2ccf43e5a137d2b222 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 27 Aug 2018 23:22:21 -0700 Subject: [PATCH] Use off64_t instead of __off64_t
@@ -8,16 +8,15 @@ unknown type name '__off64_t' Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> - --- open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c -index 82c0aa18..e9154541 100644 +index 492a4bf4a..a80a884cd 100644 --- a/open-vm-tools/lib/file/fileIOPosix.c +++ b/open-vm-tools/lib/file/fileIOPosix.c -@@ -206,10 +206,10 @@ static AlignedPool alignedPool; +@@ -211,10 +211,10 @@ static AlignedPool alignedPool; * the symbols (and anyone building XOPEN<700 gets nothing). */ extern ssize_t preadv64(int fd, const struct iovec *iov, int iovcnt,
@@ -30,3 +29,6 @@ index 82c0aa18..e9154541 100644 #else #error "Large file support is unavailable." #endif +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch +5 -3
@@ -1,4 +1,4 @@ -From c6836386549fb8f017761ce17a237fa42901434c Mon Sep 17 00:00:00 2001 +From 859c21b9a21c53d936301b05044d0c649d6cf32b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 24 Mar 2021 17:36:26 -0400 Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility
@@ -10,13 +10,12 @@ Refit for open-vm-tools-11.2.5. Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Randy MacLeod <[email protected]> Signed-off-by: Trevor Gamblin <[email protected]> - --- open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index f5cc80b7..5a79d645 100644 +index f5cc80b76..5a79d6451 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
@@ -40,3 +39,6 @@ index f5cc80b7..5a79d645 100644 attr->userId = stats->st_uid; attr->groupId = stats->st_gid; +-- +2.25.1 +
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From cfc6839362bd96bf2f42954160f16a60bf1de377 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 22 Dec 2018 19:59:02 -0800 -Subject: [PATCH] misc: Do not print NULL string into logs - -string format %s is getting a NULL pointer for 'expand' -parameter always since the check for chunks[i] == NULL will ensure that -its always null when the Log() API is called - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312] - -Signed-off-by: Khem Raj <[email protected]> ---- - open-vm-tools/lib/misc/util_misc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/open-vm-tools/lib/misc/util_misc.c -+++ b/open-vm-tools/lib/misc/util_misc.c -@@ -719,7 +719,7 @@ Util_ExpandString(const char *fileName) - ASSERT(!freeChunk[i]); - chunks[i] = expand; - if (chunks[i] == NULL) { -- Log("%s: Cannot allocate memory to expand $ in \"%s\".\n", -+ Log("%s: Cannot allocate memory to expand in \"%s\".\n", - __FUNCTION__, fileName); - goto out; - }
meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-open-vm-tools-Correct-include-path-for-poll.h.patch +2 -2
@@ -1,4 +1,4 @@ -From 2cefed441753b012c385e2d3ea5374b4d67e5696 Mon Sep 17 00:00:00 2001 +From 7f7e00ce582d72013cb54278548d3320e032b0dc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 7 Feb 2022 13:32:32 -0800 Subject: [PATCH] open-vm-tools: Correct include path for poll.h
@@ -32,5 +32,5 @@ index 2bba2937e..025339595 100644 #endif -- -2.35.1 +2.25.1
meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.0.bb renamed from meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +14 -16
@@ -30,20 +30,18 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=maste file://vmtoolsd.service \ file://vmtoolsd.init \ file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ - file://0003-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ - file://0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ - file://0005-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ - file://0006-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ - file://0007-Fix-subdir-objects-configure-error.patch;patchdir=.. \ - file://0008-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ - file://0009-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ - file://0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ - file://0012-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ - file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ - file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ - file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ - file://0001-open-vm-tools-Correct-include-path-for-poll.h.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=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)"
@@ -51,7 +49,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "87abba1ce2356fc860eb9d0777d8e9de47427358" +SRCREV = "6f5e4b13647b40a45c196dad76b1cb39cc6690b9" S = "${WORKDIR}/git/open-vm-tools"
@@ -66,7 +64,7 @@ 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-vgauth --disable-deploypkg --disable-containerinfo \ --without-root-privileges --without-kernel-modules --with-tirpc \ --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
Signature · 1 line
2.25.1