[arch-commits] Commit in open-vm-tools/repos (28 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Fri Mar 22 11:49:32 UTC 2013
Date: Friday, March 22, 2013 @ 12:49:32
Author: spupykin
Revision: 86810
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
open-vm-tools/repos/community-staging-i686/
open-vm-tools/repos/community-staging-i686/PKGBUILD
(from rev 86809, open-vm-tools/trunk/PKGBUILD)
open-vm-tools/repos/community-staging-i686/modprobe.conf
(from rev 86809, open-vm-tools/trunk/modprobe.conf)
open-vm-tools/repos/community-staging-i686/open-vm-tools-X11Bool.patch
(from rev 86809, open-vm-tools/trunk/open-vm-tools-X11Bool.patch)
open-vm-tools/repos/community-staging-i686/open-vm-tools-dkms.install
(from rev 86809, open-vm-tools/trunk/open-vm-tools-dkms.install)
open-vm-tools/repos/community-staging-i686/open-vm-tools.conf.d
(from rev 86809, open-vm-tools/trunk/open-vm-tools.conf.d)
open-vm-tools/repos/community-staging-i686/open-vm-tools.install
(from rev 86809, open-vm-tools/trunk/open-vm-tools.install)
open-vm-tools/repos/community-staging-i686/open-vm-tools.rc.d
(from rev 86809, open-vm-tools/trunk/open-vm-tools.rc.d)
open-vm-tools/repos/community-staging-i686/scripts-network-FS19541.patch
(from rev 86809, open-vm-tools/trunk/scripts-network-FS19541.patch)
open-vm-tools/repos/community-staging-i686/scripts-network.patch
(from rev 86809, open-vm-tools/trunk/scripts-network.patch)
open-vm-tools/repos/community-staging-i686/tools.conf
(from rev 86809, open-vm-tools/trunk/tools.conf)
open-vm-tools/repos/community-staging-i686/vmtoolsd.service
(from rev 86809, open-vm-tools/trunk/vmtoolsd.service)
open-vm-tools/repos/community-staging-i686/vmware-guestd
(from rev 86809, open-vm-tools/trunk/vmware-guestd)
open-vm-tools/repos/community-staging-i686/xautostart.conf
(from rev 86809, open-vm-tools/trunk/xautostart.conf)
open-vm-tools/repos/community-staging-x86_64/
open-vm-tools/repos/community-staging-x86_64/PKGBUILD
(from rev 86809, open-vm-tools/trunk/PKGBUILD)
open-vm-tools/repos/community-staging-x86_64/modprobe.conf
(from rev 86809, open-vm-tools/trunk/modprobe.conf)
open-vm-tools/repos/community-staging-x86_64/open-vm-tools-X11Bool.patch
(from rev 86809, open-vm-tools/trunk/open-vm-tools-X11Bool.patch)
open-vm-tools/repos/community-staging-x86_64/open-vm-tools-dkms.install
(from rev 86809, open-vm-tools/trunk/open-vm-tools-dkms.install)
open-vm-tools/repos/community-staging-x86_64/open-vm-tools.conf.d
(from rev 86809, open-vm-tools/trunk/open-vm-tools.conf.d)
open-vm-tools/repos/community-staging-x86_64/open-vm-tools.install
(from rev 86809, open-vm-tools/trunk/open-vm-tools.install)
open-vm-tools/repos/community-staging-x86_64/open-vm-tools.rc.d
(from rev 86809, open-vm-tools/trunk/open-vm-tools.rc.d)
open-vm-tools/repos/community-staging-x86_64/scripts-network-FS19541.patch
(from rev 86809, open-vm-tools/trunk/scripts-network-FS19541.patch)
open-vm-tools/repos/community-staging-x86_64/scripts-network.patch
(from rev 86809, open-vm-tools/trunk/scripts-network.patch)
open-vm-tools/repos/community-staging-x86_64/tools.conf
(from rev 86809, open-vm-tools/trunk/tools.conf)
open-vm-tools/repos/community-staging-x86_64/vmtoolsd.service
(from rev 86809, open-vm-tools/trunk/vmtoolsd.service)
open-vm-tools/repos/community-staging-x86_64/vmware-guestd
(from rev 86809, open-vm-tools/trunk/vmware-guestd)
open-vm-tools/repos/community-staging-x86_64/xautostart.conf
(from rev 86809, open-vm-tools/trunk/xautostart.conf)
--------------------------------------------------------+
community-staging-i686/PKGBUILD | 100 ++++++++++++++
community-staging-i686/modprobe.conf | 1
community-staging-i686/open-vm-tools-X11Bool.patch | 15 ++
community-staging-i686/open-vm-tools-dkms.install | 23 +++
community-staging-i686/open-vm-tools.conf.d | 11 +
community-staging-i686/open-vm-tools.install | 10 +
community-staging-i686/open-vm-tools.rc.d | 106 +++++++++++++++
community-staging-i686/scripts-network-FS19541.patch | 38 +++++
community-staging-i686/scripts-network.patch | 73 ++++++++++
community-staging-i686/tools.conf | 1
community-staging-i686/vmtoolsd.service | 9 +
community-staging-i686/vmware-guestd | 6
community-staging-i686/xautostart.conf | 6
community-staging-x86_64/PKGBUILD | 100 ++++++++++++++
community-staging-x86_64/modprobe.conf | 1
community-staging-x86_64/open-vm-tools-X11Bool.patch | 15 ++
community-staging-x86_64/open-vm-tools-dkms.install | 23 +++
community-staging-x86_64/open-vm-tools.conf.d | 11 +
community-staging-x86_64/open-vm-tools.install | 10 +
community-staging-x86_64/open-vm-tools.rc.d | 106 +++++++++++++++
community-staging-x86_64/scripts-network-FS19541.patch | 38 +++++
community-staging-x86_64/scripts-network.patch | 73 ++++++++++
community-staging-x86_64/tools.conf | 1
community-staging-x86_64/vmtoolsd.service | 9 +
community-staging-x86_64/vmware-guestd | 6
community-staging-x86_64/xautostart.conf | 6
26 files changed, 798 insertions(+)
Copied: open-vm-tools/repos/community-staging-i686/PKGBUILD (from rev 86809, open-vm-tools/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Krzysztof Raczkowski <raczkow at gmail.com>
+
+pkgbase=open-vm-tools
+pkgname=('open-vm-tools' 'open-vm-tools-dkms')
+epoch=1
+pkgver=9.2.2
+_pkgsubver=893683
+pkgrel=7
+pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
+arch=('i686' 'x86_64')
+url="http://open-vm-tools.sourceforge.net/"
+license=('LGPL')
+depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss' 'iproute2')
+makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst')
+optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm'
+ 'open-vm-tools-modules: for linux kernel'
+ 'open-vm-tools-dkms: for linux-lts and other kernels')
+backup=('etc/conf.d/open-vm-tools'
+ 'etc/pam.d/vmware-guestd')
+options=('docs' '!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz
+ scripts-network.patch
+ scripts-network-FS19541.patch
+ open-vm-tools-X11Bool.patch
+ open-vm-tools.conf.d
+ open-vm-tools.rc.d
+ tools.conf
+ vmware-guestd
+ xautostart.conf
+ modprobe.conf
+ vmtoolsd.service)
+md5sums=('7af505681d736d4c9ee6493b1166689f'
+ 'b8f68fef3d388489e40dba581b6da18a'
+ '507ead54854e49762ca2a6893529c484'
+ '8c333a979578bdc0c3134c1dd6bb7353'
+ '6567ca1b465854f832fc94a4e9faf876'
+ '0848618fa6310294db2752c77ae99865'
+ 'b55d15e2c4be396aad709aeca91033d3'
+ '1b9ae908fce4c623269f100ee9bdfdef'
+ '75a25d83417e683957321f97a00f8465'
+ 'bc5518489077e91655489bd04b868584'
+ 'a6c53243d31c765580f6dded7d5fa98f')
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+ export CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS ${CFLAGS}"
+ [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules
+ make
+}
+
+package_open-vm-tools() {
+ cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+
+ make install DESTDIR="$pkgdir"
+ install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop
+
+ # vmware-user XDG autostart
+ mkdir -p $pkgdir/etc/xdg/autostart
+ ln -s /usr/share/applications/vmware-user.desktop $pkgdir/etc/xdg/autostart/vmware-user.desktop
+
+ install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
+ chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
+
+ cd "$pkgdir"
+ 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 -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools
+ install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools
+ install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf
+ install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf
+ install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd
+ rm -rf "$pkgdir"/usr/etc
+
+ ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs
+
+ cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \;
+ install -Dm644 ${srcdir}/vmtoolsd.service ${pkgdir}/usr/lib/systemd/system/vmtoolsd.service
+
+ rm -f $pkgdir/etc/vmware-tools/scripts/vmware/*.orig
+}
+
+package_open-vm-tools-dkms() {
+ pkgdesc="kernel modules for the open source implementation of VMware Tools"
+ depends=('dkms')
+ provides=('open-vm-tools-modules')
+ conflicts=('open-vm-tools-modules')
+ optdepends=()
+ backup=()
+ install=open-vm-tools-dkms.install
+
+ install -d -m755 ${pkgdir}/usr/src/
+ sh ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/modules/linux/dkms.sh \
+ ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/ \
+ ${pkgdir}/usr/src/
+ install -Dm644 ${srcdir}/modprobe.conf ${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf
+}
Copied: open-vm-tools/repos/community-staging-i686/modprobe.conf (from rev 86809, open-vm-tools/trunk/modprobe.conf)
===================================================================
--- community-staging-i686/modprobe.conf (rev 0)
+++ community-staging-i686/modprobe.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1 @@
+softdep pcnet32 pre: vmxnet
Copied: open-vm-tools/repos/community-staging-i686/open-vm-tools-X11Bool.patch (from rev 86809, open-vm-tools/trunk/open-vm-tools-X11Bool.patch)
===================================================================
--- community-staging-i686/open-vm-tools-X11Bool.patch (rev 0)
+++ community-staging-i686/open-vm-tools-X11Bool.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,15 @@
+diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h
+--- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000
++++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000
+@@ -83,8 +83,11 @@
+
+ /* STRICT ANSI means the Xserver build and X defines Bool differently. */
+ #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__)
++# ifndef _XTYPEDEF_BOOL
++# define _XTYPEDEF_BOOL
+ typedef char Bool;
+ #endif
++#endif
+
+ #ifndef FALSE
+ #define FALSE 0
Copied: open-vm-tools/repos/community-staging-i686/open-vm-tools-dkms.install (from rev 86809, open-vm-tools/trunk/open-vm-tools-dkms.install)
===================================================================
--- community-staging-i686/open-vm-tools-dkms.install (rev 0)
+++ community-staging-i686/open-vm-tools-dkms.install 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,23 @@
+post_install() {
+ echo ">>> Enable building of open-vm-tools modules:"
+ echo ">>> $ dkms add open-vm-tools/${1%-*}"
+ echo ">>>"
+ echo ">>> Enabling vmxnet driver in /usr/lib/modprobe.d/open-vm-tools-modules.conf"
+ echo ">>> (this will disable pcnet32 driver)"
+ echo ">>>"
+ echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually"
+ echo ">>> disable loading of pcnet32 driver"
+ echo ">>>"
+}
+
+post_upgrade() {
+ echo ">>> Enable building of open-vm-tools modules:"
+ echo ">>> $ dkms add open-vm-tools/${1%-*}"
+ echo ">>>"
+}
+
+post_remove() {
+ echo ">>>"
+ echo ">>> Remember to un-blacklist pcnet32 driver"
+ echo ">>>"
+}
Copied: open-vm-tools/repos/community-staging-i686/open-vm-tools.conf.d (from rev 86809, open-vm-tools/trunk/open-vm-tools.conf.d)
===================================================================
--- community-staging-i686/open-vm-tools.conf.d (rev 0)
+++ community-staging-i686/open-vm-tools.conf.d 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,11 @@
+# Enable support for Drag'n'Drop
+VM_DRAG_AND_DROP="yes"
+
+# Load these modules on startup
+# They must be listed in proper dependency order
+# vmblock module loading is switched by VM_DRAG_AND_DROP variable above
+VM_MODULES=('vmci' 'vsock' 'vmhgfs' 'vmsync')
+
+# vmware-guestd settings
+GUESTD_BIN="/usr/sbin/vmware-guestd"
+PIDFILE="/var/run/vmware-guestd.pid"
Copied: open-vm-tools/repos/community-staging-i686/open-vm-tools.install (from rev 86809, open-vm-tools/trunk/open-vm-tools.install)
===================================================================
--- community-staging-i686/open-vm-tools.install (rev 0)
+++ community-staging-i686/open-vm-tools.install 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,10 @@
+post_install() {
+ [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs
+ echo ">>>"
+ echo ">>> You can mount VMware Shared Folders via:"
+ echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs"
+ echo ">>>"
+ echo ">>> or by adding this line to /etc/fstab:"
+ echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0"
+ echo ">>>"
+}
Copied: open-vm-tools/repos/community-staging-i686/open-vm-tools.rc.d (from rev 86809, open-vm-tools/trunk/open-vm-tools.rc.d)
===================================================================
--- community-staging-i686/open-vm-tools.rc.d (rev 0)
+++ community-staging-i686/open-vm-tools.rc.d 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# source application-specific settings
+[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools
+
+PID=`pidof -o %PPID /usr/bin/vmtoolsd`
+case "$1" in
+ start)
+ stat_busy "Starting Open Virtual Machine Tools"
+
+ if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+ VMBLOCK=`grep -w vmblock /proc/modules`
+ [ -z "$VMBLOCK" ] && modprobe vmblock
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi
+
+ DND_TMPDIR="/tmp/VMwareDnD"
+ if [ ! -d "$DND_TMPDIR" ]; then
+ mkdir $DND_TMPDIR
+ chmod 1777 $DND_TMPDIR
+ fi
+
+ mount -t vmblock none /proc/fs/vmblock/mountPoint
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi
+ fi
+
+
+ for m in ${VM_MODULES[@]}; do
+ VMMOD=`grep -w $m /proc/modules`
+ [ -z "$VMMOD" ] && \
+ { modprobe $m
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi; }
+ done
+
+
+ [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon open-vm-tools
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Open Virtual Machine Tools"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+# if [ $? -gt 0 ]; then
+# stat_fail
+# exit 1
+# fi
+
+ VM_MODULES_RM=()
+ for m in ${VM_MODULES[@]}; do
+ VM_MODULES_RM=($m ${VM_MODULES_RM[@]})
+ done
+
+ for m in ${VM_MODULES_RM[@]}; do
+ VMMOD=`grep -w $m /proc/modules`
+ [ ! -z "$VMMOD" ] && rmmod $m
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 4
+ fi
+ done
+
+ if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+ MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules`
+ [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 5
+ fi
+
+ DND_TMPDIR="/tmp/VMwareDnD"
+ rm -r $DND_TMPDIR
+
+ VMBLOCK=`grep -w vmblock /proc/modules`
+ [ ! -z "$VMBLOCK" ] && rmmod vmblock
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 6
+ fi
+ fi
+
+ rm_daemon open-vm-tools
+ stat_done
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: open-vm-tools/repos/community-staging-i686/scripts-network-FS19541.patch (from rev 86809, open-vm-tools/trunk/scripts-network-FS19541.patch)
===================================================================
--- community-staging-i686/scripts-network-FS19541.patch (rev 0)
+++ community-staging-i686/scripts-network-FS19541.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,38 @@
+--- 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 ..."
+
+- ifup $nic
++ ip link set $nic up
+ exitCode=`expr $exitCode \| $?`
+ fi
+ done < $activeList
+@@ -105,7 +105,7 @@
+ # `which' may be a bit noisy, so we'll shush it.
+ dbusSend=`which dbus-send 2>/dev/null`
+ 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`
+ 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 ifup >/dev/null 2>&1 || Panic "ifup not in search path."
+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path."
+
+ case "$1" in
Copied: open-vm-tools/repos/community-staging-i686/scripts-network.patch (from rev 86809, open-vm-tools/trunk/scripts-network.patch)
===================================================================
--- community-staging-i686/scripts-network.patch (rev 0)
+++ community-staging-i686/scripts-network.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,73 @@
+--- network.org 2012-03-17 22:20:11.000000000 +0400
++++ network 2012-03-17 22:18:47.000000000 +0400
+@@ -34,51 +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"
+-}
+-
+-
+-#
+ # run_network_script --
+ #
+ # Finds out how to run the system's script used to control networking, and
+@@ -87,17 +42,7 @@
+ #
+ run_network_script()
+ {
+- script=`find_networking_script`
+- [ "$script" != "error" ] || Panic "Cannot find system networking script."
+-
+- # Using SysV "service" if it exists, otherwise fall back to run the script directly
+- service=`which service 2>/dev/null`
+- if [ $? = 0 -a -n "$service" ]; then
+- serviceName=`basename "$script"`
+- "$service" "$serviceName" "$1"
+- else
+- "$script" "$1"
+- fi
++ /etc/rc.d/network "$1"
+ }
+
+
Copied: open-vm-tools/repos/community-staging-i686/tools.conf (from rev 86809, open-vm-tools/trunk/tools.conf)
===================================================================
--- community-staging-i686/tools.conf (rev 0)
+++ community-staging-i686/tools.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1 @@
+bindir = "/usr/bin"
Copied: open-vm-tools/repos/community-staging-i686/vmtoolsd.service (from rev 86809, open-vm-tools/trunk/vmtoolsd.service)
===================================================================
--- community-staging-i686/vmtoolsd.service (rev 0)
+++ community-staging-i686/vmtoolsd.service 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Open Virtual Machine Tools (VMware Tools)
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+
+[Install]
+WantedBy=multi-user.target
Copied: open-vm-tools/repos/community-staging-i686/vmware-guestd (from rev 86809, open-vm-tools/trunk/vmware-guestd)
===================================================================
--- community-staging-i686/vmware-guestd (rev 0)
+++ community-staging-i686/vmware-guestd 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth sufficient pam_unix2.so shadow nullok
+auth required pam_unix_auth.so shadow nullok
+account sufficient pam_unix2.so
+account required pam_unix_acct.so
Copied: open-vm-tools/repos/community-staging-i686/xautostart.conf (from rev 86809, open-vm-tools/trunk/xautostart.conf)
===================================================================
--- community-staging-i686/xautostart.conf (rev 0)
+++ community-staging-i686/xautostart.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,6 @@
+gnome-panel
+ksmserver
+startkde
+kwrapper
+panel
+xfce4-panel
Copied: open-vm-tools/repos/community-staging-x86_64/PKGBUILD (from rev 86809, open-vm-tools/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Krzysztof Raczkowski <raczkow at gmail.com>
+
+pkgbase=open-vm-tools
+pkgname=('open-vm-tools' 'open-vm-tools-dkms')
+epoch=1
+pkgver=9.2.2
+_pkgsubver=893683
+pkgrel=7
+pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
+arch=('i686' 'x86_64')
+url="http://open-vm-tools.sourceforge.net/"
+license=('LGPL')
+depends=('libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss' 'iproute2')
+makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst')
+optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm'
+ 'open-vm-tools-modules: for linux kernel'
+ 'open-vm-tools-dkms: for linux-lts and other kernels')
+backup=('etc/conf.d/open-vm-tools'
+ 'etc/pam.d/vmware-guestd')
+options=('docs' '!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz
+ scripts-network.patch
+ scripts-network-FS19541.patch
+ open-vm-tools-X11Bool.patch
+ open-vm-tools.conf.d
+ open-vm-tools.rc.d
+ tools.conf
+ vmware-guestd
+ xautostart.conf
+ modprobe.conf
+ vmtoolsd.service)
+md5sums=('7af505681d736d4c9ee6493b1166689f'
+ 'b8f68fef3d388489e40dba581b6da18a'
+ '507ead54854e49762ca2a6893529c484'
+ '8c333a979578bdc0c3134c1dd6bb7353'
+ '6567ca1b465854f832fc94a4e9faf876'
+ '0848618fa6310294db2752c77ae99865'
+ 'b55d15e2c4be396aad709aeca91033d3'
+ '1b9ae908fce4c623269f100ee9bdfdef'
+ '75a25d83417e683957321f97a00f8465'
+ 'bc5518489077e91655489bd04b868584'
+ 'a6c53243d31c765580f6dded7d5fa98f')
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+ export CFLAGS="-DGLIB_DISABLE_DEPRECATION_WARNINGS ${CFLAGS}"
+ [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules
+ make
+}
+
+package_open-vm-tools() {
+ cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}"
+
+ make install DESTDIR="$pkgdir"
+ install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop
+
+ # vmware-user XDG autostart
+ mkdir -p $pkgdir/etc/xdg/autostart
+ ln -s /usr/share/applications/vmware-user.desktop $pkgdir/etc/xdg/autostart/vmware-user.desktop
+
+ install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de
+ chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper
+
+ cd "$pkgdir"
+ 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 -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools
+ install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools
+ install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf
+ install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf
+ install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd
+ rm -rf "$pkgdir"/usr/etc
+
+ ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs
+
+ cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \;
+ install -Dm644 ${srcdir}/vmtoolsd.service ${pkgdir}/usr/lib/systemd/system/vmtoolsd.service
+
+ rm -f $pkgdir/etc/vmware-tools/scripts/vmware/*.orig
+}
+
+package_open-vm-tools-dkms() {
+ pkgdesc="kernel modules for the open source implementation of VMware Tools"
+ depends=('dkms')
+ provides=('open-vm-tools-modules')
+ conflicts=('open-vm-tools-modules')
+ optdepends=()
+ backup=()
+ install=open-vm-tools-dkms.install
+
+ install -d -m755 ${pkgdir}/usr/src/
+ sh ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/modules/linux/dkms.sh \
+ ${srcdir}/open-vm-tools-${pkgver}-${_pkgsubver}/ \
+ ${pkgdir}/usr/src/
+ install -Dm644 ${srcdir}/modprobe.conf ${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf
+}
Copied: open-vm-tools/repos/community-staging-x86_64/modprobe.conf (from rev 86809, open-vm-tools/trunk/modprobe.conf)
===================================================================
--- community-staging-x86_64/modprobe.conf (rev 0)
+++ community-staging-x86_64/modprobe.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1 @@
+softdep pcnet32 pre: vmxnet
Copied: open-vm-tools/repos/community-staging-x86_64/open-vm-tools-X11Bool.patch (from rev 86809, open-vm-tools/trunk/open-vm-tools-X11Bool.patch)
===================================================================
--- community-staging-x86_64/open-vm-tools-X11Bool.patch (rev 0)
+++ community-staging-x86_64/open-vm-tools-X11Bool.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,15 @@
+diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h
+--- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000
++++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000
+@@ -83,8 +83,11 @@
+
+ /* STRICT ANSI means the Xserver build and X defines Bool differently. */
+ #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__)
++# ifndef _XTYPEDEF_BOOL
++# define _XTYPEDEF_BOOL
+ typedef char Bool;
+ #endif
++#endif
+
+ #ifndef FALSE
+ #define FALSE 0
Copied: open-vm-tools/repos/community-staging-x86_64/open-vm-tools-dkms.install (from rev 86809, open-vm-tools/trunk/open-vm-tools-dkms.install)
===================================================================
--- community-staging-x86_64/open-vm-tools-dkms.install (rev 0)
+++ community-staging-x86_64/open-vm-tools-dkms.install 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,23 @@
+post_install() {
+ echo ">>> Enable building of open-vm-tools modules:"
+ echo ">>> $ dkms add open-vm-tools/${1%-*}"
+ echo ">>>"
+ echo ">>> Enabling vmxnet driver in /usr/lib/modprobe.d/open-vm-tools-modules.conf"
+ echo ">>> (this will disable pcnet32 driver)"
+ echo ">>>"
+ echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually"
+ echo ">>> disable loading of pcnet32 driver"
+ echo ">>>"
+}
+
+post_upgrade() {
+ echo ">>> Enable building of open-vm-tools modules:"
+ echo ">>> $ dkms add open-vm-tools/${1%-*}"
+ echo ">>>"
+}
+
+post_remove() {
+ echo ">>>"
+ echo ">>> Remember to un-blacklist pcnet32 driver"
+ echo ">>>"
+}
Copied: open-vm-tools/repos/community-staging-x86_64/open-vm-tools.conf.d (from rev 86809, open-vm-tools/trunk/open-vm-tools.conf.d)
===================================================================
--- community-staging-x86_64/open-vm-tools.conf.d (rev 0)
+++ community-staging-x86_64/open-vm-tools.conf.d 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,11 @@
+# Enable support for Drag'n'Drop
+VM_DRAG_AND_DROP="yes"
+
+# Load these modules on startup
+# They must be listed in proper dependency order
+# vmblock module loading is switched by VM_DRAG_AND_DROP variable above
+VM_MODULES=('vmci' 'vsock' 'vmhgfs' 'vmsync')
+
+# vmware-guestd settings
+GUESTD_BIN="/usr/sbin/vmware-guestd"
+PIDFILE="/var/run/vmware-guestd.pid"
Copied: open-vm-tools/repos/community-staging-x86_64/open-vm-tools.install (from rev 86809, open-vm-tools/trunk/open-vm-tools.install)
===================================================================
--- community-staging-x86_64/open-vm-tools.install (rev 0)
+++ community-staging-x86_64/open-vm-tools.install 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,10 @@
+post_install() {
+ [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs
+ echo ">>>"
+ echo ">>> You can mount VMware Shared Folders via:"
+ echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs"
+ echo ">>>"
+ echo ">>> or by adding this line to /etc/fstab:"
+ echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0"
+ echo ">>>"
+}
Copied: open-vm-tools/repos/community-staging-x86_64/open-vm-tools.rc.d (from rev 86809, open-vm-tools/trunk/open-vm-tools.rc.d)
===================================================================
--- community-staging-x86_64/open-vm-tools.rc.d (rev 0)
+++ community-staging-x86_64/open-vm-tools.rc.d 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# source application-specific settings
+[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools
+
+PID=`pidof -o %PPID /usr/bin/vmtoolsd`
+case "$1" in
+ start)
+ stat_busy "Starting Open Virtual Machine Tools"
+
+ if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+ VMBLOCK=`grep -w vmblock /proc/modules`
+ [ -z "$VMBLOCK" ] && modprobe vmblock
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi
+
+ DND_TMPDIR="/tmp/VMwareDnD"
+ if [ ! -d "$DND_TMPDIR" ]; then
+ mkdir $DND_TMPDIR
+ chmod 1777 $DND_TMPDIR
+ fi
+
+ mount -t vmblock none /proc/fs/vmblock/mountPoint
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi
+ fi
+
+
+ for m in ${VM_MODULES[@]}; do
+ VMMOD=`grep -w $m /proc/modules`
+ [ -z "$VMMOD" ] && \
+ { modprobe $m
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ fi; }
+ done
+
+
+ [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon open-vm-tools
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping Open Virtual Machine Tools"
+ [ ! -z "$PID" ] && kill $PID &>/dev/null
+# if [ $? -gt 0 ]; then
+# stat_fail
+# exit 1
+# fi
+
+ VM_MODULES_RM=()
+ for m in ${VM_MODULES[@]}; do
+ VM_MODULES_RM=($m ${VM_MODULES_RM[@]})
+ done
+
+ for m in ${VM_MODULES_RM[@]}; do
+ VMMOD=`grep -w $m /proc/modules`
+ [ ! -z "$VMMOD" ] && rmmod $m
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 4
+ fi
+ done
+
+ if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
+ MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules`
+ [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 5
+ fi
+
+ DND_TMPDIR="/tmp/VMwareDnD"
+ rm -r $DND_TMPDIR
+
+ VMBLOCK=`grep -w vmblock /proc/modules`
+ [ ! -z "$VMBLOCK" ] && rmmod vmblock
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 6
+ fi
+ fi
+
+ rm_daemon open-vm-tools
+ stat_done
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: open-vm-tools/repos/community-staging-x86_64/scripts-network-FS19541.patch (from rev 86809, open-vm-tools/trunk/scripts-network-FS19541.patch)
===================================================================
--- community-staging-x86_64/scripts-network-FS19541.patch (rev 0)
+++ community-staging-x86_64/scripts-network-FS19541.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,38 @@
+--- 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 ..."
+
+- ifup $nic
++ ip link set $nic up
+ exitCode=`expr $exitCode \| $?`
+ fi
+ done < $activeList
+@@ -105,7 +105,7 @@
+ # `which' may be a bit noisy, so we'll shush it.
+ dbusSend=`which dbus-send 2>/dev/null`
+ 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`
+ 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 ifup >/dev/null 2>&1 || Panic "ifup not in search path."
+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path."
+
+ case "$1" in
Copied: open-vm-tools/repos/community-staging-x86_64/scripts-network.patch (from rev 86809, open-vm-tools/trunk/scripts-network.patch)
===================================================================
--- community-staging-x86_64/scripts-network.patch (rev 0)
+++ community-staging-x86_64/scripts-network.patch 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,73 @@
+--- network.org 2012-03-17 22:20:11.000000000 +0400
++++ network 2012-03-17 22:18:47.000000000 +0400
+@@ -34,51 +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"
+-}
+-
+-
+-#
+ # run_network_script --
+ #
+ # Finds out how to run the system's script used to control networking, and
+@@ -87,17 +42,7 @@
+ #
+ run_network_script()
+ {
+- script=`find_networking_script`
+- [ "$script" != "error" ] || Panic "Cannot find system networking script."
+-
+- # Using SysV "service" if it exists, otherwise fall back to run the script directly
+- service=`which service 2>/dev/null`
+- if [ $? = 0 -a -n "$service" ]; then
+- serviceName=`basename "$script"`
+- "$service" "$serviceName" "$1"
+- else
+- "$script" "$1"
+- fi
++ /etc/rc.d/network "$1"
+ }
+
+
Copied: open-vm-tools/repos/community-staging-x86_64/tools.conf (from rev 86809, open-vm-tools/trunk/tools.conf)
===================================================================
--- community-staging-x86_64/tools.conf (rev 0)
+++ community-staging-x86_64/tools.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1 @@
+bindir = "/usr/bin"
Copied: open-vm-tools/repos/community-staging-x86_64/vmtoolsd.service (from rev 86809, open-vm-tools/trunk/vmtoolsd.service)
===================================================================
--- community-staging-x86_64/vmtoolsd.service (rev 0)
+++ community-staging-x86_64/vmtoolsd.service 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Open Virtual Machine Tools (VMware Tools)
+ConditionVirtualization=vmware
+
+[Service]
+ExecStart=/usr/bin/vmtoolsd
+
+[Install]
+WantedBy=multi-user.target
Copied: open-vm-tools/repos/community-staging-x86_64/vmware-guestd (from rev 86809, open-vm-tools/trunk/vmware-guestd)
===================================================================
--- community-staging-x86_64/vmware-guestd (rev 0)
+++ community-staging-x86_64/vmware-guestd 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth sufficient pam_unix2.so shadow nullok
+auth required pam_unix_auth.so shadow nullok
+account sufficient pam_unix2.so
+account required pam_unix_acct.so
Copied: open-vm-tools/repos/community-staging-x86_64/xautostart.conf (from rev 86809, open-vm-tools/trunk/xautostart.conf)
===================================================================
--- community-staging-x86_64/xautostart.conf (rev 0)
+++ community-staging-x86_64/xautostart.conf 2013-03-22 11:49:32 UTC (rev 86810)
@@ -0,0 +1,6 @@
+gnome-panel
+ksmserver
+startkde
+kwrapper
+panel
+xfce4-panel
More information about the arch-commits
mailing list