move

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@1340 6952d904-891a-0410-993b-d76249ca496b

app-emulation/open-vm-tools/files/default-scripts.patch

@@ -0,0 +1,139 @@
+diff --git a/scripts/linux/resume-vm-default b/scripts/linux/resume-vm-default
+index cebbba0..dbd38a6 100644
+--- a/scripts/linux/resume-vm-default
++++ b/scripts/linux/resume-vm-default
+@@ -25,41 +25,10 @@
+ echo `date` ": Executing '$0'"
+ echo
+ 
+-find_networking_script() {
+-    local script="error"
+-    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
+-        if [ -d "$dir/rc0.d" ] &&
+-	    [ -d "$dir/rc1.d" ] &&
+-	    [ -d "$dir/rc2.d" ] &&
+-	    [ -d "$dir/rc3.d" ] &&
+-	    [ -d "$dir/rc4.d" ] &&
+-	    [ -d "$dir/rc5.d" ] &&
+-	    [ -d "$dir/rc6.d" ]; then
+-
+-	    # Now find the appropriate networking script.
+-	    if [ -d "$dir/init.d" ]; then
+-		if [ -x "$dir/init.d/network" ]; then
+-		    script="$dir/init.d/network"
+-		elif [ -x "$dir/init.d/networking" ]; then
+-		    script="$dir/init.d/networking"
+-		fi
+-	    else
+-		if [ -x "$dir/network" ]; then
+-		    script="$dir/network"
+-		elif [ -x "$dir/networking" ]; then
+-		    script="$dir/networking"
+-		fi
+-	    fi
+-        fi
+-    done
+-
+-    echo "$script"
+-}
+-
+ rescue_NIC() {
+    niclist="/var/run/vmware-active-nics"
+ 
+-   ifup_path=`which ifup 2>/dev/null`;
++   ifup_path="/etc/init.d/net.";
+    if [ $? -ne 0 ]; then
+       return 1;
+    fi
+@@ -76,7 +45,7 @@ rescue_NIC() {
+          else
+             echo `date` "[rescue_nic] activating $nic ..."
+ 
+-            $ifup_path $nic
++            $ifup_path$nic restart
+          fi
+       done < $niclist
+ 
+@@ -95,15 +64,8 @@ if [ -d "$scriptsdir" ]; then
+     done
+ fi
+ 
+-network=`find_networking_script`
+-if [ "$network" != "error" ]; then
+-   "$network" restart
+-   # Continue even if the networking init script wasn't successful.
+-   status=0
+-else
+-   echo "networking script not found"
+-   status=1
+-fi
++# Continue even if the networking init script wasn't successful.
++status=0
+ 
+ if [ $status -eq 0 ]; then
+     rescue_NIC
+diff --git a/scripts/linux/suspend-vm-default b/scripts/linux/suspend-vm-default
+index 80bf5b9..f590194 100644
+--- a/scripts/linux/suspend-vm-default
++++ b/scripts/linux/suspend-vm-default
+@@ -25,37 +25,6 @@
+ echo `date` ": Executing '$0'"
+ echo
+ 
+-find_networking_script() {
+-    local script="error"
+-    for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
+-        if [ -d "$dir/rc0.d" ] &&
+-	    [ -d "$dir/rc1.d" ] &&
+-	    [ -d "$dir/rc2.d" ] &&
+-	    [ -d "$dir/rc3.d" ] &&
+-	    [ -d "$dir/rc4.d" ] &&
+-	    [ -d "$dir/rc5.d" ] &&
+-	    [ -d "$dir/rc6.d" ]; then
+-
+-	    # Now find the appropriate networking script.
+-	    if [ -d "$dir/init.d" ]; then
+-		if [ -x "$dir/init.d/network" ]; then
+-		    script="$dir/init.d/network"
+-		elif [ -x "$dir/init.d/networking" ]; then
+-		    script="$dir/init.d/networking"
+-		fi
+-	    else
+-		if [ -x "$dir/network" ]; then
+-		    script="$dir/network"
+-		elif [ -x "$dir/networking" ]; then
+-		    script="$dir/networking"
+-		fi
+-	    fi
+-        fi
+-    done
+-
+-    echo "$script"
+-}
+-
+ save_active_NIC_list() {
+     ifconfig_path=`which ifconfig 2>/dev/null`
+     if [ $? ]; then
+@@ -76,15 +45,12 @@ fi
+ 
+ save_active_NIC_list
+ 
+-network=`find_networking_script`
+-if [ "$network" != "error" ]; then
+-   "$network" stop
+-   # If the network is down, this may fail but that's not a good reason
+-   # to prevent the suspend.
+-   status=0
+-else
+-   echo "networking script not found"
+-   status=1
+-fi
++for network in `ls /etc/init.d/net.*`; 
++do
++  "$network" stop
++done
++# If the network is down, this may fail but that's not a good reason
++# to prevent the suspend.
++status=0
+ 
+ exit "$status"

app-emulation/open-vm-tools/files/open-vm-tools-2009.05.22-167859-libproc-1.patch

@@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-06-12
+Initial Package Version: 2009.05.22
+Origin: me
+Upstream Status: unknown
+Description: link against libproc not libproc-2.3.7
+ 
+diff -Naur open-vm-tools-2009.05.22-167859.orig/configure.ac open-vm-tools-2009.05.22-167859/configure.ac
+--- open-vm-tools-2009.05.22-167859.orig/configure.ac	2009-06-12 19:04:42.793906039 +0000
++++ open-vm-tools-2009.05.22-167859/configure.ac	2009-06-12 19:04:55.226773156 +0000
+@@ -608,7 +608,7 @@
+    if test -z "$CUSTOM_PROCPS_LIBS"; then
+       CUSTOM_PROCPS_LIBS="-L/lib"
+    fi
+-   AC_VMW_CHECK_LIB([proc-3.2.7],
++   AC_VMW_CHECK_LIB([proc],
+                     [PROCPS],
+                     [],
+                     [],

app-emulation/open-vm-tools/files/open-vm-tools-build-fix.patch

@@ -0,0 +1,23 @@
+--- a/vmware-user/vmware-user.cpp
++++ b/vmware-user/vmware-user.cpp
+@@ -529,7 +529,7 @@ VMwareUserRpcInSetOptionCB(char const **
+    char *value;
+    unsigned int index = 0;
+    Bool ret = FALSE;
+-   char *retStr = NULL;
++   const char *retStr = NULL;
+ 
+    /* parse the option & value string */
+    option = StrUtil_GetNextToken(&index, args, " ");
+--- a/vmware-user/Makefile.am
++++ b/vmware-user/Makefile.am
+@@ -75,7 +75,9 @@ vmware_user_LDADD += ../lib/err/libErr.l
+ vmware_user_LDADD += ../lib/foundryMsg/libFoundryMsg.la
+ vmware_user_LDADD += ../lib/backdoor/libBackdoor.la
+ vmware_user_LDADD += ../lib/dict/libDict.la
++if HAVE_GTKMM
+ vmware_user_LDADD += ../lib/dndGuest/libDndGuest.la
++endif
+ vmware_user_LDADD += ../lib/dnd/libDnd.la
+ vmware_user_LDADD += ../lib/dynxdr/libDynxdr.la
+ vmware_user_LDADD += ../lib/hgfs/libHgfs.la

app-emulation/open-vm-tools/files/open-vm-tools.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=vmware-user
+Name=VMware User Agent
+X-KDE-autostart-phase=1
+NoDisplay=true

app-emulation/open-vm-tools/files/open-vm.confd

@@ -0,0 +1,2 @@
+# Set this to no to disable drag and drop (and vmblock) loading.
+VM_DRAG_AND_DROP="yes"

app-emulation/open-vm-tools/files/open-vm.initd

@@ -0,0 +1,76 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm.initd,v 1.2 2008/02/01 12:33:36 flameeyes Exp $
+
+DND_TMPDIR="/tmp/VMwareDnD"
+USER_GROUP="root:vmware"
+DND_TMPDIR_PERMS="1777"
+GUESTD_BIN="/usr/sbin/vmware-guestd"
+PIDFILE="/var/run/vmware-guestd.pid"
+MOUNTPOINT="/proc/fs/vmblock/mountPoint"
+
+depend() {
+	before checkfs fsck net X
+}
+
+start() {
+	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
+	then
+
+		if ! grep -q -w vmblock /proc/modules;
+		then
+			ebegin "Loading vmblock module"
+			modprobe vmblock
+			eend $?
+			sleep 0.25
+		fi
+
+		if [[ ! -d "${DND_TMPDIR}" ]];
+		then
+			# einfo "Creating the VM drag and drop directory"
+			mkdir "${DND_TMPDIR}"
+			chown "${USER_GROUP}" "${DND_TMPDIR}"
+			chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
+		fi
+
+		# DnD_TMPDIR must exist before vmblock can be mounted
+		ebegin "Mounting vmblock device"
+		mount -t vmblock none ${MOUNTPOINT}
+		eend $?
+	fi
+	
+	ebegin "Starting vmware-guestd"
+	start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+	local ret
+	
+	if [ "${VM_DRAG_AND_DROP}" == "yes" ];
+	then
+		ebegin "Cleaning the contents of ${DND_TMPDIR}"
+		# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
+		if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
+		then
+			rm -rf ${DND_TMPDIR}/*
+			ret=0
+		else
+			eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
+			ret=1
+		fi
+		eend $ret
+
+		ebegin "Unmounting vmblock device"
+		if grep -q -w "${MOUNTPOINT}" /proc/mounts;
+		then
+			umount ${MOUNTPOINT} 1>&2 > /dev/null
+		fi
+		eend 0
+	fi
+
+	ebegin "Stopping vmware-guestd"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
+}

app-emulation/open-vm-tools/files/wiper-warning-fix.patch

@@ -0,0 +1,14 @@
+--- a/lib/wiper/wiperPosix.c
++++ b/lib/wiper/wiperPosix.c
+@@ -998,8 +998,9 @@
+                   break;
+                }
+             }
+-         } else {
+-            fgets(deviceName, sizeof deviceName, fp);
++         } else if (fgets(deviceName, sizeof deviceName, fp) != deviceName) {
++            Warning("%s: Error reading device name from /proc/devices.", __func__);
++            break;
+          }
+       }
+