From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jan 2018 11:49:00 +0000 (+0000)
Subject: openvmtools: Update to 10.2.0
X-Git-Tag: v2.19-core120~161
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a2359cc0eb66e45b4f27f9940d482da815e36738

openvmtools: Update to 10.2.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
index caeb568f18..35a33dd97e 100644
--- a/config/rootfiles/packages/openvmtools
+++ b/config/rootfiles/packages/openvmtools
@@ -3,7 +3,6 @@ etc/rc.d/rc0.d/K01openvmtools
 etc/rc.d/rc3.d/S60openvmtools
 etc/rc.d/rc6.d/K01openvmtools
 etc/vmware-tools
-etc/vmware-tools/guestproxy-ssl.conf
 etc/vmware-tools/poweroff-vm-default
 etc/vmware-tools/poweron-vm-default
 etc/vmware-tools/resume-vm-default
@@ -13,12 +12,13 @@ etc/vmware-tools/scripts/vmware/network
 etc/vmware-tools/statechange.subr
 etc/vmware-tools/suspend-vm-default
 etc/vmware-tools/vm-support
+lib/udev/rules.d/99-vmware-scsi-udev.rules
 sbin/mount.vmhgfs
 usr/bin/vmhgfs-fuse
 usr/bin/vmtoolsd
 usr/bin/vmware-checkvm
-usr/bin/vmware-guestproxycerttool
 usr/bin/vmware-hgfsclient
+usr/bin/vmware-namespace-cmd
 usr/bin/vmware-rpctool
 usr/bin/vmware-toolbox-cmd
 usr/bin/vmware-vmblock-fuse
@@ -51,9 +51,9 @@ usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
 #usr/lib/open-vm-tools/plugins/common/libvix.la
 usr/lib/open-vm-tools/plugins/common/libvix.so
 usr/lib/open-vm-tools/plugins/vmsvc
-usr/lib/open-vm-tools/plugins/vmsvc/libgrabbitmqProxy.so
 usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so
 usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
 usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
 #usr/lib/pkgconfig/vmguestlib.pc
diff --git a/lfs/openvmtools b/lfs/openvmtools
index b5b1fefa21..6ca27e618f 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 10.0.5-3227872
+VER        = 10.2.0-7253323
 
 THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,12 +33,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 PROG       = openvmtools
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
-#CFLAGS    += -fno-PIC
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -47,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 734eccf6e9e007cb37dc4eb3ed6707b5
+$(DL_FILE)_MD5 = 9256c2402640ad19eb79cf49635e01b5
 
 install : $(TARGET)
 
@@ -79,12 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
-	cd $(DIR_APP) && autoreconf -vfi
-
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--with-kernel-release=$(KVER)-ipfire \
+		--without-ssl \
 		--without-pam \
 		--without-gtk2 \
 		--without-gtkmm \
@@ -98,12 +95,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,openvmtools)
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
-	rm -rvf /usr/etc/pam.d /usr/share/openvmtools
+	rm -rvf /usr/share/openvmtools
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)