From 448db7a50713fce0c6b34349175b93f48b264e1e Mon Sep 17 00:00:00 2001
From: Yuhei OKAWA <tochiro.srchack@gmail.com>
Date: Wed, 23 Jun 2021 11:25:46 +0900
Subject: [PATCH] open-vm-tools: update to 11.3.0

Refreshed patches.

Signed-off-by: Yuhei OKAWA <tochiro.srchack@gmail.com>
---
 utils/open-vm-tools/Makefile                           | 10 ++++------
 .../0003-Use-configure-test-for-struct-timespec.patch  |  2 +-
 ...figure-to-test-for-feature-instead-of-platfor.patch |  4 ++--
 utils/open-vm-tools/patches/020-no-werror.patch        |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/utils/open-vm-tools/Makefile b/utils/open-vm-tools/Makefile
index 39cff6e7e5..b57d452784 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:=11.2.5
+PKG_VERSION:=11.3.0
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-17337674.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-18090558.tar.gz
 PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/releases/download/stable-$(PKG_VERSION)
-PKG_HASH:=d01c9e036536b569ee561e33302e9dad1c2ac27c04f762ebdc3f81791cb44566
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-17337674
+PKG_HASH:=9bad3ee755340853bf7990e92f3d3880959a73e0749e8aaae62730854368bd2c
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-18090558
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENSE
@@ -82,9 +82,7 @@ TARGET_LDFLAGS += -liconv
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-ifeq ($(QUILT),)
 	mv $(PKG_BUILD_DIR)/lib/include/poll.h $(PKG_BUILD_DIR)/lib/include/vm_poll.h
-endif
 endef
 
 define Package/open-vm-tools/install
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 ef742dcf4f..fd729c75e4 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
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1195,6 +1195,7 @@ AC_TYPE_OFF_T
+@@ -1212,6 +1212,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 bec5d34bce..54c1cdc541 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
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -923,6 +923,7 @@ AC_CHECK_FUNCS(
+@@ -940,6 +940,7 @@ AC_CHECK_FUNCS(
  
  AC_CHECK_FUNCS([ecvt])
  AC_CHECK_FUNCS([fcvt])
@@ -8,7 +8,7 @@
  
  AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes])
  
-@@ -1132,10 +1133,13 @@ fi
+@@ -1149,10 +1150,13 @@ fi
  ###
  
  AC_CHECK_HEADERS([crypt.h])
diff --git a/utils/open-vm-tools/patches/020-no-werror.patch b/utils/open-vm-tools/patches/020-no-werror.patch
index be3fbbde0f..8718373acc 100644
--- a/utils/open-vm-tools/patches/020-no-werror.patch
+++ b/utils/open-vm-tools/patches/020-no-werror.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1210,7 +1210,6 @@ AC_C_VOLATILE
+@@ -1227,7 +1227,6 @@ AC_C_VOLATILE
  
  ### General flags / actions
  CFLAGS="$CFLAGS -Wall"