From 4141f5b04aab597f88a617a82649a404c773469a Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Nov 2011 23:14:50 +0000 Subject: Thu Nov 10 23:14:50 UTC 2011 --- community/open-vm-tools/PKGBUILD | 15 ++++----- .../open-vm-tools/scripts-network-FS19541.patch | 38 ++++++++++------------ 2 files changed, 25 insertions(+), 28 deletions(-) (limited to 'community/open-vm-tools') diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index c38880bc2..8821eaa01 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56482 2011-10-07 10:14:48Z spupykin $ +# $Id: PKGBUILD 58259 2011-11-09 14:58:37Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools -pkgver=2011.09.23 -_pkgsubver=491607 +pkgver=2011.10.26 +_pkgsubver=514583 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') @@ -24,9 +24,9 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('599342eee8d531b35ca1cc948b61868f' +md5sums=('06f299375a91fbcba9d16b5007490023' '06f7448e274db2a911f582e276088fc9' - 'b183ec265200d68431a5e4eb1b0c8cf5' + '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' '67cb83a9e5a4dd016c1a1da2863ca36d' @@ -37,7 +37,6 @@ md5sums=('599342eee8d531b35ca1cc948b61868f' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" [ $NOEXTRACT -eq 1 ] || { -# sed -i 's#3.2.7#3.2.8#' configure configure.ac sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac } [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules @@ -52,8 +51,8 @@ package() { chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper cd $pkgdir - patch -Np1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -Np1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools diff --git a/community/open-vm-tools/scripts-network-FS19541.patch b/community/open-vm-tools/scripts-network-FS19541.patch index 1f65b9824..5fcb33ba8 100644 --- a/community/open-vm-tools/scripts-network-FS19541.patch +++ b/community/open-vm-tools/scripts-network-FS19541.patch @@ -1,5 +1,5 @@ ---- network 2010-04-28 12:30:51.000000000 +0200 -+++ network.bak 2010-05-20 12:12:50.000000000 +0200 +--- network.orig 2011-11-09 18:42:28.000000000 +0400 ++++ network 2011-11-09 18:46:22.000000000 +0400 @@ -76,7 +76,7 @@ else echo `date` "[rescue_nic] activating $nic ..." @@ -9,32 +9,30 @@ exitCode=`expr $exitCode \| $?` fi done < $activeList -@@ -103,7 +103,7 @@ - TranquilizeNetworkManager() { +@@ -105,7 +105,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -133,7 +133,7 @@ - WakeNetworkManager() { + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -154,7 +154,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -165,8 +165,8 @@ + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -203,7 +203,7 @@ # 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." +# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." + which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." case "$1" in - poweron-vm) -- cgit v1.2.3-54-g00ecf