open-vm-tools: updated to 9.4.6-1770165

- fixed build with current toolchain, but kernel modules are no longer built
- updated init script

open-vm-tools/.footprint

@@ -9,24 +9,8 @@ drwxr-xr-x	root/root	etc/vmware-tools/scripts/
 drwxr-xr-x	root/root	etc/vmware-tools/scripts/vmware/
 -rwxr-xr-x	root/root	etc/vmware-tools/statechange.subr
 -rwxr-xr-x	root/root	etc/vmware-tools/suspend-vm-default
--rwxr-xr-x	root/root	etc/vmware-tools/tools.conf
+-rw-r--r--	root/root	etc/vmware-tools/tools.conf
 -rwxr-xr-x	root/root	etc/vmware-tools/vm-support
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/modules/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/vmci.ko
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/misc/vmsync.ko
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/fs/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/fs/vmblock/
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/fs/vmblock/vmblock.ko
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/fs/vmhgfs/
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/fs/vmhgfs/vmhgfs.ko
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/net/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/net/vsock/
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/net/vsock/vsock.ko
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/mount.vmhgfs
 drwxr-xr-x	root/root	usr/
@@ -36,7 +20,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/vmware-hgfsclient
 -rwxr-xr-x	root/root	usr/bin/vmware-rpctool
 -rwxr-xr-x	root/root	usr/bin/vmware-toolbox-cmd
--rwxr-xr-x	root/root	usr/bin/vmware-vmblock-fuse
 -rwxr-xr-x	root/root	usr/bin/vmware-xferlogs
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/vmGuestLib/
@@ -44,7 +27,6 @@ drwxr-xr-x	root/root	usr/include/vmGuestLib/
 -rw-r--r--	root/root	usr/include/vmGuestLib/vmGuestLib.h
 -rw-r--r--	root/root	usr/include/vmGuestLib/vmSessionId.h
 -rw-r--r--	root/root	usr/include/vmGuestLib/vm_basic_types.h
--rw-r--r--	root/root	usr/include/vmci_sockets.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libguestlib.la
 lrwxrwxrwx	root/root	usr/lib/libguestlib.so -> libguestlib.so.0.0.0
@@ -61,9 +43,7 @@ lrwxrwxrwx	root/root	usr/lib/libvmtools.so.0 -> libvmtools.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/open-vm-tools/
 drwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/
 drwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/common/
--rwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/common/libhgfsServer.la
 -rwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
--rwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/common/libvix.la
 -rwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/common/libvix.so
 drwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/vmsvc/
 -rwxr-xr-x	root/root	usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so

open-vm-tools/.md5sum

@@ -1,3 +1,3 @@
-91f74bf6e42a3f460a42b3be31db31dc  open-vm-tools-9.4.0-1280544.tar.gz
+3969daf1535d34e1c5f0c87a779b7642  open-vm-tools-9.4.6-1770165.tar.gz
 8b2a357cfbe5de97b2a7d5fa9c4266d7  tools.conf
-d4a8b123bf7b0ba29313c50675f04fa9  vmtools.rc
+78940d4735e78f71f1e664880814caef  vmtools.rc

open-vm-tools/Pkgfile

@@ -4,7 +4,7 @@
 # Depends:	libdnet glib
 
 name=open-vm-tools
-version=9.4.0-1280544
+version=9.4.6-1770165
 release=1
 source=(
 http://downloads.sourceforge.net/project/$name/$name/stable-9.4.x/$name-$version.tar.gz
@@ -15,6 +15,10 @@ tools.conf
 build(){
 	cd $name-$version
 
+	sed -ie 's|-Werror||g' configure.ac
+	autoreconf -iv
+
+	CUSTOM_PROCPS_NAME=procps \
 	./configure \
 		--prefix=/usr \
 		--disable-static \
@@ -23,17 +27,15 @@ build(){
 		--without-gtk2 \
 		--without-gtkmm \
 		--without-icu \
-		--without-pam
+		--without-pam \
+		--without-kernel-modules
 	make
 	make DESTDIR=$PKG install
 	mv $PKG/usr/sbin/mount.vmhgfs $PKG/sbin/mount.vmhgfs
 	install -D $SRC/vmtools.rc $PKG/etc/rc.d/vmtools
 
 	rm -rf $PKG/usr/{etc,sbin,share} $PKG/etc/vmware-tools/scripts/vmware/network
-	# rm -f $PKG/usr/lib/lib{vmtools,hgfs}.{,l}a $PKG/usr/lib/libguestlib.a
+	rm -f $PKG/usr/lib/open-vm-tools/plugins/common/*.la
 
-	# This is included in the linux kernel, enable CONFIG_VMXNET3
-	rm -f $PKG/lib/modules/`uname -r`/kernel/drivers/net/vmxnet.ko && rmdir $PKG/lib/modules/`uname -r`/kernel/drivers/net
-
-	install $SRC/tools.conf $PKG/etc/vmware-tools/tools.conf
+	install -m644 $SRC/tools.conf $PKG/etc/vmware-tools/tools.conf
 }

open-vm-tools/vmtools.rc

@@ -1,29 +1,77 @@
-#!/bin/sh
-#
-# /etc/rc.d/vmtools: start/stop VMware Tools
-#
+#!/bin/bash
 
-PIDFILE=/var/run/vmware-tools.pid
-VMTOOLSD_BIN=/usr/bin/vmtoolsd
+NAME=vmtools
+USER=root
+CONFIG="/etc/vmware-tools/tools.conf"
+RUNDIR="/var/run"
+PIDFILE="$RUNDIR/vmtoolsd.pid"
+STARTCMD="/usr/bin/vmtoolsd --config=$CONFIG --background=$PIDFILE"
+STOPCMD=""
+STOPTIMEOUT=300
+
+function getpid() {
+	if [ -z "$PIDFILE" ]; then
+		pid="$(pgrep -xfn "$STARTCMD")"
+	else
+		if [ -f "$PIDFILE" ]; then
+			pid=$(< $PIDFILE)
+			if [ ! -d /proc/"$pid" ]; then
+				echo "$NAME: removing stale pidfile $PIDFILE" >&2
+				rm -f "$PIDFILE"
+				unset pid
+			fi
+		fi
+	fi
+	echo "$pid"
+}
 
 case $1 in
 start)
-	$VMTOOLSD_BIN --background=$PIDFILE
+	pid=$(getpid)
+	install -d -m 755 -o $USER $RUNDIR || exit 1
+	if [ -n "$pid" ]; then
+		echo "$NAME already running with pid $pid" >&2
+		exit 1
+	fi
+	eval "$STARTCMD"
 	;;
 stop)
-	if [ -f $PIDFILE ]; then
-		kill $(< $PIDFILE) && rm -f $PIDFILE
+	pid=$(getpid)
+	if [ -n "$pid" ]; then
+		if [ -n "$STOPCMD" ]; then
+			eval "$STOPCMD"
+		else
+			kill "$pid"
+		fi
+		t=$(printf '%(%s)T' -1)
+		tend=$((t+STOPTIMEOUT))
+		while [ -d /proc/$pid -a $t -lt $tend ]; do
+			sleep 0.5
+			t=$(printf '%(%s)T' -1)
+		done
+		if [ -d /proc/"$pid" ]; then
+			echo "$NAME still running with pid $pid" >&2
+		else
+			[ -n "$PIDFILE" ] && rm -f "$PIDFILE"
+		fi
 	else
-		killall -q $VMTOOLSD_BIN
+		echo "$NAME is not running" >&2
 	fi
 	;;
 restart)
 	$0 stop
 	$0 start
 	;;
+status)
+	pid=$(getpid)
+	if [ -n "$pid" ]; then
+		echo "$NAME is running with pid $pid"
+	else
+		echo "$NAME is not running"
+	fi
+	;;
 *)
-	echo "usage: $0 [start|stop|restart]"
+	echo "usage: $0 [start|stop|restart|status]"
 	;;
 esac
 
-# End of file