open-vm-tools: update to 12.5.0

for detailed change log, please refer to:
https://github.com/vmware/open-vm-tools/blob/stable-12.5.0/open-vm-tools/ChangeLog

Signed-off-by: Tan Zien <[email protected]>

diff --git a/utils/open-vm-tools/Makefile b/utils/open-vm-tools/Makefile
index e56bde55fbe5ca58d1007d1838b81d33940c2a2c..e655090d204a7ead0fd2267ff181ddb0a1126ada 100644 (file)
--- 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.2.0
+PKG_VERSION:=12.5.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-21223074.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-24276846.tar.gz
 PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERSION)
-PKG_HASH:=ddc797cb75c435ad03c197ee0753156add148d06aefb14587dd31bff7556479a
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-21223074
+PKG_HASH:=7eefd632f10ed4afc48559bcae31a598501377e72dec4b9965cee53e8c4f47ce
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-24276846
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENSE

diff --git a/utils/open-vm-tools/patches/0001-werror.patch b/utils/open-vm-tools/patches/0001-werror.patch
index 09eb72d3843e8dbcfada661b02dccdb34b0b1896..92ba105c6b119380bf2d35688b37a79cb0d49a4e 100644 (file)
--- 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 <[email protected]>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1461,7 +1461,17 @@ AC_C_VOLATILE
+@@ -1403,7 +1403,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 90392f69bf3fcb4e731aeaba47c1dd55cea730bd..cf1bcdbab3e40b857295db3fdf1f0f124ba30cb2 100644 (file)
--- 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 <[email protected]>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1451,6 +1451,7 @@ AC_TYPE_OFF_T
+@@ -1393,6 +1393,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 579846b42195ac8e11879b9fc6681e855290ef5c..24b855c02eaef2827f41cb552e86a0ee5d2ff0bf 100644 (file)
--- 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 <[email protected]>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1179,6 +1179,7 @@ AC_CHECK_FUNCS(
+@@ -1121,6 +1121,7 @@ AC_CHECK_FUNCS(
  
  AC_CHECK_FUNCS([ecvt])
  AC_CHECK_FUNCS([fcvt])
@@ -35,7 +35,7 @@ Signed-off-by: Natanael Copa <[email protected]>
  
  AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
  
-@@ -1388,10 +1389,13 @@ fi
+@@ -1330,10 +1331,13 @@ fi
  ###
  
  AC_CHECK_HEADERS([crypt.h])

diff --git a/utils/open-vm-tools/patches/0006-Use-configure-test-for-sys-stat.h-include.patch b/utils/open-vm-tools/patches/0006-Use-configure-test-for-sys-stat.h-include.patch
index 7c4922fc7ef81eb5c64cd0d90b3c978e303e3d3b..75b1a7fe000bbe72487fa5c7418ba4aa86778330 100644 (file)
--- a/utils/open-vm-tools/patches/0006-Use-configure-test-for-sys-stat.h-include.patch
+++ b/utils/open-vm-tools/patches/0006-Use-configure-test-for-sys-stat.h-include.patch
@@ -12,7 +12,7 @@ Signed-off-by: Natanael Copa <[email protected]>
 
 --- a/services/plugins/vix/vixTools.c
 +++ b/services/plugins/vix/vixTools.c
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
  #include <unistd.h>
  #endif
  

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 e4935b186ed26cb8cdf55d2b1f67462a6aa05f6a..9d31fbf4528446afa356803f22f1de1c59c0c8a3 100644 (file)
--- 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 <[email protected]>
  #include "unicodeOperations.h"
 --- a/lib/include/asyncsocket.h
 +++ b/lib/include/asyncsocket.h
-@@ -175,7 +175,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.
   */

diff --git a/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch b/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch
index 89af717da9f2c15ff8672059ae9f87cdc1aa26f2..4e1a3a26decc079482d3d537ee6c760af01cdb9d 100644 (file)
--- a/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch
+++ b/utils/open-vm-tools/patches/0013-fsutil_use_typedef_loff_t.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] use off64_t instead of loff_t
 
 --- a/vmhgfs-fuse/file.c
 +++ b/vmhgfs-fuse/file.c
-@@ -547,7 +547,7 @@ static int
+@@ -548,7 +548,7 @@ static int
  HgfsDoRead(HgfsHandle handle,  // IN:  Handle for this file
             char *buf,          // OUT: Buffer to copy data into
             size_t count,       // IN:  Number of bytes to read
@@ -20,7 +20,7 @@ Subject: [PATCH] use off64_t instead of loff_t
  {
     HgfsReq *req;
     HgfsOp opUsed;
-@@ -708,11 +708,11 @@ ssize_t
+@@ -709,11 +709,11 @@ ssize_t
  HgfsRead(struct fuse_file_info *fi,  // IN:  File info struct
           char  *buf,                 // OUT: User buffer to copy data into
           size_t count,               // IN:  Number of bytes to read
@@ -34,7 +34,7 @@ Subject: [PATCH] use off64_t instead of loff_t
     size_t nextCount, remainingCount = count;
     uint32 maxIOSize = HgfsMaxIOSize();
  
-@@ -769,7 +769,7 @@ static int
+@@ -770,7 +770,7 @@ static int
  HgfsDoWrite(HgfsHandle handle,       // IN: Handle for the file
              const char *buf,         // IN: Buffer containing data
              size_t count,            // IN: Number of bytes to write
@@ -43,7 +43,7 @@ Subject: [PATCH] use off64_t instead of loff_t
  {
     HgfsReq *req;
     int result = 0;
-@@ -893,11 +893,11 @@ ssize_t
+@@ -894,11 +894,11 @@ ssize_t
  HgfsWrite(struct fuse_file_info *fi,  // IN: File info structure
           const char  *buf,            // OUT: User buffer to copy data into
           size_t count,                // IN:  Number of bytes to read

diff --git a/utils/open-vm-tools/patches/010-warnings.patch b/utils/open-vm-tools/patches/010-warnings.patch
index b63a1081f3494be89fce6f6a1c0f47c5f554fcf2..5a2bf09a3374dc25d0cb3b0e2fd7542e8c5448f4 100644 (file)
--- a/utils/open-vm-tools/patches/010-warnings.patch
+++ b/utils/open-vm-tools/patches/010-warnings.patch
@@ -58,7 +58,7 @@
     /*
 --- a/services/plugins/gdp/gdpPlugin.c
 +++ b/services/plugins/gdp/gdpPlugin.c
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/eventfd.h>