Version bump (bug #471104 by Dustin C. Hatch). Fixes bug #460224 by Toei Rei. Patch by William Cooke.

(Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key 30427902)

3 files changed, 100 insertions, 1 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index 1dfffb49f994..36fc480b9c5c 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.32 2013/06/16 12:16:03 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.33 2013/06/22 23:27:33 phajdan.jr Exp $
+
+*open-vm-tools-kmod-2013.04.16.1098359 (22 Jun 2013)
+
+  22 Jun 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +open-vm-tools-kmod-2013.04.16.1098359.ebuild, +files/putname.patch:
+  Version bump (bug #471104 by Dustin C. Hatch). Fixes bug #460224 by Toei Rei.
+  Patch by William Cooke.
 
   16 Jun 2013; Vadim Kuznetsov vadimk@gentoo.org metadata.xml:
   dropped myself as a maintainer. maintainer needed
diff --git a/app-emulation/open-vm-tools-kmod/files/putname.patch b/app-emulation/open-vm-tools-kmod/files/putname.patch
new file mode 100644
index 000000000000..b605e12fa07f
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/files/putname.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/linux/vmblock/linux/control.c b/modules/linux/vmblock/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/modules/linux/vmblock/linux/control.c
++++ b/modules/linux/vmblock/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
++   __putname(name);
+ 
+    return retval;
+ }
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
new file mode 100644
index 000000000000..7b3da1332228
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild,v 1.1 2013/06/22 23:27:33 phajdan.jr Exp $
+
+EAPI="4"
+
+inherit eutils linux-info linux-mod versionator
+
+MY_PN="${PN/-kmod}"
+MY_PV="$(replace_version_separator 3 '-')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	"
+
+CONFIG_CHECK="
+	~DRM_VMWGFX
+	~VMWARE_BALLOON
+	~VMWARE_PVSCSI
+	~VMXNET3
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	VMWARE_MOD_DIR="modules/linux"
+	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
+
+	MODULE_NAMES=""
+	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
+
+	for mod in ${VMWARE_MODULE_LIST};
+	do
+		if [ "${mod}" == "vmxnet" ];
+		then
+			MODTARGET="net"
+		else
+			MODTARGET="openvmtools"
+		fi
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
+	done
+}
+
+src_prepare() {
+	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
+		|| die "Sed failed."
+	epatch "${FILESDIR}/frozen.patch"
+	epatch "${FILESDIR}/putname.patch"
+	epatch_user
+}
+
+src_configure() {
+	:				# do nothing at all
+}
+
+src_install() {
+	linux-mod_src_install
+
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	insinto /lib/udev/rules.d/
+	doins "${udevrules}"
+}