VMware desktop build 703057

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

5 files changed, 17 insertions, 109 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 00f305727aba..5a331430a89e 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2012/03/26 16:14:40 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.92 2012/05/05 14:51:31 vadimk Exp $
+
+*vmware-modules-264.3 (05 May 2012)
+
+  05 May 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-264.3.ebuild,
+  -files/264.2-3.2.0.patch, -vmware-modules-264.2-r1.ebuild,
+  files/264-3.2.0.patch, metadata.xml:
+  VMware desktop build 703057
 
 *vmware-modules-264.2-r1 (26 Mar 2012)
 *vmware-modules-238.5-r1 (26 Mar 2012)
diff --git a/app-emulation/vmware-modules/files/264-3.2.0.patch b/app-emulation/vmware-modules/files/264-3.2.0.patch
index 5baa61df9e9d..87f89147e2b4 100644
--- a/app-emulation/vmware-modules/files/264-3.2.0.patch
+++ b/app-emulation/vmware-modules/files/264-3.2.0.patch
@@ -1,20 +1,3 @@
-diff --git a/vmmon-only/linux/iommu.c b/vmmon-only/linux/iommu.c
-index c692c2d..501d602 100644
---- a/vmmon-only/linux/iommu.c
-+++ b/vmmon-only/linux/iommu.c
-@@ -42,6 +42,12 @@
- #define PCI_BDF_SLOTFUNC(bdf) PCI_DEVFN(PCI_SLOT(bdf), PCI_FUNC(bdf))
- #define PCI_BDF_BUS(bdf)      (((bdf) >> 8) & 0xff)
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/pci.h>
-+#define iommu_found() iommu_present(&pci_bus_type)
-+#define iommu_domain_alloc() iommu_domain_alloc(&pci_bus_type)
-+#endif
-+
- typedef struct PassthruDevice {
-    uint32 bdf;
-    struct pci_dev *pdev;
 diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
 index 491add5..74f7a3b 100644
 --- a/vmnet-only/filter.c
diff --git a/app-emulation/vmware-modules/files/264.2-3.2.0.patch b/app-emulation/vmware-modules/files/264.2-3.2.0.patch
deleted file mode 100644
index 87f89147e2b4..000000000000
--- a/app-emulation/vmware-modules/files/264.2-3.2.0.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/vmnet-only/filter.c b/vmnet-only/filter.c
-index 491add5..74f7a3b 100644
---- a/vmnet-only/filter.c
-+++ b/vmnet-only/filter.c
-@@ -40,6 +40,10 @@
- #include "vnetInt.h"
- #include "vmnetInt.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+#include <linux/export.h>
-+#endif
-+
- // VNet_FilterLogPacket.action for dropped packets
- #define VNET_FILTER_ACTION_DRP         (1)
- #define VNET_FILTER_ACTION_DRP_SHORT   (2)
-diff --git a/vmnet-only/netif.c b/vmnet-only/netif.c
-index 4bdb643..5b71339 100644
---- a/vmnet-only/netif.c
-+++ b/vmnet-only/netif.c
-@@ -62,7 +62,9 @@ static int  VNetNetifClose(struct net_device *dev);
- static int  VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev);
- static struct net_device_stats *VNetNetifGetStats(struct net_device *dev);
- static int  VNetNetifSetMAC(struct net_device *dev, void *addr);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- static void VNetNetifSetMulticast(struct net_device *dev);
-+#endif
- #if 0
- static void VNetNetifTxTimeout(struct net_device *dev);
- #endif
-@@ -131,7 +133,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-       .ndo_stop = VNetNetifClose,
-       .ndo_get_stats = VNetNetifGetStats,
-       .ndo_set_mac_address = VNetNetifSetMAC,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-       .ndo_set_multicast_list = VNetNetifSetMulticast,
-+#endif
-       /*
-        * We cannot stuck... If someone will report problems under
-        * low memory conditions or some such, we should enable it.
-@@ -152,7 +156,9 @@ VNetNetIfSetup(struct net_device *dev)  // IN:
-    dev->stop = VNetNetifClose;
-    dev->get_stats = VNetNetifGetStats;
-    dev->set_mac_address = VNetNetifSetMAC;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
-    dev->set_multicast_list = VNetNetifSetMulticast;
-+#endif
-    /*
-     * We cannot stuck... If someone will report problems under
-     * low memory conditions or some such, we should enable it.
-@@ -612,11 +618,12 @@ VNetNetifSetMAC(struct net_device *dev, // IN:
-  *----------------------------------------------------------------------
-  */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- void
- VNetNetifSetMulticast(struct net_device *dev) // IN: unused
- {
- }
--
-+#endif
- 
- /*
-  *----------------------------------------------------------------------
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index 541187b..77e0089 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -517,10 +517,18 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
- 	 unsigned int tmpCsum;
- 	 const void *vaddr;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+	 vaddr = kmap(skb_frag_page(frag));
-+#else
- 	 vaddr = kmap(frag->page);
-+#endif
- 	 tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
- 					 curr, frag->size, 0, &err);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)
-+	 kunmap(skb_frag_page(frag));
-+#else
- 	 kunmap(frag->page);
-+#endif
- 	 if (err) {
- 	    return err;
- 	 }
diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index 9deb3119be16..2efced2927d2 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -8,4 +8,7 @@
 	<longdescription>
 		VMware kernel modules.
 	</longdescription>
+	<use>
+    	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
index 520cb4188816..45cbd8c95e49 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.3.ebuild
@@ -1,8 +1,8 @@
 # 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-264.2-r1.ebuild,v 1.1 2012/03/26 16:14:40 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.3.ebuild,v 1.1 2012/05/05 14:51:31 vadimk Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils flag-o-matic linux-info linux-mod versionator
 
@@ -17,7 +17,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hardened"
+IUSE="pax_kernel"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -63,8 +63,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	epatch "${FILESDIR}/${PV}-3.2.0.patch"
-	use hardened && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
+	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 }
 
 src_install() {