putname patch. Bug 447154.

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

4 files changed, 102 insertions, 16 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 2987275933dd..78a2bc6f1690 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.99 2012/12/12 11:46:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.100 2012/12/16 14:19:07 vadimk Exp $
+
+*vmware-modules-271.1-r1 (16 Dec 2012)
+
+  16 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org +files/271-putname.patch,
+  +vmware-modules-271.1-r1.ebuild:
+  putname patch. Bug 447154.
 
   12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   vmware-modules-238.6.ebuild, vmware-modules-264.4.ebuild,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 1eb11aa2e470..9ddee6a1a6aa 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 238-2.6.39.patch 8566 SHA256 31e68e9897660cc8ff898eae1d722d616205fff1efd30cd8e042a3a455bd2350 SHA512 c52c1ea600103971fdbb288868f6302ba82b5a79308ff147b342752f8f63cfe30b8aeb88801318040cfe8854535fbfedf692f7f31f8bcaf0b180baeae7d43d46 WHIRLPOOL 8725ca46300a32e471aeb403c1ff251e9d687697b656cb91e7f0a5cf94d4cbede9e154a97c9c07e66da908331bb60cb0438a29e11aedaecc2c4dcc36d7f8f802
 AUX 238-3.2.0.patch 3533 SHA256 df2bf5a026281559ba6e0d364555c8f48024b7ce2231c652960b5c477cc4545a SHA512 431a77943ce0c7d1ade35534baddae12d413f7209f068af1f08f0f63e9614d488454a613551970f096652b36519e751ea3dc01056c7e930e2867c548fffea12e WHIRLPOOL d2ee45366fd3491cf4686cdce67d3ce80cdc1a7f16869beb6ad30c6cb2ffc488018e4f61ebde6246112d52727da211adedf2ab0b90c466ea4c1a2dd2d2722c14
 AUX 238-d-make-root.patch 418 SHA256 097a4be57e19b9342d2aab6d2f354969dd7e596efeef60465fd9bf818dadcd8a SHA512 948e4ef1d57e720178f8995ecd47987cf5a34981b959dccd5f8d16a214ff9261e6547a72efaa44dae920b2184aee0d65190be5b72f1d87fb760286278a789255 WHIRLPOOL b7cda3432c7cc9103d5c2b0457e7fdfc20c7c209827be61a46e6e99566aac7977a122e7de4c59468d053e664b162329bae3b5131ea3f8de3db72634179d4c48e
@@ -21,21 +18,12 @@ AUX 271-apic.patch 302 SHA256 60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236a
 AUX 271-makefile-include.patch 2501 SHA256 208121855fe18ecb279ff40f2833463559363461c2170d32c17040211a01f169 SHA512 c498c025c7eb025f6554cee683242dd73e4a284e4b28c95b75339f4f4a912a156acc1845881fbd78bf399c2092af7413f5d6c4782cd066527ea275518b411c1d WHIRLPOOL e03a6d7139ab7b309e0ca1527cb8b52a8f84f5f5d997a510305d2a6ccdd39f33b18c7276df8ac78d92d2a17a66236f582baaa5e374069d3912090544908a0338
 AUX 271-makefile-kernel-dir.patch 2153 SHA256 d76b1028d21b804836e36478d243cd7914435a34f3fe014058e0a9cc7a020653 SHA512 f18339dc8ac4c864b0c2fb234ad2db8f4638a5cd28e8fd11b5593c82107925b41b42e0d0acac52232a373780d79a3e397f70886534cdf889055e86cfda718f62 WHIRLPOOL 70c869bf4efab6843856addd0c5f5a295ed2fe38f9fc2a8ab2ca55523cd39cb92018d6bd0dac75658fa0f5260962c98f0bbd001593f3f11c2d204c693061c5b6
 AUX 271-netdevice.patch 833 SHA256 8f17ce379abda45a8f94e1dcd6e43367273f97f76edd41f9941beb3b1730a751 SHA512 b4ec7c1694968a1843f10e8bfe0dbfdc99bd3b5fc1391456d91a3648b848b82df681a0748d967afa19e728c4d19b79b6a3cb9fd3e15a52a5cab048a6ac9b06a9 WHIRLPOOL b0cabe2ec1b8ca52d427c02593d6057c98d4ed00c578d006de65460138c37a5be76a7938d85f5a35eb6f49ee5e34065ce62b60a51b0ccf021639a59b27aeac8a
+AUX 271-putname.patch 394 SHA256 b8103d3c72c24696e974e49dcdcdf2d5a2b2c2fdd5f6ca050842b840e906ba77 SHA512 86a0a0ec3ff225940190056e85d498fd7eb260bcc52882fea8921398f572bc46f56c3f2941d3f3d1587a07bc72c8885cbddacf632d2b5fed7d8c9d284399d6d8 WHIRLPOOL e1e8afcafe00131fd6d90b61e5d911da69d7c26b7fd19be085eb5cfd23c2ab19784ae5ddf18928f9cc4a178d87c6d51e8de27dfab8507e2d57fc18868fde9f45
 AUX 271-vmmon.patch 1581 SHA256 a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979 WHIRLPOOL 28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
 AUX hardened.patch 5052 SHA256 191cf892bfb9a6288d110191de824bf6243bc6f48f1e62ab49f3582c7ade5af6 SHA512 52dcca8d9f689f0a0d0ca369c0c7ce0d177de3529d2d1325330eb5a9e940a55e8930bbbe7374793bdf29cbdefac9727e9eb21d00f81ad4f5eddba3a51597b7a5 WHIRLPOOL 539731bc36f3e292403f55d74c353deeb28baa312f726b36d2a6060adf3483dfa2ed011baf93eff941fa754ef62f4d6da86868c40550ee2292c4a711e061bde0
 EBUILD vmware-modules-238.6.ebuild 2131 SHA256 4cffe7a701d5d75a213a30de320c90dee94eb812b2f18e834732e9f196265e3d SHA512 3197cc418b413897d240e2ddb81699eae2a64bc364537390a1797af01803ed4b73b495a9c854b7ff9f3f32265608253c69c0cd4d02ee5d2438676a63e4fed3d3 WHIRLPOOL 55295b53f8778b35f9de640c2d9cff8dee4b05fcad3361097b05e58960eda7ae6f8ec8b1d86f50543ce540a98e214249ea80995693a00bf8a16f4e0e835a0217
 EBUILD vmware-modules-264.4.ebuild 2101 SHA256 1e180351d7a30638a40b7dbdb03e4478799464ea0ad445389be1d3faa373c854 SHA512 d74a3892d05cde1d3a22511e8f08d13e7da3c9ed80e57aca4bbb6d744a092619c818ccf43af61f06f8617660dc493e3d70f376083eadc67a9b26f1c10f8f1ce3 WHIRLPOOL 4c2c5c6ca58354d476d912ac32531075e46537d372d32260ed5c30ade8199004be916f5d86ed9cfcfe780955cce654dcabffd032b2e6b9e5ae8f4a76ad7a15f3
+EBUILD vmware-modules-271.1-r1.ebuild 2020 SHA256 da994f79de444aebb32b501fa7b81d29168383d2e314aa040c784acbe275bed5 SHA512 1e49688ac23cb06683f2c6bf3bce8021767ed50bcc38fd3ceefbeb511797df4805535074dba2c8e9330c7f669f8e60f5db742fde01b779540b6ab1b04e05020a WHIRLPOOL 9e49600b5bdab7ed25887c0071fcc088c471d0a7f0bd8e76a85e69f6a2ec21a57459337f47e59afdf2cbd16f88084c93fc63076ab957ec33774d3b70100925f7
 EBUILD vmware-modules-271.1.ebuild 1953 SHA256 759634a861152f2e51a00d335e265d514c04b02942b9c0dc3750fdf623ce189b SHA512 8fb96791d5271e218f8ca9b16aef8b0742be0a00a595f3e62256ea93948e04aa7ce4758520b4119add40d1039805df6cb26ec15c4618f00297bf4bcf10273435 WHIRLPOOL b171e7de31b14f4b4bb9d7e4494f01b4ab1d385268c09bc961fa327404319a65592fe77159b2ca137ebcbd43123f73c73b15340a7fbb985461da3bfef0d61ec7
-MISC ChangeLog 21958 SHA256 e8311ae1a436da40232ea67eac3c3bf1cf902fa05c842a1662406784c97f463e SHA512 0f6a30deb2d906ec4896ac592ab069ee7e8148c2940bdaf3f0012557a7114b42d9768f042f2c00e53709c33d6fae99d21bfdbd44349e7b6f256170329159a676 WHIRLPOOL 677a5114b0b838587625c47adcadad509f599ca4e77e2bcfa21c7114787b0e6b7537d911af7d858dba43d76ed3ef637967a4d6222dff97cf4ea4681e156bcfa4
+MISC ChangeLog 22136 SHA256 49bcdd64ec51052819f0b92812b9ec4cf32c7a2fa6d377d811baa8805b070d79 SHA512 0ae4d21e39e5dde3ecbe2b9762aded4d8e8a137dbbc8184370b988f9e1491ca4da9b3a900ed470b76b20683878a2582bb20b6c2ddef99d02b5d3dab00139ba1d WHIRLPOOL 5bd750679aa17200a87df4c6be5a99a88e91cc314f61021a911639fbe93e6e42c5b46bedcfd0fc450705d222f74100bbc9256bba50c932250bdc754e967e110c
 MISC metadata.xml 382 SHA256 1d7ec802d18a99c79283d3c21dd905ca3e74738bf8627e16412a67ce0af50361 SHA512 484f74a5c3c8af11c77fce53ad44dcbfdc416156db505b95a4cca7b308d8d1337e7b18e7966a20d4c1f4e50495f021d11e534c69e885a65b44c15d3e910ec319 WHIRLPOOL f99943e161bd6e2b518c2e11c23c5ed5564ad9bc28ae406df0f08de22a2d5ec7f752361fc02ff18040884f79269f723594d40574584d269f3220a0e09aaee1e4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQyG6yAAoJEEdUh39IaPFNYHcH/iQnJYpXCGVer+HBt13kpQ8o
-fIzRHtMgU7Wye8kvgkikPqGHtTZ3tXhnfbmyAyFP/pANIFdz943osw3OREUsI2l4
-gG0nli35t48kTY5xSztuCmgN2uFnzNwG9D33n/Mp+tTN0xiTyy3FfQ5t3is776M/
-i8o9iXyoS+pdWskzNC0qVmAqwyH0kVHotsFCBaPZMmLQKbH3nfCyigI37M6/Z1XI
-7HCzE9+EIVUWVK3DkWIMe0OEU6H+PXIWBIif+lm+uNEsLDUtBxFQnjjA3SDdThuX
-Q7Tuq/JRFquqm+i/pqOt5cYBLoliQI/o3z+dwdZwPdyroKVAK+6nRJ5rBzzjw14=
-=//64
------END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-modules/files/271-putname.patch b/app-emulation/vmware-modules/files/271-putname.patch
new file mode 100644
index 000000000000..6e76130fa165
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-putname.patch
@@ -0,0 +1,13 @@
+diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/vmblock-only/linux/control.c
++++ b/vmblock-only/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/vmware-modules/vmware-modules-271.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
new file mode 100644
index 000000000000..eadb6d7b785d
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1-r1.ebuild,v 1.1 2012/12/16 14:19:07 vadimk Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE=660
+		KERNEL=="vmmon", GROUP="vmware", MODE=660
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	udev_dorules "${udevrules}"
+}