vmware-mod preparations for workstation version 6

vmware fixes for pax markings

2 files changed, 18 insertions, 11 deletions

diff --git a/eclass/vmware-mod.eclass b/eclass/vmware-mod.eclass
index c82d2ebc90c0..1bfcb572f2de 100644
--- a/eclass/vmware-mod.eclass
+++ b/eclass/vmware-mod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-mod.eclass,v 1.6 2006/11/22 17:16:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-mod.eclass,v 1.7 2007/01/05 17:52:20 ikelos Exp $
 
 
 # Ensure vmware comes before linux-mod since we want linux-mod's pkg_preinst and
@@ -37,14 +37,16 @@ vmware-mod_pkg_setup() {
 
 	vmware_determine_product
 
-	case ${product} in
-		vmware-tools)
-			VMWARE_MODULE_LIST="vmdesched vmhgfs vmmemctl vmxnet"
-			;;
-		*)
-			VMWARE_MODULE_LIST="vmmon vmnet"
-			;;
-	esac
+	if [[ -z "${VMWARE_MODULE_LIST}" ]]; then
+		case ${product} in
+			vmware-tools)
+				VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST}vmdesched vmhgfs vmmemctl vmxnet"
+				;;
+			*)
+				VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST}vmmon vmnet"
+				;;
+		esac
+	fi
 
 	for mod in ${VMWARE_MODULE_LIST}; do
 	MODULE_NAMES="${MODULE_NAMES}
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass
index 590536326ca8..90cc1d621e44 100644
--- a/eclass/vmware.eclass
+++ b/eclass/vmware.eclass
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.18 2006/12/01 09:38:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.19 2007/01/05 17:52:20 ikelos Exp $
 
 # This eclass is for all vmware-* ebuilds in the tree and should contain all
 # of the common components across the multiple packages.
 
 # Only one package per "product" is allowed to be installed at any given time.
 
-inherit eutils
+inherit pax-utils eutils
 
 EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_setup src_install src_unpack pkg_postrm
 
@@ -141,6 +141,11 @@ vmware_src_unpack() {
 			fi
 		fi
 
+		# Remove PAX MPROTECT flag from all applicable files in /bin, /sbin for
+		# the vmware package only (since modules, tools and console should not
+		# need to generate code on the fly in memory).
+		[[ "${product}" == "vmware" ]] && pax-mark -m $(list-paxables ${S}/{bin,sbin}/{vmware-serverd,vmware-vmx})
+
 		# Run through any patches that might need to be applied
 		cd "${S}"
 		if [[ -d "${FILESDIR}/${PV}" ]]