[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2018-04-07 Thread Fabio Rossi 
commit: 78376a3171e9d29c9d132929159d22628fe86776
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue Feb 20 16:43:04 2018 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Tue Feb 20 16:43:04 2018 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=78376a31

app-emulation/vmware-modules: add support to kernel 4.16-rc2

The changes are due to kernel commit ae5e165d855dd978a461b22175531b07f54fb61f,
there is a new API to access inode->i_version

 .../files/308-4.16-00-vmblock-iversion.patch   | 25 ++
 .../vmware-modules/vmware-modules-308.5.8.ebuild   |  1 +
 2 files changed, 26 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch 
b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
new file mode 100644
index 000..42efdb9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
@@ -0,0 +1,25 @@
+--- ./vmblock-only/linux/inode.c   2018-02-20 16:33:44.296417858 +0100
 ./vmblock-only/linux/inode.c.new   2018-02-20 17:33:24.525618051 +0100
+@@ -30,6 +30,10 @@
+ #include 
+ #include 
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
++#include 
++#endif
++
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+ #include "block.h"
+@@ -155,7 +159,11 @@
+ 
+inode->i_mode = S_IFLNK | S_IRWXUGO;
+inode->i_size = INODE_TO_IINFO(inode)->nameLen;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
++   inode_set_iversion(inode, 1);
++#else
+inode->i_version = 1;
++#endif
+inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+inode->i_uid = inode->i_gid = 0;

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
index e6f2999..17264ed 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
@@ -115,6 +115,7 @@ src_prepare() {
kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-00-vmmon-global-page-state.patch"
kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-01-deprecated-asm-uaccess.patch"
kernel_is ge 4 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.15-00-init_timer.patch"
+   kernel_is ge 4 16 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.16-00-vmblock-iversion.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-workstation/, ...

2018-04-07 Thread Fabio Rossi 
commit: bbf6adcc2928c8bf6096cb4e363b1e3202b72053
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue Feb 20 23:06:09 2018 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Tue Feb 20 23:06:09 2018 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=bbf6adcc

Added latest version 12.5.9.7535481 in 12.5 series.

 .../{vmware-modules-308.5.8.ebuild => vmware-modules-308.5.9.ebuild}  | 0
 ...e-player-12.5.8.7098237.ebuild => vmware-player-12.5.9.7535481.ebuild} | 0
 ...ion-12.5.8.7098237.ebuild => vmware-workstation-12.5.9.7535481.ebuild} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.9.ebuild
similarity index 100%
rename from app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
rename to app-emulation/vmware-modules/vmware-modules-308.5.9.ebuild

diff --git a/app-emulation/vmware-player/vmware-player-12.5.8.7098237.ebuild 
b/app-emulation/vmware-player/vmware-player-12.5.9.7535481.ebuild
similarity index 100%
rename from app-emulation/vmware-player/vmware-player-12.5.8.7098237.ebuild
rename to app-emulation/vmware-player/vmware-player-12.5.9.7535481.ebuild

diff --git 
a/app-emulation/vmware-workstation/vmware-workstation-12.5.8.7098237.ebuild 
b/app-emulation/vmware-workstation/vmware-workstation-12.5.9.7535481.ebuild
similarity index 100%
rename from 
app-emulation/vmware-workstation/vmware-workstation-12.5.8.7098237.ebuild
rename to 
app-emulation/vmware-workstation/vmware-workstation-12.5.9.7535481.ebuild

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2017-12-04 Thread Fabio Rossi 
commit: 0f4fedb03b69af3b839d73c74a0aa87bc1132ba8
Author: Fabio Rossi  inwind  it>
AuthorDate: Mon Dec  4 23:03:11 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Mon Dec  4 23:03:11 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0f4fedb0

app-emulation/vmware-modules: add support to kernel 4.15-rc2

Patch inspired to 
https://github.com/mkubecek/vmware-host-modules/commit/562121d7bc06
but I prefer to leave the sources as close as possible to the original ones.

The changes are due to kernel commits b9eaf1871ef8b2bd6a67240ebe668622152a
and e99e88a9d2b067465adaa9c111ada99a041bef9a

 .../files/308-4.15-00-init_timer.patch | 105 +
 .../vmware-modules/vmware-modules-308.5.8.ebuild   |   1 +
 2 files changed, 106 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.15-00-init_timer.patch 
b/app-emulation/vmware-modules/files/308-4.15-00-init_timer.patch
new file mode 100644
index 000..94855db
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.15-00-init_timer.patch
@@ -0,0 +1,105 @@
+--- vmmon-only/linux/hostif.c  2017-12-04 23:49:53.485615520 +0100
 vmmon-only/linux/hostif.c.orig 2017-12-04 23:54:13.982630086 +0100
+@@ -1780,7 +1780,11 @@
+  */
+ 
+ static void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++HostIFUptimeResyncMono(struct timer_list *data)  // IN: ignored
++#else
+ HostIFUptimeResyncMono(unsigned long data)  // IN: ignored
++#endif
+ {
+unsigned long jifs;
+uintptr_t flags;
+@@ -1842,8 +1846,12 @@
+   -(tv.tv_usec * (UPTIME_FREQ / 100) + 
+ tv.tv_sec * UPTIME_FREQ));
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++   timer_setup(, HostIFUptimeResyncMono, 0);
++#else
+init_timer();
+uptimeState.timer.function = HostIFUptimeResyncMono;
++#endif
+mod_timer(, jiffies + HZ);
+ }
+ 
+--- vmmon-only/linux/driver.c  2017-12-04 23:49:53.061615496 +0100
 vmmon-only/linux/driver.c.orig 2017-12-04 23:53:26.086627408 +0100
+@@ -115,7 +115,11 @@
+ #endif
+ static int LinuxDriverMmap(struct file *filp, struct vm_area_struct *vma);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++static void LinuxDriverPollTimeout(struct timer_list *clientData);
++#else
+ static void LinuxDriverPollTimeout(unsigned long clientData);
++#endif
+ static unsigned int LinuxDriverEstimateTSCkHz(void);
+ 
+ static struct vm_operations_struct vmuser_mops = {
+@@ -227,7 +231,11 @@
+  *--
+  */
+ static void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++LinuxDriverEstimateTSCkHzDeferred(struct timer_list *data)
++#else
+ LinuxDriverEstimateTSCkHzDeferred(unsigned long data)
++#endif
+ {
+LinuxDriverEstimateTSCkHz();
+ }
+@@ -265,9 +273,11 @@
+}
+ 
+Vmx86_ReadTSCAndUptime();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+tscTimer.function = LinuxDriverEstimateTSCkHzDeferred;
+-   tscTimer.expires  = jiffies + 4 * HZ;
+tscTimer.data = 0;
++#endif
++   tscTimer.expires  = jiffies + 4 * HZ;
+add_timer();
+ }
+ 
+@@ -309,9 +319,14 @@
+ */
+ 
+init_waitqueue_head();
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++   timer_setup(, LinuxDriverPollTimeout, 0);
++#else
+init_timer();
+linuxState.pollTimer.data = 0;
+linuxState.pollTimer.function = LinuxDriverPollTimeout;
++#endif
+ 
+linuxState.fastClockThread = NULL;
+linuxState.fastClockFile = NULL;
+@@ -360,7 +375,11 @@
+linuxState.deviceName, linuxState.major, linuxState.minor);
+ 
+HostIF_InitUptime();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++   timer_setup(, LinuxDriverEstimateTSCkHzDeferred, 0UL);
++#else
+init_timer();
++#endif
+LinuxDriverInitTSCkHz();
+Vmx86_InitIDList();
+ 
+@@ -858,7 +877,11 @@
+  */
+ 
+ static void
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++LinuxDriverPollTimeout(struct timer_list *clientData)  // IN:
++#else
+ LinuxDriverPollTimeout(unsigned long clientData)  // IN:
++#endif
+ {
+LinuxDriverWakeUp(FALSE);
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
index 0f74914..e6f2999 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-01-vmmon-fix-page-accounting.patch"
kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-00-vmmon-global-page-state.patch"
kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-01-deprecated-asm-uaccess.patch"
+   kernel_is ge 4 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.15-00-init_timer.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2017-11-09 Thread Fabio Rossi 
commit: c5fa588af3bc70ad201324c55f5a02b237f14919
Author: Fabio Rossi  inwind  it>
AuthorDate: Wed Oct 25 21:31:35 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri Nov  3 22:43:15 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c5fa588a

app-emulation/vmware-modules: remove an unneeded patch

Removed a patch for kernel 4.8 not needed by vmware-modules-308.5.x, it was
useless because already fixed upstream with a #ifdef. The same patch is
still valid for vmware-modules-304.4.x

 .../vmware-modules/files/308-4.08-00-nr_anon_mapped.patch  | 14 --
 app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild |  1 -
 2 files changed, 15 deletions(-)

diff --git 
a/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch 
b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
deleted file mode 100644
index f806ccd..000
--- a/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
 a/vmmon-only/linux/hostif.c2016-08-13 16:54:18.935207507 +0300
-+++ b/vmmon-only/linux/hostif.c2016-08-13 16:53:52.981424256 +0300
-@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
-  */
- #define LOCKED_PAGE_SLACK 1
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
-+#define NR_ANON_PAGES NR_ANON_MAPPED
-+#endif
-+
- static struct {
-Atomic_uint64 uptimeBase;
-VersionedAtomic   version;

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index 59ce990..d7ebd9f 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -102,7 +102,6 @@ src_prepare() {
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
-   kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch"
kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2017-11-09 Thread Fabio Rossi 
commit: f1e55c55662305fc41f64d9bbb074a28ed5a462c
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri Nov  3 23:16:27 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri Nov  3 23:16:27 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f1e55c55

app-emulation/vmware-modules: fix page accounting

Found a possibile problem with future vmware v14 products, at a certain point a
virtual machine remains without memory. See for example:

https://communities.vmware.com/thread/573281
https://superuser.com/questions/1255099/vmware-workstation-not-enough-physical-memory-since-last-update/1255963

To solve the issue I have inserted three of the patches available from
https://github.com/mkubecek/vmware-host-modules/commit/b50848c985f1
Thanks to mkubecek.

 .../files/308-4.08-00-vmmon-fix-page-accounting.patch | 19 +++
 .../files/308-4.13-01-vmmon-fix-page-accounting.patch | 14 ++
 .../vmware-modules/vmware-modules-308.5.7.ebuild  |  2 ++
 3 files changed, 35 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.08-00-vmmon-fix-page-accounting.patch
 
b/app-emulation/vmware-modules/files/308-4.08-00-vmmon-fix-page-accounting.patch
new file mode 100644
index 000..7d653f4
--- /dev/null
+++ 
b/app-emulation/vmware-modules/files/308-4.08-00-vmmon-fix-page-accounting.patch
@@ -0,0 +1,19 @@
+--- vmmon-only/linux/hostif.c  2017-10-26 00:01:58.466448868 +0200
 vmmon-only/linux/hostif.c.new  2017-10-26 00:10:42.874478191 +0200
+@@ -1597,11 +1597,15 @@
+   BYTES_2_PAGES(vm->memInfo.hugePageBytes);
+unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
+   global_page_state(NR_SLAB_UNRECLAIMABLE) +
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
++  global_node_page_state(NR_UNEVICTABLE) +
++#else
+   global_page_state(NR_UNEVICTABLE) +
++#endif
+   hugePages + reservedPages;
+unsigned int anonPages =
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+-  global_page_state(NR_ANON_MAPPED);
++  global_node_page_state(NR_ANON_MAPPED);
+ #else
+   global_page_state(NR_ANON_PAGES);
+ #endif

diff --git 
a/app-emulation/vmware-modules/files/308-4.13-01-vmmon-fix-page-accounting.patch
 
b/app-emulation/vmware-modules/files/308-4.13-01-vmmon-fix-page-accounting.patch
new file mode 100644
index 000..050a828
--- /dev/null
+++ 
b/app-emulation/vmware-modules/files/308-4.13-01-vmmon-fix-page-accounting.patch
@@ -0,0 +1,14 @@
+--- vmmon-only/linux/hostif.c  2017-10-26 00:16:39.496498131 +0200
 vmmon-only/linux/hostif.c.new  2017-10-26 00:20:35.154511309 +0200
+@@ -1596,7 +1596,11 @@
+unsigned int hugePages = (vm == NULL) ? 0 :
+   BYTES_2_PAGES(vm->memInfo.hugePageBytes);
+unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
++  global_node_page_state(NR_SLAB_UNRECLAIMABLE) +
++#else
+   global_page_state(NR_SLAB_UNRECLAIMABLE) +
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+   global_node_page_state(NR_UNEVICTABLE) +
+ #else

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index d7ebd9f..8987a1d 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -102,6 +102,7 @@ src_prepare() {
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
+   kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-vmmon-fix-page-accounting.patch"
kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch"
kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"
@@ -110,6 +111,7 @@ src_prepare() {
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-01-vmci-do_once.patch"
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch"
kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-00-vmnet-refcount.patch"
+   kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-01-vmmon-fix-page-accounting.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2017-11-09 Thread Fabio Rossi 
commit: f52a32ebbed4e06c26456ca69a0a837aeb1ff90c
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri Nov  3 23:31:24 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri Nov  3 23:31:24 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f52a32eb

app-emulation/vmware-modules: add support to kernel 4.14

Added two patches to build vmware-modules with latest 4.14-rcX

One patch tracks kernel changes introduced with 
c41f012ade0b95b0a6e25c7150673e0554736165.
The other patch fixes changes introduced with 
7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba
(in this case kernel changes were already available since kernel 4.10
but they produced a build failure only with kernel 4.14-rcX)

 .../308-4.14-00-vmmon-global-page-state.patch  | 14 ++
 .../files/308-4.14-01-deprecated-asm-uaccess.patch | 50 ++
 .../vmware-modules/vmware-modules-308.5.7.ebuild   |  2 +
 3 files changed, 66 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.14-00-vmmon-global-page-state.patch 
b/app-emulation/vmware-modules/files/308-4.14-00-vmmon-global-page-state.patch
new file mode 100644
index 000..85de302
--- /dev/null
+++ 
b/app-emulation/vmware-modules/files/308-4.14-00-vmmon-global-page-state.patch
@@ -0,0 +1,14 @@
+--- vmmon-only/linux/hostif.c  2017-10-26 00:46:14.312597372 +0200
 vmmon-only/linux/hostif.c.new  2017-10-26 00:49:16.419607555 +0200
+@@ -1595,7 +1595,11 @@
+unsigned int reservedPages = MEMDEFAULTS_MIN_HOST_PAGES;
+unsigned int hugePages = (vm == NULL) ? 0 :
+   BYTES_2_PAGES(vm->memInfo.hugePageBytes);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++   unsigned int lockedPages = global_zone_page_state(NR_PAGETABLE) +
++#else
+unsigned int lockedPages = global_page_state(NR_PAGETABLE) +
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)
+   global_node_page_state(NR_SLAB_UNRECLAIMABLE) +
+ #else

diff --git 
a/app-emulation/vmware-modules/files/308-4.14-01-deprecated-asm-uaccess.patch 
b/app-emulation/vmware-modules/files/308-4.14-01-deprecated-asm-uaccess.patch
new file mode 100644
index 000..4ee38f9
--- /dev/null
+++ 
b/app-emulation/vmware-modules/files/308-4.14-01-deprecated-asm-uaccess.patch
@@ -0,0 +1,50 @@
+--- vmblock-only/linux/control.c   2017-10-26 00:35:44.391562150 +0200
 vmblock-only/linux/control.c.new   2017-10-26 00:44:31.803591641 +0200
+@@ -29,7 +29,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ 
+ #include "vmblockInt.h"
+ #include "block.h"
+--- ./vsock-only/shared/compat_uaccess.h   2017-06-20 04:29:39.0 
+0200
 ./vsock-only/shared/compat_uaccess.h.new   2017-10-26 01:09:20.867674903 
+0200
+@@ -21,7 +21,9 @@
+ 
+ 
+ /* User space access functions moved in 2.1.7 to asm/uaccess.h --hpreg */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
++#   include 
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
+ #   include 
+ #else
+ #   include 
+--- ./vmci-only/shared/compat_uaccess.h2017-06-20 04:29:39.0 
+0200
 ./vmci-only/shared/compat_uaccess.h.new2017-10-26 01:08:43.547672817 
+0200
+@@ -21,7 +21,9 @@
+ 
+ 
+ /* User space access functions moved in 2.1.7 to asm/uaccess.h --hpreg */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
++#   include 
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
+ #   include 
+ #else
+ #   include 
+--- ./vmblock-only/shared/compat_uaccess.h 2017-06-20 04:29:39.0 
+0200
 ./vmblock-only/shared/compat_uaccess.h.new 2017-10-26 01:07:48.915669762 
+0200
+@@ -21,7 +21,9 @@
+ 
+ 
+ /* User space access functions moved in 2.1.7 to asm/uaccess.h --hpreg */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
++#   include 
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 7)
+ #   include 
+ #else
+ #   include 

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index 8987a1d..0f74914 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -112,6 +112,8 @@ src_prepare() {
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch"
kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-00-vmnet-refcount.patch"
kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-01-vmmon-fix-page-accounting.patch"
+   kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-00-vmmon-global-page-state.patch"
+   kernel_is ge 4 14 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.14-01-deprecated-asm-uaccess.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2017-08-22 Thread Fabio Rossi 
commit: d04316bedfd9d97e1c2c0f98bcfdfbb82e6fc679
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue Aug 22 10:02:00 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Tue Aug 22 10:02:00 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d04316be

app-emulation/vmware-modules: add support to kernel 4.13 for version 12

 .../vmware-modules/files/308-4.13-00-vmnet-refcount.patch | 11 +++
 app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.13-00-vmnet-refcount.patch 
b/app-emulation/vmware-modules/files/308-4.13-00-vmnet-refcount.patch
new file mode 100644
index 000..0a1d835
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.13-00-vmnet-refcount.patch
@@ -0,0 +1,11 @@
+--- vmnet-only/bridge.c2017-06-20 04:54:39.0 +0200
 vmnet-only/bridge.c.new2017-08-18 11:16:20.979974593 +0200
+@@ -636,7 +636,7 @@
+unsigned long flags;
+int i;
+ 
+-   atomic_inc(>users);
++   refcount_inc(>users);
+ 
+clone->dev = dev;
+clone->protocol = eth_type_trans(clone, dev);

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index ad6b45c..59ce990 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -110,6 +110,7 @@ src_prepare() {
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-00-vmblock-current_time.patch"
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-01-vmci-do_once.patch"
kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch"
+   kernel_is ge 4 13 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.13-00-vmnet-refcount.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2017-08-21 Thread Evan Teran 
commit: f0d2d07f7592531eab46fb5b86d58b29bf206d0b
Author: Joshua Baergen  emc  com>
AuthorDate: Thu Jul  6 18:23:43 2017 +
Commit: Evan Teran  gmail  com>
CommitDate: Thu Jul  6 18:23:50 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f0d2d07f

app-emulation/vmware-modules: add support to kernel 4.12

 .../files/308-4.12-00-vmblock-current_time.patch   | 11 +++
 .../files/308-4.12-01-vmci-do_once.patch   | 18 ++
 .../files/308-4.12-02-vmci-pci_enable_msix.patch   | 17 +
 .../vmware-modules/vmware-modules-308.5.7.ebuild   |  3 +++
 4 files changed, 49 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch 
b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch
new file mode 100644
index 000..f39b862
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-00-vmblock-current_time.patch
@@ -0,0 +1,11 @@
+--- ./vmblock-only/linux/inode.c   2017-07-06 11:47:09.496190133 -0600
 ./vmblock-only/linux/inode.c.new   2017-07-06 11:55:53.212410091 -0600
+@@ -156,7 +156,7 @@
+inode->i_mode = S_IFLNK | S_IRWXUGO;
+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_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+inode->i_uid = inode->i_gid = 0;
+ #else

diff --git a/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch 
b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch
new file mode 100644
index 000..e91f047
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-01-vmci-do_once.patch
@@ -0,0 +1,18 @@
+--- vmci-only/shared/vm_basic_defs.h   2017-06-19 20:29:40.0 -0600
 vmci-only/shared/vm_basic_defs.h.new   2017-07-06 12:11:37.146017203 
-0600
+@@ -720,6 +720,7 @@
+  lfMessageFont)
+ 
+ /* This is not intended to be thread-safe. */
++#ifndef DO_ONCE
+ #define DO_ONCE(code)   \
+do { \
+   static Bool _doOnceDone = FALSE;  \
+@@ -728,6 +729,7 @@
+  code;  \
+   } \
+} while (0)
++#endif
+ 
+ /*
+  * Bug 827422 and 838523.

diff --git 
a/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch 
b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch
new file mode 100644
index 000..a4ce13a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.12-02-vmci-pci_enable_msix.patch
@@ -0,0 +1,17 @@
+--- ./vmci-only/linux/driver.c 2017-07-06 12:12:38.860458601 -0600
 ./vmci-only/linux/driver.c.new 2017-07-06 12:21:09.986139888 -0600
+@@ -1726,11 +1726,11 @@
+   vmci_dev.msix_entries[i].vector = i;
+}
+ 
+-   result = pci_enable_msix(pdev, vmci_dev.msix_entries, VMCI_MAX_INTRS);
++   result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, 
VMCI_MAX_INTRS);
+if (!result) {
+   vmci_dev.exclusive_vectors = TRUE;
+-   } else if (result > 0) {
+-  result = pci_enable_msix(pdev, vmci_dev.msix_entries, 1);
++   } else {
++  result = pci_enable_msix_exact(pdev, vmci_dev.msix_entries, 1);
+}
+return result;
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
index 351dec4..ad6b45c 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.5.7.ebuild
@@ -107,6 +107,9 @@ src_prepare() {
kernel_is ge 4 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch"
kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers.patch"
kernel_is ge 4 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch"
+   kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-00-vmblock-current_time.patch"
+   kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-01-vmci-do_once.patch"
+   kernel_is ge 4 12 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.12-02-vmci-pci_enable_msix.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2017-06-25 Thread Fabio Rossi 
commit: d3812eca3c9455951be5632544f70f3fff9205c3
Author: Fabio Rossi  inwind  it>
AuthorDate: Sun Jun 25 21:42:48 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Sun Jun 25 21:42:48 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d3812eca

app-emulation/vmware-modules: removed unused patches in FILESDIR

 .../files/308-4.03-00-vmmon-misc_deregister.patch  | 14 --
 .../files/308-4.07-00-trans_start.patch| 11 
 .../vmware-modules/files/308-4.11-02-vmmon.patch   | 30 --
 3 files changed, 55 deletions(-)

diff --git 
a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch 
b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
deleted file mode 100644
index 9f0df66..000
--- a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
 work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.0 +0200
-+++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
-@@ -387,9 +387,7 @@
- #ifdef VMX86_DEVEL
-unregister_chrdev(linuxState.major, linuxState.deviceName);
- #else
--   if (misc_deregister()) {
--  Warning("Module %s: error unregistering\n", linuxState.deviceName);
--   }
-+   misc_deregister();
- #endif
- 
-Log("Module %s: unloaded\n", linuxState.deviceName);

diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch 
b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
deleted file mode 100644
index 751924f..000
--- a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 ./vmnet-only/netif.c.old   2016-05-19 20:13:14.259914206 +0200
-+++ ./vmnet-only/netif.c   2016-05-19 20:13:21.250914596 +0200
-@@ -465,7 +465,7 @@
-VNetSend(>port.jack, skb);
- 
-netIf->stats.tx_packets++;
--   dev->trans_start = jiffies;
-+   netif_trans_update(dev);
- 
-return 0;
- }

diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch 
b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
deleted file mode 100644
index b126453..000
--- a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
 old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.0 +0200
-+++ vmmon-only/linux/driver.c  2017-03-06 10:46:33.347053458 +0200
-@@ -105,7 +105,7 @@
- static int LinuxDriver_Close(struct inode *inode, struct file *filp);
- static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
- #if defined(VMW_NOPAGE_2624)
--static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault 
*fault);
-+static int LinuxDriverFault(struct vm_fault *fault);
- #else
- static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
-   unsigned long address,
-@@ -882,15 +882,14 @@
-  */
-
- #if defined(VMW_NOPAGE_2624)
--static int LinuxDriverFault(struct vm_area_struct *vma, //IN
--struct vm_fault *fault) //IN/OUT
-+static int LinuxDriverFault(struct vm_fault *fault) //IN/OUT
- #else
- static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
-   unsigned long address,  //IN
-   int *type)  //OUT: 
Fault type
- #endif
- {
--   VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
-+   VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
-unsigned long pg;
-struct page* page;
-

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2017-05-23 Thread Fabio Rossi 
commit: 9a41d0c3db28fb44493720e49e81384943611b0d
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue May 23 23:10:54 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Tue May 23 23:10:54 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=9a41d0c3

Fix support to kernel 4.9 and add 4.10 and 4.11 for old =vmware-modules-304

 .../files/304-4.10-00-generic_readlink.patch   | 14 
 .../files/304-4.11-00-missing-headers-p1.patch | 40 ++
 .../files/304-4.11-00-missing-headers-p2.patch | 20 +++
 .../files/304-4.11-01-vsock-lockdep.patch  | 21 
 .../vmware-modules/files/304-4.11-02-vmmon.patch   | 30 
 .../files/304-4.9-02-get_user_pages.patch  | 40 ++
 .../vmware-modules/vmware-modules-304.4-r1.ebuild  |  8 -
 7 files changed, 172 insertions(+), 1 deletion(-)

diff --git 
a/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch 
b/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch
new file mode 100644
index 000..ab22a75
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.10-00-generic_readlink.patch
@@ -0,0 +1,14 @@
+--- vmblock-only/linux/inode.c 2017-02-21 08:38:50.844678686 -0700
 vmblock-only/linux/inode.c 2017-02-21 08:59:40.557917497 -0700
+@@ -207,8 +207,10 @@
+   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
+ #elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
+ return readlink_copy(buffer, buflen, iinfo->name);
+-#else
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 9, 99)
+ return generic_readlink(dentry, buffer, buflen);
++#else
++return vfs_readlink(dentry, buffer, buflen);
+ #endif
+ }
+ 

diff --git 
a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch 
b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
new file mode 100644
index 000..215bcf3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p1.patch
@@ -0,0 +1,40 @@
+--- vmblock-only/linux/inode.c 2017-05-06 16:54:57.0 +0200
 vmblock-only/linux/inode.c.new 2017-05-06 16:55:32.0 +0200
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+--- vmci-only/linux/driver.c   2017-05-06 16:59:06.0 +0200
 vmci-only/linux/driver.c.new   2017-05-06 17:00:03.0 +0200
+@@ -38,6 +38,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vmci-only/linux/vmciKernelIf.c 2017-05-06 17:00:42.0 +0200
 vmci-only/linux/vmciKernelIf.c.new 2017-05-06 17:01:24.0 +0200
+@@ -41,6 +41,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vsock-only/linux/af_vsock.c2017-05-06 17:02:05.0 +0200
 vsock-only/linux/af_vsock.c.new2017-05-06 17:02:49.0 +0200
+@@ -106,6 +106,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
+ #   include 

diff --git 
a/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch 
b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
new file mode 100644
index 000..29a0c9d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-00-missing-headers-p2.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/hostif.c  2017-05-06 16:56:09.0 +0200
 vmmon-only/linux/hostif.c.new  2017-05-06 16:56:41.0 +0200
+@@ -73,6 +73,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+--- vmnet-only/userif.c2017-03-13 04:05:59.0 +0100
 vmnet-only/userif.c.new2017-05-06 16:58:32.0 +0200
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 

diff --git a/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch 
b/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch
new file mode 100644
index 000..7218d27
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.11-01-vsock-lockdep.patch
@@ -0,0 +1,21 @@
+--- vsock-only/linux/af_vsock.c2017-05-21 00:58:02.900776185 +0200
 vsock-only/linux/af_vsock.c.new2017-05-21 00:57:18.932773727 +0200
+@@ -213,7 +213,7 @@
+  struct sockaddr *addr, int addrLen, int 
flags);
+ static int VSockVmciStreamConnect(struct socket *sock,
+   struct sockaddr *addr, int addrLen, int 
flags);
+-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int 
flags);
++static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int 
flags, bool kern);
+ static int VSockVmciGetname(struct socket *sock,
+ struct sockaddr *addr, int *addrLen,

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2017-05-23 Thread Fabio Rossi 
commit: 0326b3e5c8bd3163cd658cc99b865251756bfec2
Author: Fabio Rossi  inwind  it>
AuthorDate: Tue May 23 23:08:30 2017 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Tue May 23 23:08:30 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0326b3e5

app-emulation/vmware-modules: add support to kernel 4.11

 .../files/308-4.11-00-missing-headers-p1.patch | 40 ++
 .../files/308-4.11-00-missing-headers-p2.patch | 20 +++
 .../files/308-4.11-01-vsock-lockdep.patch  | 21 
 .../vmware-modules/files/308-4.11-02-vmmon.patch   | 30 
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  4 +++
 .../vmware-modules/vmware-modules-308.5.6.ebuild   |  2 ++
 6 files changed, 117 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch 
b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch
new file mode 100644
index 000..60fcdfc
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch
@@ -0,0 +1,40 @@
+--- vmblock-only/linux/inode.c 2017-05-06 16:54:57.0 +0200
 vmblock-only/linux/inode.c.new 2017-05-06 16:55:32.0 +0200
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "vmblockInt.h"
+ #include "filesystem.h"
+--- vmci-only/linux/driver.c   2017-05-06 16:59:06.0 +0200
 vmci-only/linux/driver.c.new   2017-05-06 17:00:03.0 +0200
+@@ -38,6 +38,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vmci-only/linux/vmciKernelIf.c 2017-05-06 17:00:42.0 +0200
 vmci-only/linux/vmciKernelIf.c.new 2017-05-06 17:01:24.0 +0200
+@@ -41,6 +41,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vsock-only/linux/af_vsock.c2017-05-06 17:02:05.0 +0200
 vsock-only/linux/af_vsock.c.new2017-05-06 17:02:49.0 +0200
+@@ -106,6 +106,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
+ #   include 

diff --git 
a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch 
b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
new file mode 100644
index 000..29a0c9d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/hostif.c  2017-05-06 16:56:09.0 +0200
 vmmon-only/linux/hostif.c.new  2017-05-06 16:56:41.0 +0200
+@@ -73,6 +73,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ 
+--- vmnet-only/userif.c2017-03-13 04:05:59.0 +0100
 vmnet-only/userif.c.new2017-05-06 16:58:32.0 +0200
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 

diff --git a/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch 
b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch
new file mode 100644
index 000..7218d27
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch
@@ -0,0 +1,21 @@
+--- vsock-only/linux/af_vsock.c2017-05-21 00:58:02.900776185 +0200
 vsock-only/linux/af_vsock.c.new2017-05-21 00:57:18.932773727 +0200
+@@ -213,7 +213,7 @@
+  struct sockaddr *addr, int addrLen, int 
flags);
+ static int VSockVmciStreamConnect(struct socket *sock,
+   struct sockaddr *addr, int addrLen, int 
flags);
+-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int 
flags);
++static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int 
flags, bool kern);
+ static int VSockVmciGetname(struct socket *sock,
+ struct sockaddr *addr, int *addrLen, int peer);
+ static unsigned int VSockVmciPoll(struct file *file,
+@@ -3772,7 +3772,8 @@
+ static int
+ VSockVmciAccept(struct socket *sock, // IN
+ struct socket *newsock,  // IN/OUT
+-int flags)   // IN
++int flags,   // IN
++bool kern)   // IN
+ {
+struct sock *listener;
+int err;

diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch 
b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
new file mode 100644
index 000..b126453
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
@@ -0,0 +1,30 @@
+diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
+--- old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.0 +0200
 vmmon-only/linux/driver.c  2017-03-06 10:46:33.347053458 +0200
+@@ -105,7 +105,7 @@
+ static int LinuxDriver_Close(struct inode *inode,

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2017-04-05 Thread Evan Teran 
commit: 21f2f9477ccb35e04fefed3c0bc3d4c724ab0255
Author: Evan Teran  gmail  com>
AuthorDate: Wed Apr  5 14:49:40 2017 +
Commit: Evan Teran  gmail  com>
CommitDate: Wed Apr  5 14:49:40 2017 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=21f2f947

adding support for 4.9 kernels to vmware-modules 304 (workstation 11)

 .../files/304-4.9-00-get_user_pages.patch  |  20 
 .../files/304-4.9-01-get_user_pages.patch  |  20 
 .../vmware-modules/vmware-modules-304.4-r1.ebuild  | 125 +
 3 files changed, 165 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch 
b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch
new file mode 100644
index 000..9b7e0a4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.9-00-get_user_pages.patch
@@ -0,0 +1,20 @@
+--- vmmon-only.bak/linux/hostif.c   2017-04-05 10:10:24.522070886 -0400
 vmmon-only/linux/hostif.c   2017-04-05 10:13:35.871077701 -0400
+@@ -1171,12 +1171,16 @@ HostIFGetUserPages(void *uvAddr,
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++   retval = get_user_pages((unsigned long)uvAddr, numPages, 0, ppages, 
NULL);
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
+retval = get_user_pages((unsigned long)uvAddr,
+ #else
+retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
+ #endif
+numPages, 0, 0, ppages, NULL);
++#endif
+up_read(>mm->mmap_sem);
+ 
+return retval != numPages;
+

diff --git a/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch 
b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch
new file mode 100644
index 000..0858beb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.9-01-get_user_pages.patch
@@ -0,0 +1,20 @@
+diff -rupN vmnet-only.bak/userif.c vmnet-only/userif.c
+--- vmnet-only.bak/userif.c2017-04-05 10:44:29.166143701 -0400
 vmnet-only/userif.c2017-04-05 10:45:46.443146453 -0400
+@@ -113,12 +113,16 @@ UserifLockPage(VA addr) // IN
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
++   retval = get_user_pages(addr, 1, FOLL_WRITE, , NULL);
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
+retval = get_user_pages(addr,
+ #else
+retval = get_user_pages(current, current->mm, addr,
+ #endif
+  1, 1, 0, , NULL);
++#endif
+up_read(>mm->mmap_sem);
+ 
+if (retval != 1) {

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
new file mode 100644
index 000..d50aedc
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-304.4-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+IUSE="pax_kernel +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   || ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
+   =app-emulation/vmware-workstation-11.1.${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
+   if use vmci ; then
+   CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+   else
+   CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+   fi
+   if use vsock ; then
+   CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+   else
+   CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+   fi
+
+   linux-info_pkg_setup
+
+   linux-mod_pkg_setup
+
+   VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+   VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+   VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+   use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+   use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_ALL}; do
+   tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+   done
+}
+
+src_prepare() {
+   epatch

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2016-12-12 Thread Evan Teran 
commit: 44fda826a47e67573d69290ea616e6da210e9849
Author: Joshua Baergen  emc  com>
AuthorDate: Mon Dec 12 18:11:23 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Mon Dec 12 18:19:55 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=44fda826

app-emulation/vmware-modules: add support for kernel 4.9

4.9 introduced a change to the get_user_pages() API:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=768ae309a96103ed02eb1e111e838c87854d8b51

 .../files/308-4.09-00-user-pages.patch | 77 ++
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  1 +
 2 files changed, 78 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch 
b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch
new file mode 100644
index 000..73c6c9f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.09-00-user-pages.patch
@@ -0,0 +1,77 @@
+--- vmmon-only/linux/hostif.c  2016-12-12 09:17:44.438182532 -0700
 vmmon-only/linux/hostif.c  2016-12-12 09:19:24.066254301 -0700
+@@ -1172,7 +1172,11 @@
+ #else
+retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
+ #endif
+-   numPages, 0, 0, ppages, NULL);
++   numPages, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++   0,
++#endif
++ ppages, NULL);
+up_read(>mm->mmap_sem);
+ 
+return retval != numPages;
+--- vmnet-only/userif.c 2016-12-12 09:27:12.445246854 -0700
 vmnet-only/userif.c 2016-12-12 09:27:30.654298646 -0700
+@@ -118,7 +118,13 @@
+ #else
+retval = get_user_pages(current, current->mm, addr,
+ #endif
+- 1, 1, 0, , NULL);
++  1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++  1, 0,
++#else
++  FOLL_WRITE,
++#endif
++  , NULL);
+up_read(>mm->mmap_sem);
+ 
+if (retval != 1) {
+--- vmci-only/linux/driver.c2016-12-12 09:38:13.076847013 -0700
 vmci-only/linux/driver.c2016-12-12 09:38:45.638087445 -0700
+@@ -1473,7 +1473,13 @@
+ #else
+retval = get_user_pages(current, current->mm, addr,
+ #endif
+-   1, 1, 0, , NULL);
++  1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++  1, 0,
++#else
++  FOLL_WRITE,
++#endif
++  , NULL);
+up_read(>mm->mmap_sem);
+ 
+if (retval != 1) {
+--- vmci-only/linux/vmciKernelIf.c  2016-12-12 09:38:20.678904322 -0700
 vmci-only/linux/vmciKernelIf.c  2016-12-12 09:39:59.129587451 -0700
+@@ -2061,7 +2061,11 @@
+(VA)produceUVA,
+ #endif
+produceQ->kernelIf->numPages,
+-   1, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++  1, 0,
++#else
++  FOLL_WRITE,
++#endif
+produceQ->kernelIf->u.h.headerPage,
+NULL);
+if (retval < produceQ->kernelIf->numPages) {
+@@ -2079,7 +2083,11 @@
+(VA)consumeUVA,
+ #endif
+consumeQ->kernelIf->numPages,
+-   1, 0,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
++  1, 0,
++#else
++  FOLL_WRITE,
++#endif
+consumeQ->kernelIf->u.h.headerPage,
+NULL);
+if (retval < consumeQ->kernelIf->numPages) {

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index b3faaaf..bb9db4f 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -105,6 +105,7 @@ src_prepare() {
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
+   kernel_is ge 4 9 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2016-08-17 Thread Fabio Rossi 
commit: 5f6e3b9c5c56a7f3d470a42d628736f1f90a5e4e
Author: Fabio Rossi  inwind  it>
AuthorDate: Wed Aug 17 12:35:18 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Wed Aug 17 12:35:18 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=5f6e3b9c

app-emulation/vmware-modules: really fix hardened with 304.x

 app-emulation/vmware-modules/files/304-hardened.patch | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app-emulation/vmware-modules/files/304-hardened.patch 
b/app-emulation/vmware-modules/files/304-hardened.patch
index cc3e041..588abca 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -82,7 +82,7 @@ index b12b982..40bd4cf 100644
  
  /*
   * Utility functions
-@@ -476,28 +491,6 @@ init_module(void)
+@@ -476,22 +491,6 @@ init_module(void)
goto err_proto;
 }
  
@@ -97,14 +97,8 @@ index b12b982..40bd4cf 100644
 -   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;
 -

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2016-08-17 Thread Fabio Rossi 
commit: 88f3b5bda1e08e8c9e35a5ad96b25c0cb7cda545
Author: Fabio Rossi  inwind  it>
AuthorDate: Wed Aug 17 12:10:38 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Wed Aug 17 12:10:38 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=88f3b5bd

Revert "app-emulation/vmware-modules: fix version 304.3 with hardened"

This reverts commit 84ce9f6be8f1b115b9a3c454f3d9d8b2ff6db253.

 .../vmware-modules/files/304-hardened.patch| 62 --
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/app-emulation/vmware-modules/files/304-hardened.patch 
b/app-emulation/vmware-modules/files/304-hardened.patch
index 822bd57..cc3e041 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -1,6 +1,8 @@
 vmmon-only/linux/driver.c.orig 2016-07-28 22:10:27.464215083 +0200
-+++ vmmon-only/linux/driver.c  2016-07-28 22:54:20.796362329 +0200
-@@ -124,7 +124,16 @@ static struct vm_operations_struct vmuse
+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
  };
  
@@ -8,19 +10,25 @@
 +static struct file_operations vmuser_fops = {
 +   .owner = THIS_MODULE,
 +   .poll = LinuxDriverPoll,
-+   .unlocked_ioctl = LinuxDriver_Ioctl,
-+   .compat_ioctl = LinuxDriver_Ioctl,
++#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;
- static Atomic_uint32 tsckHz;
- static VmTimeStart tsckHzStartTime;
-@@ -317,21 +326,6 @@ init_module(void)
-linuxState.fastClockPriority = -20;
-linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
+ 
+ /*
+@@ -357,27 +372,6 @@ init_module(void)
+spin_lock_init();
+ #endif
  
 -   /*
 -* Initialize the file_operations structure. Because this code is always
@@ -31,8 +39,14 @@
 -   memset(_fops, 0, sizeof vmuser_fops);
 -   vmuser_fops.owner = THIS_MODULE;
 -   vmuser_fops.poll = LinuxDriverPoll;
--   vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
--   vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
+-#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;
@@ -40,11 +54,13 @@
  #ifdef VMX86_DEVEL
 devel_init_module();
 linuxState.minor = 0;
 vmnet-only/driver.c.orig   2016-04-15 01:48:48.0 +0200
-+++ vmnet-only/driver.c2016-07-28 22:54:20.797362329 +0200
-@@ -137,7 +137,16 @@ static ssize_t  VNetFileOpWrite(struct f
- static long  VNetFileOpUnlockedIoctl(struct file * filp,
+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 = {
@@ -52,15 +68,21 @@
 +   .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
-@@ -317,22 +326,6 @@ init_module(void)
+@@ -476,28 +491,6 @@ init_module(void)
goto err_proto;
 }
  
@@ -75,8 +97,14 @@
 -   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;
 -

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2016-08-17 Thread Fabio Rossi 
commit: f5e136467b79ef82f237004c60f5bc8dd4e486ef
Author: Fabio Rossi  inwind  it>
AuthorDate: Wed Aug 17 12:08:10 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Wed Aug 17 12:08:10 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f5e13646

app-emulation/vmware-modules: add support to kernel 4.8

upstream kernel commit 4b9d0fab7166c9323f06d708518a35cf3a90426c renamed
a symbol, add a patch to fix the problem. This solves the bug #591284.

 .../vmware-modules/files/304-4.8-00-nr_anon_mapped.patch   | 14 ++
 .../vmware-modules/files/308-4.08-00-nr_anon_mapped.patch  | 14 ++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  |  1 +
 app-emulation/vmware-modules/vmware-modules-304.4.ebuild   |  1 +
 app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild |  1 +
 5 files changed, 31 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch 
b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch
new file mode 100644
index 000..f806ccd
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.8-00-nr_anon_mapped.patch
@@ -0,0 +1,14 @@
+diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- a/vmmon-only/linux/hostif.c2016-08-13 16:54:18.935207507 +0300
 b/vmmon-only/linux/hostif.c2016-08-13 16:53:52.981424256 +0300
+@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
+  */
+ #define LOCKED_PAGE_SLACK 1
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
++#define NR_ANON_PAGES NR_ANON_MAPPED
++#endif
++
+ static struct {
+Atomic_uint64 uptimeBase;
+VersionedAtomic   version;

diff --git 
a/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch 
b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
new file mode 100644
index 000..f806ccd
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.08-00-nr_anon_mapped.patch
@@ -0,0 +1,14 @@
+diff -uprNb a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+--- a/vmmon-only/linux/hostif.c2016-08-13 16:54:18.935207507 +0300
 b/vmmon-only/linux/hostif.c2016-08-13 16:53:52.981424256 +0300
+@@ -140,6 +140,10 @@ static DECLARE_TASKLET(timerTasklet, Hos
+  */
+ #define LOCKED_PAGE_SLACK 1
+ 
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 99)
++#define NR_ANON_PAGES NR_ANON_MAPPED
++#endif
++
+ static struct {
+Atomic_uint64 uptimeBase;
+VersionedAtomic   version;

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index ba97b17..a10a9f4 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
+   kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
index ba97b17..a10a9f4 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.4.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
+   kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.8-00-nr_anon_mapped.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index da4a7a1..b3faaaf 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
+   kernel_is ge 4 8 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-08-05 Thread Fabio Rossi 
commit: 7688f8838d5b9761d0434d304be8fe8390270bd6
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri Aug  5 07:25:16 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri Aug  5 07:25:16 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=7688f883

app-emulation/vmware-modules: complete support to kernel 4.7

Latest 4.7 kernel doesn't export anymore the readlink_copy() function:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=bfe8804d908a791b16e3686c101f0d7eca9fb5b9

This fixes bug #590220

 .../vmware-modules/files/304-4.7-01-readlink_copy.patch  | 16 
 .../vmware-modules/files/308-4.07-01-readlink_copy.patch | 16 
 .../vmware-modules/vmware-modules-304.3-r1.ebuild|  1 +
 .../vmware-modules/vmware-modules-308.1.1.ebuild |  1 +
 4 files changed, 34 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch 
b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch
new file mode 100644
index 000..5fccd97
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch
@@ -0,0 +1,16 @@
+--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200
 vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200
+@@ -205,10 +205,11 @@
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
+   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
++return readlink_copy(buffer, buflen, iinfo->name);
+ #else
+-   return readlink_copy(buffer, buflen, iinfo->name);
++return generic_readlink(dentry, buffer, buflen);
+ #endif
+-
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch 
b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch
new file mode 100644
index 000..5fccd97
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch
@@ -0,0 +1,16 @@
+--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200
 vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200
+@@ -205,10 +205,11 @@
+ 
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
+   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
++return readlink_copy(buffer, buflen, iinfo->name);
+ #else
+-   return readlink_copy(buffer, buflen, iinfo->name);
++return generic_readlink(dentry, buffer, buflen);
+ #endif
+-
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 665965c..ba97b17 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -103,6 +103,7 @@ src_prepare() {
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
+   kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index 1bfbcb4..da4a7a1 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -103,6 +103,7 @@ src_prepare() {
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
+   kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2016-08-05 Thread Fabio Rossi 
commit: 84ce9f6be8f1b115b9a3c454f3d9d8b2ff6db253
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri Aug  5 07:24:03 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri Aug  5 07:24:03 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=84ce9f6b

app-emulation/vmware-modules: fix version 304.3 with hardened

 .../vmware-modules/files/304-hardened.patch| 62 ++
 1 file changed, 17 insertions(+), 45 deletions(-)

diff --git a/app-emulation/vmware-modules/files/304-hardened.patch 
b/app-emulation/vmware-modules/files/304-hardened.patch
index cc3e041..822bd57 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -1,8 +1,6 @@
-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 = {
+--- vmmon-only/linux/driver.c.orig 2016-07-28 22:10:27.464215083 +0200
 vmmon-only/linux/driver.c  2016-07-28 22:54:20.796362329 +0200
+@@ -124,7 +124,16 @@ static struct vm_operations_struct vmuse
  #endif
  };
  
@@ -10,25 +8,19 @@ index b21dd44..960c2aa 100644
 +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
++   .unlocked_ioctl = LinuxDriver_Ioctl,
++   .compat_ioctl = LinuxDriver_Ioctl,
 +   .open = LinuxDriver_Open,
 +   .release = LinuxDriver_Close,
 +   .mmap = LinuxDriverMmap
 +};
 +
  static struct timer_list tscTimer;
- 
- /*
-@@ -357,27 +372,6 @@ init_module(void)
-spin_lock_init();
- #endif
+ static Atomic_uint32 tsckHz;
+ static VmTimeStart tsckHzStartTime;
+@@ -317,21 +326,6 @@ init_module(void)
+linuxState.fastClockPriority = -20;
+linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
  
 -   /*
 -* Initialize the file_operations structure. Because this code is always
@@ -39,14 +31,8 @@ index b21dd44..960c2aa 100644
 -   memset(_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.unlocked_ioctl = LinuxDriver_Ioctl;
+-   vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
 -   vmuser_fops.open = LinuxDriver_Open;
 -   vmuser_fops.release = LinuxDriver_Close;
 -   vmuser_fops.mmap = LinuxDriverMmap;
@@ -54,13 +40,11 @@ index b21dd44..960c2aa 100644
  #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,
+--- vmnet-only/driver.c.orig   2016-04-15 01:48:48.0 +0200
 vmnet-only/driver.c2016-07-28 22:54:20.797362329 +0200
+@@ -137,7 +137,16 @@ static ssize_t  VNetFileOpWrite(struct f
+ static long  VNetFileOpUnlockedIoctl(struct file * filp,
   unsigned int iocmd, unsigned long ioarg);
- #endif
  
 -static struct file_operations vnetFileOps;
 +static struct file_operations vnetFileOps = {
@@ -68,21 +52,15 @@ index b12b982..40bd4cf 100644
 +   .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)
+@@ -317,22 +326,6 @@ init_module(void)
goto err_proto;
 }
  
@@ -97,14 +75,8 @@ index b12b982..40bd4cf 100644
 -   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;
 -

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-05-30 Thread Fabio Rossi 
commit: 92a78cb3305fc182764cb0c6b2c44892dcc35212
Author: Fabio Rossi  inwind  it>
AuthorDate: Mon May 30 21:50:44 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Mon May 30 21:50:44 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92a78cb3

app-emulation/vmware-modules: add support to kernel 4.7

Fix compilation with latest 4.7-rc1 taking example from
kernel commit 860e9538a9482bb84589f7d0718a7e6d0a944d58

 .../vmware-modules/files/304-4.7-00-trans_start.patch | 11 +++
 .../vmware-modules/files/308-4.07-00-trans_start.patch| 11 +++
 app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild   |  1 +
 app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild|  1 +
 4 files changed, 24 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch 
b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
new file mode 100644
index 000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old   2016-05-19 20:13:14.259914206 +0200
 ./vmnet-only/netif.c   2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+VNetSend(>port.jack, skb);
+ 
+netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+return 0;
+ }

diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch 
b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
new file mode 100644
index 000..751924f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
@@ -0,0 +1,11 @@
+--- ./vmnet-only/netif.c.old   2016-05-19 20:13:14.259914206 +0200
 ./vmnet-only/netif.c   2016-05-19 20:13:21.250914596 +0200
+@@ -465,7 +465,7 @@
+VNetSend(>port.jack, skb);
+ 
+netIf->stats.tx_packets++;
+-   dev->trans_start = jiffies;
++   netif_trans_update(dev);
+ 
+return 0;
+ }

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index c56f4de..665965c 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -102,6 +102,7 @@ src_prepare() {
kernel_is ge 4 3 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
+   kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
index a7e1daa..1bfbcb4 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
@@ -102,6 +102,7 @@ src_prepare() {
kernel_is ge 4 3 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
kernel_is ge 4 6 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
+   kernel_is ge 4 7 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2016-05-27 Thread Fabio Rossi 
commit: af19a5d912cdd537f70667722d2fb3cbb14b3d35
Author: Fabio Rossi  inwind  it>
AuthorDate: Fri May 27 21:31:39 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Fri May 27 22:57:07 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=af19a5d9

app-emulation/vmware-modules: fix patching of version 308 for kernel 4.5

The old patch 308-4.05-00-vmblock-follow_link.patch was not complete
(probably produced before final 4.5-rc1 release). The problem was
triggering a build failure on some systems.

The patch for version 304 was already correct.

 .../files/308-4.05-00-vmblock-follow_link.patch| 33 ++
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git 
a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch 
b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
index c139292..03311b0 100644
--- a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
+++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
@@ -1,12 +1,12 @@
 vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100
-+++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100
+--- vmblock-only/linux/inode.c.old 2016-05-27 15:12:49.315632906 +0200
 vmblock-only/linux/inode.c 2016-05-27 22:57:39.550192422 +0200
 @@ -44,7 +44,9 @@
  static int InodeOpReadlink(struct dentry *, char __user *, int);
  #endif
-
+ 
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
-+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode 
*inode, void **cookie);
++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode 
*inode, struct delayed_call *done);
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
  static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
  #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
@@ -21,21 +21,23 @@
 .follow_link = InodeOpFollowlink,
 +#endif
  };
-
+ 
  /*
-@@ -231,6 +237,9 @@
+@@ -231,7 +237,10 @@
  static int
  #endif
  InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +  struct inode *inode,
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++  struct delayed_call *done)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
void **cookie)  // OUT: stores opaque pointer
  #else
-@@ -241,12 +250,20 @@
+   struct nameidata *nd)   // OUT: stores result
+@@ -241,18 +250,28 @@
 VMBlockInodeInfo *iinfo;
-
+ 
 if (!dentry) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +  ret = -ECHILD;
@@ -45,7 +47,7 @@
 +#endif
goto out;
 }
-
+ 
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
 +   iinfo = INODE_TO_IINFO(inode);
 +#else
@@ -54,3 +56,12 @@
 if (!iinfo) {
ret = -EINVAL;
goto out;
+}
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++   return iinfo->name;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+return *cookie = iinfo->name;
+ #else
+nd_set_link(nd, iinfo->name);

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2016-05-19 Thread Fabio Rossi 
commit: 10131c0123b70c9731716d8e2b1acd37040cbf64
Author: Fabio Rossi  inwind  it>
AuthorDate: Thu May 19 17:52:06 2016 +
Commit: Fabio Rossi  inwind  net>
CommitDate: Thu May 19 17:52:06 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=10131c01

app-emulation/vmware-modules: add support to kernel 4.6

This closes https://github.com/gentoo/vmware/pull/23 and bug #583244

 .../files/304-4.6-00-user-pages.patch  | 84 ++
 .../files/308-4.06-00-user-pages.patch | 84 ++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  |  1 +
 .../vmware-modules/vmware-modules-308.1.1.ebuild   |  1 +
 4 files changed, 170 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch 
b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
new file mode 100644
index 000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.6-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old 2016-05-19 19:00:09.784669042 +0200
 ./vmci-only/linux/driver.c 2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+retval = get_user_pages(current, current->mm, addr,
++#endif
+1, 1, 0, , NULL);
+up_read(>mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old   2016-05-19 18:57:04.344658673 
+0200
 ./vmci-only/linux/vmciKernelIf.c   2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+   if (dirty) {
+  set_page_dirty(pages[i]);
+   }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++  put_page(pages[i]);
++#else
+   page_cache_release(pages[i]);
++#endif
+   pages[i] = NULL;
+}
+ }
+@@ -2049,9 +2053,13 @@
+int err = VMCI_SUCCESS;
+ 
+down_write(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)produceUVA,
++#else
+retval = get_user_pages(current,
+current->mm,
+(VA)produceUVA,
++#endif
+produceQ->kernelIf->numPages,
+1, 0,
+produceQ->kernelIf->u.h.headerPage,
+@@ -2063,9 +2071,13 @@
+   goto out;
+}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((VA)consumeUVA,
++#else
+retval = get_user_pages(current,
+current->mm,
+(VA)consumeUVA,
++#endif
+consumeQ->kernelIf->numPages,
+1, 0,
+consumeQ->kernelIf->u.h.headerPage,
+--- ./vmmon-only/linux/hostif.c.old2016-05-19 18:50:42.872637343 +0200
 ./vmmon-only/linux/hostif.c2016-05-19 18:53:40.208647259 +0200
+@@ -1163,7 +1163,11 @@
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages((unsigned long)uvAddr,
++#else
+retval = get_user_pages(current, current->mm, (unsigned long)uvAddr,
++#endif
+numPages, 0, 0, ppages, NULL);
+up_read(>mm->mmap_sem);
+ 
+--- ./vmnet-only/userif.c.old  2016-05-19 18:52:45.904644222 +0200
 ./vmnet-only/userif.c  2016-05-19 18:53:28.599646610 +0200
+@@ -113,7 +113,11 @@
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+retval = get_user_pages(current, current->mm, addr,
++#endif
+  1, 1, 0, , NULL);
+up_read(>mm->mmap_sem);
+ 

diff --git a/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch 
b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
new file mode 100644
index 000..dc677c2
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.06-00-user-pages.patch
@@ -0,0 +1,84 @@
+--- ./vmci-only/linux/driver.c.old 2016-05-19 19:00:09.784669042 +0200
 ./vmci-only/linux/driver.c 2016-05-19 19:00:47.480671150 +0200
+@@ -1468,7 +1468,11 @@
+int retval;
+ 
+down_read(>mm->mmap_sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++   retval = get_user_pages(addr,
++#else
+retval = get_user_pages(current, current->mm, addr,
++#endif
+1, 1, 0, , NULL);
+up_read(>mm->mmap_sem);
+ 
+--- ./vmci-only/linux/vmciKernelIf.c.old   2016-05-19 18:57:04.344658673 
+0200
 ./vmci-only/linux/vmciKernelIf.c   2016-05-19 19:03:28.600680159 +0200
+@@ -1835,7 +1835,11 @@
+   if (dirty) {
+  set_page_dirty(pages[i]);
+   }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 99)
++  put_page(pages[i]);
++#else
+   page_cache_release(pages[i]);
++#endif
+   pages[i] = NULL;
+}
+ }
+@@ -2049,9 +2053,13

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2016-03-20 Thread Evan Teran 
commit: 249fc566682eb42f75ea4a97b1a61c6a0da4a0ba
Author: Evan Teran  gmail  com>
AuthorDate: Mon Mar 21 01:35:46 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Mon Mar 21 01:35:46 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=249fc566

app-emulation/vmware-modules: enabling a patch that makes 308.x build on 4.5 
kernels :-)

Package-Manager: portage-2.2.26

 app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild 
b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
index 98a4bd4..0412eca 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
@@ -96,10 +96,11 @@ src_prepare() {
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
-   kernel_is ge 4 01 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
-   kernel_is ge 4 02 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
-   kernel_is ge 4 02 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
-   kernel_is ge 4 03 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
+   kernel_is ge 4 1 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
+   kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
+   kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
+   kernel_is ge 4 3 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
+   kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-03-20 Thread Evan Teran 
commit: 1f0fe410a387b4dfeb5b8633576023135ca9ddc4
Author: Evan Teran  gmail  com>
AuthorDate: Thu Mar 17 02:03:05 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Thu Mar 17 02:03:05 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1f0fe410

app-emulation/vmware-modules:
compiles on 4.3 kernels :-)

Package-Manager: portage-2.2.26

 .../files/304-4.3-00-misc_deregister.patch | 34 ++
 ...304.3.ebuild => vmware-modules-304.3-r1.ebuild} |  1 +
 2 files changed, 35 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch 
b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
new file mode 100644
index 000..32d960d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch
@@ -0,0 +1,34 @@
+diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
+--- vmci-only/linux/driver.c   2016-03-16 21:59:30.229062702 -0400
 vmci-only.new/linux/driver.c   2016-03-16 21:58:35.452061974 -0400
+@@ -2469,7 +2469,9 @@ vmci_init(void)
+ static void __exit
+ vmci_exit(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
+int retval;
++#endif
+ 
+if (guestDeviceInit) {
+   pci_unregister_driver(_driver);
+
+diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
+--- vmci-only/linux/driver.c   2016-03-16 21:53:24.184057841 -0400
 vmci-only.new/linux/driver.c   2016-03-16 21:54:37.558058816 -0400
+@@ -2482,12 +2482,16 @@ vmci_exit(void)
+ 
+   VMCI_HostCleanup();
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++  misc_deregister();
++#else
+   retval = misc_deregister();
+   if (retval) {
+  Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
+   } else {
+  Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+   }
++#endif
+ 
+   hostDeviceInit = FALSE;
+}

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
similarity index 97%
rename from app-emulation/vmware-modules/vmware-modules-304.3.ebuild
rename to app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index a77203d..766eb32 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -99,6 +99,7 @@ src_prepare() {
kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch"
kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
+   kernel_is ge 4 3 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2016-03-19 Thread Evan Teran 
commit: 11f4e961c166dba8df17de09a97b6826a41f28c6
Author: Evan Teran  gmail  com>
AuthorDate: Thu Mar 17 02:26:30 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Thu Mar 17 02:26:30 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=11f4e961

app-emulation/vmware-modules: compiles on 4.5 kernels now

Package-Manager: portage-2.2.26

 .../vmware-modules/files/304-4.5-00-get_link.patch | 67 ++
 .../vmware-modules/vmware-modules-304.3-r1.ebuild  |  1 +
 2 files changed, 68 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch 
b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
new file mode 100644
index 000..169fc71
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch
@@ -0,0 +1,67 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
+--- vmblock-only/linux/inode.c 2016-03-16 22:22:00.470080630 -0400
 vmblock-only.new/linux/inode.c 2016-03-16 22:23:33.016081859 -0400
+@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
+ static int InodeOpReadlink(struct dentry *, char __user *, int);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct 
delayed_call *done);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+ static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -63,7 +65,11 @@ static struct inode_operations LinkInode
+ struct inode_operations LinkInodeOps = {
+ #endif
+.readlink= InodeOpReadlink,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   .get_link = InodeOpGetLink,
++#else
+.follow_link = InodeOpFollowlink,
++#endif
+ };
+ 
+ /*
+@@ -222,7 +228,9 @@ InodeOpReadlink(struct dentry *dentry,
+  *
+  *
+  */
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++const char *InodeOpGetLink(struct dentry *dentry, struct inode *inode, struct 
delayed_call *done)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+ static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
+ #else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+@@ -238,18 +246,28 @@ InodeOpFollowlink(struct dentry *dentry,
+VMBlockInodeInfo *iinfo;
+ 
+if (!dentry) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++  ret = -ECHILD;
++#else
+   Warning("InodeOpReadlink: invalid args from kernel\n");
+   ret = -EINVAL;
++#endif
+   goto out;
+}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   iinfo = INODE_TO_IINFO(inode);
++#else
+iinfo = INODE_TO_IINFO(dentry->d_inode);
++#endif
+if (!iinfo) {
+   ret = -EINVAL;
+   goto out;
+}
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
++   return (char *)(iinfo->name);  
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+return *cookie = (char *)(iinfo->name);  
+ #else
+nd_set_link(nd, iinfo->name);

diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 766eb32..86bea59 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -100,6 +100,7 @@ src_prepare() {
kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch"
kernel_is ge 4 2 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch"
kernel_is ge 4 3 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
+   kernel_is ge 4 5 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-03-19 Thread Evan Teran 
commit: 0ecc3a12322a6ed9456cbb5d5d9136a2699280a8
Author: Evan Teran  gmail  com>
AuthorDate: Thu Mar 17 01:44:05 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Thu Mar 17 01:44:05 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0ecc3a12

app-emulation/vmware-modules:
now vmware-modules:11 compiles cleanly on 4.2

Package-Manager: portage-2.2.26

 .../vmware-modules/files/304-4.2-00-inode_op.patch | 45 +
 .../files/304-4.2-01-vmci_vmalloc.patch| 13 
 .../vmware-modules/files/304-4.2-02-vsock.patch| 77 ++
 .../vmware-modules/files/304-4.2-03-vsock.patch| 14 
 .../vmware-modules/vmware-modules-304.3.ebuild |  4 ++
 5 files changed, 153 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch 
b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch
new file mode 100644
index 000..e6f2acb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch
@@ -0,0 +1,45 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c
+--- vmblock-only/linux/inode.c 2016-03-16 21:24:25.771034759 -0400
 vmblock-only.new/linux/inode.c 2016-03-16 21:26:22.697036311 -0400
+@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru
+ static int InodeOpReadlink(struct dentry *, char __user *, int);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+ static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -220,7 +222,9 @@ InodeOpReadlink(struct dentry *dentry,
+  *
+  *
+  */
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie)
++#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *
+ #else
+@@ -228,6 +232,7 @@ static int
+ #endif
+ InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+   struct nameidata *nd)   // OUT: stores result
++#endif
+ {
+int ret;
+VMBlockInodeInfo *iinfo;
+@@ -244,7 +249,11 @@ InodeOpFollowlink(struct dentry *dentry,
+   goto out;
+}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++   return *cookie = (char *)(iinfo->name);  
++#else
+nd_set_link(nd, iinfo->name);
++#endif
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)

diff --git a/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch 
b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch
new file mode 100644
index 000..2296c06
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch
@@ -0,0 +1,13 @@
+diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c
+--- vmci-only/linux/driver.c   2015-11-03 19:27:55.0 -0500
 vmci-only.new/linux/driver.c   2016-03-16 21:30:47.646039829 -0400
+@@ -26,6 +26,9 @@
+ 
+ #include 
+ #include 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++#include 
++#endif
+ #include 
+ #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
+ #   include 

diff --git a/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch 
b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch
new file mode 100644
index 000..bdac109
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch
@@ -0,0 +1,77 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c2016-03-16 21:31:24.582040320 -0400
 vsock-only.new/linux/af_vsock.c2016-03-16 21:37:22.140045067 -0400
+@@ -231,7 +231,16 @@ static int VSockVmciStreamSetsockopt(str
+ 
+ static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int 
optname,
+  char __user *optval, int __user * 
optlen);
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static int VSockVmciDgramSendmsg(
++ struct socket *sock, struct msghdr *msg, 
size_t len);
++static int VSockVmciDgramRecvmsg(struct socket *sock,
++ struct msghdr *msg, size_t len, int flags);
++static int VSockVmciStreamSendmsg(
++ struct socket *sock, struct msghdr *msg, 
size_t len);
++static int VSockVmciStreamRecvmsg(struct socket *sock,
++ struct msghdr *msg, size_t len, int flags);
++#else
+ static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
+  struct socket *sock, struct msghdr *msg, 
size_t len);
+ static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
+@@ -240,6 +249,7 @@

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-03-18 Thread Andreas Hüttel 
commit: 8213c15bc619e48cde6cd943fc75a825b520a165
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Mar 18 23:33:19 2016 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Mar 18 23:33:19 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=8213c15b

app-emulation/vmware-modules: Remove old

Package-Manager: portage-2.2.28

 .../vmware-modules/files/271-3.10-00-userns.patch  |  41 -
 .../files/271-3.10-01-create_proc_entry.patch  |  28 
 .../vmware-modules/files/271-3.10-02-getname.patch |  24 ---
 .../files/271-3.10-03-deprecated.patch |  89 ---
 .../files/271-3.10-04-unused-typedef.patch | 115 --
 .../vmware-modules/files/271-3.10-05-dentry.patch  |  34 -
 .../vmware-modules/files/271-3.10-06-inode.patch   |  36 -
 .../vmware-modules/files/271-3.10-07-hub.patch |  26 
 .../vmware-modules/files/271-3.11-00-readdir.patch |  41 -
 .../vmware-modules/files/271-3.11-01-filldir.patch |  53 ---
 .../vmware-modules/files/271-3.13-00-vmnet.patch   |  39 -
 .../files/271-3.15-00-readlink.patch   |  15 --
 .../vmware-modules/files/271-3.15-01-vsock.patch   |  46 --
 .../vmware-modules/files/271-3.17-00-netdev.patch  |  16 --
 .../files/271-3.19-00-vmnet-warning.patch  |  13 --
 .../files/271-3.19-01-vmblock-path.patch   |  67 
 .../vmware-modules/files/271-3.19-02-vmci.patch|  29 
 .../vmware-modules/files/271-3.19-03-vmnet.patch   |  29 
 .../vmware-modules/files/271-3.19-04-vsock.patch   |  12 --
 .../vmware-modules/files/271-3.19-05-vsock.patch   |  15 --
 .../files/271-3.19-06-vmci_qpair.patch |  24 ---
 app-emulation/vmware-modules/files/271-apic.patch  |  12 --
 .../vmware-modules/files/271-hardened.patch| 170 -
 .../files/271-makefile-include.patch   |  65 
 .../files/271-makefile-kernel-dir.patch|  85 ---
 .../vmware-modules/files/271-netdevice.patch   |  24 ---
 .../vmware-modules/files/271-putname.patch |  13 --
 .../vmware-modules/files/279-3.10-00-userns.patch  |  41 -
 .../vmware-modules/files/279-3.10-01-getname.patch |  24 ---
 .../files/279-3.10-03-deprecated.patch |  89 ---
 .../vmware-modules/files/279-3.10-04-dentry.patch  |  34 -
 .../vmware-modules/files/279-3.10-05-inode.patch   |  36 -
 .../files/279-3.15-00-readlink.patch   |  15 --
 .../vmware-modules/files/279-3.15-01-vsock.patch   |  46 --
 .../vmware-modules/files/279-3.17-00-netdev.patch  |  16 --
 .../files/279-3.18-00-version-redefined.patch  |  24 ---
 .../files/279-3.19-00-compat-namei.patch   |  23 ---
 .../vmware-modules/files/279-3.19-01-dentry.patch  |  13 --
 .../files/279-3.19-02-vmblock-path.patch   |  67 
 .../vmware-modules/files/279-3.19-03-iovec.patch   |  19 ---
 .../vmware-modules/files/279-3.19-04-iovec.patch   |  39 -
 .../files/279-3.19-05-vmci_qpair.patch |  24 ---
 .../vmware-modules/files/279-3.19-06-vsock.patch   |  15 --
 .../vmware-modules/files/279-3.19-07-vsock.patch   |  12 --
 .../vmware-modules/files/279-4.2-00-cookie.patch   |  79 --
 .../vmware-modules/files/279-5.10-00-userns.patch  |  16 --
 app-emulation/vmware-modules/files/279-apic.patch  |  12 --
 .../vmware-modules/files/279-filldir.patch |  91 ---
 .../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-vmblock.patch |  23 ---
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  | 108 -
 .../vmware-modules/vmware-modules-279.6.ebuild | 117 --
 56 files changed, 2444 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch 
b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
deleted file mode 100644
index b1b78b7..000
--- a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-correctly initializes UID/GID values
-gets UID correctly in light of user namespace API
-origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
-
 a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.0 +0100
-+++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.0 +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 = 
- 
-d_add(dentry, inode);
-
 a/vmci-only/linux/driver.c

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2016-03-18 Thread Evan Teran 
commit: 638abe578790e0a4d965e712797faee7a47a7019
Author: Evan Teran  gmail  com>
AuthorDate: Fri Mar 18 03:13:10 2016 +
Commit: Evan Teran  gmail  com>
CommitDate: Fri Mar 18 03:13:10 2016 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=638abe57

app-emulation/vmware-modules: initial support for vmware-12

Package-Manager: portage-2.2.26

 .../vmware-modules/files/308-3.10-00-dentry.patch  |  43 ++
 .../vmware-modules/files/308-3.10-01-inode.patch   |  94 +
 .../vmware-modules/files/308-3.10-02-control.patch |  57 
 .../vmware-modules/files/308-3.10-03-inline.patch  |  14 ++
 .../vmware-modules/files/308-3.11-00-readdir.patch |  41 ++
 .../vmware-modules/files/308-3.11-01-filldir.patch |  53 
 .../vmware-modules/files/308-3.15-00-vsock.patch   |  46 +++
 .../files/308-3.18-00-version-redefined.patch  |  25 
 .../files/308-3.19-00-compat-namei.patch   |  24 
 .../files/308-3.19-02-vmblock-path.patch   |  67 +
 .../vmware-modules/files/308-3.19-04-iovec.patch   |  59 
 .../files/308-3.19-05-vmci_qpair.patch |  25 
 .../vmware-modules/files/308-3.19-06-vsock.patch   |  16 +++
 .../vmware-modules/files/308-3.19-07-vsock.patch   |  13 ++
 .../vmware-modules/files/308-4.01-00-vsock.patch   |  61 +
 .../files/308-4.02-00-nd_set_link.patch|  56 
 .../files/308-4.02-01-sk_alloc.patch   |  22 +++
 .../files/308-4.03-00-vmci-misc_deregister.patch   |  27 
 .../files/308-4.03-00-vmmon-misc_deregister.patch  |  14 ++
 .../files/308-4.05-00-vmblock-follow_link.patch|  56 
 app-emulation/vmware-modules/files/308-apic.patch  |  12 ++
 .../vmware-modules/files/308-hardened.patch|  89 
 .../files/308-makefile-include.patch   |  65 +
 .../files/308-makefile-kernel-dir.patch|  85 
 .../vmware-modules/files/308-netdevice.patch   |  24 
 .../vmware-modules/vmware-modules-308.1.0.ebuild   | 149 +
 26 files changed, 1237 insertions(+)

diff --git a/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch 
b/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch
new file mode 100644
index 000..5cc445f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch
@@ -0,0 +1,43 @@
+Minor change the API, now it just gets passed flags instead of a pointer to 
the nameidata
+--- a/vmblock-only/linux/dentry.c  2015-02-07 03:11:55.0 +0300
 c/vmblock-only/linux/dentry.c  2015-02-24 03:58:06.038605919 +0300
+@@ -32,7 +32,11 @@
+ #include "block.h"
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
++#endif
+ 
+ struct dentry_operations LinkDentryOps = {
+.d_revalidate = DentryOpRevalidate,
+@@ -58,9 +62,12 @@
+  *
+  */
+ 
+-static int
+-DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-   struct nameidata *nd)   // IN: lookup flags & intent
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
++#endif
++
+ {
+VMBlockInodeInfo *iinfo;
+struct nameidata actualNd;
+@@ -101,7 +108,11 @@
+if (actualDentry &&
+actualDentry->d_op &&
+actualDentry->d_op->d_revalidate) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++  return actualDentry->d_op->d_revalidate(actualDentry, flags);
++#else
+   return actualDentry->d_op->d_revalidate(actualDentry, nd);
++#endif
+}
+ 
+if (compat_path_lookup(iinfo->name, 0, )) {

diff --git a/app-emulation/vmware-modules/files/308-3.10-01-inode.patch 
b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch
new file mode 100644
index 000..e12d84d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch
@@ -0,0 +1,94 @@
+Minor change the API, now it just gets passed flags instead of a pointer to 
the nameidata
+Properly initializes UID/GID with repsect to namespaces
+Some changes the readlink/setlink APIs
+--- a/vmblock-only/linux/inode.c   2015-02-07 03:11:55.0 +0300
 c/vmblock-only/linux/inode.c   2015-02-24 03:58:06.039605762 +0300
+@@ -35,9 +35,15 @@
+ 
+ 
+ /* Inode operations */
+-static struct dentry *InodeOpLookup(struct inode *dir,
+-struct dentry *dentry, struct nameidata 
*nd);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, 
struct nameidata *nd);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2015-09-19 Thread Andreas Hüttel 
commit: f450eae9e2390e8a2372d0c9e166c5b1438f2513
Author: Andreas K. Huettel (dilfridge)  gentoo  org>
AuthorDate: Sat Sep 19 19:08:41 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Sep 19 19:08:41 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=f450eae9

app-emulation/vmware-modules: Add patch for Kernel 4.2, bug 559602

Package-Manager: portage-2.2.20.1

 .../vmware-modules/files/279-4.2-00-cookie.patch   | 79 ++
 .../vmware-modules/vmware-modules-279.6.ebuild |  1 +
 2 files changed, 80 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch 
b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch
new file mode 100644
index 000..e2ab8a1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch
@@ -0,0 +1,79 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=559602
+Patch by Mike Auty 
+
+diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
+index 4811abd..2cbc1f6 100644
+--- a/vmblock-only/linux/inode.c
 b/vmblock-only/linux/inode.c
+@@ -38,7 +38,9 @@
+ static struct dentry *InodeOpLookup(struct inode *dir,
+ 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)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); 
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+ static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -207,7 +209,12 @@ static void *
+ static int
+ #endif
+ InodeOpFollowlink(struct dentry *dentry,  // IN : dentry of symlink
+-  struct nameidata *nd)   // OUT: stores result
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++void **cookie
++#else
++struct nameidata *nd
++#endif
++)   // OUT: stores result
+ {
+int ret;
+VMBlockInodeInfo *iinfo;
+diff --git a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
+index acb2803..4811abd 100644
+--- a/vmblock-only/linux/inode.c
 b/vmblock-only/linux/inode.c
+@@ -199,7 +199,9 @@ InodeOpReadlink(struct dentry *dentry,  // IN : dentry of 
symlink
+  *
+  */
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++static const char *
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *
+ #else
+ static int
+@@ -222,8 +224,12 @@ InodeOpFollowlink(struct dentry *dentry,  // IN : dentry 
of symlink
+   goto out;
+}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
++   return *cookie = (char *)(iinfo->name);
++#else
+nd_set_link(nd, iinfo->name);
+ret = 0;
++#endif
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+diff --git a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h
+index 23b5d19..d129f7b 100644
+--- a/vmnet-only/vmnetInt.h
 b/vmnet-only/vmnetInt.h
+@@ -78,8 +78,13 @@
+ 
+ extern struct proto vmnet_proto;
+ #ifdef VMW_NETDEV_HAS_NET
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)  
+ #   define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \
+-PF_NETLINK, _pri, 
_proto)
++  PF_NETLINK, _pri, _proto, 
1)
++# else
++#   define compat_sk_alloc(_bri, _pri) sk_alloc(_net, \
++  PF_NETLINK, _pri, _proto)
++# endif
+ #else
+ #   define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, 
_proto, 1)
+ #endif

diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 4a78931..f10f4ee 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -98,6 +98,7 @@ src_prepare() {
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+   kernel_is ge 4 2 0  && epatch 
"${FILESDIR}/${PV_MAJOR}-4.2-00-cookie.patch"
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2015-09-19 Thread Andreas Hüttel 
commit: 153d0b983a099d6c0812953c48534fd22ccaa283
Author: Andreas K. Huettel (dilfridge)  gentoo  org>
AuthorDate: Sat Sep 19 18:53:29 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Sep 19 18:54:22 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=153d0b98

app-emulation/vmware-modules: Filter some ricer CFLAGS, bug 477270

Package-Manager: portage-2.2.20.1

 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +-
 app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 2 +-
 app-emulation/vmware-modules/vmware-modules-304.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 1d24b19..7d798a4 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -44,7 +44,7 @@ pkg_setup() {
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
 
enewgroup "${VMWARE_GROUP}"
-   filter-flags -mfpmath=sse
+   filter-flags -mfpmath=sse -mavx -mpclmul -maes
 
for mod in ${VMWARE_MODULE_LIST}; do
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"

diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 356ead7..4a78931 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -58,7 +58,7 @@ pkg_setup() {
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
 
enewgroup "${VMWARE_GROUP}"
-   filter-flags -mfpmath=sse
+   filter-flags -mfpmath=sse -mavx -mpclmul -maes
 
for mod in ${VMWARE_MODULE_LIST}; do
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"

diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
index 5406bf8..173592f 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
@@ -58,7 +58,7 @@ pkg_setup() {
BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} 
KBUILD_OUTPUT=${KV_OUT_DIR}"
 
enewgroup "${VMWARE_GROUP}"
-   filter-flags -mfpmath=sse
+   filter-flags -mfpmath=sse -mavx -mpclmul -maes
 
for mod in ${VMWARE_MODULE_LIST}; do
MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2015-09-08 Thread Andreas Hüttel 
commit: d51d4158ee5f23a9afc12c383291b74f247d481e
Author: Andreas K. Huettel (dilfridge)  gentoo  org>
AuthorDate: Tue Sep  8 20:08:06 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Sep  8 20:08:06 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d51d4158

app-emulation/vmware-modules: Remove old

Package-Manager: portage-2.2.20.1

 .../vmware-modules/vmware-modules-304.0.ebuild | 113 -
 1 file changed, 113 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
deleted file mode 100644
index 21095ff..000
--- a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-   || ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
-   =app-emulation/vmware-workstation-11.1.${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
-   if use vmci ; then
-   CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-   else
-   CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-   fi
-   if use vsock ; then
-   CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-   else
-   CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-   fi
-
-   linux-info_pkg_setup
-
-   linux-mod_pkg_setup
-
-   VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-   VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-   VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-   use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-   use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} 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_ALL}; 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}/${PV_MAJOR}-hardened.patch"
-   epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-
-   kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
-   kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
-   kernel_is ge 3 10 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
-   kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
-   kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
-   kernel_is ge 3 11 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
-   kernel_is ge 3 15 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
-   kernel_is ge 3 18 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
-   kernel_is ge 3 19 0 && epatch 
"${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.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=="vmw_vmci",  GROUP="vmware", MODE="660"
-   KERNEL=="vmmon", GROUP="vmware", MODE="660"
-   KERNEL=="vsock",

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2015-09-05 Thread Andreas Hüttel 
commit: 6e4890d93e11bf483122ce6f57f702d21c6c8f17
Author: Andreas K. Huettel (dilfridge)  gentoo  org>
AuthorDate: Sat Sep  5 12:49:04 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Sep  5 12:56:00 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=6e4890d9

app-emulation/vmware-modules: Sync with main tree

Package-Manager: portage-2.2.20.1

 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 2 +-
 app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 2 +-
 app-emulation/vmware-modules/vmware-modules-304.0.ebuild| 4 ++--
 app-emulation/vmware-modules/vmware-modules-304.2.ebuild| 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 871704c..1d24b19 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.3.ebuild,v
 1.5 2014/06/09 15:24:07 dilfridge Exp $
+# $Id$
 
 EAPI="4"
 

diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 327dbe2..356ead7 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
+# $Id$
 
 EAPI=5
 

diff --git a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
index d972bb0..21095ff 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="~amd64"
 IUSE="pax_kernel +vmci +vsock"
 
 RDEPEND=""

diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
index 5c4218e..5406bf8 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="~amd64"
 IUSE="pax_kernel +vmci +vsock"
 
 RDEPEND=""

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2015-07-13 Thread Evan Teran 
commit: 1250c78913e6593944098a62bf8f2812068edf68
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue Jul 14 02:01:17 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue Jul 14 02:01:17 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1250c789

added some comments for patches

Package-Manager: portage-2.2.20

 app-emulation/vmware-modules/files/304-3.10-00-dentry.patch| 1 +
 app-emulation/vmware-modules/files/304-3.10-01-inode.patch | 3 +++
 app-emulation/vmware-modules/files/304-3.10-02-control.patch   | 2 ++
 app-emulation/vmware-modules/files/304-3.10-03-inline.patch| 1 +
 app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch | 1 +
 app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch  | 1 +
 app-emulation/vmware-modules/files/304-3.19-01-dentry.patch| 1 +
 app-emulation/vmware-modules/files/304-3.19-03-iovec.patch | 1 +
 app-emulation/vmware-modules/files/304-3.19-04-iovec.patch | 1 +
 app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch| 1 +
 app-emulation/vmware-modules/files/304-3.19-06-vsock.patch | 1 +
 app-emulation/vmware-modules/files/304-3.19-07-vsock.patch | 1 +
 12 files changed, 15 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch 
b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
index a0bb8b8..5cc445f 100644
--- a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
@@ -1,3 +1,4 @@
+Minor change the API, now it just gets passed flags instead of a pointer to 
the nameidata
 --- a/vmblock-only/linux/dentry.c  2015-02-07 03:11:55.0 +0300
 +++ c/vmblock-only/linux/dentry.c  2015-02-24 03:58:06.038605919 +0300
 @@ -32,7 +32,11 @@

diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch 
b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
index cf4ccd9..e12d84d 100644
--- a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
@@ -1,3 +1,6 @@
+Minor change the API, now it just gets passed flags instead of a pointer to 
the nameidata
+Properly initializes UID/GID with repsect to namespaces
+Some changes the readlink/setlink APIs
 --- a/vmblock-only/linux/inode.c   2015-02-07 03:11:55.0 +0300
 +++ c/vmblock-only/linux/inode.c   2015-02-24 03:58:06.039605762 +0300
 @@ -35,9 +35,15 @@

diff --git a/app-emulation/vmware-modules/files/304-3.10-02-control.patch 
b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
index bd3a265..9288353 100644
--- a/app-emulation/vmware-modules/files/304-3.10-02-control.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
@@ -1,3 +1,5 @@
+The API to create proc entries now takes the file ops structure directly, 
instead of being set after the fact
+Using new __getname/__putname API
 --- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.0 +0300
 +++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
 @@ -208,9 +208,11 @@

diff --git a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch 
b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
index 73c2a5f..fa8f36a 100644
--- a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
@@ -1,3 +1,4 @@
+Hushes a warning
 --- a/vmmon-only/linux/driver.c2015-02-07 03:54:16.0 +0300
 +++ c/vmmon-only/linux/driver.c2015-02-24 03:58:06.042605293 +0300
 @@ -1328,7 +1328,9 @@

diff --git 
a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch 
b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
index 2d38824..22d6325 100644
--- a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
+++ b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
@@ -1,3 +1,4 @@
+Hushes some (but not all warnings) relating to redefinitions of this define
 --- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.0 
+0300
 +++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 
+0300
 @@ -53,7 +53,9 @@

diff --git a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch 
b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
index ec73500..0182077 100644
--- a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
@@ -1,3 +1,4 @@
+A copy of this since it is no longer exported by the kernel headers
 --- a/vmblock-only/shared/compat_namei.h   2015-02-07 03:11:55.0 
+0300
 +++ c/vmblock-only/shared/compat_namei.h   2015-02-24 03:51:25.235286047 
+0300
 @@ -21,6 +21,20 @@

diff --git

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2015-07-10 Thread Evan Teran 
commit: 19adc449de350954deb5037f52cff19243c1d198
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Mon Jul  6 08:49:58 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Mon Jul  6 08:49:58 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=19adc449

fixing udev rules needing some quotes

Package-Manager: portage-2.2.20

 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 6 +++---
 app-emulation/vmware-modules/vmware-modules-279.6.ebuild| 8 
 app-emulation/vmware-modules/vmware-modules-304.0.ebuild| 8 
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 3158493..871704c 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -100,9 +100,9 @@ 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
+   KERNEL==vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmmon, GROUP=vmware, MODE=660
+   KERNEL==vsock, GROUP=vmware, MODE=660
EOF
udev_dorules ${udevrules}
 }

diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index 64a7d8a..327dbe2 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -107,10 +107,10 @@ src_install() {
linux-mod_src_install
local udevrules=${T}/60-vmware.rules
cat  ${udevrules} -EOF
-   KERNEL==vmci,  GROUP=vmware, MODE=660
-   KERNEL==vmw_vmci,  GROUP=vmware, MODE=660
-   KERNEL==vmmon, GROUP=vmware, MODE=660
-   KERNEL==vsock, GROUP=vmware, MODE=660
+   KERNEL==vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmw_vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmmon, GROUP=vmware, MODE=660
+   KERNEL==vsock, GROUP=vmware, MODE=660
EOF
udev_dorules ${udevrules}
 }

diff --git a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild 
b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
index e817e97..d972bb0 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.0.ebuild
@@ -104,10 +104,10 @@ src_install() {
linux-mod_src_install
local udevrules=${T}/60-vmware.rules
cat  ${udevrules} -EOF
-   KERNEL==vmci,  GROUP=vmware, MODE=660
-   KERNEL==vmw_vmci,  GROUP=vmware, MODE=660
-   KERNEL==vmmon, GROUP=vmware, MODE=660
-   KERNEL==vsock, GROUP=vmware, MODE=660
+   KERNEL==vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmw_vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmmon, GROUP=vmware, MODE=660
+   KERNEL==vsock, GROUP=vmware, MODE=660
EOF
udev_dorules ${udevrules}
 }

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2015-07-10 Thread Evan Teran 
commit: c8b1c812a25cbaa673e0fb40623d92642973c0a1
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Mon Jul  6 08:22:22 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Mon Jul  6 08:22:22 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=c8b1c812

version bump for vmware-workstation 10 and 3.19/4.0 kernel support

Package-Manager: portage-2.2.20

 .../files/279-3.18-00-version-redefined.patch  | 24 
 .../files/279-3.19-00-compat-namei.patch   | 23 
 .../vmware-modules/files/279-3.19-01-dentry.patch  | 13 +
 .../files/279-3.19-02-vmblock-path.patch   | 67 ++
 .../vmware-modules/files/279-3.19-03-iovec.patch   | 19 ++
 .../vmware-modules/files/279-3.19-04-iovec.patch   | 39 +
 .../files/279-3.19-05-vmci_qpair.patch | 24 
 .../vmware-modules/files/279-3.19-06-vsock.patch   | 15 +
 .../vmware-modules/files/279-3.19-07-vsock.patch   | 12 
 ...es-279.5.ebuild = vmware-modules-279.6.ebuild} | 11 +++-
 .../vmware-modules/vmware-modules-304.0.ebuild | 35 +--
 11 files changed, 264 insertions(+), 18 deletions(-)

diff --git 
a/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch 
b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
new file mode 100644
index 000..2d38824
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
@@ -0,0 +1,24 @@
+--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.0 
+0300
 c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 
+0300
+@@ -53,7 +53,9 @@
+  *VMware HD Audio codec
+  *VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2  0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA   0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA0x0711
+--- a/vmnet-only/vm_device_version.h   2015-02-07 03:54:16.0 +0300
 c/vmnet-only/vm_device_version.h   2015-02-24 03:58:06.044604981 +0300
+@@ -53,7 +53,9 @@
+  *VMware HD Audio codec
+  *VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2  0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA   0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA0x0711

diff --git a/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch 
b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
new file mode 100644
index 000..ec73500
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
@@ -0,0 +1,23 @@
+--- a/vmblock-only/shared/compat_namei.h   2015-02-07 03:11:55.0 
+0300
 c/vmblock-only/shared/compat_namei.h   2015-02-24 03:51:25.235286047 
+0300
+@@ -21,6 +21,20 @@
+ 
+ #include linux/namei.h
+ 
++/* Copy-n-paste from kernel's source/fs/namei.c */
++struct nameidata {
++ struct path path;
++ struct qstr last;
++ struct path root;
++ struct inode*inode; /* path.dentry.d_inode */
++ unsigned intflags;
++ unsignedseq, m_seq;
++ int last_type;
++ unsigneddepth;
++ struct file *base;
++ char *saved_names[MAX_NESTED_LINKS + 1];
++};
++
+ /*
+  * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
+  * struct. They were both replaced with a struct path.

diff --git a/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch 
b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
new file mode 100644
index 000..6f11a52
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
@@ -0,0 +1,13 @@
+--- a/vmnet-only/driver.c  2015-02-07 03:54:17.0 +0300
 c/vmnet-only/driver.c  2015-02-24 03:58:06.043605137 +0300
+@@ -1191,8 +1191,8 @@
+struct inode *inode = NULL;
+long err;
+
+-   if (filp  filp-f_dentry) {
+-  inode = filp-f_dentry-d_inode;
++   if (filp  filp-f_path.dentry) {
++  inode = filp-f_path.dentry-d_inode;
+}
+err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+return err;

diff --git a/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch 
b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
new file mode 100644
index 000..178d147
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c   2015-02-14 18:05:46.0 -0500

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2015-07-10 Thread Evan Teran 
commit: b5fe5509592d54689ed4c4eb0633507bcda8219b
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Mon Jul  6 03:47:43 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Mon Jul  6 03:47:43 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=b5fe5509

adding some minor patches that were applied to previous versions
probably not 100% necessary, but they don't hurt either

Package-Manager: portage-2.2.20

 app-emulation/vmware-modules/files/304-apic.patch  |  12 +++
 .../vmware-modules/files/304-hardened.patch| 113 +
 .../vmware-modules/files/304-netdevice.patch   |  24 +
 .../vmware-modules/vmware-modules-304.0.ebuild |   4 +
 4 files changed, 153 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-apic.patch 
b/app-emulation/vmware-modules/files/304-apic.patch
new file mode 100644
index 000..66cd459
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-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 linux/kthread.h
+ #include linux/wait.h
+ 
++#include asm/apic.h
+ 
+ #include vmware.h
+ #include x86apic.h

diff --git a/app-emulation/vmware-modules/files/304-hardened.patch 
b/app-emulation/vmware-modules/files/304-hardened.patch
new file mode 100644
index 000..cc3e041
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-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

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2015-07-10 Thread Evan Teran 
commit: 9c26a3fe09dc2b49b046b2097248ce3d6c60075e
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Mon Jul  6 03:21:27 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Mon Jul  6 03:21:27 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=9c26a3fe

working on vmware-workstation 11 support :-)

Package-Manager: portage-2.2.20

 .../vmware-modules/files/304-3.10-00-dentry.patch  |  42 
 .../vmware-modules/files/304-3.10-01-inode.patch   |  91 +
 .../vmware-modules/files/304-3.10-02-control.patch |  55 +++
 .../vmware-modules/files/304-3.10-03-inline.patch  |  13 +++
 .../vmware-modules/files/304-3.11-00-readdir.patch |  41 
 .../vmware-modules/files/304-3.11-01-filldir.patch |  53 ++
 .../vmware-modules/files/304-3.15-00-vsock.patch   |  46 +
 .../files/304-3.18-00-version-redefined.patch  |  24 +
 .../files/304-3.19-00-compat-namei.patch   |  23 +
 .../vmware-modules/files/304-3.19-01-dentry.patch  |  13 +++
 .../files/304-3.19-02-vmblock-path.patch   |  67 +
 .../vmware-modules/files/304-3.19-03-iovec.patch   |  19 
 .../vmware-modules/files/304-3.19-04-iovec.patch   |  58 +++
 .../files/304-3.19-05-vmci_qpair.patch |  24 +
 .../vmware-modules/files/304-3.19-06-vsock.patch   |  15 +++
 .../vmware-modules/files/304-3.19-07-vsock.patch   |  12 +++
 .../files/304-makefile-include.patch   |  65 +
 .../files/304-makefile-kernel-dir.patch|  85 
 .../vmware-modules/vmware-modules-304.0.ebuild | 108 +
 19 files changed, 854 insertions(+)

diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch 
b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
new file mode 100644
index 000..a0bb8b8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
@@ -0,0 +1,42 @@
+--- a/vmblock-only/linux/dentry.c  2015-02-07 03:11:55.0 +0300
 c/vmblock-only/linux/dentry.c  2015-02-24 03:58:06.038605919 +0300
+@@ -32,7 +32,11 @@
+ #include block.h
+ 
+ 
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 10, 0)
+ static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
++#endif
+ 
+ struct dentry_operations LinkDentryOps = {
+.d_revalidate = DentryOpRevalidate,
+@@ -58,9 +62,12 @@
+  *
+  */
+ 
+-static int
+-DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-   struct nameidata *nd)   // IN: lookup flags  intent
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 10, 0)
++static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
++#endif
++
+ {
+VMBlockInodeInfo *iinfo;
+struct nameidata actualNd;
+@@ -101,7 +108,11 @@
+if (actualDentry 
+actualDentry-d_op 
+actualDentry-d_op-d_revalidate) {
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 10, 0)
++  return actualDentry-d_op-d_revalidate(actualDentry, flags);
++#else
+   return actualDentry-d_op-d_revalidate(actualDentry, nd);
++#endif
+}
+ 
+if (compat_path_lookup(iinfo-name, 0, actualNd)) {

diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch 
b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
new file mode 100644
index 000..cf4ccd9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
@@ -0,0 +1,91 @@
+--- a/vmblock-only/linux/inode.c   2015-02-07 03:11:55.0 +0300
 c/vmblock-only/linux/inode.c   2015-02-24 03:58:06.039605762 +0300
+@@ -35,9 +35,15 @@
+ 
+ 
+ /* Inode operations */
+-static struct dentry *InodeOpLookup(struct inode *dir,
+-struct dentry *dentry, struct nameidata 
*nd);
++
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 10, 0)
++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, 
struct nameidata *nd);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int 
buflen);
++#else
++static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned 
int);
++static int InodeOpReadlink(struct dentry *, char __user *, int);
++#endif
++
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+@@ -49,12 +55,15 @@
+.lookup = InodeOpLookup,
+ };
+ 
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 13, 0)
+ static struct inode_operations LinkInodeOps = {
++#else
++struct inode_operations LinkInodeOps = {
++#endif
+.readlink= InodeOpReadlink,
+.follow_link = InodeOpFollowlink,
+ };
+ 
+-
+ /*
+

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2015-05-06 Thread Evan Teran 
commit: cb645967849017b215d6a47818549c8c999a640e
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu May  7 00:56:12 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu May  7 00:56:12 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=cb645967

trying to fix vsock's usage of VMCI interface, previous patch compiled... but 
was broken
as demonstrated by trying to do a VMWARE automatted install. This new patch 
looks better
but needs to be tested

 .../files/271-3.19-06-vmci_qpair.patch | 24 +++
 .../vmware-modules/files/271-3.19-06-vsock.patch   | 36 --
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  2 +-
 3 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch 
b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
new file mode 100644
index 000..1849a37
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
@@ -0,0 +1,24 @@
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
 vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+* able to send.
+*/
+ 
+-  written = vmci_qpair_enquev(vsk-qpair, msg-msg_iov,
++  written = vmci_qpair_enquev(vsk-qpair, msg-msg_iter.iov,
+   len - totalWritten, 0);
+   if (written  0) {
+  err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+  }
+ 
+  if (flags  MSG_PEEK) {
+-read = vmci_qpair_peekv(vsk-qpair, msg-msg_iov, len - copied, 
0);
++read = vmci_qpair_peekv(vsk-qpair, msg-msg_iter.iov, len - 
copied, 0);
+  } else {
+-read = vmci_qpair_dequev(vsk-qpair, msg-msg_iov, len - copied, 
0);
++read = vmci_qpair_dequev(vsk-qpair, msg-msg_iter.iov, len - 
copied, 0);
+  }
+ 
+  if (read  0) {

diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch 
b/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
deleted file mode 100644
index a2b0136..000
--- a/app-emulation/vmware-modules/files/271-3.19-06-vsock.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
 vsock-only/linux/af_vsock.c2015-05-05 11:51:59.794166063 -0400
-+++ vsock-only.new/linux/af_vsock.c2015-05-05 11:53:38.621171420 -0400
-@@ -4874,9 +4874,11 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
-  }
- 
-  if (flags  MSG_PEEK) {
--read = vmci_qpair_peekv(vsk-qpair, msg-msg_iov, len - copied, 
0);
-+  struct iovec iov = iov_iter_iovec(msg-msg_iter);
-+read = vmci_qpair_peekv(vsk-qpair, iov, len - copied, 0);
-  } else {
--read = vmci_qpair_dequev(vsk-qpair, msg-msg_iov, len - copied, 
0);
-+  struct iovec iov = iov_iter_iovec(msg-msg_iter);
-+read = vmci_qpair_dequev(vsk-qpair, iov, len - copied, 0);
-  }
- 
-  if (read  0) {
-diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
 vsock-only/linux/af_vsock.c2015-05-05 11:53:59.937172575 -0400
-+++ vsock-only.new/linux/af_vsock.c2015-05-05 11:59:25.824190240 -0400
-@@ -4628,9 +4628,12 @@ VSockVmciStreamSendmsg(struct kiocb *kio
-* size.  It is the caller's responsibility to check how many bytes we 
were
-* able to send.
-*/
--
--  written = vmci_qpair_enquev(vsk-qpair, msg-msg_iov,
--  len - totalWritten, 0);
-+  {
-+struct iovec iov = iov_iter_iovec(msg-msg_iter);
-+  written = vmci_qpair_enquev(vsk-qpair, iov,
-+  len - totalWritten, 0);
-+  }
-+
-   if (written  0) {
-  err = -ENOMEM;
-  goto outWait;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 66c0b2b..3158493 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
kernel_is ge 3 19 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.19-03-vmnet.patch
kernel_is ge 3 19 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.19-04-vsock.patch
kernel_is ge 3 19 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.19-05-vsock.patch
-   kernel_is ge 3 19 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch
+   kernel_is ge 3 19 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.19-06-vmci_qpair.patch
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2015-05-05 Thread Evan Teran 
commit: 633505a21b03a51abaee1d90875693741cdb119e
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue May  5 17:09:16 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue May  5 17:09:16 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=633505a2

looks like this patch was missing a portion, my bad

Package-Manager: portage-2.2.18

 .../vmware-modules/files/271-3.19-01-vmblock-path.patch   | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch 
b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
index 4bf17e1..178d147 100644
--- a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
+++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
@@ -1,3 +1,6 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
 diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
 --- vmblock-only.orig/linux/dentry.c   2015-02-14 18:05:46.0 -0500
 +++ vmblock-only/linux/dentry.c2015-02-14 18:09:59.0 -0500
@@ -50,3 +53,15 @@ diff -rupN vmblock-only.orig/shared/compat_namei.h 
vmblock-only/shared/compat_na
  #else
  #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
  #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.0 -0500
 vmblock-only/linux/file.c  2015-02-11 12:41:41.0 -0500
+@@ -92,7 +92,7 @@
+ * and that would try to acquire the inode's semaphore; if the two inodes
+ * are the same we'll deadlock.
+ */
+-   if (actualFile-f_dentry  inode == actualFile-f_dentry-d_inode) {
++   if (actualFile-f_path.dentry  inode == 
actualFile-f_path.dentry-d_inode) {
+   Warning(FileOpOpen: identical inode encountered, open cannot 
succeed.\n);
+   if (filp_close(actualFile, current-files)  0) {
+  Warning(FileOpOpen: unable to close opened file.\n);

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2015-05-05 Thread Evan Teran 
commit: 92cecf1dbaab4333b53269e65ecbee15d9b866b0
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue May  5 16:42:05 2015 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue May  5 16:42:05 2015 +
URL:https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92cecf1d

271 should now compile (and I beleive function correctly) on 3.19
I'll look into 4.x soon

Package-Manager: portage-2.2.18

 .../files/271-3.19-00-vmnet-warning.patch  | 13 ++
 .../files/271-3.19-01-vmblock-path.patch   | 52 ++
 .../vmware-modules/files/271-3.19-02-vmci.patch| 29 
 .../vmware-modules/files/271-3.19-03-vmnet.patch   | 29 
 .../vmware-modules/files/271-3.19-04-vsock.patch   | 12 +
 .../vmware-modules/files/271-3.19-05-vsock.patch   | 15 +++
 .../vmware-modules/files/271-3.19-06-vsock.patch   | 36 +++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  | 10 -
 8 files changed, 195 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch 
b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
new file mode 100644
index 000..b4d30c9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
@@ -0,0 +1,13 @@
+diff -rupN vmnet-only/vm_device_version.h vmnet-only.new/vm_device_version.h
+--- vmnet-only/vm_device_version.h 2013-11-06 00:40:52.0 -0500
 vmnet-only.new/vm_device_version.h 2015-05-05 12:03:06.879202223 -0400
+@@ -53,7 +53,9 @@
+  *VMware HD Audio codec
+  *VMware HD Audio controller
+  */
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 19, 0)
+ #define PCI_VENDOR_ID_VMWARE0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2  0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA   0x0710
+ #define PCI_DEVICE_ID_VMWARE_NET0x0720

diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch 
b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
new file mode 100644
index 000..4bf17e1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
@@ -0,0 +1,52 @@
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c   2015-02-14 18:05:46.0 -0500
 vmblock-only/linux/dentry.c2015-02-14 18:09:59.0 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+unsigned int flags)   // IN: lookup flags  intent
+ {
+VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+struct dentry *actualDentry;
+int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c   2014-11-20 19:29:15.0 
-0500
 vmblock-only/linux/filesystem.c2015-02-14 18:10:49.0 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,// IN: f
+ {
+VMBlockInodeInfo *iinfo;
+struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h 
vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h2014-11-20 19:29:15.0 
-0500
 vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.0 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(nd) was replaced with path_put(nd.path). */
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put((nd)-path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, 
((nd)-path))
++#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
+ #endif

diff --git a/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch 
b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
new file mode 100644
index 000..a8ec2b1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
@@ -0,0 +1,29 @@
+diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c
+--- vmci-only/linux/vmciKernelIf.c 2015-05-05 11:22:55.276071501 -0400
 vmci-only.new/linux/vmciKernelIf.c 2015-05-05 11:23:58.912074950 -0400
+@@ -40,6 +40,7 @@
+ #include linux/socket.h   /* For

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2014-10-16 Thread Andreas Hüttel 
commit: b98ffa6d5d97a41a8b7be0a258a5adf92ed2de27
Author: Andreas K. Huettel (dilfridge) dilfridge AT gentoo DOT org
AuthorDate: Thu Oct 16 21:59:55 2014 +
Commit: Andreas Hüttel dilfridge AT gentoo DOT org
CommitDate: Thu Oct 16 21:59:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b98ffa6d

Version bump

---
 .../vmware-modules/vmware-modules-279.3-r1.ebuild  | 107 +
 1 file changed, 107 insertions(+)

diff --git a/app-emulation/vmware-modules/vmware-modules-279.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.3-r1.ebuild
new file mode 100644
index 000..bf8e379
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-279.3-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 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.2.ebuild,v
 1.5 2014/06/09 15:24:07 dilfridge 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 +vmci +vsock
+
+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
+   if use vmci ; then
+   CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI
+   else
+   CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI
+   fi
+   if use vsock ; then
+   CONFIG_CHECK=${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS
+   else
+   CONFIG_CHECK=${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS
+   fi
+
+   linux-info_pkg_setup
+
+   linux-mod_pkg_setup
+
+   VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+   VMWARE_MODULE_LIST_ALL=vmblock vmmon vmnet vmci vsock
+   VMWARE_MODULE_LIST=vmblock vmmon vmnet
+   use vmci  VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} vmci
+   use vsock  VMWARE_MODULE_LIST=${VMWARE_MODULE_LIST} 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_ALL}; 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 10 0  epatch ${FILESDIR}/${PV_MAJOR}-vmblock.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch
+   kernel_is ge 3 11 0  epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
+   kernel_is ge 3 17 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.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==vmw_vmci,  GROUP=vmware, MODE=660
+   KERNEL==vmmon, GROUP=vmware, MODE=660
+   KERNEL==vsock, GROUP=vmware, MODE=660
+   EOF
+   udev_dorules ${udevrules}
+}

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2014-10-13 Thread Evan Teran 
commit: a5c729fbf9a617c83527554d7a13da097d49c1f8
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue Oct 14 01:58:18 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue Oct 14 01:58:18 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a5c729fb

added comments explaining reason/origin of patches for 271 patches

Package-Manager: portage-2.2.8-r2

---
 app-emulation/vmware-modules/files/271-3.10-00-userns.patch  | 4 
 .../vmware-modules/files/271-3.10-01-create_proc_entry.patch | 4 
 app-emulation/vmware-modules/files/271-3.10-02-getname.patch | 5 +
 app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch  | 4 
 app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch  | 3 +++
 app-emulation/vmware-modules/files/271-3.10-05-dentry.patch  | 4 
 app-emulation/vmware-modules/files/271-3.10-06-inode.patch   | 4 
 app-emulation/vmware-modules/files/271-3.10-07-hub.patch | 5 +
 app-emulation/vmware-modules/files/271-3.11-00-readdir.patch | 3 +++
 app-emulation/vmware-modules/files/271-3.11-01-filldir.patch | 3 +++
 app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch   | 3 +++
 app-emulation/vmware-modules/files/271-3.15-00-readlink.patch| 2 ++
 app-emulation/vmware-modules/files/271-3.15-01-vsock.patch   | 3 +++
 app-emulation/vmware-modules/files/271-3.17-00-netdev.patch  | 4 
 14 files changed, 51 insertions(+)

diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch 
b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
index c960b78..b1b78b7 100644
--- a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
@@ -1,3 +1,7 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
 --- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.0 +0100
 +++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.0 +0100
 @@ -135,7 +135,8 @@

diff --git 
a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch 
b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
index 85c3def..889ae71 100644
--- a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
@@ -1,3 +1,7 @@
+uses the new proc_create function to create /proc entries
+instead of create_proc_entry which was deprecated: 
+https://lkml.org/lkml/2013/4/11/215
+
 --- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200
 +++ b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200
 @@ -208,9 +208,10 @@

diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch 
b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
index 7bcf536..05ed8db 100644
--- a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
@@ -1,3 +1,8 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of 
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
 --- vmblock-only/linux/control.c   2014-03-15 15:28:40.871076076 +0100
 +++ vmblock-only/linux/control.c.new   2014-03-15 15:29:15.079074439 +0100
 @@ -279,11 +279,17 @@

diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch 
b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
index 3a9f785..981aabd 100644
--- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -1,3 +1,7 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in linux/printk.h. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some very loud warnings.
+
 diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
 --- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400
 +++ vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 
-0400

diff --git 
a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch 
b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
index d030110..d5129ec 100644
--- a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
@@ -1,3 +1,6 @@
+hushes warnings about unused typedefs which are part of the static assert
+technique that the code uses. We simply add an __attribute__((unused)) to 
each of them
+
 --- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400
 +++

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2014-10-13 Thread Evan Teran 
commit: 2513650a3e9235695b3e37dc924fd26c1d65442f
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue Oct 14 02:03:46 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue Oct 14 02:03:46 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=2513650a

added comments for 279 and fixed up some comments for 271 patches

Package-Manager: portage-2.2.8-r2

---
 app-emulation/vmware-modules/files/271-3.10-06-inode.patch  | 3 ++-
 app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch  | 2 +-
 app-emulation/vmware-modules/files/271-3.15-00-readlink.patch   | 1 +
 app-emulation/vmware-modules/files/279-3.10-00-userns.patch | 4 
 app-emulation/vmware-modules/files/279-3.10-01-getname.patch| 5 +
 app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch | 4 
 app-emulation/vmware-modules/files/279-3.10-04-dentry.patch | 4 
 app-emulation/vmware-modules/files/279-3.10-05-inode.patch  | 5 +
 app-emulation/vmware-modules/files/279-3.15-00-readlink.patch   | 3 +++
 app-emulation/vmware-modules/files/279-3.15-01-vsock.patch  | 3 +++
 app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 4 
 11 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch 
b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
index 4f6246d..01c8893 100644
--- a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -1,6 +1,7 @@
 starting with kernel 3.6, d_revalidate takes an unsigned int flags
 as the second argument, not a nameidata pointer! see fs/namei.c 
-for implementation
+for implementation. Also changing vfs_follow_link to nd_set_link.
+See: https://lkml.org/lkml/2013/9/9/236
 
 diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
 --- vmblock-only/linux/inode.c 2013-11-05 23:33:26.0 -0500

diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch 
b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
index f65284f..1bf2207 100644
--- a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -1,4 +1,4 @@
-The new API to get the hooknum
+the new API to get the hooknum
 origionally from http://forums.gentoo.org/viewtopic-t-979802-start-25.html
 
 --- work/vmnet-only/filter.c   2013-08-27 20:29:04.0 +0100

diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch 
b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
index b1c7f24..b8ee078 100644
--- a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
+++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
@@ -1,4 +1,5 @@
 replacing usage of vfs_readlink with new readlink_copy API
+see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090
 
 diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
 --- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400

diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch 
b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
index c960b78..b1b78b7 100644
--- a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
@@ -1,3 +1,7 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
 --- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.0 +0100
 +++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.0 +0100
 @@ -135,7 +135,8 @@

diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch 
b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
index 7bcf536..05ed8db 100644
--- a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
@@ -1,3 +1,8 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of 
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
 --- vmblock-only/linux/control.c   2014-03-15 15:28:40.871076076 +0100
 +++ vmblock-only/linux/control.c.new   2014-03-15 15:29:15.079074439 +0100
 @@ -279,11 +279,17 @@

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch 
b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
index 0cd1a16..98b28aa 100644
--- a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -1,3 +1,7 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in linux/printk.h. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2014-10-13 Thread Evan Teran 
commit: a4ebbb5986cd81342824655c853c6330425269d2
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Tue Oct 14 02:26:54 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Tue Oct 14 02:26:54 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a4ebbb59

seems that NET_NAME_USER is more appropriate than NET_NAME_UNKNOWN
adjusting patches

Package-Manager: portage-2.2.8-r2

---
 app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 2 +-
 app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch 
b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
index 7c52455..e3ee3aa 100644
--- a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
@@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
 NULL_TERMINATE_STRING(deviceName);
  
 -   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
-+   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, 
VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, 
VNetNetIfSetup);
 if (!dev) {
retval = -ENOMEM;
goto out;

diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch 
b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
index 7c52455..e3ee3aa 100644
--- a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
 NULL_TERMINATE_STRING(deviceName);
  
 -   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
-+   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, 
VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, 
VNetNetIfSetup);
 if (!dev) {
retval = -ENOMEM;
goto out;

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2014-10-11 Thread Evan Teran 
commit: 8435434eab0fc7c5d08581822ebda283458578c1
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 15:40:41 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 15:40:41 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=8435434e

adding vmware-modules-279.2-r1, (workstation 10) which compiles cleanrly on 
3.10.0, 3.11.0 and 3.12.0

---
 .../vmware-modules/files/279-3.10-00-userns.patch  |  37 +++
 .../vmware-modules/files/279-3.10-01-getname.patch |  19 
 .../files/279-3.10-02-unused-typedef.patch | 112 
 .../vmware-modules/files/279-3.10-03-dentry.patch  |  30 ++
 .../vmware-modules/files/279-3.10-04-inode.patch   |  31 ++
 .../vmware-modules/files/279-3.10-05-hub.patch |  21 
 app-emulation/vmware-modules/files/279-apic.patch  |  12 +++
 .../vmware-modules/files/279-filldir.patch |  91 +
 .../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-vmblock.patch |  23 +
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  | 109 
 15 files changed, 785 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch 
b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
new file mode 100644
index 000..c960b78
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
@@ -0,0 +1,37 @@
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.0 +0100
 b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.0 +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.c2013-03-20 17:57:35.0 +0100
 b/vmci-only/linux/driver.c2013-03-20 17:57:43.0 +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.0 +0100
 b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.0 +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-3.10-01-getname.patch 
b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
new file mode 100644
index 000..7bcf536
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
@@ -0,0 +1,19 @@
+--- vmblock-only/linux/control.c   2014-03-15 15:28:40.871076076 +0100
 vmblock-only/linux/control.c.new   2014-03-15 15:29:15.079074439 +0100
+@@ -279,11 +279,17 @@
+int i;
+int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+if (IS_ERR(name)) {
+   return PTR_ERR(name);
+}
+ 
++   i = strncpy_from_user(name, buf, PATH_MAX);
++   if (i  0 || i == PATH_MAX) {
++  __putname(name);
++  return -EINVAL;
++   }
++
+for (i = strlen(name) - 1; i = 0  name[i] == '/'; i--) {

diff --git 
a/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch 
b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
new file mode 100644
index 000..d030110
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-02-unused-typedef.patch
@@ -0,0 +1,112 @@
+--- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400
 vmblock-only/shared/vm_assert.h2014-10-07 22:48:01.346409957 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vmci-only/shared/vm_assert.h   2014-10-07

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-11 Thread Evan Teran 
commit: 87ec4f2abfca54db62bfa89450aa1c55a2e5d9b5
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 15:47:01 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 15:47:01 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=87ec4f2a

build on 3.14.0

---
 .../files/279-3.10-03-deprecated.patch | 85 ++
 ...10-03-dentry.patch = 279-3.10-04-dentry.patch} |  0
 ...3.10-04-inode.patch = 279-3.10-05-inode.patch} |  0
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |  5 +-
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch 
b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
new file mode 100644
index 000..3a9f785
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -0,0 +1,85 @@
+diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
+--- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400
 vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 
-0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
+Warning(%s:%d: %s is DEPRECATED; %s\n, \
+   __FILE__, __LINE__, __FUNCTION__, \
+   _fix))
+ #else
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
+--- vmci-only/shared/vm_assert.h   2014-10-09 21:50:54.222159088 -0400
 vmci-only.new/shared/vm_assert.h   2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
+Warning(%s:%d: %s is DEPRECATED; %s\n, \
+   __FILE__, __LINE__, __FUNCTION__, \
+   _fix))
+ #else
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
+--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
 vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
+Warning(%s:%d: %s is DEPRECATED; %s\n, \
+   __FILE__, __LINE__, __FUNCTION__, \
+   _fix))
+ #else
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
+--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
 vmnet-only.new/vm_assert.h 2014-10-09 21:52:57.736165784 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
+Warning(%s:%d: %s is DEPRECATED; %s\n, \
+   __FILE__, __LINE__, __FUNCTION__, \
+   _fix))
+ #else
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
+--- vsock-only/shared/vm_assert.h  2014-10-09 21:50:54.222159088 -0400
 vsock-only.new/shared/vm_assert.h  2014-10-09 21:52:45.352165112 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
+Warning(%s:%d: %s is DEPRECATED; %s\n, \
+   __FILE__, __LINE__, __FUNCTION__, \
+   _fix))
+ #else
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 

diff --git a/app-emulation/vmware-modules/files/279-3.10-03-dentry.patch 
b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
similarity index 100%
rename from app-emulation/vmware-modules/files/279-3.10-03-dentry.patch
rename to

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-11 Thread Evan Teran 
commit: 1a5f058793742777d3e60ca3b930fc54bb42a344
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 15:43:43 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 15:43:43 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=1a5f0587

now supports 3.13.0

---
 .../vmware-modules/files/279-3.13-00-vmnet.patch   | 36 ++
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |  1 +
 2 files changed, 37 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch 
b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch
new file mode 100644
index 000..4e9d7e9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.13-00-vmnet.patch
@@ -0,0 +1,36 @@
+--- work/vmnet-only/filter.c   2013-08-27 20:29:04.0 +0100
 patched/vmnet-only/filter.c   2014-01-26 01:09:05.184893854 +
+@@ -27,6 +27,7 @@
+ #include compat_module.h
+ #include linux/mutex.h
+ #include linux/netdevice.h
++#include linux/version.h
+ #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
+ #   include linux/module.h
+ #else
+@@ -203,7 +204,11 @@
+ #endif
+
+ static unsigned int
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum, // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,// IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+  struct sk_buff *skb,  // IN:
+ #else
+@@ -252,7 +257,12 @@
+
+/* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+/* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++
++   #if LINUX_VERSION_CODE  KERNEL_VERSION(3, 13, 0)
++  transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++  transmit = (ops-hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+
+packetHeader = compat_skb_network_header(skb);
+ip = (struct iphdr*)packetHeader;

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index 1212ca8..cd4419a 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -90,6 +90,7 @@ src_prepare() {
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-05-hub.patch

kernel_is ge 3 11 0  epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch
+   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch
 
 
# Allow user patches so they can support RC kernels and whatever else

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2014-10-11 Thread Evan Teran 
commit: 195bd13fb5abc21ec6c31396b0a7018df192796d
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 15:51:14 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 15:51:14 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=195bd13f

now compiles on 3.17.0 :-)

---
 app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 12 
 app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch 
b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
new file mode 100644
index 000..fbe1741
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -0,0 +1,12 @@
+diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
+--- vmnet-only/netif.c 2013-11-06 00:40:52.0 -0500
 vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName,  // IN:
+memcpy(deviceName, devName, sizeof deviceName);
+NULL_TERMINATE_STRING(deviceName);
+ 
+-   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, 
VNetNetIfSetup);
+if (!dev) {
+   retval = -ENOMEM;
+   goto out;

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index e5875a7..d6cc8ea 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -94,6 +94,7 @@ src_prepare() {
kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
+   kernel_is ge 3 17 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2014-10-11 Thread Evan Teran 
commit: 86a9b9c8758c45e519653a5652a7869cd990ffc8
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 15:48:56 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 15:48:56 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=86a9b9c8

compiles on 3.16.0

---
 .../files/279-3.15-00-readlink.patch   | 12 ++
 .../vmware-modules/files/279-3.15-01-vsock.patch   | 43 ++
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |  3 +-
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch 
b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
new file mode 100644
index 000..36be37f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
@@ -0,0 +1,12 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400
 vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400
+@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry,
+   return -EINVAL;
+}
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo-name);
++   return readlink_copy(buffer, buflen, iinfo-name);
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch 
b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
new file mode 100644
index 000..a880a75
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
@@ -0,0 +1,43 @@
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c  2013-11-05 23:33:27.0 -0500
 vsock-only.new/linux/notify.c  2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+vsk = vsock_sk(sk);
+PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++   sk-sk_data_ready(sk);
++#else
+sk-sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c2013-11-05 23:33:27.0 -0500
 vsock-only.new/linux/notifyQState.c2014-10-05 23:46:33.231303931 
-0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+  struct sockaddr_vm *dst,// IN: unused
+  struct sockaddr_vm *src)// IN: unused
+ {
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++   sk-sk_data_ready(sk);
++#else
+sk-sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+   }
+ 
+   /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++  sk-sk_data_ready(sk);
++#else
+   sk-sk_data_ready(sk, 0);
++#endif
+}
+ 
+return err;

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index 131d93a..e5875a7 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -92,7 +92,8 @@ src_prepare() {

kernel_is ge 3 11 0  epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch
kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch
-
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-tools/

2014-10-11 Thread Evan Teran 
commit: fd40acca7d289df68b3fc616b0e3b184dc05f8d4
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 16:09:24 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 16:09:24 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=fd40acca

more synching with mainline

---
 app-emulation/vmware-modules/Manifest  | 44 +
 app-emulation/vmware-tools/Manifest| 48 +--
 .../vmware-tools/vmware-tools-8.4.9.744570.ebuild  | 55 -
 .../vmware-tools/vmware-tools-9.2.3.1031769.ebuild | 56 --
 ...25.ebuild = vmware-tools-9.6.2.1744117.ebuild} |  6 +--
 5 files changed, 59 insertions(+), 150 deletions(-)

diff --git a/app-emulation/vmware-modules/Manifest 
b/app-emulation/vmware-modules/Manifest
index e69de29..30288f3 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -0,0 +1,44 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA256
+
+AUX 271-3.10.0.patch 23418 SHA256 
346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 
878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410
 WHIRLPOOL 
196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e
+AUX 271-apic.patch 302 SHA256 
60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 
003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7
 WHIRLPOOL 
4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
+AUX 271-filldir.patch 2485 SHA256 
539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 
e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937
 WHIRLPOOL 
a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
+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-vfsfollowlink.patch 1219 SHA256 
b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 
b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d
 WHIRLPOOL 
3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3954bf6a82960e78ebd120c1eb2aac68e8
+AUX 271-vmmon.patch 1581 SHA256 
a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 
10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979
 WHIRLPOOL 
28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
+AUX 279-apic.patch 302 SHA256 
60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 
003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7
 WHIRLPOOL 
4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
+AUX 279-filldir.patch 2485 SHA256 
539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-player/

2014-10-11 Thread Evan Teran 
commit: b23ef6aca3d68aa9a6ad81d1351372306db6e42c
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 16:04:35 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 16:04:35 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=b23ef6ac

trying to generate some manifests

---
 app-emulation/vmware-modules/Manifest | 0
 app-emulation/vmware-player/Manifest  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/vmware-modules/Manifest 
b/app-emulation/vmware-modules/Manifest
new file mode 100644
index 000..e69de29

diff --git a/app-emulation/vmware-player/Manifest 
b/app-emulation/vmware-player/Manifest
index ea1f747..65d7b3e 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,2 +1,2 @@
-DIST VMware-Player-5.0.2-1031769.i386.bundle.tar 220037120 SHA256 
9ed94f5137f96d5ab1b4898abb7bdc1ab84edf7eb8b6477ca3f33a9b18e4d0be SHA512 
5fac9dc97ff36631c40765fe4e63c734176891441f3dfbeb417d1dae7db02db7b65c799ae706cbbb8edd91c8aed3fe6d11ebbae8c69a82d37b3ddc48261bff5c
 WHIRLPOOL 
c7e634f59c6852e58f7665de7db9c4295451592ba61de738e4cac927907b9d662a9b944579aca1474b5bf5c241d1a5bbcc1ed8c07aff1c31d1d39d4a66309fe4
-DIST VMware-Player-5.0.2-1031769.x86_64.bundle.tar 185395200 SHA256 
5ba11b8d4ece91c9dc1f9ed096e7c2d420370d8809b4d009a355fca390698482 SHA512 
58695587244c142953a55b9f8c4400e54f0951297aab594544d569d15ec3e25c71f4885eb59bfa453cfb6a8c33bfcaff77412dc4a79349c22285b72ec700f635
 WHIRLPOOL 
554986c680cd4caa760cdc9c9ddf75769be9a92a45ebefa7daabc6697801fa170e6f738ce513d819d4d3f22e3a33424fc559408187a6ee48b969c109bd86ee52
+DIST VMware-Player-6.0.2-1744117.i386.bundle.tar 233226240 SHA256 
b3314b1b4658fff3a3bd821381e141b4039bc6925088d509f073dfdc19f78937 SHA512 
da912c898306a50392cdf814f523321962e70d6d2afabe2cbcec35e581c60d1ba3e28fdf11f4e83306c9057038a7ab8d1d1e2e4281068fdb9997f6d1aaf34e74
 WHIRLPOOL 
bdd81a3620a56a689f48443d8cb0fc5dbde8ec5d996fcff5e38a983eb4fa5d6bfb73658f1b15837f6c4272578b4f90875f9393db3318ee9ad84cf1266fbcbed5
+DIST VMware-Player-6.0.2-1744117.x86_64.bundle.tar 200560640 SHA256 
6e8ef0982303128fe2d41f59cc6d4031edcc85f4dcc8ba20e17df9837a4c972f SHA512 
8e71b59e5152ec6a21e2bc87e11462fbc9f25a27ea48e73ace6daa198bc75fb0cf49d895755abe10b3fb52df0ec0586fd00e8bd51c461b7a638e745c6bbd996e
 WHIRLPOOL 
a9af879ce290a9f0ac2fb5f6af425e509455d6fb553156250013a941e782c416435be7326498ed544ee81623fbac4a5924940cc05dd56325c0d8e4c71c44b0b8

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/

2014-10-11 Thread Evan Teran 
commit: 8143bff01172d2dcadd8ac2a8fab8fce0df467f2
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 21:50:49 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 21:50:49 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=8143bff0

cleaning up whitespace of the ebuilds

Package-Manager: portage-2.2.8-r2

---
 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild | 10 +-
 app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 181d792..96c6ccf 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -65,21 +65,21 @@ src_prepare() {
use pax_kernel  epatch ${FILESDIR}/${PV_MAJOR}-hardened.patch
epatch ${FILESDIR}/${PV_MAJOR}-apic.patch
kernel_is ge 3 7 0  epatch ${FILESDIR}/${PV_MAJOR}-putname.patch
-   
+
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch
-   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-05-dentry.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-06-inode.patch
-   
+
# fixes a memcpy/memcmp bug in the hub code
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-07-hub.patch
-   
+
kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch
kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch
-   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch 
+   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
kernel_is ge 3 17 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch

diff --git a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
index 96b318b..bf8e379 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.2-r1.ebuild
@@ -85,8 +85,6 @@ src_prepare() {
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch
kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch
-
-   
kernel_is ge 3 11 0  epatch ${FILESDIR}/${PV_MAJOR}-filldir.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-11 Thread Evan Teran 
commit: 9855e554b7065d7a7233017037371f70b7abe796
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Sat Oct 11 21:49:37 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Sat Oct 11 21:49:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=9855e554

correcting the patches for VMware 10

Package-Manager: portage-2.2.8-r2

---
 app-emulation/vmware-modules/Manifest  |  44 
 .../files/279-3.10-02-unused-typedef.patch | 112 -
 .../files/279-3.10-03-deprecated.patch |  70 ++---
 .../vmware-modules/files/279-3.10-05-hub.patch |  21 
 .../vmware-modules/files/279-3.13-00-vmnet.patch   |  36 ---
 .../vmware-modules/vmware-modules-279.2-r1.ebuild  |   4 -
 6 files changed, 35 insertions(+), 252 deletions(-)

diff --git a/app-emulation/vmware-modules/Manifest 
b/app-emulation/vmware-modules/Manifest
deleted file mode 100644
index 30288f3..000
--- a/app-emulation/vmware-modules/Manifest
+++ /dev/null
@@ -1,44 +0,0 @@
--BEGIN PGP SIGNED MESSAGE-
-Hash: SHA256
-
-AUX 271-3.10.0.patch 23418 SHA256 
346d1ca7705dd5f791e0d69cdbb346ebd31f2f4f11f3989c23d1a89e11e1b91b SHA512 
878678f951b05137deb1656ccd7fd3185887f02649f2a223ef60ccecdedc7aeda6ca08ddd108e379734b5e04ef11d326b20e45c069c53cc52b7a6869b8db6410
 WHIRLPOOL 
196515870addefcd6857dd3e44a04b8a6c0da39185e7cea7826f1498f5a4c17997ebe43aada7f22a1c3fa94302576ced2a7ed36e2452de00711256c83f7fa41e
-AUX 271-apic.patch 302 SHA256 
60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 
003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7
 WHIRLPOOL 
4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
-AUX 271-filldir.patch 2485 SHA256 
539e8940b47cb7a5f39ab2ba6f18ceb290a2627c81bd6daead6e5850aec02a63 SHA512 
e5f85031f459a79a0f64b15224ae8c1ef23892ef159a37955b9c2a2b13ab6e892325a5aeedd4fd2969da3b187cedcaea8fc41540638d02cf56dce2d3e9194937
 WHIRLPOOL 
a455300e72624e4f9c8d3dc79fa5c3ab1b288e79a04483503006a61d44bc83bf14faf0bfa753f82a70dbd23f870b2f6bfe1b06d23792eb1522a7265799ce03eb
-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-vfsfollowlink.patch 1219 SHA256 
b195f6492a172f682d55fb506ba02c473fd924bb47dc0d1359dd5de163b4da22 SHA512 
b675f68175be0b7003d2f80c54dce05a064f8d5bd8744d40571d3d1e0153c01f909e37e0403e53f23a6d61383a9b054c40a2a9ffa95dd765eeffb0c7e739ff1d
 WHIRLPOOL 
3e108ee29c2050029c6079f652e2670529a9f6b220524db214c7dadba3dcaef8fa1ab261f0e10ffa7506456d9f3954bf6a82960e78ebd120c1eb2aac68e8
-AUX 271-vmmon.patch 1581 SHA256 
a4e89766232d0fc0456bb026978dedca17fcc62e247c8d65ae747b537e62fd13 SHA512 
10aca60b959647c058fa69f851892a0245acad971028876da8d0a0e6002d0e8f6f2677fd0d9b140ee8a1a68cf2cfa3f8937a992f8b0e7e163aa6bcc17b75c979
 WHIRLPOOL 
28d1a34e89c7a995dbde48d87d8942c6f58e61f4a24189a1463c148c843fdf16cea7df497993eb6fb8d8de228f07ae8a44233bb63e42b54ab1f762e7e24889ba
-AUX 279-apic.patch 302 SHA256 
60e7df881281fedcabe9ea4427b324b5e1142a1a2b6ab5236ac0843bd1051048 SHA512 
003240043e5875d8c6425c146e708eb3c3d8be7fa48a2ac42b3071f00dafdbd51f7796d6f884298b135adccaf8a3eac32fd82b34a436a724da125dac5f6261d7
 WHIRLPOOL 
4707d0ddd532d5ec27ee2ba3d0fb25c1972bbc9f958b4b89f2f5cceffdf955ba88cd1be0cde046aa5fa688d52faeab5ccf3f03bbccb3e9b088abc37ad579e8e0
-AUX 279-filldir.patch 2485 SHA256

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2014-10-10 Thread Evan Teran 
commit: 10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 21:09:30 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 21:09:30 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10ad4083

now properly compiles with minimal wanrings for 3.10, moving onto 3.11 testing 
:-)

---
 .../files/271-3.10-04-unused-typedef.patch | 112 +
 .../vmware-modules/files/271-3.10-05-dentry.patch  |  30 ++
 .../vmware-modules/files/271-3.10-06-inode.patch   |  31 ++
 .../vmware-modules/files/271-3.10-07-hub.patch |  21 
 4 files changed, 194 insertions(+)

diff --git 
a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch 
b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
new file mode 100644
index 000..d030110
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
@@ -0,0 +1,112 @@
+--- vmblock-only/shared/vm_assert.h2014-10-07 22:43:39.519402467 -0400
 vmblock-only/shared/vm_assert.h2014-10-07 22:48:01.346409957 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vmci-only/shared/vm_assert.h   2014-10-07 22:43:39.519402467 -0400
 vmci-only/shared/vm_assert.h   2014-10-07 22:47:51.829409685 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vmmon-only/include/vm_assert.h 2014-10-07 22:43:39.520402467 -0400
 vmmon-only/include/vm_assert.h 2014-10-07 22:47:39.246409325 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vmnet-only/vm_assert.h 2014-10-07 22:43:39.520402467 -0400
 vmnet-only/vm_assert.h 2014-10-07 22:47:55.804409799 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vsock-only/shared/vm_assert.h  2014-10-07 22:47:11.595408534 -0400
 vsock-only/shared/vm_assert.h  2014-10-07 22:45:55.715406363 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+do { \
+   enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+} while (0)
+ 
+ 
+--- vsock-only/shared/vm_atomic.h  2013-11-05 23:33:27.0 -0500
 vsock-only/shared/vm_atomic.h  2014-10-07 22:53:06.024418673 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+8 * sizeof (out) == size 
\
+8 * sizeof (cast) == size
\
+  ? 1 : -1 };  
\
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; 
\
++  __attribute__((unused)) typedef char 
AssertOnCompileFailed[AssertOnCompileMisused]; \
+}  
\
+   
\
+   
\
+--- vmci-only/shared/vm_atomic.h   2013-11-05 23:33:27.0 -0500
 vmci-only/shared/vm_atomic.h   2014-10-07 22:53:24.873419213 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+8 * sizeof (out) == size 
\
+8 * sizeof (cast) == size
\
+  ? 1 : -1 };  
\
+-  typedef char AssertOnCompileFailed[AssertOnCompileMisused]; 
\
++

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-10 Thread Evan Teran 
commit: 5bf8b1f68790299292623fa59ecce2415a230ade
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 21:24:40 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 21:24:40 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=5bf8b1f6

compiles with 3.14/3.15 moving onto 3.16...

---
 .../files/271-3.15-00-readlink.patch   | 12 ++
 .../vmware-modules/files/271-3.15-01-vsock.patch   | 43 ++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  7 ++--
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch 
b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
new file mode 100644
index 000..36be37f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
@@ -0,0 +1,12 @@
+diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400
 vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400
+@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry,
+   return -EINVAL;
+}
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo-name);
++   return readlink_copy(buffer, buflen, iinfo-name);
+ }
+ 
+ 

diff --git a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch 
b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
new file mode 100644
index 000..a880a75
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
@@ -0,0 +1,43 @@
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c  2013-11-05 23:33:27.0 -0500
 vsock-only.new/linux/notify.c  2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+vsk = vsock_sk(sk);
+PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++   sk-sk_data_ready(sk);
++#else
+sk-sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c2013-11-05 23:33:27.0 -0500
 vsock-only.new/linux/notifyQState.c2014-10-05 23:46:33.231303931 
-0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+  struct sockaddr_vm *dst,// IN: unused
+  struct sockaddr_vm *src)// IN: unused
+ {
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++   sk-sk_data_ready(sk);
++#else
+sk-sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+   }
+ 
+   /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 15, 0)
++  sk-sk_data_ready(sk);
++#else
+   sk-sk_data_ready(sk, 0);
++#endif
+}
+ 
+return err;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index e922472..f1b1f2b 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -79,10 +79,9 @@ src_prepare() {

kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch
kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch
-
-   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch
-
-
+   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch 
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
+   kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2014-10-10 Thread Evan Teran 
commit: afba145791293bf201c88e3e4c4b0dad9ec3ac54
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 21:16:53 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 21:16:53 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=afba1457

compiles cleanly with 3.11, moving onto 3.12

---
 .../vmware-modules/files/271-3.11-00-readdir.patch | 38 
 .../vmware-modules/files/271-3.11-01-filldir.patch | 50 ++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  | 21 +++--
 3 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch 
b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
new file mode 100644
index 000..15a9a8f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
@@ -0,0 +1,38 @@
+diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only/linux/file.c  2013-11-05 23:33:26.0 -0500
 vmblock-only/linux/file.c  2014-04-26 10:58:03.062635343 -0400
+@@ -166,11 +166,9 @@
+ 
+ static int
+ FileOpReaddir(struct file *file,  // IN
+-  void *dirent,   // IN
+-  filldir_t filldir)  // IN
++  struct dir_context *ctx)
+ {
+int ret;
+-   FilldirInfo info;
+struct file *actualFile;
+ 
+if (!file) {
+@@ -184,11 +182,8 @@
+   return -EINVAL;
+}
+ 
+-   info.filldir = filldir;
+-   info.dirent = dirent;
+-
+actualFile-f_pos = file-f_pos;
+-   ret = vfs_readdir(actualFile, Filldir, info);
++   ret = iterate_dir(actualFile, ctx);
+file-f_pos = actualFile-f_pos;
+ 
+return ret;
+@@ -237,7 +232,7 @@
+ 
+ 
+ struct file_operations RootFileOps = {
+-   .readdir = FileOpReaddir,
++   .iterate = FileOpReaddir,
+.open= FileOpOpen,
+.release = FileOpRelease,
+ };

diff --git a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch 
b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
new file mode 100644
index 000..d36c61a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
@@ -0,0 +1,50 @@
+diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
+--- vmblock-only/linux/file.c  2014-10-07 23:22:46.832469618 -0400
 vmblock-only.new/linux/file.c  2014-10-07 23:24:35.276472720 -0400
+@@ -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 */
+ 
+ /*

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 72b49b0..7b2771a 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -66,10 +66,23 @@ src_prepare() {
epatch ${FILESDIR}/${PV_MAJOR}-apic.patch
kernel_is ge 3 7 0  epatch ${FILESDIR}/${PV_MAJOR}-putname.patch

-   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-271-3.10-00-userns.patch
-   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-271-3.10-01-create_proc_entry.patch
-   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-271-3.10-02-getname.patch
-   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-271-3.10-03-deprecated.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch
+   kernel_is ge 3 10 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch
+   kernel_is ge 3 10 0  epatch

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-10 Thread Evan Teran 
commit: 641205e8d0e691be4155abc1c5dc2c4232898304
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 21:34:25 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 21:34:25 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=641205e8

now compiles with 3.16/3.17, i think that makes it up to date!

---
 app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 12 
 app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch 
b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
new file mode 100644
index 000..fbe1741
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
@@ -0,0 +1,12 @@
+diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
+--- vmnet-only/netif.c 2013-11-06 00:40:52.0 -0500
 vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName,  // IN:
+memcpy(deviceName, devName, sizeof deviceName);
+NULL_TERMINATE_STRING(deviceName);
+ 
+-   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, 
VNetNetIfSetup);
+if (!dev) {
+   retval = -ENOMEM;
+   goto out;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index f1b1f2b..181d792 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -82,6 +82,7 @@ src_prepare() {
kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch 
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch
kernel_is ge 3 15 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch
+   kernel_is ge 3 17 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch
 
# Allow user patches so they can support RC kernels and whatever else
epatch_user

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/

2014-10-10 Thread Evan Teran 
commit: 4d9b602206d7e267af066b17f437934479b36ac0
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 20:17:17 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 20:17:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=4d9b6022

doing an initial commit which should patch and compile correctly for 3.10 
kernels as a test run

---
 .../vmware-modules/files/271-3.10-00-userns.patch  |  37 +
 .../files/271-3.10-01-create_proc_entry.patch  |  24 +++
 .../vmware-modules/files/271-3.10-02-getname.patch |  19 +++
 .../files/271-3.10-03-deprecated.patch |  90 +++
 app-emulation/vmware-modules/files/271-apic.patch  |  12 ++
 .../vmware-modules/files/271-hardened.patch| 170 +
 .../files/271-makefile-include.patch   |  65 
 .../files/271-makefile-kernel-dir.patch|  85 +++
 .../vmware-modules/files/271-netdevice.patch   |  24 +++
 .../vmware-modules/files/271-putname.patch |  13 ++
 app-emulation/vmware-modules/metadata.xml  |  13 ++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  87 +++
 12 files changed, 639 insertions(+)

diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch 
b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
new file mode 100644
index 000..c960b78
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
@@ -0,0 +1,37 @@
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.0 +0100
 b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.0 +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.c2013-03-20 17:57:35.0 +0100
 b/vmci-only/linux/driver.c2013-03-20 17:57:43.0 +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.0 +0100
 b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.0 +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/271-3.10-01-create_proc_entry.patch 
b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
new file mode 100644
index 000..85c3def
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
@@ -0,0 +1,24 @@
+--- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200
 b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200
+@@ -208,9 +208,10 @@
+VMBlockSetProcEntryOwner(controlProcMountpoint);
+ 
+/* Create /proc/fs/vmblock/dev */
+-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+-VMBLOCK_CONTROL_MODE,
+-controlProcDirEntry);
++   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
++  VMBLOCK_CONTROL_MODE,
++  controlProcDirEntry,
++  ControlFileOps);
+if (!controlProcEntry) {
+   Warning(SetupProcDevice: could not create  VMBLOCK_DEVICE \n);
+   remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+@@ -218,7 +219,6 @@
+   return -EINVAL;
+}
+ 
+-   controlProcEntry-proc_fops = ControlFileOps;
+return 0;
+ }
+ 

diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch 
b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
new file mode 100644
index 000..7bcf536
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
@@ -0,0 +1,19 @@
+--- vmblock-only/linux/control.c   2014-03-15 15:28:40.871076076 +0100
 vmblock-only/linux/control.c.new   2014-03-15 15:29:15.079074439 +0100
+@@ -279,11 +279,17 @@
+int i;
+int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+if (IS_ERR(name)) {
+   return PTR_ERR(name);
+}
+ 
++   i =

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/

2014-10-10 Thread Evan Teran 
commit: c03d98c3ed5ce0336044e36afcee4abf806d5fac
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Fri Oct 10 01:55:55 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Fri Oct 10 01:55:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=c03d98c3

a better approach to dealing with deprecated macro redefinition

---
 .../files/271-3.10-03-deprecated.patch | 75 ++
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch 
b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
index 862ef97..3a9f785 100644
--- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -1,90 +1,85 @@
 diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
 vmblock-only/shared/vm_assert.h2013-11-05 23:33:27.0 -0500
-+++ vmblock-only.new/shared/vm_assert.h2014-10-07 18:13:59.583815971 
-0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmblock-only/shared/vm_assert.h2014-10-09 21:50:54.221159088 -0400
 vmblock-only.new/shared/vm_assert.h2014-10-09 21:53:04.612166156 
-0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
--   #define DEPRECATED(_fix) DO_ONCE(\
-+   #define VMWARE_DEPRECATED(_fix) DO_ONCE(   
 \
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
 Warning(%s:%d: %s is DEPRECATED; %s\n, \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
  #else
--   #define DEPRECATED(_fix) do {} while (0)
-+   #define VMWARE_DEPRECATED(_fix) do {} while (0)
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
  #endif
  
- 
 diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
 vmci-only/shared/vm_assert.h   2013-11-05 23:33:27.0 -0500
-+++ vmci-only.new/shared/vm_assert.h   2014-10-07 18:14:18.470816995 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmci-only/shared/vm_assert.h   2014-10-09 21:50:54.222159088 -0400
 vmci-only.new/shared/vm_assert.h   2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
--   #define DEPRECATED(_fix) DO_ONCE(\
-+   #define VMWARE_DEPRECATED(_fix) DO_ONCE(   
 \
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
 Warning(%s:%d: %s is DEPRECATED; %s\n, \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
  #else
--   #define DEPRECATED(_fix) do {} while (0)
-+   #define VMWARE_DEPRECATED(_fix) do {} while (0)
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
  #endif
  
- 
 diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
 vmmon-only/include/vm_assert.h 2013-11-06 00:40:51.0 -0500
-+++ vmmon-only.new/include/vm_assert.h 2014-10-07 18:14:12.118816650 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
 vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
  #define LOG_ONCE(_s) DO_ONCE(Log _s)
  
  #ifdef VMX86_DEVEL
--   #define DEPRECATED(_fix) DO_ONCE(\
-+   #define VMWARE_DEPRECATED(_fix) DO_ONCE(   
 \
++   #undef DEPRECATED
+#define DEPRECATED(_fix) DO_ONCE(\
 Warning(%s:%d: %s is DEPRECATED; %s\n, \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
  #else
--   #define DEPRECATED(_fix) do {} while (0)
-+   #define VMWARE_DEPRECATED(_fix) do {} while (0)
++   #undef DEPRECATED
+#define DEPRECATED(_fix) do {} while (0)
  #endif
  
- 
 diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
 vmnet-only/vm_assert.h 2013-11-06 00:40:52.0 -0500
-+++ vmnet-only.new/vm_assert.h 2014-10-07 18:14:05.167816273 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
 vmnet-only.new/vm_assert.h 2014-10-09

[gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/

2014-10-10 Thread Evan Teran 
commit: a47d968589d7559e72d5f8cc4e957ea3b9fb78d2
Author: Evan Teran evan.teran AT gmail DOT com
AuthorDate: Thu Oct  9 21:20:45 2014 +
Commit: Evan Teran evan.teran AT gmail DOT com
CommitDate: Thu Oct  9 21:20:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a47d9685

compiles with 3.12/3.13, moving onto 3.14

---
 .../vmware-modules/files/271-3.13-00-vmnet.patch   | 36 ++
 .../vmware-modules/vmware-modules-271.3-r1.ebuild  |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch 
b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
new file mode 100644
index 000..4e9d7e9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -0,0 +1,36 @@
+--- work/vmnet-only/filter.c   2013-08-27 20:29:04.0 +0100
 patched/vmnet-only/filter.c   2014-01-26 01:09:05.184893854 +
+@@ -27,6 +27,7 @@
+ #include compat_module.h
+ #include linux/mutex.h
+ #include linux/netdevice.h
++#include linux/version.h
+ #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
+ #   include linux/module.h
+ #else
+@@ -203,7 +204,11 @@
+ #endif
+
+ static unsigned int
++#if LINUX_VERSION_CODE  KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum, // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,// IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+  struct sk_buff *skb,  // IN:
+ #else
+@@ -252,7 +257,12 @@
+
+/* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+/* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++
++   #if LINUX_VERSION_CODE  KERNEL_VERSION(3, 13, 0)
++  transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++  transmit = (ops-hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+
+packetHeader = compat_skb_network_header(skb);
+ip = (struct iphdr*)packetHeader;

diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild 
b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 7b2771a..e922472 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch
kernel_is ge 3 11 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch
 
-
+   kernel_is ge 3 13 0  epatch 
${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch