From 464e4c58023d5cc4430f49da9dbeb8559b41b7ad Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Sun, 19 Mar 2023 14:01:48 +0200 Subject: [PATCH] open-vm-tools: update to 12.2.0 Signed-off-by: Oskari Rauta --- utils/open-vm-tools/Makefile | 10 +++++----- utils/open-vm-tools/patches/0001-werror.patch | 2 +- ...Use-configure-test-for-struct-timespec.patch | 2 +- ...to-test-for-feature-instead-of-platfor.patch | 17 +++++++++-------- .../0008-Rename-poll.h-to-vm_poll.h.patch | 2 +- utils/open-vm-tools/patches/010-warnings.patch | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/utils/open-vm-tools/Makefile b/utils/open-vm-tools/Makefile index 172639304d..c86af28a2d 100644 --- a/utils/open-vm-tools/Makefile +++ b/utils/open-vm-tools/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open-vm-tools -PKG_VERSION:=12.1.5 +PKG_VERSION:=12.2.0 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20735119.tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-21223074.tar.gz PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERSION) -PKG_HASH:=72cb68c71c59fd429bcb357926f41f07e21c737a341534b707fc1df010ed4868 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-20735119 +PKG_HASH:=ddc797cb75c435ad03c197ee0753156add148d06aefb14587dd31bff7556479a +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-21223074 PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=LICENSE @@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=glib2/host +PKG_BUILD_DEPENDS:=glib2/host rpcsvc-proto/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/utils/open-vm-tools/patches/0001-werror.patch b/utils/open-vm-tools/patches/0001-werror.patch index 223939b736..09eb72d384 100644 --- a/utils/open-vm-tools/patches/0001-werror.patch +++ b/utils/open-vm-tools/patches/0001-werror.patch @@ -13,7 +13,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1451,7 +1451,17 @@ AC_C_VOLATILE +@@ -1461,7 +1461,17 @@ AC_C_VOLATILE ### General flags / actions CFLAGS="$CFLAGS -Wall" diff --git a/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch b/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch index de31de4a16..90392f69bf 100644 --- a/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch +++ b/utils/open-vm-tools/patches/0003-Use-configure-test-for-struct-timespec.patch @@ -14,7 +14,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T +@@ -1451,6 +1451,7 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) diff --git a/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch b/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch index 3e0b8f3160..579846b421 100644 --- a/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/utils/open-vm-tools/patches/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -27,7 +27,7 @@ Signed-off-by: Natanael Copa --- a/configure.ac +++ b/configure.ac -@@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( +@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS( AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt]) @@ -35,7 +35,7 @@ Signed-off-by: Natanael Copa AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1378,10 +1379,13 @@ fi +@@ -1388,10 +1389,13 @@ fi ### AC_CHECK_HEADERS([crypt.h]) @@ -65,7 +65,7 @@ Signed-off-by: Natanael Copa #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) { @@ -77,13 +77,13 @@ Signed-off-by: Natanael Copa * We use __secure_getenv, which returns NULL if the binary is - * setuid or setgid. Alternatives include, + * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not -+ * available. Alternatives include, ++ * available. Alternatives included * - * a) getauxval(AT_SECURE); not available until glibc 2.16. - * b) __libc_enable_secure; may not be exported. + * a) issetugid(); not (yet?) available in glibc. + * b) getauxval(AT_SECURE); not available until glibc 2.16. -+ * c) __libc_enable_secure; may not be exported. ++ * c) c) __libc_enable_secure; may not be exported. * - * Use (a) when we are based on glibc 2.16, or newer. + * Use (b) when we are based on glibc 2.16, or newer. @@ -99,10 +99,11 @@ Signed-off-by: Natanael Copa +#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. */ diff --git a/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch b/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch index 9de17af2e0..e4935b186e 100644 --- a/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch +++ b/utils/open-vm-tools/patches/0008-Rename-poll.h-to-vm_poll.h.patch @@ -40,7 +40,7 @@ Signed-off-by: Natanael Copa #include "unicodeOperations.h" --- a/lib/include/asyncsocket.h +++ b/lib/include/asyncsocket.h -@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; +@@ -175,7 +175,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. */ diff --git a/utils/open-vm-tools/patches/010-warnings.patch b/utils/open-vm-tools/patches/010-warnings.patch index 6681586a9b..b63a1081f3 100644 --- a/utils/open-vm-tools/patches/010-warnings.patch +++ b/utils/open-vm-tools/patches/010-warnings.patch @@ -38,7 +38,7 @@ #include #include #include -@@ -2573,7 +2574,7 @@ HgfsStatToFileAttr(struct stat *stats, +@@ -2566,7 +2567,7 @@ HgfsStatToFileAttr(struct stat *stats, # define FMTTIMET "l" # endif #else @@ -47,7 +47,7 @@ #endif LOG(4, "access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" "attr: %"FMTTIMET"d/%"FMT64"u\n", -@@ -5301,7 +5302,7 @@ HgfsWriteCheckIORange(off_t offset, +@@ -5294,7 +5295,7 @@ HgfsWriteCheckIORange(off_t offset, goto exit; }