open-vm-tolls: version bump

svn path=/trunk/; revision=512

6 files changed, 33 insertions, 231 deletions

diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest
index cf8844c..f29221e 100644
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@@ -1,3 +1,3 @@
-DIST open-vm-tools-2011.09.23-491607.tar.gz 3455939 RMD160 12400eb9580086c7768f6e9b702c1be88db04061 SHA1 69f1dad5f26ff0d5efad878aea608a4fb1c1455b SHA256 27311a0839e8e7defcbd1dcaf1e9943dacb0fbb7e89f7a66db6fbc349eec40ee
-EBUILD open-vm-tools-kmod-0.0.20110923.491607.ebuild 1806 RMD160 b90ac2ed875525aaad39c0f5dbefa4ea1af88d41 SHA1 2986384273c6d545db67db12cfaf84b29ebfef2f SHA256 a66ec070786d3719b2d3a92a8abfde46ab6d15f4c2237826feb778d4ec0ce8c0
+DIST open-vm-tools-2011.10.26-514583.tar.gz 3488922 RMD160 8cea5aa8a78e1d54f071ecf396c2f5fcbfe64fdb SHA1 825f615ef2369bca2cbeae11f851ef14bf22b1c6 SHA256 9dbe0242a1af4943c7cae1e3482c7dcf56fb8adc40d7a2297a5b558734da94b6
+EBUILD open-vm-tools-kmod-0.0.20111026.514583.ebuild 1806 RMD160 b90ac2ed875525aaad39c0f5dbefa4ea1af88d41 SHA1 2986384273c6d545db67db12cfaf84b29ebfef2f SHA256 a66ec070786d3719b2d3a92a8abfde46ab6d15f4c2237826feb778d4ec0ce8c0
 MISC metadata.xml 503 RMD160 fc12351dcb94137033d4810fc69d0211e0d0ec93 SHA1 bbe6feea6eff4574c897555e35649c6bd1f01963 SHA256 bed306dcff1b6d4243cf63ba912c88d3a630081501891687925c9dbf37995e00
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20111026.514583.ebuild
index eebb6d3..eebb6d3 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20110923.491607.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-0.0.20111026.514583.ebuild
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 10d455c..a105ff3 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,7 +1,7 @@
-AUX default-scripts.patch 6245 RMD160 858a918af6d783d06131abcf8352b650fb47d390 SHA1 e0f333c2eae7f54ffc35bbc250937fce61e604c6 SHA256 78ea752fa3219318455027d4e05ddf4909089038ab5fd458e33207b61cd9db5e
+AUX network 289 RMD160 9b9ecfc92eb1e8519de1ae2ee6ab16a797cb2358 SHA1 37cc60c88dcb224c75f6f7f7163faf9d0eec4874 SHA256 9c90919b9c3fb8cace8230af8c90192cf7a184d833d13fba090fc98b289ef2e7
 AUX open-vm-tools.desktop 140 RMD160 2e4a6ec7d866975c0952e78b5ea72fef3904b411 SHA1 0b012eb6f0fedadf8e6dfefb8a63eec2d52eb43f SHA256 86363f5430d33afb2f9fcb004ca86813f14434f56986e427e296bd530724eeb0
 AUX open-vm-tools.initd 1875 RMD160 1462e939f2e8bfb4aa7a828fb8a436429ea8d002 SHA1 8eae35945cad1d9e9089f96a5211dfb23a891b7d SHA256 83a8c41d201e571193bd116a242abcdedd5d365a71f6e40bce2d3a40e0c2c15f
 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
-DIST open-vm-tools-2011.09.23-491607.tar.gz 3455939 RMD160 12400eb9580086c7768f6e9b702c1be88db04061 SHA1 69f1dad5f26ff0d5efad878aea608a4fb1c1455b SHA256 27311a0839e8e7defcbd1dcaf1e9943dacb0fbb7e89f7a66db6fbc349eec40ee
-EBUILD open-vm-tools-0.0.20110923.491607.ebuild 3181 RMD160 cae1ac45753b0fa8a14afc49d14faf287746b217 SHA1 c78201202b813d51cb55f69bdcd051ec2de8e55f SHA256 775d345f66b4b665e864c7b6248ea179e78552de408aebe7453af9961c12b15c
+DIST open-vm-tools-2011.10.26-514583.tar.gz 3488922 RMD160 8cea5aa8a78e1d54f071ecf396c2f5fcbfe64fdb SHA1 825f615ef2369bca2cbeae11f851ef14bf22b1c6 SHA256 9dbe0242a1af4943c7cae1e3482c7dcf56fb8adc40d7a2297a5b558734da94b6
+EBUILD open-vm-tools-0.0.20111026.514583.ebuild 3255 RMD160 34498f4187e9155e0d01c4e0435592d6bebd43ab SHA1 2533487bc0269e1337f63b5c1257a099e65c55e8 SHA256 cc6df7d1d763674ba08f746307cba9c453a26ac42f9f5e8e37bc624aba08aef0
 MISC metadata.xml 737 RMD160 dcae61c146409e21b9bf4011a7b0f304b0478fcb SHA1 55b57f8904586ea1ee3b9cabe1180226e96e6244 SHA256 9779f28fc54f628940f881f57ab87a2385030610ce5ca78955f4d80af0709355
diff --git a/app-emulation/open-vm-tools/files/default-scripts.patch b/app-emulation/open-vm-tools/files/default-scripts.patch
deleted file mode 100644
index ed57fcf..0000000
--- a/app-emulation/open-vm-tools/files/default-scripts.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- scripts/linux/network.orig	2010-07-06 14:54:01.000000000 -0400
-+++ scripts/linux/network	2010-07-07 13:05:21.000000000 -0400
-@@ -34,164 +34,6 @@
- 
- 
- #
--# find_networking_script --
--#
--#    Searches common Linux distro init/rc paths to find a singular network
--#    services script.
--#
--# Result:
--#    Returns a valid networking script path on success or "error" on failure.
--#
--# Side effects:
--#    None.
--#
--
--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 --
--#
--#    Records a list of every active NIC to /var/run/vmware-active-nics.
--#
--#    XXX What's the story on aliases?  Should they still be included, or will
--#    they be recreated automatically upon resume?
--#
--# Results:
--#    $activeList has, one per line, a list of all active NICs.
--#
--# Side effects:
--#    None.
--#
--
--save_active_NIC_list() {
--   >$activeList
--
--   for nic in `ifconfig | awk '/^eth/ { print $1 }'`; do
--      ifconfig $nic | egrep -q '\bUP\b' && echo $nic >> $activeList
--      exitCode=`expr $exitCode \| $?`
--   done
--}
--
--
--#
--# rescue_NIC --
--#
--#    For each NIC recorded in $activeList that is not currently "up", run
--#    "ifup $nic".
--#
--# Results:
--#    All downed NICs should be active.
--#
--
--rescue_NIC() {
--   if [ -f "$activeList" ]; then
--      while read nic; do
--         if ifconfig $nic | egrep -q '\bUP\b'; then
--            echo `date` "[rescue_nic] $nic is already active."
--         else
--            echo `date` "[rescue_nic] activating $nic ..."
--
--            ifup $nic
--            exitCode=`expr $exitCode \| $?`
--         fi
--      done < $activeList
--
--      rm -f $activeList
--   fi
--}
--
--
--#
--# TranquilizeNetworkManager --
--#
--#    Put the NetworkManager daemon to sleep (maybe).
--#
--#    See http://projects.gnome.org/NetworkManager/developers/spec.html .
--#
--# Results:
--#    Sleep(true) request is sent to the NetworkManager D-Bus interface.
--#
--# Side effects:
--#    None.
--#
--
--TranquilizeNetworkManager() {
--   # `which' may be a bit noisy, so we'll shush it.
--   dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
--      # NetworkManager 0.6
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.sleep
--      # NetworkManager 0.7.0
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.Sleep boolean:true
--   fi
--}
--
--
--#
--# WakeNetworkManager --
--#
--#    Wake the NetworkManager daemon (maybe).
--#
--#    See http://projects.gnome.org/NetworkManager/developers/spec.html .
--#
--# Results:
--#    Sleep(false)request is sent to the NetworkManager D-Bus interface.
--#
--# Side effects:
--#    None.
--#
--
--WakeNetworkManager() {
--   # `which' may be a bit noisy, so we'll shush it.
--   dbusSend=`which dbus-send 2>/dev/null`
--   if [ $? -eq 0 ]; then
--      # NetworkManager 0.6
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.wake
--      # NetworkManager 0.7.0
--      $dbusSend --system --dest=org.freedesktop.NetworkManager          \
--         /org/freedesktop/NetworkManager                                \
--         org.freedesktop.NetworkManager.Sleep boolean:false
--   fi
--}
--
--
--#
- # main --
- #
- #    Main entry point.  Perform some sanity checking, then map state change
-@@ -203,45 +45,24 @@
- 
- main() {
-    exitCode=0
--   activeList=/var/run/vmware-active-nics
- 
--   networkScript=`find_networking_script`
--   [ "$networkScript" != "error" ] || Panic "Cannot find system networking script."
--
--   # XXX Are these really necessary?  If so, we should have seen customer
--   # complaints by now.
--   which ifup >/dev/null 2>&1      || Panic "ifup not in search path."
--   which ifconfig >/dev/null 2>&1  || Panic "ifconfig not in search path."
-+   #
-+   # net.eth0, net.eth1, network, wicd, NetworkManager
-+   service="net.eth0"
-+
-+   if [ $(rc-service -e net.eth0) ] 
-+   then
-+   	service="net.eth0"
-+   else
-+	service="network"
-+   fi
- 
-    case "$1" in
--      poweron-vm)
--         rm -f $activeList
--         ;;
-       suspend-vm)
--         save_active_NIC_list
--         "$networkScript" stop
--         TranquilizeNetworkManager
-+         rc-service $service stop
-          ;;
-       resume-vm)
--         # According to hfu, "/etc/init.d/networking restart" on Debian 5.0
--         # may bring down ethernet interfaces tagged as "allow-hotplug" without
--         # bringing them back up.
--         #
--         # This is especially a problem when reverting to a live, running
--         # VM snapshot where an active NIC list hadn't yet been generated,
--         # resulting in sudden loss of an otherwise operational NIC.
--         #
--         # So, if the active list doesn't exist, assume we're coming back to
--         # a live snapshot and capture the current active list now for
--         # rescue later.
--         if [ ! -s $activeList ]; then
--            save_active_NIC_list
--         fi
--         WakeNetworkManager
--         # XXX Do we really want restart or is start sufficient?  Like, would
--         # using start avoid the problem mentioned above?
--         "$networkScript" restart
--         rescue_NIC
-+         rc-service $service start
-          ;;
-       *) ;;
-    esac
diff --git a/app-emulation/open-vm-tools/files/network b/app-emulation/open-vm-tools/files/network
new file mode 100644
index 0000000..dabd183
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/network
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# net.eth0, net.eth1, network, wicd, NetworkManager
+service="net.eth0"
+
+if [ $(rc-service -e net.eth0) ]
+then
+	service="net.eth0"
+else
+	service="network"
+fi
+
+case "$1" in
+	suspend-vm)
+		rc-service $service stop
+		;;
+	resume-vm)
+		rc-service $service start
+		;;
+	*)
+		;;
+esac
+
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild
index 6e57840..02092ad 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-0.0.20110923.491607.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.20111026.514583.ebuild
@@ -58,7 +58,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/default-scripts.patch"
+	#epatch "${FILESDIR}/default-scripts.patch"
 	#epatch "${FILESDIR}/checkvm-pie-safety.patch"
 	#sed -i -e 's/proc-3.2.7/proc/g' configure || die "sed configure failed"
 	# Do not filter out Werror
@@ -101,6 +101,9 @@ src_install() {
 	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
 	newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
 
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
+
 	if use X;
 	then
 		fperms 4755 "/usr/bin/vmware-user-suid-wrapper" || die