version bump. bug 438110

Package-Manager: portage-2.1.11.34/cvs/Linux x86_64

5 files changed, 124 insertions, 7 deletions

diff --git a/app-emulation/open-vm-tools-kmod/ChangeLog b/app-emulation/open-vm-tools-kmod/ChangeLog
index 9209b744ed3c..9a928f6a03fc 100644
--- a/app-emulation/open-vm-tools-kmod/ChangeLog
+++ b/app-emulation/open-vm-tools-kmod/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/open-vm-tools-kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.28 2012/06/02 14:45:23 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.29 2012/12/09 14:11:50 vadimk Exp $
+
+*open-vm-tools-kmod-9.2.2.893683 (09 Dec 2012)
+*open-vm-tools-kmod-2012.10.14.874563 (09 Dec 2012)
+
+  09 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org +files/frozen.patch,
+  +open-vm-tools-kmod-2012.10.14.874563.ebuild,
+  +open-vm-tools-kmod-9.2.2.893683.ebuild,
+  -open-vm-tools-kmod-2012.03.13.651368-r1.ebuild:
+  version bump. bug 438110
 
 *open-vm-tools-kmod-2012.05.21.724730 (02 Jun 2012)
 
@@ -177,4 +186,3 @@
   29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
   +open-vm-tools-kmod-0.0.20091015.201664.ebuild, +metadata.xml:
   open-vm-tools kernel modules.
-
diff --git a/app-emulation/open-vm-tools-kmod/Manifest b/app-emulation/open-vm-tools-kmod/Manifest
index 270c718c71e7..5bbc876fd466 100644
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@@ -1,9 +1,12 @@
 AUX fragsize.patch 4543 SHA256 fee39ad39fb9d3d84bfa09b7a51096ffc7d1f65f78a227ab591c0c006eef9f8e SHA512 96566f82bf7b0fa78444823062d847e73a9b3020c6b873a6c838efe8ad2b1a317f7b1acaf55bb4f24d1d4974dd78f4baf2091d3dac6a4dfad6172af7a4188c82 WHIRLPOOL 762534c4b1c088df67dfc0f1ae6fdf0c3b5014bc2946a50d0571a5df14d726e25f056f9bf670142240885d307e82fe0d5b3a0b14dd41e67a6b7cc04662677a67
-DIST open-vm-tools-2012.03.13-651368.tar.gz 3551741 SHA256 f173071705aec3c835d2a2d3f8ae8178defff216c706b23765d0c932171e6795 SHA512 75ee74b0f15427dd41e9005da5444e88ba45d65b808977f232466fef851331d620bcf6c5fd2187eb700792804ca07b68de9b82231281b8883d8ea2dcd978cad4 WHIRLPOOL 7d013eaed0b940b0e36c4cc254845091caac41b03d0bcc8088736b67f68548150456b07522ed036b7f37f0060f78d07e10c7d5fa1e60bc8f6ce94803f5e1253c
+AUX frozen.patch 1155 SHA256 5997f5aa4d1d2bb262b9ef24888d4706f1227af4d359862d3d49b4e6c961d193 SHA512 5dbee1a119d6abd13b8217d66b8f611fee92c863b0d48029b1c05f33a06f6a20f35eaf6f01fb268a811270c6c799a1fef26939f7bfc97a42421e7f14b4cfa46d WHIRLPOOL 34244123ac2eebe6aa9d144f2af12304c1355f455b4b04b15ff5f949ffa0b23c62d40436b16371e3c5055b94afd51b2dd9ea3f92864d4f597c9b568814e3fa48
 DIST open-vm-tools-2012.05.21-724730.tar.gz 3567582 SHA256 c7daaaf0ed031cd36295cf10d51dbbdedeb1eb0015e49f0806620792f8dab71b SHA512 54f3d1f052720994432c2b657d8f6c3b16a90aae39e9fec2671def34d57019b58e1f4a8e626b390a79de5d33665a2f8f76e42b9ef110ecb46dddfd27538cd6e7 WHIRLPOOL eaf241384222c0d3591ddc6fda2fa4e5d4ed3ca524309673779685e34f30b1b241bd844f99ed5eb104f60bec7f822db96d09a21a8107b8620213fd4a0aeb57d8
+DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb
 DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56
-EBUILD open-vm-tools-kmod-2012.03.13.651368-r1.ebuild 1664 SHA256 dafc5a350c7366eb164d48d7c0901f03611f50234d25c5542f718403e5cd2339 SHA512 c0e2bf6eddb80b5850d2e0c9ca53122a2aef2fe80771bdcce1199aff55554f617c266bffd6264e4fa110832d0886bcac1f2de198b03683be5c2223728984ecef WHIRLPOOL 1c55eee800524adbb4a1d065fdb5a39e81f70588390948e94d65baa46aaccd14fcefb876a8d31be645a2c603ae24eb7aa99bdd4f7402bfee09657300dafbb859
+DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872
 EBUILD open-vm-tools-kmod-2012.05.21.724730.ebuild 1661 SHA256 9818630844eb571800f57054eab78c93b7cf425992090568677713bd55a5ec93 SHA512 dc12d25b5cd68ecfed140905ad61376ad5a0aea5a6782649c1f362fc21f37c6a151fd590325078316625cef420996f32880c9766daadc78df1254c88f2c21cf2 WHIRLPOOL fc8a642bc4ec55331938437573f955fdfbcb64f57ef028deba0db2806ed5ed2b4d7eeb3d3e018cb8699906fb2cb44ce5f91831c1676f92c90d4705f9734bd593
+EBUILD open-vm-tools-kmod-2012.10.14.874563.ebuild 1703 SHA256 6a93e1e0bc2a54dac7a4e081319e254dd187959e82da087e63db9a5277d8b797 SHA512 660c412cf8a467e75bd6f2816def470795f3f33cb80fde11c4325b930583ddee191286b8bf599f14fa6e39bd84970111bfd70dfb0a26c2831caf34ea1fe00a2d WHIRLPOOL 5060e3f38af9527e9852d832fd5d567cdff58b7951a80791519d3b001b1278a106e67897cbbbdca136ef28acfef1357945af3e6cc1fb4450e1b25f2b8e7a3aa9
 EBUILD open-vm-tools-kmod-8.8.2.590212-r1.ebuild 1725 SHA256 6ddf95d775557421df79417fe03cc5bc24f9cc6eb29588b5f359ce6a3589c78c SHA512 4140ccfbe11beb28e6b9f7868c630a23929d4962a43d5d26127587f296d2578a7d108a9af0648673c8f82e46208442644e8324f3b5e676f3c9cd8787ae96a65a WHIRLPOOL 8b0c0ceb3c064ed39f248a21acae40501c0718635adba612eaeb8df96264c3792bfa7832550de36b7aa5b9c6c5f855a473179af90ba7f62b50267a55f05f0837
-MISC ChangeLog 5958 SHA256 ae9bf8515e90bafbf12294545e41c3bd902a3b9d50faeb99f14b1ba08ad7f2bb SHA512 c984289b4dd4a043bf58d9ce91af2fb904a4ec327d18ffe8ef8a4b7294ec828a3a91e7666c0fe8b6748c8d9a6fb19941b7675827558369cb39eeb67b303b2ab8 WHIRLPOOL 4f0b7427fe79bbe2ac6b18529c6b6527f80486003d8863832ed4630a305ffbdd9ff8d4e95261dc0f6f327f153ea528b2c45e01725c8da3cdf57653e7e3f26f20
+EBUILD open-vm-tools-kmod-9.2.2.893683.ebuild 1757 SHA256 64055ed5f59c14c3be9a46858ed03e6665e0d6a36711ba7b68a0ff7b1404de56 SHA512 e5dba9b76dae45aac8a932cd687637e43bb5a00016c2ba24a4d686e6af0b601bea98ea4e15bd7aa3991a8a708fa3c761806f7369b8df72506816a0a9e4dc0f9b WHIRLPOOL 70f62b322bdd9ab163436bd5a0b7a5b5124970a4ee07cf8a22086f80db69dc5e6e43a5b32a931f33bbda02da5460b0b36a685c1837c05fecf50fb505a5b5d279
+MISC ChangeLog 6297 SHA256 898c0de052ba99584ca6e883f7992389899ca5ab24c39720ebe6f6d43eb0a150 SHA512 8ec0c254b49e6715c46ccabcb9d6ffbc30fb7b3abb3e051ee31dbe3b3754299c76eefc8279d59ef87f518a0470df8434e4b7eae3d044fd937ddeb0475a129abc WHIRLPOOL d4fb5a2a8b75a58f036635ad9ef2351a2ab65c1a507f2417173a18f7971d14c16b278c65ce1b581159aa0bd45acf1a309ec5f3fc370a1600db92cd52c9c81ff4
 MISC metadata.xml 503 SHA256 bed306dcff1b6d4243cf63ba912c88d3a630081501891687925c9dbf37995e00 SHA512 9f7ac6a572ec1894ffabb85c00a8842fc9b2b4d523d1b90a4f2a53218d8808b4fac6ea47d77af182c5ba0040534c87cc47d7367565ac4a089260a84b7a20b550 WHIRLPOOL 7a3eee23b867eeeb94a00fa1aca193980288c60ff7cef4b6b338369fb0bedd5950a107bca059cb6e0c7e23afdc05c9f13f8bccaedcd22edc525a189d29afa396
diff --git a/app-emulation/open-vm-tools-kmod/files/frozen.patch b/app-emulation/open-vm-tools-kmod/files/frozen.patch
new file mode 100644
index 000000000000..8b3fd7f37910
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/files/frozen.patch
@@ -0,0 +1,28 @@
+diff -urpN a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
+--- a/modules/linux/vmsync/sync.c	2012-08-01 19:02:59.000000000 -0700
++++ b/modules/linux/vmsync/sync.c	2012-10-14 07:38:18.000000000 -0700
+@@ -162,7 +162,11 @@ VmSyncThawDevices(void  *_state)  // IN
+    cancel_delayed_work(&state->thawTask);
+    list_for_each_safe(cur, tmp, &state->devices) {
+       dev = list_entry(cur, VmSyncBlockDevice, list);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++      if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+       if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
++#endif
+          thaw_bdev(dev->bdev, dev->sb);
+          atomic_dec(&gFreezeCount);
+       }
+@@ -237,7 +241,11 @@ VmSyncAddPath(const VmSyncState *state,
+     * the superblock is already frozen.
+     */
+    if (inode->i_sb->s_bdev == NULL ||
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
++       inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
++#else
+        inode->i_sb->s_frozen != SB_UNFROZEN) {
++#endif
+       result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
+       compat_path_release(&nd);
+       goto exit;
+
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.03.13.651368-r1.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild
index 11922cc422b3..a9351b7e7c23 100644
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.03.13.651368-r1.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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-2012.03.13.651368-r1.ebuild,v 1.1 2012/03/26 15:54:37 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2012.10.14.874563.ebuild,v 1.1 2012/12/09 14:11:50 vadimk Exp $
 
 EAPI="4"
 
-inherit linux-info linux-mod versionator
+inherit eutils linux-info linux-mod versionator
 
 MY_PN="${PN/-kmod}"
 MY_PV="$(replace_version_separator 3 '-')"
@@ -58,6 +58,7 @@ pkg_setup() {
 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"
 }
 
 src_configure() {
diff --git a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild
new file mode 100644
index 000000000000..111fdd9445e0
--- /dev/null
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-9.2.2.893683.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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-9.2.2.893683.ebuild,v 1.1 2012/12/09 14:11:50 vadimk 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."
+	#kernel_is ge 3 2 0 && epatch "${FILESDIR}/fragsize.patch"
+	epatch "${FILESDIR}/frozen.patch"
+}
+
+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}"
+}