From 60d678fe9b953c6e15d9239589322ec08a66e261 Mon Sep 17 00:00:00 2001 From: Justin Riley Date: Thu, 13 Mar 2014 13:40:51 -0400 Subject: vmware-modules: fix for kernel 3.12.13 --- app-emulation/vmware-modules/ChangeLog | 651 +++++++++++++++++++++ app-emulation/vmware-modules/files/279-apic.patch | 12 + .../vmware-modules/files/279-hardened.patch | 113 ++++ .../files/279-makefile-include.patch | 65 ++ .../files/279-makefile-kernel-dir.patch | 85 +++ .../vmware-modules/files/279-netdevice.patch | 24 + .../vmware-modules/files/279-putname.patch | 13 + .../vmware-modules/files/279-userns.patch | 37 ++ .../vmware-modules/files/279-vmblock-3.11.patch | 89 +++ .../vmware-modules/files/279-vmblock-3.12.patch | 69 +++ .../vmware-modules/files/279-vmblock.patch | 23 + app-emulation/vmware-modules/metadata.xml | 11 + .../vmware-modules/vmware-modules-279.1.ebuild | 86 +++ 13 files changed, 1278 insertions(+) create mode 100644 app-emulation/vmware-modules/ChangeLog create mode 100644 app-emulation/vmware-modules/files/279-apic.patch create mode 100644 app-emulation/vmware-modules/files/279-hardened.patch create mode 100644 app-emulation/vmware-modules/files/279-makefile-include.patch create mode 100644 app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch create mode 100644 app-emulation/vmware-modules/files/279-netdevice.patch create mode 100644 app-emulation/vmware-modules/files/279-putname.patch create mode 100644 app-emulation/vmware-modules/files/279-userns.patch create mode 100644 app-emulation/vmware-modules/files/279-vmblock-3.11.patch create mode 100644 app-emulation/vmware-modules/files/279-vmblock-3.12.patch create mode 100644 app-emulation/vmware-modules/files/279-vmblock.patch create mode 100644 app-emulation/vmware-modules/metadata.xml create mode 100644 app-emulation/vmware-modules/vmware-modules-279.1.ebuild diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog new file mode 100644 index 0000000..d06c985 --- /dev/null +++ b/app-emulation/vmware-modules/ChangeLog @@ -0,0 +1,651 @@ +# ChangeLog for app-emulation/vmware-modules +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.114 2013/12/27 16:34:13 dilfridge Exp $ + + 27 Dec 2013; Andreas K. Huettel + +files/264-newline.patch, vmware-modules-264.5.ebuild: + Add cosmetic patch for bug 439280 + + 23 Nov 2013; Magnus Granberg vmware-modules-279.0.ebuild, + vmware-modules-279.1.ebuild, +files/279-hardened.patch: + Update hardned patch for 279.X #491342 + +*vmware-modules-279.1 (06 Nov 2013) + + 06 Nov 2013; Andreas K. Huettel + +vmware-modules-279.1.ebuild: + Version bump + + 02 Nov 2013; Andreas K. Huettel + -files/279-3.10.0.patch, vmware-modules-279.0.ebuild: + Re-add keywords after testing + + 02 Nov 2013; Andreas K. Huettel + files/279-vmblock.patch, vmware-modules-279.0.ebuild: + Apply proper patches. Tested with 3.10.7-gentoo-r1. + + 22 Oct 2013; Andreas K. Huettel + -files/238-2.6.39.patch, -files/238-makefile-kernel-dir.patch, + -files/238-3.2.0.patch, -files/238-d-make-root.patch, + -files/238-jobserver.patch, -files/238-makefile-include.patch, + -files/238-netdevice.patch, -files/238-sema.patch, + -files/238-unlocked_ioctl.patch, -vmware-modules-238.6.ebuild: + Drop old + +*vmware-modules-279.0 (19 Oct 2013) + + 19 Oct 2013; Andreas K. Huettel + +files/279-3.10.0.patch, +files/279-apic.patch, + +files/279-makefile-include.patch, +files/279-makefile-kernel-dir.patch, + +files/279-netdevice.patch, +files/279-putname.patch, + +files/279-vmblock.patch, +vmware-modules-279.0.ebuild: + Version bump, added without keywords for testing. Bug 484098. Thanks to Billy + DeVincentis for the files. + + 11 Aug 2013; Andreas K. Huettel + +files/264-3.10.0.patch, +files/271-3.10.0.patch, + vmware-modules-264.5.ebuild, vmware-modules-271.2.ebuild: + Add contributed patches for kernel 3.10.0, see bug 470896 + + 23 Jun 2013; Andreas K. Huettel + +files/264-3.8.0.patch, -vmware-modules-264.4.ebuild, + vmware-modules-264.5.ebuild: + Remove old; add patch to build 264 with kernel 3.8, bug 458228 + + 21 Jun 2013; Andreas K. Huettel + vmware-modules-238.6.ebuild, vmware-modules-264.5.ebuild, + vmware-modules-271.2.ebuild: + Add support for epatch_user, bug 459182 + + 16 Jun 2013; Vadim Kuznetsov vadimk@gentoo.org metadata.xml: + dropped myself as a maintainer. maintainer needed + +*vmware-modules-271.2 (10 Mar 2013) + + 10 Mar 2013; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-271.2.ebuild, + -vmware-modules-271.1-r1.ebuild, -vmware-modules-271.1.ebuild: + vmware desktop 9.0.2 version bump. Bugs 459566, 458228, 460908. + +*vmware-modules-264.5 (07 Jan 2013) + + 07 Jan 2013; Vadim Kuznetsov vadimk@gentoo.org +files/264-putname.patch, + +vmware-modules-264.5.ebuild: + vmware desktop 8.0.5 version bump + + 22 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org vmware-modules-271.1-r1.ebuild: + apply patch to kernel gte 3.7.0 + +*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 + vmware-modules-238.6.ebuild, vmware-modules-264.4.ebuild, + vmware-modules-271.1.ebuild: + Use udev.eclass and udev_dorules to install rules into correct directory wrt + #433912 by Martin von Gagern + +*vmware-modules-271.1 (09 Dec 2012) + + 09 Dec 2012; Vadim Kuznetsov vadimk@gentoo.org +files/271-apic.patch, + +files/271-makefile-include.patch, +files/271-makefile-kernel-dir.patch, + +files/271-netdevice.patch, +files/271-vmmon.patch, + +vmware-modules-271.1.ebuild: + vmware desktop 9.0.1 version bump.bugs 432918, 443022 + +*vmware-modules-238.6 (17 Jun 2012) +*vmware-modules-264.4 (17 Jun 2012) + + 17 Jun 2012; Vadim Kuznetsov vadimk@gentoo.org +vmware-modules-238.6.ebuild, + +vmware-modules-264.4.ebuild, -vmware-modules-238.5-r1.ebuild, + -vmware-modules-264.3.ebuild: + bump vmware desktop. bug 421269 + + 01 Jun 2012; Zac Medico vmware-modules-238.5-r1.ebuild, + vmware-modules-264.3.ebuild: + inherit user for enewgroup + + 24 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/238-d-make-root.patch, + vmware-modules-238.5-r1.ebuild: + Andrew Dean's patch of 238 vmware modules for 3.4.0 kernel. Bug 411853 + + 22 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-d-make-root.patch, + vmware-modules-264.3.ebuild: + d_make_root patch for 3.4 kernel. Bug 411853. + + 07 May 2012; Vadim Kuznetsov vadimk@gentoo.org +files/264-apic.patch: + missing patch. Bug 414831 + +*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) + + 26 Mar 2012; Vadim Kuznetsov vadimk@gentoo.org + +vmware-modules-238.5-r1.ebuild, +vmware-modules-264.2-r1.ebuild, + -vmware-modules-238.5.ebuild, -vmware-modules-264.2.ebuild: + udev rules moved to /lib/udev/rules.d + + 24 Mar 2012; Vadim Kuznetsov +files/hardened.patch, + -vmware-modules-264.1.ebuild, vmware-modules-264.2.ebuild: + patch for hardened + + 12 Mar 2012; Vadim Kuznetsov +files/264.2-3.2.0.patch: + missing patch + +*vmware-modules-264.2 (10 Mar 2012) + + 10 Mar 2012; Vadim Kuznetsov +vmware-modules-264.2.ebuild: + vmware desktop version bump + + 10 Jan 2012; Vadim Kuznetsov +files/238-3.2.0.patch, + +files/238-netdevice.patch, vmware-modules-238.5.ebuild: + patches for 3.1.x and 3.2 kernels. Bug 395305 + + 06 Jan 2012; Vadim Kuznetsov files/264-3.2.0.patch: + fixed patch for 3.2.0 kernel . Bug 397733. + + 06 Jan 2012; Vadim Kuznetsov +files/264-3.2.0.patch, + vmware-modules-264.1.ebuild: + added patch for 3.2 kernel + + 05 Dec 2011; Vadim Kuznetsov + -files/1.0.0.25-autoconf-generated.patch, + -files/1.0.0.25-makefile-include.patch, + -files/1.0.0.25-makefile-kernel-dir.patch, -files/1.0.0.25-sema.patch, + -vmware-modules-1.0.0.25-r3.ebuild, -files/1.0.0.25-sk_sleep.patch, + -vmware-modules-1.0.0.25-r4.ebuild, -files/1.0.0.25-unlocked_ioctl.patch, + -files/sched_h-2.6.32.patch, -files/apic.patch: + removed old version. bug 385727. + +*vmware-modules-264.1 (03 Dec 2011) + + 03 Dec 2011; Vadim Kuznetsov +files/264-jobserver.patch, + +files/264-makefile-include.patch, +files/264-netdevice.patch, + +vmware-modules-264.1.ebuild, +files/264-makefile-kernel-dir.patch: + vmware desktop version bump + + 19 Oct 2011; Vadim Kuznetsov -files/208-sema.patch, + -files/208-sk_sleep.patch, -files/208-unlocked_ioctl.patch, + -vmware-modules-208.2.ebuild: + 208 vmware modules removed + + 17 Oct 2011; Vadim Kuznetsov + -vmware-modules-238.4.ebuild, -vmware-modules-238.4-r1.ebuild: + cleanup + +*vmware-modules-238.5 (08 Oct 2011) + + 08 Oct 2011; Vadim Kuznetsov + +vmware-modules-238.5.ebuild: + version bump + +*vmware-modules-238.4-r1 (04 Sep 2011) + + 04 Sep 2011; Vadim Kuznetsov +files/238-2.6.39.patch, + +vmware-modules-238.4-r1.ebuild: + Bug 368139 + + 18 Jul 2011; Vadim Kuznetsov + -vmware-modules-238.3-r8.ebuild: + bug 374599 + +*vmware-modules-238.4 (15 Apr 2011) + + 15 Apr 2011; Vadim Kuznetsov + +vmware-modules-238.4.ebuild: + version bump + + 09 Apr 2011; Vadim Kuznetsov + -files/1.0.0.24-autoconf-generated.patch, + -files/1.0.0.24-kernel-2.6.29.patch, -files/1.0.0.24-kernel-2.6.30.patch, + -files/1.0.0.24-makefile-kernel-dir.patch, -files/1.0.0.24-sema.patch, + -files/1.0.0.24-sk_sleep.patch, -files/1.0.0.24-vmnet-2.6.31.patch, + -files/1.0.0.24-unlocked_ioctl.patch, -vmware-modules-1.0.0.24-r3.ebuild: + 1.0.0.24 is replaced by 208.2 + + 30 Mar 2011; Vadim Kuznetsov files/208-sema.patch: + corrected sema patch + +*vmware-modules-208.2 (27 Mar 2011) + + 27 Mar 2011; Vadim Kuznetsov +files/208-sema.patch, + +files/208-sk_sleep.patch, +files/208-unlocked_ioctl.patch, + +vmware-modules-208.2.ebuild: + vmware kernel modules for vmware server 2 host + +*vmware-modules-238.3-r8 (27 Mar 2011) + + 27 Mar 2011; Vadim Kuznetsov +files/238-jobserver.patch, + +files/238-makefile-include.patch, +files/238-makefile-kernel-dir.patch, + +files/238-sema.patch, +files/238-unlocked_ioctl.patch, + +vmware-modules-238.3-r8.ebuild: + vmware kernel modules of the vmware player 3.1.3 or workstation 7.1.3 host + +*vmware-modules-1.0.0.25-r4 (18 Mar 2011) + + 18 Mar 2011; Vadim Kuznetsov + +vmware-modules-1.0.0.25-r4.ebuild: + BKL check, updated udev rules, better sed + + 16 Mar 2011; Vadim Kuznetsov + vmware-modules-1.0.0.24-r3.ebuild, vmware-modules-1.0.0.25-r3.ebuild: + patched for 2.6.38 + + 16 Mar 2011; Vadim Kuznetsov + -vmware-modules-1.0.0.25-r1.ebuild, + cleanup + + 16 Mar 2011; Vadim Kuznetsov + -files/patches/000_all_makefile-include-directory.patch, + -files/patches/020_all_epoll-def-warnings.patch, + -vmware-modules-1.0.0.15-r2.ebuild, + -files/patches/vmmon/035_all_kernel-2.6.25.patch, + -files/patches/vmmon/040_all_kernel-2.6.27.patch, + -files/patches/vmnet/021_all_wireless_fix.patch, + -files/patches/vmblock/010_all_kernel-2.6.25.patch, + -files/patches/vmnet/025_all_kernel-2.6.25.patch, + -files/patches/vmnet/030_all_kernel-2.6.27.patch, + -files/patches/vmmon/030_all_fix-linux-headers.patch: + Bug 354383 + + 17 Feb 2011; Thomas Kahle + vmware-modules-1.0.0.25-r3.ebuild: + x86 stable per bug 352421 + + 11 Feb 2011; Vadim Kuznetsov + vmware-modules-1.0.0.15-r2.ebuild: + back to testing + + 11 Feb 2011; Vadim Kuznetsov + -vmware-modules-1.0.0.24-r1.ebuild, -vmware-modules-1.0.0.24-r2.ebuild, + -vmware-modules-1.0.0.25-r2.ebuild: + clean up + + 11 Feb 2011; Vadim Kuznetsov + -vmware-modules-1.0.0.15-r1.ebuild: + clean up + + 25 Jan 2011; Markos Chandras + vmware-modules-1.0.0.25-r3.ebuild: + Stable on amd64 wrt bug #352421 + +*vmware-modules-1.0.0.24-r3 (15 Jan 2011) + + 15 Jan 2011; Vadim Kuznetsov +files/1.0.0.24-sema.patch, + +vmware-modules-1.0.0.24-r3.ebuild: + Bugs 345145, 351592. + Thanks Mateusz Dziadko, c1pher. + +*vmware-modules-1.0.0.25-r3 (13 Jan 2011) + + 13 Jan 2011; Vadim Kuznetsov +files/1.0.0.25-sema.patch, + +vmware-modules-1.0.0.25-r3.ebuild: + Bug 345145 and 349649 and 351592 + Thanks to Mateusz Dziadko, Dane Smith and bugs et al. + +*vmware-modules-1.0.0.24-r2 (21 Nov 2010) + + 21 Nov 2010; Vadim Kuznetsov + +files/1.0.0.24-unlocked_ioctl.patch, +vmware-modules-1.0.0.24-r2.ebuild, + vmware-modules-1.0.0.25-r2.ebuild: + unlocked_ioctl patch + +*vmware-modules-1.0.0.25-r2 (21 Nov 2010) + + 21 Nov 2010; Vadim Kuznetsov + +files/1.0.0.25-unlocked_ioctl.patch, +vmware-modules-1.0.0.25-r2.ebuild: + updated unlocked_ioctl patch + + 21 Nov 2010; Vadim Kuznetsov + -files/1.0.0.26-ioctl-2.6.36.patch, -files/1.0.0.26-iommu_map.patch, + -files/1.0.0.26-makefile-include.patch, + -files/1.0.0.26-makefile-kernel-dir.patch, -files/1.0.0.26-sk_sleep.patch, + -vmware-modules-1.0.0.26.ebuild: + replaced by vmware-modules-235 (in overlay) + + 05 Nov 2010; Fabio Erculiani + vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild, + +files/1.0.0.26-ioctl-2.6.36.patch: + add 2.6.36 Linux kernel support + + 04 Aug 2010; Vadim Kuznetsov + +files/1.0.0.24-sk_sleep.patch, vmware-modules-1.0.0.24-r1.ebuild, + +files/1.0.0.25-sk_sleep.patch, vmware-modules-1.0.0.25-r1.ebuild, + +files/1.0.0.26-iommu_map.patch, vmware-modules-1.0.0.26.ebuild, + +files/1.0.0.26-sk_sleep.patch: + patches for 2.6.35 kernel. Bug 322245, Bug 330019 + + 03 May 2010; Vadim Kuznetsov + vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild, + +files/apic.patch: + Bugs 274529, 317583 + Thanks to Mikhail Zolotaryov for the patch. + +*vmware-modules-1.0.0.26 (28 Feb 2010) + + 28 Feb 2010; Vadim Kuznetsov + +files/1.0.0.26-makefile-include.patch, -vmware-modules-1.0.0.25.ebuild, + +files/1.0.0.26-makefile-kernel-dir.patch, + +vmware-modules-1.0.0.26.ebuild: + vmware-modules for VMware Workstation 7.0.x and Player 3.0.x + + 26 Feb 2010; Vadim Kuznetsov + +files/1.0.0.24-autoconf-generated.patch, + vmware-modules-1.0.0.24-r1.ebuild, + +files/1.0.0.25-autoconf-generated.patch, + vmware-modules-1.0.0.25-r1.ebuild: + Bug 301320 + +*vmware-modules-1.0.0.25-r1 (13 Feb 2010) + + 13 Feb 2010; Patrick Lauer + +vmware-modules-1.0.0.25-r1.ebuild: + Small fix for header changes in 2.6.33 and later + + 02 Jan 2010; Vadim Kuznetsov + -vmware-modules-1.0.0.24.ebuild, vmware-modules-1.0.0.24-r1.ebuild, + vmware-modules-1.0.0.25.ebuild, +files/sched_h-2.6.32.patch: + Bug 295955 + + 30 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org + -files/1.0.0.23-makefile-kernel-dir.patch, + -vmware-modules-1.0.0.23.ebuild, -vmware-modules-1.0.0.23-r1.ebuild, + -files/1.0.0.23-r1-kernel-2.6.29.patch: + cleanup + + 25 Sep 2009; Markus Meier + vmware-modules-1.0.0.25.ebuild: + amd64 stable, bug #282213 + +*vmware-modules-1.0.0.24-r1 (22 Sep 2009) + + 22 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org + +vmware-modules-1.0.0.24-r1.ebuild, +files/1.0.0.24-vmnet-2.6.31.patch: + vmnet patch for 2.6.31 kernel. Bug 274173, comment 15. + + 02 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org + -files/patches/vmmon/050_all_kernel-2.6.29.patch, + -files/patches/vmnet/040_all_kernel-2.6.29.patch: + revert previous commit. Bug 273173 + + 28 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org + +files/patches/vmmon/050_all_kernel-2.6.29.patch, + +files/patches/vmnet/040_all_kernel-2.6.29.patch: + bugs 264098, 273173. 1.0.0.15-r2 patches suggested in 272173 + + 25 Aug 2009; Christian Faulhammer + vmware-modules-1.0.0.25.ebuild: + stable x86, security bug 282213 + +*vmware-modules-1.0.0.25 (22 Aug 2009) + + 22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org + +files/1.0.0.25-makefile-include.patch, +vmware-modules-1.0.0.25.ebuild, + +files/1.0.0.25-makefile-kernel-dir.patch: + Version bump. modules for vmware-{workstation,player}-{6.2}.5.3 + + 03 Jul 2009; Jeroen Roovers metadata.xml: + Fix e-mail address. + +*vmware-modules-1.0.0.24 (14 Jun 2009) + + 14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org + +vmware-modules-1.0.0.24.ebuild, +files/1.0.0.24-kernel-2.6.29.patch, + +files/1.0.0.24-kernel-2.6.30.patch, + +files/1.0.0.24-makefile-kernel-dir.patch, metadata.xml: + Bugs 268099, 270150, 273750. New ebuild without vmware-mod eclass. + +*vmware-modules-1.0.0.23-r1 (16 May 2009) + + 16 May 2009; Mike Auty + +vmware-modules-1.0.0.23-r1.ebuild, + +files/1.0.0.23-r1-kernel-2.6.29.patch: + Version bump vmware-modules for 2.6.29 support. + + 22 Feb 2009; Mike Auty + -files/1.0.0.20-vmblock-2.6.26-2.patch, + -files/1.0.0.20-makefile-kernel-dir.patch, + -files/1.0.0.20-vmblock-2.6.26-1.patch, + -files/1.0.0.20-vmmon-2.6.26.patch, -files/1.0.0.20-vmnet-2.6.26.patch, + -files/1.0.0.22-makefile-kernel-dir.patch, + -vmware-modules-1.0.0.20.ebuild, -vmware-modules-1.0.0.22.ebuild: + Clear out old versions of vmware-modules that are no longer needed due to + the removal of insecure versions of vmware products (bug 245941). + + 14 Jan 2009; Mike Auty + files/patches/vmnet/030_all_kernel-2.6.27.patch: + Third time lucky, more patches for < 2.6.26 kernels. + + 14 Jan 2009; Mike Auty + files/patches/vmnet/030_all_kernel-2.6.27.patch: + Add patch to try and fix bug 254768. + + 12 Jan 2009; Mike Auty Manifest: + Fix up vmware-modules-1.0.0.15 patches for kernels older than 2.6.27. + + 12 Jan 2009; Markus Meier + vmware-modules-1.0.0.23.ebuild: + amd64/x86 stable, bug #245941 + + 11 Jan 2009; Markus Meier + vmware-modules-1.0.0.15-r2.ebuild: + amd64/x86 stable, bug #236167 + + 10 Jan 2009; Mike Auty + -files/1.0.0.17-update115-nasty-hack.patch, + -vmware-modules-1.0.0.16-r1.ebuild, -vmware-modules-1.0.0.17.ebuild, + -vmware-modules-1.0.0.17-r1.ebuild: + Clear out old modules for products no longer in the tree. + +*vmware-modules-1.0.0.15-r2 (10 Jan 2009) + + 10 Jan 2009; Mike Auty + +files/patches/vmmon/040_all_kernel-2.6.27.patch, + +files/patches/vmnet/030_all_kernel-2.6.27.patch, + +vmware-modules-1.0.0.15-r2.ebuild: + Add in vmware-modules-1.0.0.15-r2. Should compile on kernels up to and + including 2.6.28, big thanks go to Tim Yamin for help with the patches. + +*vmware-modules-1.0.0.23 (09 Nov 2008) + + 09 Nov 2008; Mike Auty + +files/1.0.0.23-makefile-kernel-dir.patch, vmware-modules-1.0.0.20.ebuild, + vmware-modules-1.0.0.22.ebuild, +vmware-modules-1.0.0.23.ebuild: + Add in vmware-modules-1.0.0.23 for vmware-workstation-6.5 and + vmware-player-2.5. + +*vmware-modules-1.0.0.22 (30 Sep 2008) + + 30 Sep 2008; Mike Auty + +files/1.0.0.20-vmblock-2.6.26-1.patch, + +files/1.0.0.20-vmblock-2.6.26-2.patch, + +files/1.0.0.20-vmmon-2.6.26.patch, + +files/1.0.0.22-makefile-kernel-dir.patch, + +files/1.0.0.20-vmnet-2.6.26.patch, -vmware-modules-1.0.0.11-r1.ebuild, + -vmware-modules-1.0.0.13-r1.ebuild, vmware-modules-1.0.0.20.ebuild, + +vmware-modules-1.0.0.22.ebuild: + Remove old unused versions, fix up 1.0.0.20 bugs and put in a new version + for workstation 6.0.5 and player 2.0.5. + + 18 Jun 2008; Mike Auty + +files/1.0.0.20-makefile-kernel-dir.patch, vmware-modules-1.0.0.20.ebuild: + Fix kernel build directories (bug 227941). + +*vmware-modules-1.0.0.20 (14 Jun 2008) + + 14 Jun 2008; Mike Auty +vmware-modules-1.0.0.20.ebuild: + Add in vmware-modules-1.0.0.20 for workstation 6.0.4 and player 2.0.4. + + 26 Apr 2008; Mike Auty + +files/patches/vmblock/010_all_kernel-2.6.25.patch, + +files/patches/vmmon/035_all_kernel-2.6.25.patch, + +files/patches/vmnet/025_all_kernel-2.6.25.patch: + Add patches for -r1 ebuilds to ensure they work on 2.6.25 and older + kernels. + + 31 Jan 2008; Mike Auty ChangeLog: + Re-sign digestless manifest. + +*vmware-modules-1.0.0.17-r1 (26 Jan 2008) + + 26 Jan 2008; Mike Auty + +files/1.0.0.17-update115-nasty-hack.patch, + +files/patches/vmmon/030_all_fix-linux-headers.patch, + +files/patches/vmnet/021_all_wireless_fix.patch, + +vmware-modules-1.0.0.17-r1.ebuild: + Bump vmware-modules to any-any115, and apply fixes for wireless and 2.6.24. + + 25 Nov 2007; Mike Auty + -files/1.0.0.16-kernel-2.6.22.patch, -vmware-modules-1.0.0.16.ebuild, + vmware-modules-1.0.0.17.ebuild: + Bump to vmware-any-any-update114. Also update 1.0.0.17 to use the latest + vmware-player package. + + 14 Oct 2007; Mike Auty + vmware-modules-1.0.0.16-r1.ebuild: + Add vmblock module building to vmware-modules-1.0.0.16-r1 + +*vmware-modules-1.0.0.17 (14 Oct 2007) + + 14 Oct 2007; Mike Auty vmware-modules-1.0.0.16.ebuild, + +vmware-modules-1.0.0.17.ebuild: + Add the latest modules for vmware-workstation-6.0.1 + +*vmware-modules-1.0.0.16-r1 (16 Sep 2007) + + 16 Sep 2007; Mike Auty + -files/1.0.0.15-gcc4-ignore-pedantic-errors.patch, + +vmware-modules-1.0.0.16-r1.ebuild: + Adding in vmware-modules-1.0.0.16-r1, now that vmware-any-any-update can + handle workstation 6. Also cleaned out an old patch for 1.0.0.15. + + 28 Jul 2007; Mike Auty + +files/1.0.0.16-kernel-2.6.22.patch, vmware-modules-1.0.0.16.ebuild: + Redigest for vmware-any-any-update112. + + 12 Jul 2007; Chris Gianelloni + -vmware-modules-1.0.0.11.ebuild, vmware-modules-1.0.0.11-r1.ebuild, + -vmware-modules-1.0.0.13.ebuild, vmware-modules-1.0.0.13-r1.ebuild: + Marking 1.0.0.11-r1 and 1.0.0.13-r1 stable on amd64/x86 since the changes + from the previous ebuilds is just the placement of a variable, and the + current stable versions didn't work properly. + +*vmware-modules-1.0.0.16 (24 Jun 2007) + + 24 Jun 2007; Mike Auty + +vmware-modules-1.0.0.16.ebuild: + Add in the latest modules for vmware-player-2 and vmware-workstation-6. + + 28 Apr 2007; Mike Auty + -files/patches/010_all_makefile-vm-build-no-unused-warnings.patch: + Remove unnecessary patch, that's now part of any-any109. + + 28 Apr 2007; Mike Auty + files/digest-vmware-modules-1.0.0.11, + files/digest-vmware-modules-1.0.0.11-r1, + files/digest-vmware-modules-1.0.0.13, + files/digest-vmware-modules-1.0.0.13-r1, + files/digest-vmware-modules-1.0.0.15-r1, Manifest: + Redigest for vmware-any-any109. + + 04 Mar 2007; Mike Auty + -vmware-modules-1.0.0.15.ebuild: + Bump vmware-any-any to 108. Remove old vmware-server module ebuild. + + 05 Feb 2007; Mike Auty + vmware-modules-1.0.0.15-r1.ebuild: + Vmware-any-any bump to support 2.6.20 and fix a copyright date. + + 17 Dec 2006; Mike Frysinger + +files/patches/010_all_makefile-vm-build-no-unused-warnings.patch, + +files/patches/020_all_epoll-def-warnings.patch: + Fix building with newer kernels #146004. + + 01 Dec 2006; Chris Gianelloni + vmware-modules-1.0.0.15-r1.ebuild: + Stable on amd64/x86 for vmware-workstation-5.5.3. + + 01 Dec 2006; Mike Auty + files/digest-vmware-modules-1.0.0.11, + files/digest-vmware-modules-1.0.0.11-r1, + files/digest-vmware-modules-1.0.0.13, + files/digest-vmware-modules-1.0.0.13-r1, + files/digest-vmware-modules-1.0.0.15-r1, Manifest: + Redigest for vmware-any-any105. + + 30 Oct 2006; Chris Gianelloni + -vmware-modules-1.0.0.8.ebuild: + Removed verion 0.0.8 since we have removed the only VMware product (VMware + Workstation 3.2.1) that used it. + +*vmware-modules-1.0.0.15-r1 (17 Oct 2006) +*vmware-modules-1.0.0.13-r1 (17 Oct 2006) +*vmware-modules-1.0.0.11-r1 (17 Oct 2006) + + 17 Oct 2006; Mike Auty + +vmware-modules-1.0.0.11-r1.ebuild, +vmware-modules-1.0.0.13-r1.ebuild, + +vmware-modules-1.0.0.15-r1.ebuild: + Version bump for all vmware-modules to fix for bug 149679, thanks to Jason + Urbank. + + 22 Sep 2006; Mike Auty + files/patches/000_all_makefile-include-directory.patch: + Updated patch fixing bug #148613, thanks to Alon Bar-Lev. + + 13 Sep 2006; Mike Auty + +files/1.0.0.15-gcc4-ignore-pedantic-errors.patch, + vmware-modules-1.0.0.15.ebuild: + Add a patch to fix compilation against kernels <= 2.6.16 with gcc-4.1. + Closes bug #146004. + + 28 Aug 2006; Chris Gianelloni + vmware-modules-1.0.0.8.ebuild: + Stable on x86 for vmware-workstation. + + 27 Aug 2006; Chris Gianelloni + vmware-modules-1.0.0.11.ebuild: + Stable on amd64 and x86 for vmware-workstation. + + 25 Aug 2006; Mike Auty + files/digest-vmware-modules-1.0.0.8, files/digest-vmware-modules-1.0.0.11, + files/digest-vmware-modules-1.0.0.13, Manifest: + Redigested for vmware-any-any-update104. + + 22 Aug 2006; Chris Gianelloni + vmware-modules-1.0.0.13.ebuild: + Stable on amd64 and x86 for vmware-workstation and vmware-player. + + 19 Aug 2006; Mike Auty vmware-modules-1.0.0.15.ebuild: + Update vmware-modules to use the latest vmware-server package. + + 08 Aug 2006; Mike Auty + files/digest-vmware-modules-1.0.0.8, files/digest-vmware-modules-1.0.0.11, + files/digest-vmware-modules-1.0.0.13, Manifest: + Make use of vmware-any-any103, which fixes kernel problems on 2.6.18, and + also two patches for problems with the kernel build system, thanks to Georgi + Georgiev and Alon Bar-Lev . + Closes bug #142855. + +*vmware-modules-1.0.0.13 (31 Jul 2006) +*vmware-modules-1.0.0.11 (31 Jul 2006) +*vmware-modules-1.0.0.8 (31 Jul 2006) + + 31 Jul 2006; Mike Auty +vmware-modules-1.0.0.8.ebuild, + +vmware-modules-1.0.0.11.ebuild, +vmware-modules-1.0.0.13.ebuild, + vmware-modules-1.0.0.15.ebuild: + Add in vmware-modules for workstation and player products. + +*vmware-modules-1.0.0.15 (31 Jul 2006) + + 31 Jul 2006; Mike Auty + +files/patches/000_all_makefile-include-directory.patch, +metadata.xml, + +vmware-modules-1.0.0.15.ebuild: + Initial commit of vmware-modules, as used by several vmware-packages. diff --git a/app-emulation/vmware-modules/files/279-apic.patch b/app-emulation/vmware-modules/files/279-apic.patch new file mode 100644 index 0000000..66cd459 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-apic.patch @@ -0,0 +1,12 @@ +diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +index f1f4b10..c43242f 100644 +--- a/vmmon-only/linux/hostif.c ++++ b/vmmon-only/linux/hostif.c +@@ -55,6 +55,7 @@ + #include + #include + ++#include + + #include "vmware.h" + #include "x86apic.h" diff --git a/app-emulation/vmware-modules/files/279-hardened.patch b/app-emulation/vmware-modules/files/279-hardened.patch new file mode 100644 index 0000000..cc3e041 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-hardened.patch @@ -0,0 +1,113 @@ +diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c +index b21dd44..960c2aa 100644 +--- a/vmmon-only/linux/driver.c ++++ b/vmmon-only/linux/driver.c +@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { + #endif + }; + +-static struct file_operations vmuser_fops; ++static struct file_operations vmuser_fops = { ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, ++#else ++ .ioctl = LinuxDriver_Ioctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = LinuxDriver_UnlockedIoctl, ++#endif ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close, ++ .mmap = LinuxDriverMmap ++}; ++ + static struct timer_list tscTimer; + + /* +@@ -357,27 +372,6 @@ init_module(void) + spin_lock_init(&linuxState.pollListLock); + #endif + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vmuser_fops, 0, sizeof vmuser_fops); +- vmuser_fops.owner = THIS_MODULE; +- vmuser_fops.poll = LinuxDriverPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; +-#else +- vmuser_fops.ioctl = LinuxDriver_Ioctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; +-#endif +- vmuser_fops.open = LinuxDriver_Open; +- vmuser_fops.release = LinuxDriver_Close; +- vmuser_fops.mmap = LinuxDriverMmap; +- + #ifdef VMX86_DEVEL + devel_init_module(); + linuxState.minor = 0; +diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c +index b12b982..40bd4cf 100644 +--- a/vmnet-only/driver.c ++++ b/vmnet-only/driver.c +@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, + unsigned int iocmd, unsigned long ioarg); + #endif + +-static struct file_operations vnetFileOps; ++static struct file_operations vnetFileOps = { ++ .owner = THIS_MODULE, ++ .read = VNetFileOpRead, ++ .write = VNetFileOpWrite, ++ .poll = VNetFileOpPoll, ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = VNetFileOpUnlockedIoctl, ++#else ++ .ioctl = VNetFileOpIoctl, ++#endif ++#ifdef HAVE_COMPAT_IOCTL ++ .compat_ioctl = VNetFileOpUnlockedIoctl, ++#endif ++ .open = VNetFileOpOpen, ++ .release = VNetFileOpClose ++}; + + /* + * Utility functions +@@ -476,28 +491,6 @@ init_module(void) + goto err_proto; + } + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vnetFileOps, 0, sizeof vnetFileOps); +- vnetFileOps.owner = THIS_MODULE; +- vnetFileOps.read = VNetFileOpRead; +- vnetFileOps.write = VNetFileOpWrite; +- vnetFileOps.poll = VNetFileOpPoll; +-#ifdef HAVE_UNLOCKED_IOCTL +- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; +-#else +- vnetFileOps.ioctl = VNetFileOpIoctl; +-#endif +-#ifdef HAVE_COMPAT_IOCTL +- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; +-#endif +- vnetFileOps.open = VNetFileOpOpen; +- vnetFileOps.release = VNetFileOpClose; +- + retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); + if (retval) { + LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/279-makefile-include.patch b/app-emulation/vmware-modules/files/279-makefile-include.patch new file mode 100644 index 0000000..39c3000 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-makefile-include.patch @@ -0,0 +1,65 @@ +diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel +index ab7a727..e3ec9d2 100644 +--- a/vmblock-only/Makefile.kernel ++++ b/vmblock-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE += -I$(SRCROOT)/include + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) +diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel +index ba343ee..861ea83 100644 +--- a/vmci-only/Makefile.kernel ++++ b/vmci-only/Makefile.kernel +@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI + + INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + obj-m += $(DRIVER).o + +diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel +index 8770d1d..c4746c3 100644 +--- a/vmmon-only/Makefile.kernel ++++ b/vmmon-only/Makefile.kernel +@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE + INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ + -I$(SRCROOT)/vmcore + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) + +diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel +index d1e3133..665d428 100644 +--- a/vmnet-only/Makefile.kernel ++++ b/vmnet-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE := -I$(SRCROOT) + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) +diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel +index b4629ee..264b8cb 100644 +--- a/vsock-only/Makefile.kernel ++++ b/vsock-only/Makefile.kernel +@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include + INCLUDE += -I$(SRCROOT)/linux + INCLUDE += -I$(SRCROOT)/common + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) + + diff --git a/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch new file mode 100644 index 0000000..1a647a3 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch @@ -0,0 +1,85 @@ +diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile +index 2b81323..746c8b8 100644 +--- a/vmblock-only/Makefile ++++ b/vmblock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmblock + PRODUCT := ws +diff --git a/vmci-only/Makefile b/vmci-only/Makefile +index 8e9c5be..6ec828b 100644 +--- a/vmci-only/Makefile ++++ b/vmci-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmci + PRODUCT := ws +diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile +index 5bd867b..91a83d4 100644 +--- a/vmmon-only/Makefile ++++ b/vmmon-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmmon + PRODUCT := @@PRODUCT@@ +diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile +index d4eb73c..c7c6d38 100644 +--- a/vmnet-only/Makefile ++++ b/vmnet-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmnet + PRODUCT := @@PRODUCT@@ +diff --git a/vsock-only/Makefile b/vsock-only/Makefile +index 93dd61d..9765696 100644 +--- a/vsock-only/Makefile ++++ b/vsock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vsock + PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/279-netdevice.patch b/app-emulation/vmware-modules/files/279-netdevice.patch new file mode 100644 index 0000000..35231a3 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-netdevice.patch @@ -0,0 +1,24 @@ +diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h +index 7a56304..9ff4548 100644 +--- a/vmnet-only/compat_netdevice.h ++++ b/vmnet-only/compat_netdevice.h +@@ -47,6 +47,19 @@ + # define net_device device + #endif + ++/* it looks like these have been removed from the kernel 3.1 ++ * probably because the "transition" is considered complete. ++ * so to keep this source compatible we just redefine them like they were ++ * previously ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev ++ functions are available. */ ++#define HAVE_FREE_NETDEV /* free_netdev() */ ++#define HAVE_NETDEV_PRIV /* netdev_priv() */ ++#define HAVE_NETIF_QUEUE ++#define HAVE_NET_DEVICE_OPS ++#endif + + /* + * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/files/279-putname.patch b/app-emulation/vmware-modules/files/279-putname.patch new file mode 100644 index 0000000..6e76130 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-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/files/279-userns.patch b/app-emulation/vmware-modules/files/279-userns.patch new file mode 100644 index 0000000..c960b78 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-userns.patch @@ -0,0 +1,37 @@ +--- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.000000000 +0100 ++++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100 +@@ -135,7 +135,8 @@ + inode->i_size = INODE_TO_IINFO(inode)->nameLen; + inode->i_version = 1; + inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; +- inode->i_uid = inode->i_gid = 0; ++ inode->i_uid = GLOBAL_ROOT_UID; ++ inode->i_gid = GLOBAL_ROOT_GID; + inode->i_op = &LinkInodeOps; + + d_add(dentry, inode); + +--- a/vmci-only/linux/driver.c 2013-03-20 17:57:35.000000000 +0100 ++++ b/vmci-only/linux/driver.c 2013-03-20 17:57:43.000000000 +0100 +@@ -740,7 +740,7 @@ + goto init_release; + } + +- user = current_uid(); ++ user = from_kuid(current_user_ns(), current_uid()); + retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, + 0 /* Unused */, vmciLinux->userVersion, + &user, &vmciLinux->context); + +--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100 ++++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100 +@@ -2866,7 +2866,7 @@ + vsk->connectTimeout = psk->connectTimeout; + } else { + vsk->trusted = capable(CAP_NET_ADMIN); +- vsk->owner = current_uid(); ++ vsk->owner = from_kuid(current_user_ns(), current_uid()); + vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE; + vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; + vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; + diff --git a/app-emulation/vmware-modules/files/279-vmblock-3.11.patch b/app-emulation/vmware-modules/files/279-vmblock-3.11.patch new file mode 100644 index 0000000..fc1f639 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-vmblock-3.11.patch @@ -0,0 +1,89 @@ +--- a/vmblock-only/linux/file.c ++++ b/vmblock-only/linux/file.c +@@ -38,46 +38,6 @@ typedef u64 inode_num_t; + typedef ino_t inode_num_t; + #endif + +-/* Specifically for our filldir_t callback */ +-typedef struct FilldirInfo { +- filldir_t filldir; +- void *dirent; +-} FilldirInfo; +- +- +-/* +- *---------------------------------------------------------------------------- +- * +- * Filldir -- +- * +- * Callback function for readdir that we use in place of the one provided. +- * This allows us to specify that each dentry is a symlink, but pass through +- * everything else to the original filldir function. +- * +- * Results: +- * Original filldir's return value. +- * +- * Side effects: +- * Directory information gets copied to user's buffer. +- * +- *---------------------------------------------------------------------------- +- */ +- +-static int +-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir +- const char *name, // IN: Dirent name +- int namelen, // IN: len of dirent's name +- loff_t offset, // IN: Offset +- inode_num_t ino, // IN: Inode number of dirent +- unsigned int d_type) // IN: Type of file +-{ +- FilldirInfo *info = buf; +- +- /* Specify DT_LNK regardless */ +- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK); +-} +- +- + /* File operations */ + + /* +@@ -166,11 +126,10 @@ FileOpOpen(struct inode *inode, // IN + + static int + FileOpReaddir(struct file *file, // IN +- void *dirent, // IN +- filldir_t filldir) // IN ++ struct dir_context *ctx) // IN + { + int ret; +- FilldirInfo info; ++ + struct file *actualFile; + + if (!file) { +@@ -184,12 +143,10 @@ FileOpReaddir(struct file *file, // IN + return -EINVAL; + } + +- info.filldir = filldir; +- info.dirent = dirent; +- +- actualFile->f_pos = file->f_pos; +- ret = vfs_readdir(actualFile, Filldir, &info); +- file->f_pos = actualFile->f_pos; ++ /* Ricky Wong Yung Fei: ++ * Manipulation of pos is now handled internally by iterate_dir(). ++ */ ++ ret = iterate_dir(actualFile, ctx); + + return ret; + } +@@ -237,7 +194,7 @@ FileOpRelease(struct inode *inode, // IN + + + struct file_operations RootFileOps = { +- .readdir = FileOpReaddir, ++ .iterate = FileOpReaddir, + .open = FileOpOpen, + .release = FileOpRelease, + }; diff --git a/app-emulation/vmware-modules/files/279-vmblock-3.12.patch b/app-emulation/vmware-modules/files/279-vmblock-3.12.patch new file mode 100644 index 0000000..63aabbe --- /dev/null +++ b/app-emulation/vmware-modules/files/279-vmblock-3.12.patch @@ -0,0 +1,69 @@ +--- a/vmblock-only/linux/control.c 2013-10-03 04:29:47.471339204 -0400 ++++ b/vmblock-only/linux/control.c 2013-10-03 04:31:56.607334636 -0400 +@@ -283,7 +283,7 @@ + int i; + int retval; + +- name = getname(buf); ++ name = (char*)getname(buf)->name; + if (IS_ERR(name)) { + return PTR_ERR(name); + } +--- a/vmblock-only/linux/dentry.c 2013-10-03 04:29:47.471339204 -0400 ++++ b/vmblock-only/linux/dentry.c 2013-10-03 04:31:56.607334636 -0400 +@@ -32,7 +32,7 @@ + #include "block.h" + + +-static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd); ++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags); + + struct dentry_operations LinkDentryOps = { + .d_revalidate = DentryOpRevalidate, +@@ -60,7 +60,7 @@ + + static int + DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating +- struct nameidata *nd) // IN: lookup flags & intent ++ unsigned int flags) // IN: lookup flags & intent + { + VMBlockInodeInfo *iinfo; + struct nameidata actualNd; +@@ -101,7 +101,7 @@ + if (actualDentry && + actualDentry->d_op && + actualDentry->d_op->d_revalidate) { +- return actualDentry->d_op->d_revalidate(actualDentry, nd); ++ return actualDentry->d_op->d_revalidate(actualDentry, flags); + } + + if (compat_path_lookup(iinfo->name, 0, &actualNd)) { +--- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400 ++++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400 +@@ -36,7 +36,7 @@ + + /* Inode operations */ + static struct dentry *InodeOpLookup(struct inode *dir, +- struct dentry *dentry, struct nameidata *nd); ++ struct dentry *dentry, unsigned int flags); + static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -75,7 +75,7 @@ + static struct dentry * + InodeOpLookup(struct inode *dir, // IN: parent directory's inode + struct dentry *dentry, // IN: dentry to lookup +- struct nameidata *nd) // IN: lookup intent and information ++ unsigned int flags) // IN: lookup intent and information + { + char *filename; + struct inode *inode; +@@ -221,7 +221,7 @@ + goto out; + } + +- ret = vfs_follow_link(nd, iinfo->name); ++ nd_set_link(nd, iinfo->name); + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/279-vmblock.patch b/app-emulation/vmware-modules/files/279-vmblock.patch new file mode 100644 index 0000000..0daf603 --- /dev/null +++ b/app-emulation/vmware-modules/files/279-vmblock.patch @@ -0,0 +1,23 @@ +diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c +--- work.orig/vmblock-only/linux/control.c 2013-11-02 18:05:39.960226399 +0100 ++++ work/vmblock-only/linux/control.c 2013-11-02 18:09:11.760231432 +0100 +@@ -208,17 +208,14 @@ + VMBlockSetProcEntryOwner(controlProcMountpoint); + + /* Create /proc/fs/vmblock/dev */ +- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, +- VMBLOCK_CONTROL_MODE, +- controlProcDirEntry); +- if (!controlProcEntry) { ++ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps); ++ if (controlProcEntry == NULL) { + Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n"); + remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry); + remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL); + return -EINVAL; + } + +- controlProcEntry->proc_fops = &ControlFileOps; + return 0; + } + diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml new file mode 100644 index 0000000..a6932f5 --- /dev/null +++ b/app-emulation/vmware-modules/metadata.xml @@ -0,0 +1,11 @@ + + + + vmware + + VMware kernel modules. + + + Apply patch needed for pax enabled kernels + + diff --git a/app-emulation/vmware-modules/vmware-modules-279.1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1.ebuild new file mode 100644 index 0000000..f2428f3 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-279.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-279.1.ebuild,v 1.2 2013/11/23 14:05:03 zorry Exp $ + +EAPI=5 + +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-6.0.${PV_MINOR}* + =app-emulation/vmware-workstation-10.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}/279-hardened.patch" + epatch "${FILESDIR}/${PV_MAJOR}-apic.patch" + kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch" + kernel_is ge 3 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-userns.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock-3.11.patch" + kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock-3.12.patch" + + # Allow user patches so they can support RC kernels and whatever else + epatch_user +} + +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}" +} -- cgit v1.2.3-65-gdbad