diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-11-01 14:45:43 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-11-01 14:46:23 +0100 |
| commit | a2d54401ad16fe676b80bb5618a569ebe02636d5 (patch) | |
| tree | 5a28f686ca7e6e2c030a719eaaface3cb490ac84 /app-emulation | |
| parent | app-misc/fsniper: patch against obsolete C call. (diff) | |
| download | gentoo-a2d54401ad16fe676b80bb5618a569ebe02636d5.tar.gz gentoo-a2d54401ad16fe676b80bb5618a569ebe02636d5.tar.bz2 gentoo-a2d54401ad16fe676b80bb5618a569ebe02636d5.zip | |
app-emulation/vmware-*: Remove. Please use the vmware overlay.
Diffstat (limited to 'app-emulation')
154 files changed, 0 insertions, 11201 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 b1b78b76300e..000000000000 --- 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.000000000 +0100 -+++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100 -@@ -135,7 +135,8 @@ - inode->i_size = INODE_TO_IINFO(inode)->nameLen; - inode->i_version = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -- inode->i_uid = inode->i_gid = 0; -+ inode->i_uid = GLOBAL_ROOT_UID; -+ inode->i_gid = GLOBAL_ROOT_GID; - inode->i_op = &LinkInodeOps; - - d_add(dentry, inode); - ---- a/vmci-only/linux/driver.c 2013-03-20 17:57:35.000000000 +0100 -+++ b/vmci-only/linux/driver.c 2013-03-20 17:57:43.000000000 +0100 -@@ -740,7 +740,7 @@ - goto init_release; - } - -- user = current_uid(); -+ user = from_kuid(current_user_ns(), current_uid()); - retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, - 0 /* Unused */, vmciLinux->userVersion, - &user, &vmciLinux->context); - ---- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100 -+++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100 -@@ -2866,7 +2866,7 @@ - vsk->connectTimeout = psk->connectTimeout; - } else { - vsk->trusted = capable(CAP_NET_ADMIN); -- vsk->owner = current_uid(); -+ vsk->owner = from_kuid(current_user_ns(), current_uid()); - vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE; - vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; - vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; - diff --git a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch deleted file mode 100644 index 889ae71be47b..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 @@ - 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 deleted file mode 100644 index 05ed8dbcc374..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 @@ - 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/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch deleted file mode 100644 index 981aabdd1260..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch +++ /dev/null @@ -1,89 +0,0 @@ -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.h 2014-10-09 21:50:54.221159088 -0400 -+++ vmblock-only.new/shared/vm_assert.h 2014-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/271-3.10-04-unused-typedef.patch b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch deleted file mode 100644 index d5129ec689a4..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch +++ /dev/null @@ -1,115 +0,0 @@ -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.h 2014-10-07 22:43:39.519402467 -0400 -+++ vmblock-only/shared/vm_assert.h 2014-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.000000000 -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.000000000 -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]; \ -+ __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ - } \ - \ - \ - ---- vmblock-only/shared/vm_atomic.h 2013-11-05 23:33:27.000000000 -0500 -+++ vmblock-only/shared/vm_atomic.h 2014-10-07 22:53:31.073419390 -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]; \ - } \ - \ - ---- vmnet-only/vm_atomic.h 2013-11-06 00:40:52.000000000 -0500 -+++ vmnet-only/vm_atomic.h 2014-10-07 23:04:50.637438831 -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]; \ - } \ - \ - \ - ---- vmmon-only/include/vm_atomic.h 2013-11-06 00:40:52.000000000 -0500 -+++ vmmon-only/include/vm_atomic.h 2014-10-07 23:04:50.637438831 -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]; \ - } \ - \ - \ diff --git a/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch deleted file mode 100644 index f4f59d977408..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c ---- vmblock-only/linux/dentry.c 2013-11-05 23:33:26.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2014-04-26 10:58:03.062635343 -0400 -@@ -32,7 +32,7 @@ - #include "block.h" - - --static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd); -+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags); - - struct dentry_operations LinkDentryOps = { - .d_revalidate = DentryOpRevalidate, -@@ -60,7 +60,7 @@ - - static int - DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating -- struct nameidata *nd) // IN: lookup flags & intent -+ unsigned int flags) // IN: lookup flags & intent - { - VMBlockInodeInfo *iinfo; - struct nameidata actualNd; -@@ -101,7 +101,7 @@ - if (actualDentry && - actualDentry->d_op && - actualDentry->d_op->d_revalidate) { -- return actualDentry->d_op->d_revalidate(actualDentry, nd); -+ return actualDentry->d_op->d_revalidate(actualDentry, flags); - } - - if (compat_path_lookup(iinfo->name, 0, &actualNd)) { 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 deleted file mode 100644 index 01c88930899c..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch +++ /dev/null @@ -1,36 +0,0 @@ -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. 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.000000000 -0500 -+++ vmblock-only/linux/inode.c 2014-04-26 10:58:03.063635343 -0400 -@@ -36,7 +36,7 @@ - - /* Inode operations */ - static struct dentry *InodeOpLookup(struct inode *dir, -- struct dentry *dentry, struct nameidata *nd); -+ struct dentry *dentry, unsigned int flags); - static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) - static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); -@@ -75,7 +75,7 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+ unsigned int flags) // IN: lookup intent and information - { - char *filename; - struct inode *inode; -@@ -221,7 +221,8 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); -+ ret = 0; - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/271-3.10-07-hub.patch b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch deleted file mode 100644 index eebe4a23b304..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10-07-hub.patch +++ /dev/null @@ -1,26 +0,0 @@ -fixes a bug where sizeof was being used on a pointer when they clearly -meant to use the size of the array referred to. Fortunately, the amount is -always smaller than the actual size of the buffer, so likely not a security issue -(and was fixed in vmware-workstaiton 10 - -diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c ---- vmnet-only/hub.c 2013-11-06 00:40:52.000000000 -0500 -+++ vmnet-only.new/hub.c 2014-10-07 18:45:34.403918680 -0400 -@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_ - { - VNetHub *currHub = vnetHub; - while (currHub && (currHub->hubType != HUB_TYPE_PVN || -- memcmp(idNum, currHub->id.pvnID, sizeof idNum))) { -+ memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) { - currHub = currHub->next; - } - return currHub; -@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE - - if (allocPvn) { - hub->hubType = HUB_TYPE_PVN; -- memcpy(hub->id.pvnID, id, sizeof id); -+ memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN); - ++pvnInstance; - } else { - hub->hubType = HUB_TYPE_VNET; diff --git a/app-emulation/vmware-modules/files/271-3.10.0.patch b/app-emulation/vmware-modules/files/271-3.10.0.patch deleted file mode 100644 index 7795b18f5d7e..000000000000 --- a/app-emulation/vmware-modules/files/271-3.10.0.patch +++ /dev/null @@ -1,809 +0,0 @@ ---- a/vmnet-only/bridge.c -+++ b/vmnet-only/bridge.c -@@ -105,8 +105,6 @@ static Bool VNetBridgeCycleDetect(VNetJack *this, int generation); - static Bool VNetBridgeIsDeviceWireless(struct net_device *dev); - static void VNetBridgePortsChanged(VNetJack *this); - static int VNetBridgeIsBridged(VNetJack *this); --static int VNetBridgeProcRead(char *page, char **start, off_t off, -- int count, int *eof, void *data); - static void VNetBridgeComputeHeaderPosIPv6(struct sk_buff *skb); - static PacketStatus VNetCallSMACFunc(struct SMACState *state, - struct sk_buff **skb, void *startOfData, -@@ -225,6 +223,53 @@ VNetBridgeDevCompatible(VNetBridge *bridge, // IN: Bridge - /* - *---------------------------------------------------------------------- - * -+ * VNetBridgeProcShow -- -+ * -+ * Callback for read operation on this bridge entry in vnets proc fs. -+ * -+ * Results: -+ * Length of read operation. -+ * -+ * Side effects: -+ * None. -+ * -+ *---------------------------------------------------------------------- -+ */ -+ -+int -+VNetBridgeProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into -+ void *data) // IN: client data - pointer to bridge -+{ -+ VNetBridge *bridge = (VNetBridge*)data; -+ -+ if (!bridge) { -+ return 0; -+ } -+ -+ VNetPrintPort(&bridge->port, seqf); -+ -+ seq_printf(seqf, "dev %s ", bridge->name); -+ -+ seq_printf(seqf, "\n"); -+ -+ return 0; -+} -+ -+static int proc_bridge_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, VNetBridgeProcShow, PDE_DATA(inode)); -+} -+ -+static const struct file_operations proc_bridge_fops = { -+ .open = proc_bridge_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; -+ -+/* -+ *---------------------------------------------------------------------- -+ * - * VNetBridge_Create -- - * - * Creates a bridge. Allocates struct, allocates internal device, -@@ -319,17 +364,14 @@ VNetBridge_Create(const char *devName, // IN: name of device (e.g., "eth0") - * Make proc entry for this jack. - */ - -- retval = VNetProc_MakeEntry(bridge->port.jack.name, S_IFREG, -- &bridge->port.jack.procEntry); -+ retval = VNetProc_MakeEntryOps(bridge->port.jack.name, S_IFREG, -+ &bridge->port.jack.procEntry, &proc_bridge_fops, bridge); - if (retval) { - if (retval == -ENXIO) { - bridge->port.jack.procEntry = NULL; - } else { - goto out; - } -- } else { -- bridge->port.jack.procEntry->read_proc = VNetBridgeProcRead; -- bridge->port.jack.procEntry->data = bridge; - } - - /* -@@ -1719,45 +1761,3 @@ VNetBridgeReceiveFromDev(struct sk_buff *skb, // IN: packet to receive - return 0; - } - -- --/* -- *---------------------------------------------------------------------- -- * -- * VNetBridgeProcRead -- -- * -- * Callback for read operation on this bridge entry in vnets proc fs. -- * -- * Results: -- * Length of read operation. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --int --VNetBridgeProcRead(char *page, // IN/OUT: buffer to write into -- char **start, // OUT: 0 if file < 4k, else offset into page -- off_t off, // IN: (unused) offset of read into the file -- int count, // IN: (unused) maximum number of bytes to read -- int *eof, // OUT: TRUE if there is nothing more to read -- void *data) // IN: client data - pointer to bridge --{ -- VNetBridge *bridge = (VNetBridge*)data; -- int len = 0; -- -- if (!bridge) { -- return len; -- } -- -- len += VNetPrintPort(&bridge->port, page+len); -- -- len += sprintf(page+len, "dev %s ", bridge->name); -- -- len += sprintf(page+len, "\n"); -- -- *start = 0; -- *eof = 1; -- return len; --} ---- a/vmnet-only/driver.c -+++ b/vmnet-only/driver.c -@@ -1785,21 +1785,17 @@ VNetSetMACUnique(VNetPort *port, // IN: - *---------------------------------------------------------------------- - */ - --int -+void - VNetPrintJack(const VNetJack *jack, // IN: jack -- char *buf) // OUT: info about jack -+ struct seq_file *seqf) // OUT: info about jack - { -- int len = 0; -- - read_lock(&vnetPeerLock); - if (!jack->peer) { -- len += sprintf(buf+len, "connected not "); -+ seq_printf(seqf, "connected not "); - } else { -- len += sprintf(buf+len, "connected %s ", jack->peer->name); -+ seq_printf(seqf, "connected %s ", jack->peer->name); - } - read_unlock(&vnetPeerLock); -- -- return len; - } - - -@@ -1819,52 +1815,48 @@ VNetPrintJack(const VNetJack *jack, // IN: jack - *---------------------------------------------------------------------- - */ - --int -+void - VNetPrintPort(const VNetPort *port, // IN: port -- char *buf) // OUT: info about port -+ struct seq_file *seqf) // OUT: info about port - { -- int len = 0; -+ VNetPrintJack(&port->jack, seqf); - -- len += VNetPrintJack(&port->jack, buf+len); -- -- len += sprintf(buf+len, "mac %02x:%02x:%02x:%02x:%02x:%02x ", -+ seq_printf(seqf, "mac %02x:%02x:%02x:%02x:%02x:%02x ", - port->paddr[0], port->paddr[1], port->paddr[2], - port->paddr[3], port->paddr[4], port->paddr[5]); - -- len += sprintf(buf+len, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ", -+ seq_printf(seqf, "ladrf %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ", - port->ladrf[0], port->ladrf[1], port->ladrf[2], - port->ladrf[3], port->ladrf[4], port->ladrf[5], - port->ladrf[6], port->ladrf[7]); - -- len += sprintf(buf+len, "flags IFF_RUNNING"); -+ seq_printf(seqf, "flags IFF_RUNNING"); - - if (port->flags & IFF_UP) { -- len += sprintf(buf+len, ",IFF_UP"); -+ seq_printf(seqf, ",IFF_UP"); - } - - if (port->flags & IFF_BROADCAST) { -- len += sprintf(buf+len, ",IFF_BROADCAST"); -+ seq_printf(seqf, ",IFF_BROADCAST"); - } - - if (port->flags & IFF_DEBUG) { -- len += sprintf(buf+len, ",IFF_DEBUG"); -+ seq_printf(seqf, ",IFF_DEBUG"); - } - - if (port->flags & IFF_PROMISC) { -- len += sprintf(buf+len, ",IFF_PROMISC"); -+ seq_printf(seqf, ",IFF_PROMISC"); - } - - if (port->flags & IFF_MULTICAST) { -- len += sprintf(buf+len, ",IFF_MULTICAST"); -+ seq_printf(seqf, ",IFF_MULTICAST"); - } - - if (port->flags & IFF_ALLMULTI) { -- len += sprintf(buf+len, ",IFF_ALLMULTI"); -+ seq_printf(seqf, ",IFF_ALLMULTI"); - } - -- len += sprintf(buf+len, " "); -- -- return len; -+ seq_printf(seqf, " "); - } - - ---- a/vmnet-only/hub.c -+++ b/vmnet-only/hub.c -@@ -25,6 +25,7 @@ - #include <linux/sched.h> - #include <linux/slab.h> - #include <linux/poll.h> -+#include <linux/seq_file.h> - - #include <linux/netdevice.h> - #include <linux/etherdevice.h> -@@ -71,8 +72,6 @@ static void VNetHubReceive(VNetJack *this, struct sk_buff *skb); - static Bool VNetHubCycleDetect(VNetJack *this, int generation); - static void VNetHubPortsChanged(VNetJack *this); - static int VNetHubIsBridged(VNetJack *this); --static int VNetHubProcRead(char *page, char **start, off_t off, -- int count, int *eof, void *data); - - static VNetHub *vnetHub; - static DEFINE_SPINLOCK(vnetHubLock); -@@ -241,6 +240,53 @@ VNetHub_AllocPvn(uint8 id[]) // IN: the PVN ID to alloc on - /* - *---------------------------------------------------------------------- - * -+ * VNetHubProcShow -- -+ * -+ * Callback for read operation on hub entry in vnets proc fs. -+ * -+ * Results: -+ * Length of read operation. -+ * -+ * Side effects: -+ * None. -+ * -+ *---------------------------------------------------------------------- -+ */ -+ -+int -+VNetHubProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into -+ void *data) // IN: client data - not used -+{ -+ VNetJack *jack = (VNetJack*)data; -+ VNetHub *hub; -+ -+ if (!jack || !jack->private) { -+ return 0; -+ } -+ hub = (VNetHub*)jack->private; -+ -+ VNetPrintJack(jack, seqf); -+ -+ seq_printf(seqf, "tx %u ", hub->stats[jack->index].tx); -+ seq_printf(seqf, "\n"); -+ return 0; -+} -+ -+static int proc_hub_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, VNetHubProcShow, PDE_DATA(inode)); -+} -+ -+static const struct file_operations proc_hub_fops = { -+ .open = proc_hub_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; -+ -+/* -+ *---------------------------------------------------------------------- -+ * - * VNetHubAlloc -- - * - * Allocate a jack on this hub. -@@ -354,7 +400,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet - * Make proc entry for this jack. - */ - -- retval = VNetProc_MakeEntry(jack->name, S_IFREG, &jack->procEntry); -+ retval = VNetProc_MakeEntryOps(jack->name, S_IFREG, &jack->procEntry, &proc_hub_fops, jack); - if (retval) { - if (retval == -ENXIO) { - jack->procEntry = NULL; -@@ -362,9 +408,6 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE for PVN, FALSE for vnet - hub->used[i] = FALSE; - return NULL; - } -- } else { -- jack->procEntry->read_proc = VNetHubProcRead; -- jack->procEntry->data = jack; - } - - /* -@@ -686,46 +729,3 @@ VNetHubIsBridged(VNetJack *this) - } - - --/* -- *---------------------------------------------------------------------- -- * -- * VNetHubProcRead -- -- * -- * Callback for read operation on hub entry in vnets proc fs. -- * -- * Results: -- * Length of read operation. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --int --VNetHubProcRead(char *page, // IN/OUT: buffer to write into -- char **start, // OUT: 0 if file < 4k, else offset into page -- off_t off, // IN: offset of read into the file -- int count, // IN: maximum number of bytes to read -- int *eof, // OUT: TRUE if there is nothing more to read -- void *data) // IN: client data - not used --{ -- VNetJack *jack = (VNetJack*)data; -- VNetHub *hub; -- int len = 0; -- -- if (!jack || !jack->private) { -- return len; -- } -- hub = (VNetHub*)jack->private; -- -- len += VNetPrintJack(jack, page+len); -- -- len += sprintf(page+len, "tx %u ", hub->stats[jack->index].tx); -- -- len += sprintf(page+len, "\n"); -- -- *start = 0; -- *eof = 1; -- return len; --} ---- a/vmnet-only/netif.c -+++ b/vmnet-only/netif.c -@@ -62,8 +62,6 @@ static int VNetNetifStartXmit(struct sk_buff *skb, struct net_device *dev); - static struct net_device_stats *VNetNetifGetStats(struct net_device *dev); - static int VNetNetifSetMAC(struct net_device *dev, void *addr); - static void VNetNetifSetMulticast(struct net_device *dev); --static int VNetNetIfProcRead(char *page, char **start, off_t off, -- int count, int *eof, void *data); - - /* - *---------------------------------------------------------------------- -@@ -116,6 +114,53 @@ VNetNetIfSetup(struct net_device *dev) // IN: - - } - -+/* -+ *---------------------------------------------------------------------- -+ * -+ * VNetNetIfProcShow -- -+ * -+ * Callback for read operation on this netif entry in vnets proc fs. -+ * -+ * Results: -+ * Length of read operation. -+ * -+ * Side effects: -+ * None. -+ * -+ *---------------------------------------------------------------------- -+ */ -+ -+int -+VNetNetIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into -+ void *data) // IN: client data -+{ -+ VNetNetIF *netIf = data; -+ -+ if (!netIf) { -+ return 0; -+ } -+ -+ VNetPrintPort(&netIf->port, seqf); -+ -+ seq_printf(seqf, "dev %s ", netIf->dev->name); -+ -+ seq_printf(seqf, "\n"); -+ -+ return 0; -+} -+ -+static int proc_netif_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, VNetNetIfProcShow, PDE_DATA(inode)); -+} -+ -+static const struct file_operations proc_netif_fops = { -+ .open = proc_netif_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; -+ - - /* - *---------------------------------------------------------------------- -@@ -180,16 +225,13 @@ VNetNetIf_Create(char *devName, // IN: - * Make proc entry for this jack. - */ - -- retval = VNetProc_MakeEntry(netIf->port.jack.name, S_IFREG, -- &netIf->port.jack.procEntry); -+ retval = VNetProc_MakeEntryOps(netIf->port.jack.name, S_IFREG, -+ &netIf->port.jack.procEntry, &proc_netif_fops, netIf); - if (retval) { - netIf->port.jack.procEntry = NULL; - if (retval != -ENXIO) { - goto outFreeDev; - } -- } else { -- netIf->port.jack.procEntry->read_proc = VNetNetIfProcRead; -- netIf->port.jack.procEntry->data = netIf; - } - - /* -@@ -553,45 +595,3 @@ VNetNetifGetStats(struct net_device *dev) // IN: - return &netIf->stats; - } - -- --/* -- *---------------------------------------------------------------------- -- * -- * VNetNetIfProcRead -- -- * -- * Callback for read operation on this netif entry in vnets proc fs. -- * -- * Results: -- * Length of read operation. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --int --VNetNetIfProcRead(char *page, // IN/OUT: buffer to write into -- char **start, // OUT: 0 if file < 4k, else offset into page -- off_t off, // IN: (unused) offset of read into the file -- int count, // IN: (unused) maximum number of bytes to read -- int *eof, // OUT: TRUE if there is nothing more to read -- void *data) // IN: client data --{ -- VNetNetIF *netIf = data; -- int len = 0; -- -- if (!netIf) { -- return len; -- } -- -- len += VNetPrintPort(&netIf->port, page+len); -- -- len += sprintf(page+len, "dev %s ", netIf->dev->name); -- -- len += sprintf(page+len, "\n"); -- -- *start = 0; -- *eof = 1; -- return len; --} ---- a/vmnet-only/procfs.c -+++ b/vmnet-only/procfs.c -@@ -45,10 +45,6 @@ - - #if defined(CONFIG_PROC_FS) - --static int VNetProcMakeEntryInt(VNetProcEntry *parent, char *name, int mode, -- VNetProcEntry **ret); --static void VNetProcRemoveEntryInt(VNetProcEntry *node, VNetProcEntry *parent); -- - static VNetProcEntry *base = NULL; - - -@@ -71,7 +67,12 @@ static VNetProcEntry *base = NULL; - int - VNetProc_Init(void) - { -- return VNetProcMakeEntryInt(NULL, "vmnet", S_IFDIR, &base); -+ base = proc_mkdir("vmnet", NULL); -+ if(IS_ERR(base)) { -+ base = NULL; -+ return PTR_ERR(base); -+ } -+ return 0; - } - - -@@ -94,14 +95,14 @@ VNetProc_Init(void) - void - VNetProc_Cleanup(void) - { -- VNetProcRemoveEntryInt(base, NULL); -+ proc_remove(base); - base = NULL; - } - - /* - *---------------------------------------------------------------------- - * -- * VNetProcMakeEntryInt -- -+ * VNetProc_MakeEntryOps -- - * - * Make an entry in the vnets proc file system. - * -@@ -116,72 +117,21 @@ VNetProc_Cleanup(void) - */ - - int --VNetProcMakeEntryInt(VNetProcEntry *parent, // IN: -- char *name, // IN: -+VNetProc_MakeEntryOps(char *name, // IN: - int mode, // IN: -- VNetProcEntry **ret) // OUT: -+ VNetProcEntry **ret, -+ const struct file_operations *fops, -+ void *data -+ ) // OUT: - { - VNetProcEntry *ent; -- ent = create_proc_entry(name, mode, parent); -+ ent = proc_create_data(name, mode, base, fops, data); - *ret = ent; - if (!ent) - return -ENOMEM; - return 0; - } - -- --/* -- *---------------------------------------------------------------------- -- * -- * VNetProcRemoveEntryInt -- -- * -- * Remove a previously installed proc entry. -- * -- * Results: -- * None. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --void --VNetProcRemoveEntryInt(VNetProcEntry *node, -- VNetProcEntry *parent) --{ -- if (node) { -- remove_proc_entry(node->name, parent); -- } --} -- -- --/* -- *---------------------------------------------------------------------- -- * -- * VNetProc_MakeEntry -- -- * -- * Make an entry in the vnets proc file system. -- * -- * Results: -- * errno. If errno is 0 and ret is non NULL then ret is filled -- * in with the resulting proc entry. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --int --VNetProc_MakeEntry(char *name, // IN: -- int mode, // IN: -- VNetProcEntry **ret) // OUT: --{ -- return VNetProcMakeEntryInt(base, name, mode, ret); --} -- -- - /* - *---------------------------------------------------------------------- - * -@@ -201,7 +151,8 @@ VNetProc_MakeEntry(char *name, // IN: - void - VNetProc_RemoveEntry(VNetProcEntry *node) - { -- VNetProcRemoveEntryInt(node, base); -+ if(node) -+ proc_remove(node); - } - - -@@ -253,31 +204,6 @@ VNetProc_Cleanup(void) - } - - --/* -- *---------------------------------------------------------------------- -- * -- * VNetProc_MakeEntry -- -- * -- * Make an entry in the vnets proc file system. -- * -- * Results: -- * errno. If errno is 0 and ret is non NULL then ret is filled -- * in with the resulting proc entry. -- * -- * Side effects: -- * None. -- * -- *---------------------------------------------------------------------- -- */ -- --int --VNetProc_MakeEntry(char *name, -- int mode, -- VNetProcEntry **ret) --{ -- return -ENXIO; --} -- - - /* - *---------------------------------------------------------------------- ---- a/vmnet-only/userif.c -+++ b/vmnet-only/userif.c -@@ -389,7 +389,7 @@ VNetUserIfReceive(VNetJack *this, // IN - /* - *---------------------------------------------------------------------- - * -- * VNetUserIfProcRead -- -+ * VNetUserIfProcShow -- - * - * Callback for read operation on this userif entry in vnets proc fs. - * -@@ -403,30 +403,23 @@ VNetUserIfReceive(VNetJack *this, // IN - */ - - static int --VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into -- char **start, // OUT: 0 if file < 4k, else offset into -- // page -- off_t off, // IN: offset of read into the file -- int count, // IN: maximum number of bytes to read -- int *eof, // OUT: TRUE if there is nothing more to -- // read -+VNetUserIfProcShow(struct seq_file *seqf, // IN/OUT: buffer to write into - void *data) // IN: client data - not used - { - VNetUserIF *userIf = (VNetUserIF*)data; -- int len = 0; - - if (!userIf) { -- return len; -+ return 0; - } - -- len += VNetPrintPort(&userIf->port, page+len); -+ VNetPrintPort(&userIf->port, seqf); - -- len += sprintf(page+len, "read %u written %u queued %u ", -+ seq_printf(seqf, "read %u written %u queued %u ", - userIf->stats.read, - userIf->stats.written, - userIf->stats.queued); - -- len += sprintf(page+len, -+ seq_printf(seqf, - "dropped.down %u dropped.mismatch %u " - "dropped.overflow %u dropped.largePacket %u", - userIf->stats.droppedDown, -@@ -434,13 +427,23 @@ VNetUserIfProcRead(char *page, // IN/OUT: buffer to write into - userIf->stats.droppedOverflow, - userIf->stats.droppedLargePacket); - -- len += sprintf(page+len, "\n"); -+ seq_printf(seqf, "\n"); - -- *start = 0; -- *eof = 1; -- return len; -+ return 0; -+} -+ -+static int proc_userif_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, VNetUserIfProcShow, PDE_DATA(inode)); - } - -+static const struct file_operations proc_userif_fops = { -+ .open = proc_userif_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = seq_release, -+}; -+ - - /* - *---------------------------------------------------------------------- -@@ -1036,8 +1039,8 @@ VNetUserIf_Create(VNetPort **ret) // OUT - * Make proc entry for this jack. - */ - -- retval = VNetProc_MakeEntry(userIf->port.jack.name, S_IFREG, -- &userIf->port.jack.procEntry); -+ retval = VNetProc_MakeEntryOps(userIf->port.jack.name, S_IFREG, -+ &userIf->port.jack.procEntry, &proc_userif_fops, userIf); - if (retval) { - if (retval == -ENXIO) { - userIf->port.jack.procEntry = NULL; -@@ -1045,9 +1048,6 @@ VNetUserIf_Create(VNetPort **ret) // OUT - kfree(userIf); - return retval; - } -- } else { -- userIf->port.jack.procEntry->read_proc = VNetUserIfProcRead; -- userIf->port.jack.procEntry->data = userIf; - } - - /* ---- a/vmnet-only/vnetInt.h -+++ b/vmnet-only/vnetInt.h -@@ -171,12 +171,14 @@ VNetJack *VNetDisconnect(VNetJack *jack); - - void VNetSend(const VNetJack *jack, struct sk_buff *skb); - --int VNetProc_MakeEntry(char *name, int mode, -- VNetProcEntry **ret); -+int VNetProc_MakeEntryOps(char *name, int mode, -+ VNetProcEntry **ret, -+ const struct file_operations *fops, -+ void *data); - - void VNetProc_RemoveEntry(VNetProcEntry *node); - --int VNetPrintJack(const VNetJack *jack, char *buf); -+void VNetPrintJack(const VNetJack *jack, struct seq_file *seqf); - - int VNet_MakeMACAddress(VNetPort *port); - -@@ -196,7 +198,7 @@ Bool VNetPacketMatch(const uint8 *destAddr, const uint8 *ifAddr, - - Bool VNetCycleDetectIf(const char *name, int generation); - --int VNetPrintPort(const VNetPort *port, char *buf); -+void VNetPrintPort(const VNetPort *port, struct seq_file *seqf); - - int VNetSnprintf(char *str, size_t size, const char *format, ...); - --- ---- 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.11-00-readdir.patch b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch deleted file mode 100644 index b2f76d3e2b30..000000000000 --- a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -replaces usage of vfs_readdir with iterate_dir. origionally found here: -https://bugs.gentoo.org/show_bug.cgi?id=508204 - -diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c ---- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -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 deleted file mode 100644 index 2eec99b7c1f8..000000000000 --- a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch +++ /dev/null @@ -1,53 +0,0 @@ -simply remove the code for Filldir since it is no longer used with the new -iterate_dir API - -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/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch deleted file mode 100644 index 1bf22077b727..000000000000 --- a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch +++ /dev/null @@ -1,39 +0,0 @@ -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.000000000 +0100 -+++ patched/vmnet-only/filter.c 2014-01-26 01:09:05.184893854 +0000 -@@ -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/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch deleted file mode 100644 index b8ee07822021..000000000000 --- a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 -+++ 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 deleted file mode 100644 index 9e8d9d1a32f7..000000000000 --- a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch +++ /dev/null @@ -1,46 +0,0 @@ -removing the no longer existing second parameter to sk_data_ready -doesn't seem it ever served a purpose. - -diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c ---- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -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.c 2013-11-05 23:33:27.000000000 -0500 -+++ vsock-only.new/linux/notifyQState.c 2014-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/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch deleted file mode 100644 index e3ee3aa09939..000000000000 --- a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch +++ /dev/null @@ -1,16 +0,0 @@ -new alloc_netdev requires a new parameter. All examples in the kernel i've seen just -use the constant NET_NAME_UNKNOWN. -origionally from: https://communities.vmware.com/message/2425189 - -diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c ---- vmnet-only/netif.c 2013-11-06 00:40:52.000000000 -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_USER, VNetNetIfSetup); - if (!dev) { - retval = -ENOMEM; - goto out; 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 deleted file mode 100644 index b4d30c97a59c..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.000000000 -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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_NET 0x0720 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 deleted file mode 100644 index 178d1478ae59..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -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.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -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.000000000 -0500 -+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -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.h 2014-11-20 19:29:15.000000000 -0500 -+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -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 -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c ---- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 -+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -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"); 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 deleted file mode 100644 index a8ec2b11daf9..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 memcpy_{to,from}iovec(). */ - #include <linux/vmalloc.h> - #include <linux/wait.h> -+#include <linux/skbuff.h> - - #include "compat_highmem.h" - #include "compat_interrupt.h" -diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c ---- vmci-only/linux/vmciKernelIf.c 2013-11-05 23:33:26.000000000 -0500 -+++ vmci-only.new/linux/vmciKernelIf.c 2015-05-05 11:21:59.929068500 -0400 -@@ -1246,11 +1246,11 @@ __VMCIMemcpyFromQueue(void *dest, - } - - if (isIovec) { -- struct iovec *iov = (struct iovec *)dest; -+ struct msghdr *msg = dest; - int err; - - /* The iovec will track bytesCopied internally. */ -- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy); -+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy); - if (err != 0) { - kunmap(kernelIf->page[pageIndex]); - return VMCI_ERROR_INVALID_ARGS; - diff --git a/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch b/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch deleted file mode 100644 index 041bfb6a6210..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur vmnet-only.orig/driver.c vmnet-only/driver.c ---- vmnet-only.orig/driver.c 2014-06-13 02:38:25.000000000 +0200 -+++ vmnet-only/driver.c 2015-02-21 17:31:22.630656305 +0100 -@@ -1236,8 +1236,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 -ur vmnet-only.orig/userif.c vmnet-only/userif.c ---- vmnet-only.orig/userif.c 2014-06-13 02:38:25.000000000 +0200 -+++ vmnet-only/userif.c 2015-02-21 17:37:46.154589854 +0100 -@@ -523,7 +523,10 @@ - .iov_base = buf, - .iov_len = len, - }; -- return skb_copy_datagram_iovec(skb, 0, &iov, len); -+ struct iov_iter to; -+ -+ iov_iter_init(&to, READ, &iov, 1, len); -+ return skb_copy_datagram_iter(skb, 0, &to, len); - } - - diff --git a/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch deleted file mode 100644 index 8c9d3cb6dfe3..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400 -@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc - goto out; - } - -- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len); -+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); - - dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); - dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); diff --git a/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch deleted file mode 100644 index 2e412301d096..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400 -@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc - } - - /* Place the datagram payload in the user's iovec. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen); -+#else -+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen); -+#endif - if (err) { - goto out; - } 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 deleted file mode 100644 index 1849a378456e..000000000000 --- a/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-apic.patch b/app-emulation/vmware-modules/files/271-apic.patch deleted file mode 100644 index 66cd45933246..000000000000 --- a/app-emulation/vmware-modules/files/271-apic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/271-filldir.patch b/app-emulation/vmware-modules/files/271-filldir.patch deleted file mode 100644 index 6eb1f315cd97..000000000000 --- a/app-emulation/vmware-modules/files/271-filldir.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/vmblock-only/linux/file.c b/vmblock-only/linux/file.c -index d7ac1f6..5499169 100644 ---- a/vmblock-only/linux/file.c -+++ b/vmblock-only/linux/file.c -@@ -38,46 +38,6 @@ typedef u64 inode_num_t; - typedef ino_t inode_num_t; - #endif - --/* Specifically for our filldir_t callback */ --typedef struct FilldirInfo { -- filldir_t filldir; -- void *dirent; --} FilldirInfo; -- -- --/* -- *---------------------------------------------------------------------------- -- * -- * Filldir -- -- * -- * Callback function for readdir that we use in place of the one provided. -- * This allows us to specify that each dentry is a symlink, but pass through -- * everything else to the original filldir function. -- * -- * Results: -- * Original filldir's return value. -- * -- * Side effects: -- * Directory information gets copied to user's buffer. -- * -- *---------------------------------------------------------------------------- -- */ -- --static int --Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir -- const char *name, // IN: Dirent name -- int namelen, // IN: len of dirent's name -- loff_t offset, // IN: Offset -- inode_num_t ino, // IN: Inode number of dirent -- unsigned int d_type) // IN: Type of file --{ -- FilldirInfo *info = buf; -- -- /* Specify DT_LNK regardless */ -- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK); --} -- -- - /* File operations */ - - /* -@@ -166,11 +126,10 @@ FileOpOpen(struct inode *inode, // IN - - static int - FileOpReaddir(struct file *file, // IN -- void *dirent, // IN -- filldir_t filldir) // IN -+ struct dir_context *ctx) // IN - { - int ret; -- FilldirInfo info; -+ - struct file *actualFile; - - if (!file) { -@@ -184,12 +143,10 @@ FileOpReaddir(struct file *file, // IN - return -EINVAL; - } - -- info.filldir = filldir; -- info.dirent = dirent; -- -- actualFile->f_pos = file->f_pos; -- ret = vfs_readdir(actualFile, Filldir, &info); -- file->f_pos = actualFile->f_pos; -+ /* Ricky Wong Yung Fei: -+ * Manipulation of pos is now handled internally by iterate_dir(). -+ */ -+ ret = iterate_dir(actualFile, ctx); - - return ret; - } -@@ -237,7 +194,7 @@ FileOpRelease(struct inode *inode, // IN - - - struct file_operations RootFileOps = { -- .readdir = FileOpReaddir, -+ .iterate = FileOpReaddir, - .open = FileOpOpen, - .release = FileOpRelease, - }; diff --git a/app-emulation/vmware-modules/files/271-hardened.patch b/app-emulation/vmware-modules/files/271-hardened.patch deleted file mode 100644 index ea1b0f300751..000000000000 --- a/app-emulation/vmware-modules/files/271-hardened.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c -index 921f25c..41a39e3 100644 ---- a/vmci-only/linux/driver.c -+++ b/vmci-only/linux/driver.c -@@ -241,7 +241,24 @@ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); - #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0) - #endif - --static struct file_operations vmuser_fops; -+/* -+ * Moved file operations initialize here because of incompatibilites -+ * with Gentoo hardened profile/hardend Linux 3. -+ */ -+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 -+}; - - - /* -@@ -378,26 +395,6 @@ vmci_host_init(void) - return -ENOMEM; - } - -- /* -- * 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; -- - sprintf(linuxState.deviceName, "vmci"); - linuxState.major = 10; - linuxState.misc.minor = MISC_DYNAMIC_MINOR; -diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c -index b21dd44..960c2aa 100644 ---- a/vmmon-only/linux/driver.c -+++ b/vmmon-only/linux/driver.c -@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { - #endif - }; - --static struct file_operations vmuser_fops; -+static struct file_operations vmuser_fops = { -+ .owner = THIS_MODULE, -+ .poll = LinuxDriverPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, -+#else -+ .ioctl = LinuxDriver_Ioctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = LinuxDriver_UnlockedIoctl, -+#endif -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close, -+ .mmap = LinuxDriverMmap -+}; -+ - static struct timer_list tscTimer; - - /* -@@ -357,27 +372,6 @@ init_module(void) - spin_lock_init(&linuxState.pollListLock); - #endif - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vmuser_fops, 0, sizeof vmuser_fops); -- vmuser_fops.owner = THIS_MODULE; -- vmuser_fops.poll = LinuxDriverPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; --#else -- vmuser_fops.ioctl = LinuxDriver_Ioctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; --#endif -- vmuser_fops.open = LinuxDriver_Open; -- vmuser_fops.release = LinuxDriver_Close; -- vmuser_fops.mmap = LinuxDriverMmap; -- - #ifdef VMX86_DEVEL - devel_init_module(); - linuxState.minor = 0; -diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c -index b12b982..40bd4cf 100644 ---- a/vmnet-only/driver.c -+++ b/vmnet-only/driver.c -@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, - unsigned int iocmd, unsigned long ioarg); - #endif - --static struct file_operations vnetFileOps; -+static struct file_operations vnetFileOps = { -+ .owner = THIS_MODULE, -+ .read = VNetFileOpRead, -+ .write = VNetFileOpWrite, -+ .poll = VNetFileOpPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = VNetFileOpUnlockedIoctl, -+#else -+ .ioctl = VNetFileOpIoctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = VNetFileOpUnlockedIoctl, -+#endif -+ .open = VNetFileOpOpen, -+ .release = VNetFileOpClose -+}; - - /* - * Utility functions -@@ -476,28 +491,6 @@ init_module(void) - goto err_proto; - } - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vnetFileOps, 0, sizeof vnetFileOps); -- vnetFileOps.owner = THIS_MODULE; -- vnetFileOps.read = VNetFileOpRead; -- vnetFileOps.write = VNetFileOpWrite; -- vnetFileOps.poll = VNetFileOpPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; --#else -- vnetFileOps.ioctl = VNetFileOpIoctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; --#endif -- vnetFileOps.open = VNetFileOpOpen; -- vnetFileOps.release = VNetFileOpClose; -- - retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); - if (retval) { - LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/271-makefile-include.patch b/app-emulation/vmware-modules/files/271-makefile-include.patch deleted file mode 100644 index 39c300030805..000000000000 --- a/app-emulation/vmware-modules/files/271-makefile-include.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel -index ab7a727..e3ec9d2 100644 ---- a/vmblock-only/Makefile.kernel -+++ b/vmblock-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE += -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) -diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel -index ba343ee..861ea83 100644 ---- a/vmci-only/Makefile.kernel -+++ b/vmci-only/Makefile.kernel -@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI - - INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - obj-m += $(DRIVER).o - -diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel -index 8770d1d..c4746c3 100644 ---- a/vmmon-only/Makefile.kernel -+++ b/vmmon-only/Makefile.kernel -@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) - -diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel -index d1e3133..665d428 100644 ---- a/vmnet-only/Makefile.kernel -+++ b/vmnet-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) -diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel -index b4629ee..264b8cb 100644 ---- a/vsock-only/Makefile.kernel -+++ b/vsock-only/Makefile.kernel -@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) - - diff --git a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch deleted file mode 100644 index 1a647a3302d8..000000000000 --- a/app-emulation/vmware-modules/files/271-makefile-kernel-dir.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 2b81323..746c8b8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := ws -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 8e9c5be..6ec828b 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := ws -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index 5bd867b..91a83d4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @@PRODUCT@@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index d4eb73c..c7c6d38 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @@PRODUCT@@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index 93dd61d..9765696 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/271-netdevice.patch b/app-emulation/vmware-modules/files/271-netdevice.patch deleted file mode 100644 index 35231a3205e3..000000000000 --- a/app-emulation/vmware-modules/files/271-netdevice.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h -index 7a56304..9ff4548 100644 ---- a/vmnet-only/compat_netdevice.h -+++ b/vmnet-only/compat_netdevice.h -@@ -47,6 +47,19 @@ - # define net_device device - #endif - -+/* it looks like these have been removed from the kernel 3.1 -+ * probably because the "transition" is considered complete. -+ * so to keep this source compatible we just redefine them like they were -+ * previously -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev -+ functions are available. */ -+#define HAVE_FREE_NETDEV /* free_netdev() */ -+#define HAVE_NETDEV_PRIV /* netdev_priv() */ -+#define HAVE_NETIF_QUEUE -+#define HAVE_NET_DEVICE_OPS -+#endif - - /* - * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/files/271-putname.patch b/app-emulation/vmware-modules/files/271-putname.patch deleted file mode 100644 index 6e76130fa165..000000000000 --- a/app-emulation/vmware-modules/files/271-putname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c -index 79716bd..2dd83fe 100644 ---- a/vmblock-only/linux/control.c -+++ b/vmblock-only/linux/control.c -@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name - - retval = i < 0 ? -EINVAL : blockOp(name, blocker); - -- putname(name); -+ __putname(name); - - return retval; - } diff --git a/app-emulation/vmware-modules/files/271-vfsfollowlink.patch b/app-emulation/vmware-modules/files/271-vfsfollowlink.patch deleted file mode 100644 index 13f600e39f33..000000000000 --- a/app-emulation/vmware-modules/files/271-vfsfollowlink.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur a/linux/inode.c b/linux/inode.c ---- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400 -+++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400 -@@ -36,7 +36,7 @@ - - /* Inode operations */ - static struct dentry *InodeOpLookup(struct inode *dir, -- struct dentry *dentry, struct nameidata *nd); -+ struct dentry *dentry, unsigned int flags); - static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) - static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); -@@ -75,7 +75,7 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+ unsigned int flags) // IN: lookup intent and information - { - char *filename; - struct inode *inode; -@@ -221,7 +221,7 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/271-vmmon.patch b/app-emulation/vmware-modules/files/271-vmmon.patch deleted file mode 100644 index f1979641a4d6..000000000000 --- a/app-emulation/vmware-modules/files/271-vmmon.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ru source900/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
---- source900/vmmon-only/linux/hostif.c 2012-07-23 18:18:55.000000000 +0900
-+++ source/vmmon-only/linux/hostif.c 2012-08-03 16:20:23.200420885 +0900
-@@ -48,6 +48,7 @@
- #include <linux/smp_lock.h>
- #endif
-
-+#include <asm/asm.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
- #include <linux/mc146818rtc.h>
-@@ -3586,31 +3587,14 @@
- {
- int ret;
- unsigned low, high;
--#if defined(VM_X86_64)
- asm volatile("2: rdmsr ; xor %0,%0\n"
- "1:\n\t"
- ".section .fixup,\"ax\"\n\t"
- "3: mov %4,%0 ; jmp 1b\n\t"
- ".previous\n\t"
-- ".section __ex_table,\"a\"\n\t"
-- ".balign 8\n"
-- ".quad 2b,3b\n"
-- ".previous\n"
-+ _ASM_EXTABLE(2b,3b)
- : "=r"(ret), "=a"(low), "=d"(high)
- : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
--#else
-- asm volatile("2: rdmsr ; xor %0,%0\n"
-- "1:\n\t"
-- ".section .fixup,\"ax\"\n\t"
-- "3: mov %4,%0 ; jmp 1b\n\t"
-- ".previous\n\t"
-- ".section __ex_table,\"a\"\n"
-- ".balign 4\n"
-- ".long 2b,3b\n"
-- ".previous\n"
-- : "=r"(ret), "=a"(low), "=d"(high)
-- : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
--#endif // VM_X86_64
- *val = (low | ((u64)(high) << 32));
-
- return ret;
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 deleted file mode 100644 index b1b78b76300e..000000000000 --- a/app-emulation/vmware-modules/files/279-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.000000000 +0100 -+++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100 -@@ -135,7 +135,8 @@ - inode->i_size = INODE_TO_IINFO(inode)->nameLen; - inode->i_version = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -- inode->i_uid = inode->i_gid = 0; -+ inode->i_uid = GLOBAL_ROOT_UID; -+ inode->i_gid = GLOBAL_ROOT_GID; - inode->i_op = &LinkInodeOps; - - d_add(dentry, inode); - ---- a/vmci-only/linux/driver.c 2013-03-20 17:57:35.000000000 +0100 -+++ b/vmci-only/linux/driver.c 2013-03-20 17:57:43.000000000 +0100 -@@ -740,7 +740,7 @@ - goto init_release; - } - -- user = current_uid(); -+ user = from_kuid(current_user_ns(), current_uid()); - retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, - 0 /* Unused */, vmciLinux->userVersion, - &user, &vmciLinux->context); - ---- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100 -+++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100 -@@ -2866,7 +2866,7 @@ - vsk->connectTimeout = psk->connectTimeout; - } else { - vsk->trusted = capable(CAP_NET_ADMIN); -- vsk->owner = current_uid(); -+ vsk->owner = from_kuid(current_user_ns(), current_uid()); - vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE; - vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; - vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; - diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch deleted file mode 100644 index 05ed8dbcc374..000000000000 --- a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 @@ - 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-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch deleted file mode 100644 index 98b28aabcdeb..000000000000 --- a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch +++ /dev/null @@ -1,89 +0,0 @@ -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.h 2014-04-14 17:41:41.000000000 -0400 -+++ vmblock-only.new/shared/vm_assert.h 2014-10-11 17:37:23.010352172 -0400 -@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con - #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-04-14 17:41:41.000000000 -0400 -+++ vmci-only.new/shared/vm_assert.h 2014-10-11 17:37:08.936352130 -0400 -@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con - #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-04-14 20:06:20.000000000 -0400 -+++ vmmon-only.new/include/vm_assert.h 2014-10-11 17:36:45.289352058 -0400 -@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con - #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-04-14 20:06:21.000000000 -0400 -+++ vmnet-only.new/vm_assert.h 2014-10-11 17:37:14.364352146 -0400 -@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con - #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-04-14 17:41:41.000000000 -0400 -+++ vsock-only.new/shared/vm_assert.h 2014-10-11 17:37:02.778352111 -0400 -@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con - #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-04-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch deleted file mode 100644 index f4f59d977408..000000000000 --- a/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c ---- vmblock-only/linux/dentry.c 2013-11-05 23:33:26.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2014-04-26 10:58:03.062635343 -0400 -@@ -32,7 +32,7 @@ - #include "block.h" - - --static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd); -+static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags); - - struct dentry_operations LinkDentryOps = { - .d_revalidate = DentryOpRevalidate, -@@ -60,7 +60,7 @@ - - static int - DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating -- struct nameidata *nd) // IN: lookup flags & intent -+ unsigned int flags) // IN: lookup flags & intent - { - VMBlockInodeInfo *iinfo; - struct nameidata actualNd; -@@ -101,7 +101,7 @@ - if (actualDentry && - actualDentry->d_op && - actualDentry->d_op->d_revalidate) { -- return actualDentry->d_op->d_revalidate(actualDentry, nd); -+ return actualDentry->d_op->d_revalidate(actualDentry, flags); - } - - if (compat_path_lookup(iinfo->name, 0, &actualNd)) { diff --git a/app-emulation/vmware-modules/files/279-3.10-05-inode.patch b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch deleted file mode 100644 index 01c88930899c..000000000000 --- a/app-emulation/vmware-modules/files/279-3.10-05-inode.patch +++ /dev/null @@ -1,36 +0,0 @@ -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. 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.000000000 -0500 -+++ vmblock-only/linux/inode.c 2014-04-26 10:58:03.063635343 -0400 -@@ -36,7 +36,7 @@ - - /* Inode operations */ - static struct dentry *InodeOpLookup(struct inode *dir, -- struct dentry *dentry, struct nameidata *nd); -+ struct dentry *dentry, unsigned int flags); - static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) - static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); -@@ -75,7 +75,7 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+ unsigned int flags) // IN: lookup intent and information - { - char *filename; - struct inode *inode; -@@ -221,7 +221,8 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); -+ ret = 0; - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) 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 deleted file mode 100644 index b8ee07822021..000000000000 --- a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 -+++ 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 deleted file mode 100644 index 9e8d9d1a32f7..000000000000 --- a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch +++ /dev/null @@ -1,46 +0,0 @@ -removing the no longer existing second parameter to sk_data_ready -doesn't seem it ever served a purpose. - -diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c ---- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -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.c 2013-11-05 23:33:27.000000000 -0500 -+++ vsock-only.new/linux/notifyQState.c 2014-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/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch deleted file mode 100644 index e3ee3aa09939..000000000000 --- a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch +++ /dev/null @@ -1,16 +0,0 @@ -new alloc_netdev requires a new parameter. All examples in the kernel i've seen just -use the constant NET_NAME_UNKNOWN. -origionally from: https://communities.vmware.com/message/2425189 - -diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c ---- vmnet-only/netif.c 2013-11-06 00:40:52.000000000 -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_USER, VNetNetIfSetup); - if (!dev) { - retval = -ENOMEM; - goto out; 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 deleted file mode 100644 index 2d3882430580..000000000000 --- a/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 ---- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 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 deleted file mode 100644 index ec73500e979c..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +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 int flags; -+ unsigned seq, m_seq; -+ int last_type; -+ unsigned depth; -+ 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 deleted file mode 100644 index 6f11a520a447..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/vmnet-only/driver.c 2015-02-07 03:54:17.000000000 +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 deleted file mode 100644 index 178d1478ae59..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -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.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -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.000000000 -0500 -+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -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.h 2014-11-20 19:29:15.000000000 -0500 -+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -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 -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c ---- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 -+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -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"); diff --git a/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch deleted file mode 100644 index b016fec1e652..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/vmnet-only/userif.c 2015-02-07 03:54:17.000000000 +0300 -+++ c/vmnet-only/userif.c 2015-02-24 03:58:06.043605137 +0300 -@@ -523,7 +523,15 @@ - .iov_base = buf, - .iov_len = len, - }; -- return skb_copy_datagram_iovec(skb, 0, &iov, len); -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) -+ return skb_copy_datagram_iovec(skb, 0, &iov, len); -+#else -+ struct iov_iter to; -+ iov_iter_init(&to, READ, &iov, 1, len); -+ return skb_copy_datagram_iter(skb, 0, &to, len); -+#endif - } - - diff --git a/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch deleted file mode 100644 index 9103c555663d..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rupN vmci-only.old/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c ---- vmci-only.old/linux/vmciKernelIf.c 2015-04-28 18:05:56.000000000 +0000 -+++ vmci-only/linux/vmciKernelIf.c 2015-07-06 08:02:08.314262258 +0000 -@@ -40,6 +40,7 @@ - #include <linux/socket.h> /* For memcpy_{to,from}iovec(). */ - #include <linux/vmalloc.h> - #include <linux/wait.h> -+#include <linux/skbuff.h> - - #include "compat_highmem.h" - #include "compat_interrupt.h" -@@ -1227,11 +1228,11 @@ __VMCIMemcpyToQueue(VMCIQueue *queue, - } - - if (isIovec) { -- struct iovec *iov = (struct iovec *)src; -+ struct msghdr *msg = (struct msghdr *)src; - int err; - - /* The iovec will track bytesCopied internally. */ -- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy); -+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy); - if (err != 0) { - if (!kernelIf->isDataMapped) { - kunmap(kernelIf->page[pageIndex]); -@@ -1302,11 +1303,11 @@ __VMCIMemcpyFromQueue(void *dest, - } - - if (isIovec) { -- struct iovec *iov = (struct iovec *)dest; -+ struct msghdr *msg = (struct msghdr *)dest; - int err; - - /* The iovec will track bytesCopied internally. */ -- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy); -+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy); - if (err != 0) { - if (!kernelIf->isDataMapped) { - kunmap(kernelIf->page[pageIndex]); diff --git a/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch deleted file mode 100644 index 1849a378456e..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/279-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch deleted file mode 100644 index 2e412301d096..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400 -@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc - } - - /* Place the datagram payload in the user's iovec. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen); -+#else -+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen); -+#endif - if (err) { - goto out; - } diff --git a/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch deleted file mode 100644 index 8c9d3cb6dfe3..000000000000 --- a/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400 -@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc - goto out; - } - -- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len); -+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); - - dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); - dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); 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 deleted file mode 100644 index e2ab8a15f16b..000000000000 --- a/app-emulation/vmware-modules/files/279-4.2-00-cookie.patch +++ /dev/null @@ -1,79 +0,0 @@ -See https://bugs.gentoo.org/show_bug.cgi?id=559602 -Patch by Mike Auty <ikelos@gentoo.org> - -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(&init_net, \ -- PF_NETLINK, _pri, &vmnet_proto) -+ PF_NETLINK, _pri, &vmnet_proto, 1) -+# else -+# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ -+ PF_NETLINK, _pri, &vmnet_proto) -+# endif - #else - # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) - #endif diff --git a/app-emulation/vmware-modules/files/279-5.10-00-userns.patch b/app-emulation/vmware-modules/files/279-5.10-00-userns.patch deleted file mode 100644 index 7a1bb987fecd..000000000000 --- a/app-emulation/vmware-modules/files/279-5.10-00-userns.patch +++ /dev/null @@ -1,16 +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.000000000 +0100 -+++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100 -@@ -135,7 +135,8 @@ - inode->i_size = INODE_TO_IINFO(inode)->nameLen; - inode->i_version = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -- inode->i_uid = inode->i_gid = 0; -+ inode->i_uid = GLOBAL_ROOT_UID; -+ inode->i_gid = GLOBAL_ROOT_GID; - inode->i_op = &LinkInodeOps; - - d_add(dentry, inode); diff --git a/app-emulation/vmware-modules/files/279-apic.patch b/app-emulation/vmware-modules/files/279-apic.patch deleted file mode 100644 index 66cd45933246..000000000000 --- a/app-emulation/vmware-modules/files/279-apic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/279-filldir.patch b/app-emulation/vmware-modules/files/279-filldir.patch deleted file mode 100644 index 6eb1f315cd97..000000000000 --- a/app-emulation/vmware-modules/files/279-filldir.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/vmblock-only/linux/file.c b/vmblock-only/linux/file.c -index d7ac1f6..5499169 100644 ---- a/vmblock-only/linux/file.c -+++ b/vmblock-only/linux/file.c -@@ -38,46 +38,6 @@ typedef u64 inode_num_t; - typedef ino_t inode_num_t; - #endif - --/* Specifically for our filldir_t callback */ --typedef struct FilldirInfo { -- filldir_t filldir; -- void *dirent; --} FilldirInfo; -- -- --/* -- *---------------------------------------------------------------------------- -- * -- * Filldir -- -- * -- * Callback function for readdir that we use in place of the one provided. -- * This allows us to specify that each dentry is a symlink, but pass through -- * everything else to the original filldir function. -- * -- * Results: -- * Original filldir's return value. -- * -- * Side effects: -- * Directory information gets copied to user's buffer. -- * -- *---------------------------------------------------------------------------- -- */ -- --static int --Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir -- const char *name, // IN: Dirent name -- int namelen, // IN: len of dirent's name -- loff_t offset, // IN: Offset -- inode_num_t ino, // IN: Inode number of dirent -- unsigned int d_type) // IN: Type of file --{ -- FilldirInfo *info = buf; -- -- /* Specify DT_LNK regardless */ -- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK); --} -- -- - /* File operations */ - - /* -@@ -166,11 +126,10 @@ FileOpOpen(struct inode *inode, // IN - - static int - FileOpReaddir(struct file *file, // IN -- void *dirent, // IN -- filldir_t filldir) // IN -+ struct dir_context *ctx) // IN - { - int ret; -- FilldirInfo info; -+ - struct file *actualFile; - - if (!file) { -@@ -184,12 +143,10 @@ FileOpReaddir(struct file *file, // IN - return -EINVAL; - } - -- info.filldir = filldir; -- info.dirent = dirent; -- -- actualFile->f_pos = file->f_pos; -- ret = vfs_readdir(actualFile, Filldir, &info); -- file->f_pos = actualFile->f_pos; -+ /* Ricky Wong Yung Fei: -+ * Manipulation of pos is now handled internally by iterate_dir(). -+ */ -+ ret = iterate_dir(actualFile, ctx); - - return ret; - } -@@ -237,7 +194,7 @@ FileOpRelease(struct inode *inode, // IN - - - struct file_operations RootFileOps = { -- .readdir = FileOpReaddir, -+ .iterate = FileOpReaddir, - .open = FileOpOpen, - .release = FileOpRelease, - }; diff --git a/app-emulation/vmware-modules/files/279-hardened.patch b/app-emulation/vmware-modules/files/279-hardened.patch deleted file mode 100644 index cc3e04152877..000000000000 --- a/app-emulation/vmware-modules/files/279-hardened.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c -index b21dd44..960c2aa 100644 ---- a/vmmon-only/linux/driver.c -+++ b/vmmon-only/linux/driver.c -@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { - #endif - }; - --static struct file_operations vmuser_fops; -+static struct file_operations vmuser_fops = { -+ .owner = THIS_MODULE, -+ .poll = LinuxDriverPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, -+#else -+ .ioctl = LinuxDriver_Ioctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = LinuxDriver_UnlockedIoctl, -+#endif -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close, -+ .mmap = LinuxDriverMmap -+}; -+ - static struct timer_list tscTimer; - - /* -@@ -357,27 +372,6 @@ init_module(void) - spin_lock_init(&linuxState.pollListLock); - #endif - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vmuser_fops, 0, sizeof vmuser_fops); -- vmuser_fops.owner = THIS_MODULE; -- vmuser_fops.poll = LinuxDriverPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; --#else -- vmuser_fops.ioctl = LinuxDriver_Ioctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; --#endif -- vmuser_fops.open = LinuxDriver_Open; -- vmuser_fops.release = LinuxDriver_Close; -- vmuser_fops.mmap = LinuxDriverMmap; -- - #ifdef VMX86_DEVEL - devel_init_module(); - linuxState.minor = 0; -diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c -index b12b982..40bd4cf 100644 ---- a/vmnet-only/driver.c -+++ b/vmnet-only/driver.c -@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, - unsigned int iocmd, unsigned long ioarg); - #endif - --static struct file_operations vnetFileOps; -+static struct file_operations vnetFileOps = { -+ .owner = THIS_MODULE, -+ .read = VNetFileOpRead, -+ .write = VNetFileOpWrite, -+ .poll = VNetFileOpPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = VNetFileOpUnlockedIoctl, -+#else -+ .ioctl = VNetFileOpIoctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = VNetFileOpUnlockedIoctl, -+#endif -+ .open = VNetFileOpOpen, -+ .release = VNetFileOpClose -+}; - - /* - * Utility functions -@@ -476,28 +491,6 @@ init_module(void) - goto err_proto; - } - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vnetFileOps, 0, sizeof vnetFileOps); -- vnetFileOps.owner = THIS_MODULE; -- vnetFileOps.read = VNetFileOpRead; -- vnetFileOps.write = VNetFileOpWrite; -- vnetFileOps.poll = VNetFileOpPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; --#else -- vnetFileOps.ioctl = VNetFileOpIoctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; --#endif -- vnetFileOps.open = VNetFileOpOpen; -- vnetFileOps.release = VNetFileOpClose; -- - retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); - if (retval) { - LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/279-makefile-include.patch b/app-emulation/vmware-modules/files/279-makefile-include.patch deleted file mode 100644 index 39c300030805..000000000000 --- a/app-emulation/vmware-modules/files/279-makefile-include.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel -index ab7a727..e3ec9d2 100644 ---- a/vmblock-only/Makefile.kernel -+++ b/vmblock-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE += -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) -diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel -index ba343ee..861ea83 100644 ---- a/vmci-only/Makefile.kernel -+++ b/vmci-only/Makefile.kernel -@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI - - INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - obj-m += $(DRIVER).o - -diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel -index 8770d1d..c4746c3 100644 ---- a/vmmon-only/Makefile.kernel -+++ b/vmmon-only/Makefile.kernel -@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) - -diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel -index d1e3133..665d428 100644 ---- a/vmnet-only/Makefile.kernel -+++ b/vmnet-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) -diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel -index b4629ee..264b8cb 100644 ---- a/vsock-only/Makefile.kernel -+++ b/vsock-only/Makefile.kernel -@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) - - diff --git a/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch deleted file mode 100644 index 1a647a3302d8..000000000000 --- a/app-emulation/vmware-modules/files/279-makefile-kernel-dir.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 2b81323..746c8b8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := ws -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 8e9c5be..6ec828b 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := ws -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index 5bd867b..91a83d4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @@PRODUCT@@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index d4eb73c..c7c6d38 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @@PRODUCT@@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index 93dd61d..9765696 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/279-netdevice.patch b/app-emulation/vmware-modules/files/279-netdevice.patch deleted file mode 100644 index 35231a3205e3..000000000000 --- a/app-emulation/vmware-modules/files/279-netdevice.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h -index 7a56304..9ff4548 100644 ---- a/vmnet-only/compat_netdevice.h -+++ b/vmnet-only/compat_netdevice.h -@@ -47,6 +47,19 @@ - # define net_device device - #endif - -+/* it looks like these have been removed from the kernel 3.1 -+ * probably because the "transition" is considered complete. -+ * so to keep this source compatible we just redefine them like they were -+ * previously -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev -+ functions are available. */ -+#define HAVE_FREE_NETDEV /* free_netdev() */ -+#define HAVE_NETDEV_PRIV /* netdev_priv() */ -+#define HAVE_NETIF_QUEUE -+#define HAVE_NET_DEVICE_OPS -+#endif - - /* - * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/files/279-putname.patch b/app-emulation/vmware-modules/files/279-putname.patch deleted file mode 100644 index 6e76130fa165..000000000000 --- a/app-emulation/vmware-modules/files/279-putname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c -index 79716bd..2dd83fe 100644 ---- a/vmblock-only/linux/control.c -+++ b/vmblock-only/linux/control.c -@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf, // IN: buffer with name - - retval = i < 0 ? -EINVAL : blockOp(name, blocker); - -- putname(name); -+ __putname(name); - - return retval; - } diff --git a/app-emulation/vmware-modules/files/279-vfsfollowlink.patch b/app-emulation/vmware-modules/files/279-vfsfollowlink.patch deleted file mode 100644 index 13f600e39f33..000000000000 --- a/app-emulation/vmware-modules/files/279-vfsfollowlink.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur a/linux/inode.c b/linux/inode.c ---- a/vmblock-only/linux/inode.c 2013-10-03 04:29:47.471339204 -0400 -+++ b/vmblock-only/linux/inode.c 2013-10-03 04:31:56.607334636 -0400 -@@ -36,7 +36,7 @@ - - /* Inode operations */ - static struct dentry *InodeOpLookup(struct inode *dir, -- struct dentry *dentry, struct nameidata *nd); -+ struct dentry *dentry, unsigned int flags); - static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) - static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); -@@ -75,7 +75,7 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+ unsigned int flags) // IN: lookup intent and information - { - char *filename; - struct inode *inode; -@@ -221,7 +221,7 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/279-vmblock.patch b/app-emulation/vmware-modules/files/279-vmblock.patch deleted file mode 100644 index 0daf60355618..000000000000 --- a/app-emulation/vmware-modules/files/279-vmblock.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN work.orig/vmblock-only/linux/control.c work/vmblock-only/linux/control.c ---- work.orig/vmblock-only/linux/control.c 2013-11-02 18:05:39.960226399 +0100 -+++ work/vmblock-only/linux/control.c 2013-11-02 18:09:11.760231432 +0100 -@@ -208,17 +208,14 @@ - VMBlockSetProcEntryOwner(controlProcMountpoint); - - /* Create /proc/fs/vmblock/dev */ -- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, -- VMBLOCK_CONTROL_MODE, -- controlProcDirEntry); -- if (!controlProcEntry) { -+ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, VMBLOCK_CONTROL_MODE, controlProcDirEntry, &ControlFileOps); -+ if (controlProcEntry == NULL) { - Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n"); - remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry); - remove_proc_entry(VMBLOCK_CONTROL_PROC_DIRNAME, NULL); - return -EINVAL; - } - -- controlProcEntry->proc_fops = &ControlFileOps; - return 0; - } - diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch deleted file mode 100644 index 5cc445fcadf9..000000000000 --- a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.000000000 +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 deleted file mode 100644 index e12d84d10e7b..000000000000 --- a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch +++ /dev/null @@ -1,94 +0,0 @@ -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.000000000 +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, - }; - -- - /* - *---------------------------------------------------------------------------- - * -@@ -75,7 +84,11 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ struct nameidata *nd) // IN: lookup intent and information -+#else -+ unsigned int flags) -+#endif - { - char *filename; - struct inode *inode; -@@ -135,7 +148,12 @@ - inode->i_size = INODE_TO_IINFO(inode)->nameLen; - inode->i_version = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - inode->i_uid = inode->i_gid = 0; -+#else -+ inode->i_gid = make_kgid(current_user_ns(), 0); -+ inode->i_uid = make_kuid(current_user_ns(), 0); -+#endif - inode->i_op = &LinkInodeOps; - - d_add(dentry, inode); -@@ -177,7 +195,12 @@ - return -EINVAL; - } - -- return vfs_readlink(dentry, buffer, buflen, iinfo->name); -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99) -+ return vfs_readlink(dentry, buffer, buflen, iinfo->name); -+#else -+ return readlink_copy(buffer, buflen, iinfo->name); -+#endif -+ - } - - -@@ -221,7 +244,7 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) -@@ -230,3 +253,4 @@ - return ret; - #endif - } -+ 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 deleted file mode 100644 index 928835337511..000000000000 --- a/app-emulation/vmware-modules/files/304-3.10-02-control.patch +++ /dev/null @@ -1,57 +0,0 @@ -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.000000000 +0300 -+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300 -@@ -208,9 +208,11 @@ - 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 +220,10 @@ - return -EINVAL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - controlProcEntry->proc_fops = &ControlFileOps; -+#endif -+ - return 0; - } - -@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf, - 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--) { - name[i] = '\0'; - } - - retval = i < 0 ? -EINVAL : blockOp(name, blocker); - -- putname(name); -+ __putname(name); - - return retval; - } 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 deleted file mode 100644 index fa8f36a35c29..000000000000 --- a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch +++ /dev/null @@ -1,14 +0,0 @@ -Hushes a warning ---- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300 -+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300 -@@ -1328,7 +1328,9 @@ - *----------------------------------------------------------------------------- - */ - --__attribute__((always_inline)) static Bool -+#include <linux/compiler-gcc.h> -+ -+__always_inline static Bool - LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min - { - TSCDelta tscDelta; diff --git a/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch deleted file mode 100644 index b2f76d3e2b30..000000000000 --- a/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -replaces usage of vfs_readdir with iterate_dir. origionally found here: -https://bugs.gentoo.org/show_bug.cgi?id=508204 - -diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c ---- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -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/304-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/304-3.11-01-filldir.patch deleted file mode 100644 index 2eec99b7c1f8..000000000000 --- a/app-emulation/vmware-modules/files/304-3.11-01-filldir.patch +++ /dev/null @@ -1,53 +0,0 @@ -simply remove the code for Filldir since it is no longer used with the new -iterate_dir API - -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/files/304-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch deleted file mode 100644 index 9e8d9d1a32f7..000000000000 --- a/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch +++ /dev/null @@ -1,46 +0,0 @@ -removing the no longer existing second parameter to sk_data_ready -doesn't seem it ever served a purpose. - -diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c ---- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -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.c 2013-11-05 23:33:27.000000000 -0500 -+++ vsock-only.new/linux/notifyQState.c 2014-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/files/304-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch deleted file mode 100644 index 22d6325c9a90..000000000000 --- a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 ---- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 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 deleted file mode 100644 index 0182077254a1..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.000000000 +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 int flags; -+ unsigned seq, m_seq; -+ int last_type; -+ unsigned depth; -+ 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/304-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch deleted file mode 100644 index 3e3be6542dda..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch +++ /dev/null @@ -1,14 +0,0 @@ -There is an level of abstrxtion in the newre API as of 3.19 here ---- a/vmnet-only/driver.c 2015-02-07 03:54:17.000000000 +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/304-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/304-3.19-02-vmblock-path.patch deleted file mode 100644 index 178d1478ae59..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-02-vmblock-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -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.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -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.000000000 -0500 -+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -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.h 2014-11-20 19:29:15.000000000 -0500 -+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -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 -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c ---- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 -+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -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"); diff --git a/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch deleted file mode 100644 index 726d1173b3b3..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch +++ /dev/null @@ -1,20 +0,0 @@ -using new iterator based API, this matches exactly the changes made upstream as of vmware-modules-304.2 ---- a/vmnet-only/userif.c 2015-02-07 03:54:17.000000000 +0300 -+++ c/vmnet-only/userif.c 2015-02-24 03:58:06.043605137 +0300 -@@ -523,7 +523,15 @@ - .iov_base = buf, - .iov_len = len, - }; -- return skb_copy_datagram_iovec(skb, 0, &iov, len); -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) -+ return skb_copy_datagram_iovec(skb, 0, &iov, len); -+#else -+ struct iov_iter to; -+ iov_iter_init(&to, READ, &iov, 1, len); -+ return skb_copy_datagram_iter(skb, 0, &to, len); -+#endif - } - - diff --git a/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch deleted file mode 100644 index 83f0cc8fcbbf..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch +++ /dev/null @@ -1,59 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. ---- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300 -+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300 -@@ -40,6 +40,7 @@ - #include <linux/socket.h> /* For memcpy_{to,from}iovec(). */ - #include <linux/vmalloc.h> - #include <linux/wait.h> -+#include <linux/skbuff.h> - - #include "compat_highmem.h" - #include "compat_interrupt.h" -@@ -1196,21 +1197,21 @@ - } else { - toCopy = size - bytesCopied; - } -- -+ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */ - if (isIovec) { -- struct iovec *iov = (struct iovec *)src; -- int err; -+ struct msghdr *msg = (struct msghdr *)src; -+ int err; - -- /* The iovec will track bytesCopied internally. */ -- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy); -- if (err != 0) { -- if (kernelIf->host) { -- kunmap(kernelIf->u.h.page[pageIndex]); -+ /* The iovec will track bytes_copied internally. */ -+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy); -+ if (err != 0) { -+ if (kernelIf->host) -+ kunmap(kernelIf->u.h.page[pageIndex]); -+ return VMCI_ERROR_INVALID_ARGS; - } -- return VMCI_ERROR_INVALID_ARGS; -- } -- } else { -- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy); -+ } else { -+ memcpy((u8 *)va + pageOffset, -+ (u8 *)src + bytesCopied, toCopy); - } - - bytesCopied += toCopy; -@@ -1273,11 +1274,11 @@ - } - - if (isIovec) { -- struct iovec *iov = (struct iovec *)dest; -+ struct msghdr *msg = (struct msghdr *)dest; - int err; - - /* The iovec will track bytesCopied internally. */ -- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy); -+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy); - if (err != 0) { - if (kernelIf->host) { - kunmap(kernelIf->u.h.page[pageIndex]); diff --git a/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch deleted file mode 100644 index 4dec3c468206..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch +++ /dev/null @@ -1,25 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -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/304-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch deleted file mode 100644 index 9a2096e679a4..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch +++ /dev/null @@ -1,16 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400 -@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc - } - - /* Place the datagram payload in the user's iovec. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen); -+#else -+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen); -+#endif - if (err) { - goto out; - } diff --git a/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch deleted file mode 100644 index 6aec2cd3d7b5..000000000000 --- a/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch +++ /dev/null @@ -1,13 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400 -@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc - goto out; - } - -- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len); -+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); - - dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); - dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); 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 deleted file mode 100644 index e6f2acbbb6a0..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch +++ /dev/null @@ -1,45 +0,0 @@ -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-inode.patch b/app-emulation/vmware-modules/files/304-4.2-01-inode.patch deleted file mode 100644 index 35a275bf3367..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-01-inode.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- vmblock-only/linux/inode.c.orig 2015-09-28 01:11:08.000000000 +0300 -+++ vmblock-only/linux/inode.c 2015-09-28 01:14:32.318043465 +0300 -@@ -44,7 +44,9 @@ - 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); -@@ -221,13 +223,15 @@ - *---------------------------------------------------------------------------- - */ - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) --static void * -+#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, // IN : dentry of symlink -+ struct nameidata *nd) // OUT: stores result - #else --static int --#endif --InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink -+static int InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink - struct nameidata *nd) // OUT: stores result -+#endif - { - int ret; - VMBlockInodeInfo *iinfo; -@@ -244,7 +248,11 @@ - 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 deleted file mode 100644 index 2296c060bff1..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c ---- vmci-only/linux/driver.c 2015-11-03 19:27:55.000000000 -0500 -+++ vmci-only.new/linux/driver.c 2016-03-16 21:30:47.646039829 -0400 -@@ -26,6 +26,9 @@ - - #include <linux/file.h> - #include <linux/fs.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+#include <linux/vmalloc.h> -+#endif - #include <linux/init.h> - #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) - # include <linux/ioctl32.h> diff --git a/app-emulation/vmware-modules/files/304-4.2-02-vmnetInt.patch b/app-emulation/vmware-modules/files/304-4.2-02-vmnetInt.patch deleted file mode 100644 index 11c76d0423e3..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-02-vmnetInt.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- vmnet-only/vmnetInt.h.orig 2015-05-31 16:40:39.000000000 +0300 -+++ vmnet-only/vmnetInt.h 2015-09-28 01:22:01.553054142 +0300 -@@ -78,12 +78,16 @@ - - extern struct proto vmnet_proto; - #ifdef VMW_NETDEV_HAS_NET --# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ -- PF_NETLINK, _pri, &vmnet_proto) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ -+ PF_NETLINK, _pri, &vmnet_proto, 1) - #else --# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) -+# define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ -+ PF_NETLINK, _pri, &vmnet_proto) -+#endif -+#else -+# define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) - #endif -- - - #ifdef NF_IP_LOCAL_IN - #define VMW_NF_INET_LOCAL_IN NF_IP_LOCAL_IN 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 deleted file mode 100644 index bdac109e6c60..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2016-03-16 21:31:24.582040320 -0400 -+++ vsock-only.new/linux/af_vsock.c 2016-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 @@ static int VSockVmciStreamSendmsg(struct - struct socket *sock, struct msghdr *msg, size_t len); - static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock, - struct msghdr *msg, size_t len, int flags); -+#endif - - static int VSockVmciCreate( - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) -@@ -4210,7 +4220,11 @@ VSockVmciShutdown(struct socket *sock, - */ - - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+VSockVmciDgramSendmsg( -+#else - VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED -+#endif - struct socket *sock, // IN: socket to send on - struct msghdr *msg, // IN: message to send - size_t len) // IN: length of message -@@ -4540,7 +4554,11 @@ VSockVmciStreamGetsockopt(struct socket - */ - - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+VSockVmciStreamSendmsg( -+#else - VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED -+#endif - struct socket *sock, // IN: socket to send on - struct msghdr *msg, // IN: message to send - size_t len) // IN: length of message -@@ -4709,7 +4727,11 @@ out: - */ - - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+VSockVmciDgramRecvmsg( -+#else - VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED -+#endif - struct socket *sock, // IN: socket to receive from - struct msghdr *msg, // IN/OUT: message to receive into - size_t len, // IN: length of receive buffer -@@ -4804,7 +4826,11 @@ out: - */ - - static int -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+VSockVmciStreamRecvmsg( -+#else - VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED -+#endif - struct socket *sock, // IN: socket to receive from - struct msghdr *msg, // IN/OUT: message to receive into - size_t len, // IN: length of receive buffer diff --git a/app-emulation/vmware-modules/files/304-4.2-03-af_vsock.patch b/app-emulation/vmware-modules/files/304-4.2-03-af_vsock.patch deleted file mode 100644 index 6155df425972..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-03-af_vsock.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- vsock-only/linux/af_vsock.c.orig 2015-09-28 01:26:51.354061029 +0300 -+++ vsock-only/linux/af_vsock.c 2015-09-28 01:25:11.196058649 +0300 -@@ -2826,7 +2826,9 @@ - * network namespace, and the option to zero the sock was dropped. - * - */ --#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) - sk = sk_alloc(vsockVmciFamilyOps.family, priority, - vsockVmciProto.slab_obj_size, vsockVmciProto.slab); - #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) diff --git a/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch b/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch deleted file mode 100644 index a2504a6a15e3..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2016-03-16 21:38:01.401045589 -0400 -+++ vsock-only.new/linux/af_vsock.c 2016-03-16 21:39:32.529046799 -0400 -@@ -2836,7 +2836,9 @@ __VSockVmciCreate(struct net *net, - * network namespace, and the option to zero the sock was dropped. - * - */ --#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) -+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1); -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) - sk = sk_alloc(vsockVmciFamilyOps.family, priority, - vsockVmciProto.slab_obj_size, vsockVmciProto.slab); - #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) diff --git a/app-emulation/vmware-modules/files/304-4.2-04-driver.patch b/app-emulation/vmware-modules/files/304-4.2-04-driver.patch deleted file mode 100644 index 237aa2297a3a..000000000000 --- a/app-emulation/vmware-modules/files/304-4.2-04-driver.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- vmci-only/linux/driver.c.orig 2015-09-28 01:33:04.416069896 +0300 -+++ vmci-only/linux/driver.c 2015-09-28 01:34:32.814071997 +0300 -@@ -26,6 +26,7 @@ - - #include <linux/file.h> - #include <linux/fs.h> -+#include <linux/vmalloc.h> - #include <linux/init.h> - #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) - # include <linux/ioctl32.h> -@@ -713,7 +714,7 @@ - - case IOCTL_VMCI_INIT_CONTEXT: { - VMCIInitBlock initBlock; -- VMCIHostUser user; -+ uid_t user; - - retval = copy_from_user(&initBlock, (void *)ioarg, sizeof initBlock); - if (retval != 0) { -@@ -736,7 +736,11 @@ - goto init_release; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - user = current_uid(); -+#else -+ user = from_kuid(&init_user_ns, current_uid()); -+#endif - retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, - 0 /* Unused */, vmciLinux->userVersion, - &user, &vmciLinux->context); - -@@ -1683,7 +1684,7 @@ - /* This should be last to make sure we are done initializing. */ - retval = pci_register_driver(&vmci_driver); - if (retval < 0) { -- vfree(data_buffer); -+ kvfree(data_buffer); - data_buffer = NULL; - return retval; - } -@@ -2470,7 +2471,7 @@ - - if (guestDeviceInit) { - pci_unregister_driver(&vmci_driver); -- vfree(data_buffer); -+ kvfree(data_buffer); - guestDeviceInit = FALSE; - } - 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 deleted file mode 100644 index 32d960dfbcae..000000000000 --- a/app-emulation/vmware-modules/files/304-4.3-00-misc_deregister.patch +++ /dev/null @@ -1,34 +0,0 @@ -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(&vmci_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(&linuxState.misc); -+#else - retval = misc_deregister(&linuxState.misc); - 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/files/304-4.5-00-get_link.patch b/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch deleted file mode 100644 index 169fc71d9e22..000000000000 --- a/app-emulation/vmware-modules/files/304-4.5-00-get_link.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/files/304-apic.patch b/app-emulation/vmware-modules/files/304-apic.patch deleted file mode 100644 index 66cd45933246..000000000000 --- a/app-emulation/vmware-modules/files/304-apic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index cc3e04152877..000000000000 --- a/app-emulation/vmware-modules/files/304-hardened.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c -index b21dd44..960c2aa 100644 ---- a/vmmon-only/linux/driver.c -+++ b/vmmon-only/linux/driver.c -@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { - #endif - }; - --static struct file_operations vmuser_fops; -+static struct file_operations vmuser_fops = { -+ .owner = THIS_MODULE, -+ .poll = LinuxDriverPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, -+#else -+ .ioctl = LinuxDriver_Ioctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = LinuxDriver_UnlockedIoctl, -+#endif -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close, -+ .mmap = LinuxDriverMmap -+}; -+ - static struct timer_list tscTimer; - - /* -@@ -357,27 +372,6 @@ init_module(void) - spin_lock_init(&linuxState.pollListLock); - #endif - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vmuser_fops, 0, sizeof vmuser_fops); -- vmuser_fops.owner = THIS_MODULE; -- vmuser_fops.poll = LinuxDriverPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; --#else -- vmuser_fops.ioctl = LinuxDriver_Ioctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; --#endif -- vmuser_fops.open = LinuxDriver_Open; -- vmuser_fops.release = LinuxDriver_Close; -- vmuser_fops.mmap = LinuxDriverMmap; -- - #ifdef VMX86_DEVEL - devel_init_module(); - linuxState.minor = 0; -diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c -index b12b982..40bd4cf 100644 ---- a/vmnet-only/driver.c -+++ b/vmnet-only/driver.c -@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, - unsigned int iocmd, unsigned long ioarg); - #endif - --static struct file_operations vnetFileOps; -+static struct file_operations vnetFileOps = { -+ .owner = THIS_MODULE, -+ .read = VNetFileOpRead, -+ .write = VNetFileOpWrite, -+ .poll = VNetFileOpPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = VNetFileOpUnlockedIoctl, -+#else -+ .ioctl = VNetFileOpIoctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = VNetFileOpUnlockedIoctl, -+#endif -+ .open = VNetFileOpOpen, -+ .release = VNetFileOpClose -+}; - - /* - * Utility functions -@@ -476,28 +491,6 @@ init_module(void) - goto err_proto; - } - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vnetFileOps, 0, sizeof vnetFileOps); -- vnetFileOps.owner = THIS_MODULE; -- vnetFileOps.read = VNetFileOpRead; -- vnetFileOps.write = VNetFileOpWrite; -- vnetFileOps.poll = VNetFileOpPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; --#else -- vnetFileOps.ioctl = VNetFileOpIoctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; --#endif -- vnetFileOps.open = VNetFileOpOpen; -- vnetFileOps.release = VNetFileOpClose; -- - retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); - if (retval) { - LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/304-makefile-include.patch b/app-emulation/vmware-modules/files/304-makefile-include.patch deleted file mode 100644 index 39c300030805..000000000000 --- a/app-emulation/vmware-modules/files/304-makefile-include.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel -index ab7a727..e3ec9d2 100644 ---- a/vmblock-only/Makefile.kernel -+++ b/vmblock-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE += -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) -diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel -index ba343ee..861ea83 100644 ---- a/vmci-only/Makefile.kernel -+++ b/vmci-only/Makefile.kernel -@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI - - INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - obj-m += $(DRIVER).o - -diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel -index 8770d1d..c4746c3 100644 ---- a/vmmon-only/Makefile.kernel -+++ b/vmmon-only/Makefile.kernel -@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) - -diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel -index d1e3133..665d428 100644 ---- a/vmnet-only/Makefile.kernel -+++ b/vmnet-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) -diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel -index b4629ee..264b8cb 100644 ---- a/vsock-only/Makefile.kernel -+++ b/vsock-only/Makefile.kernel -@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) - - diff --git a/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch deleted file mode 100644 index 1a647a3302d8..000000000000 --- a/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 2b81323..746c8b8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := ws -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 8e9c5be..6ec828b 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := ws -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index 5bd867b..91a83d4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @@PRODUCT@@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index d4eb73c..c7c6d38 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @@PRODUCT@@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index 93dd61d..9765696 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/304-netdevice.patch b/app-emulation/vmware-modules/files/304-netdevice.patch deleted file mode 100644 index 35231a3205e3..000000000000 --- a/app-emulation/vmware-modules/files/304-netdevice.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h -index 7a56304..9ff4548 100644 ---- a/vmnet-only/compat_netdevice.h -+++ b/vmnet-only/compat_netdevice.h -@@ -47,6 +47,19 @@ - # define net_device device - #endif - -+/* it looks like these have been removed from the kernel 3.1 -+ * probably because the "transition" is considered complete. -+ * so to keep this source compatible we just redefine them like they were -+ * previously -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev -+ functions are available. */ -+#define HAVE_FREE_NETDEV /* free_netdev() */ -+#define HAVE_NETDEV_PRIV /* netdev_priv() */ -+#define HAVE_NETIF_QUEUE -+#define HAVE_NET_DEVICE_OPS -+#endif - - /* - * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch deleted file mode 100644 index 5cc445fcadf9..000000000000 --- a/app-emulation/vmware-modules/files/308-3.10-00-dentry.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.000000000 +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/308-3.10-01-inode.patch b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch deleted file mode 100644 index e12d84d10e7b..000000000000 --- a/app-emulation/vmware-modules/files/308-3.10-01-inode.patch +++ /dev/null @@ -1,94 +0,0 @@ -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.000000000 +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, - }; - -- - /* - *---------------------------------------------------------------------------- - * -@@ -75,7 +84,11 @@ - static struct dentry * - InodeOpLookup(struct inode *dir, // IN: parent directory's inode - struct dentry *dentry, // IN: dentry to lookup -- struct nameidata *nd) // IN: lookup intent and information -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ struct nameidata *nd) // IN: lookup intent and information -+#else -+ unsigned int flags) -+#endif - { - char *filename; - struct inode *inode; -@@ -135,7 +148,12 @@ - inode->i_size = INODE_TO_IINFO(inode)->nameLen; - inode->i_version = 1; - inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - inode->i_uid = inode->i_gid = 0; -+#else -+ inode->i_gid = make_kgid(current_user_ns(), 0); -+ inode->i_uid = make_kuid(current_user_ns(), 0); -+#endif - inode->i_op = &LinkInodeOps; - - d_add(dentry, inode); -@@ -177,7 +195,12 @@ - return -EINVAL; - } - -- return vfs_readlink(dentry, buffer, buflen, iinfo->name); -+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99) -+ return vfs_readlink(dentry, buffer, buflen, iinfo->name); -+#else -+ return readlink_copy(buffer, buflen, iinfo->name); -+#endif -+ - } - - -@@ -221,7 +244,7 @@ - goto out; - } - -- ret = vfs_follow_link(nd, iinfo->name); -+ nd_set_link(nd, iinfo->name); - - out: - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) -@@ -230,3 +253,4 @@ - return ret; - #endif - } -+ diff --git a/app-emulation/vmware-modules/files/308-3.10-02-control.patch b/app-emulation/vmware-modules/files/308-3.10-02-control.patch deleted file mode 100644 index 928835337511..000000000000 --- a/app-emulation/vmware-modules/files/308-3.10-02-control.patch +++ /dev/null @@ -1,57 +0,0 @@ -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.000000000 +0300 -+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300 -@@ -208,9 +208,11 @@ - 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 +220,10 @@ - return -EINVAL; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - controlProcEntry->proc_fops = &ControlFileOps; -+#endif -+ - return 0; - } - -@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf, - 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--) { - name[i] = '\0'; - } - - retval = i < 0 ? -EINVAL : blockOp(name, blocker); - -- putname(name); -+ __putname(name); - - return retval; - } diff --git a/app-emulation/vmware-modules/files/308-3.10-03-inline.patch b/app-emulation/vmware-modules/files/308-3.10-03-inline.patch deleted file mode 100644 index fa8f36a35c29..000000000000 --- a/app-emulation/vmware-modules/files/308-3.10-03-inline.patch +++ /dev/null @@ -1,14 +0,0 @@ -Hushes a warning ---- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300 -+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300 -@@ -1328,7 +1328,9 @@ - *----------------------------------------------------------------------------- - */ - --__attribute__((always_inline)) static Bool -+#include <linux/compiler-gcc.h> -+ -+__always_inline static Bool - LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min - { - TSCDelta tscDelta; diff --git a/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch deleted file mode 100644 index b2f76d3e2b30..000000000000 --- a/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -replaces usage of vfs_readdir with iterate_dir. origionally found here: -https://bugs.gentoo.org/show_bug.cgi?id=508204 - -diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c ---- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -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/308-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch deleted file mode 100644 index 2eec99b7c1f8..000000000000 --- a/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch +++ /dev/null @@ -1,53 +0,0 @@ -simply remove the code for Filldir since it is no longer used with the new -iterate_dir API - -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/files/308-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch deleted file mode 100644 index 9e8d9d1a32f7..000000000000 --- a/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch +++ /dev/null @@ -1,46 +0,0 @@ -removing the no longer existing second parameter to sk_data_ready -doesn't seem it ever served a purpose. - -diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c ---- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -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.c 2013-11-05 23:33:27.000000000 -0500 -+++ vsock-only.new/linux/notifyQState.c 2014-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/files/308-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch deleted file mode 100644 index 22d6325c9a90..000000000000 --- a/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 ---- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +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_VMWARE 0x15AD -+#endif - #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 - #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 diff --git a/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch deleted file mode 100644 index 0182077254a1..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.000000000 +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 int flags; -+ unsigned seq, m_seq; -+ int last_type; -+ unsigned depth; -+ 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/308-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch deleted file mode 100644 index 178d1478ae59..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -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.000000000 -0500 -+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -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.000000000 -0500 -+++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -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.h 2014-11-20 19:29:15.000000000 -0500 -+++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -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 -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c ---- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 -+++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -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"); diff --git a/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch deleted file mode 100644 index 83f0cc8fcbbf..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch +++ /dev/null @@ -1,59 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. ---- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300 -+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300 -@@ -40,6 +40,7 @@ - #include <linux/socket.h> /* For memcpy_{to,from}iovec(). */ - #include <linux/vmalloc.h> - #include <linux/wait.h> -+#include <linux/skbuff.h> - - #include "compat_highmem.h" - #include "compat_interrupt.h" -@@ -1196,21 +1197,21 @@ - } else { - toCopy = size - bytesCopied; - } -- -+ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */ - if (isIovec) { -- struct iovec *iov = (struct iovec *)src; -- int err; -+ struct msghdr *msg = (struct msghdr *)src; -+ int err; - -- /* The iovec will track bytesCopied internally. */ -- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy); -- if (err != 0) { -- if (kernelIf->host) { -- kunmap(kernelIf->u.h.page[pageIndex]); -+ /* The iovec will track bytes_copied internally. */ -+ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy); -+ if (err != 0) { -+ if (kernelIf->host) -+ kunmap(kernelIf->u.h.page[pageIndex]); -+ return VMCI_ERROR_INVALID_ARGS; - } -- return VMCI_ERROR_INVALID_ARGS; -- } -- } else { -- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy); -+ } else { -+ memcpy((u8 *)va + pageOffset, -+ (u8 *)src + bytesCopied, toCopy); - } - - bytesCopied += toCopy; -@@ -1273,11 +1274,11 @@ - } - - if (isIovec) { -- struct iovec *iov = (struct iovec *)dest; -+ struct msghdr *msg = (struct msghdr *)dest; - int err; - - /* The iovec will track bytesCopied internally. */ -- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy); -+ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy); - if (err != 0) { - if (kernelIf->host) { - kunmap(kernelIf->u.h.page[pageIndex]); diff --git a/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch deleted file mode 100644 index 4dec3c468206..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch +++ /dev/null @@ -1,25 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -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/308-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch deleted file mode 100644 index 9a2096e679a4..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch +++ /dev/null @@ -1,16 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400 -@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc - } - - /* Place the datagram payload in the user's iovec. */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) - err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen); -+#else -+ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen); -+#endif - if (err) { - goto out; - } diff --git a/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch deleted file mode 100644 index 6aec2cd3d7b5..000000000000 --- a/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch +++ /dev/null @@ -1,13 +0,0 @@ -Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. -diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c ---- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400 -+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400 -@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc - goto out; - } - -- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len); -+ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); - - dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); - dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); diff --git a/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch b/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch deleted file mode 100644 index 5735cd50650e..000000000000 --- a/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200 -+++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200 -@@ -233,14 +233,10 @@ - static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user * optlen); - --static int VSockVmciDgramSendmsg(struct kiocb *kiocb, -- struct socket *sock, struct msghdr *msg, size_t len); --static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock, -- struct msghdr *msg, size_t len, int flags); --static int VSockVmciStreamSendmsg(struct kiocb *kiocb, -- struct socket *sock, struct msghdr *msg, size_t len); --static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock, -- struct msghdr *msg, size_t len, int flags); -+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); - - static int VSockVmciCreate( - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) -@@ -4211,8 +4207,7 @@ - */ - - static int --VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED -- struct socket *sock, // IN: socket to send on -+VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on - struct msghdr *msg, // IN: message to send - size_t len) // IN: length of message - { -@@ -4541,8 +4536,7 @@ - */ - - static int --VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED -- struct socket *sock, // IN: socket to send on -+VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on - struct msghdr *msg, // IN: message to send - size_t len) // IN: length of message - { -@@ -4710,8 +4704,7 @@ - */ - - static int --VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED -- struct socket *sock, // IN: socket to receive from -+VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from - struct msghdr *msg, // IN/OUT: message to receive into - size_t len, // IN: length of receive buffer - int flags) // IN: receive flags -@@ -4803,8 +4796,7 @@ - */ - - static int --VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED -- struct socket *sock, // IN: socket to receive from -+VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from - struct msghdr *msg, // IN/OUT: message to receive into - size_t len, // IN: length of receive buffer - int flags) // IN: receive flags diff --git a/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch b/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch deleted file mode 100644 index 66609bff6308..000000000000 --- a/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- vmci-only/linux/driver.c 2015-02-07 01:11:55.000000000 +0100 -+++ vmci-only/linux/driver.c.new 2015-07-23 00:28:25.713804866 +0200 -@@ -37,6 +37,7 @@ - #include <linux/moduleparam.h> - #include <linux/poll.h> - #include <linux/smp.h> -+#include <linux/vmalloc.h> - - #include "compat_highmem.h" - #include "compat_interrupt.h" ---- vmblock-only/linux/inode.c 2015-08-23 00:34:11.959377109 +0200 -+++ vmblock-only/linux/inode.c.new 2015-08-23 00:37:49.839389292 +0200 -@@ -38,7 +38,9 @@ - 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, 1, 99) -+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); -@@ -203,13 +205,19 @@ - *---------------------------------------------------------------------------- - */ - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) -+static const char * -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) - static void * - #else - static int - #endif - InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) -+ void **cookie) // OUT: stores opaque pointer -+#else - struct nameidata *nd) // OUT: stores result -+#endif - { - int ret; - VMBlockInodeInfo *iinfo; -@@ -226,7 +234,11 @@ - goto out; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) -+ return *cookie = 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/308-4.02-01-sk_alloc.patch b/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch deleted file mode 100644 index 6437d6022a36..000000000000 --- a/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- vmnet-only/vmnetInt.h 2015-05-28 01:46:53.023206897 +0200 -+++ vmnet-only/vmnetInt.h.new 2015-05-28 01:47:07.911207730 +0200 -@@ -79,7 +79,7 @@ - extern struct proto vmnet_proto; - #ifdef VMW_NETDEV_HAS_NET - # define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ -- PF_NETLINK, _pri, &vmnet_proto) -+ PF_NETLINK, _pri, &vmnet_proto, 0) - #else - # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) - #endif ---- vsock-only/linux/af_vsock.c 2015-05-28 01:50:03.553217551 +0200 -+++ vsock-only/linux/af_vsock.c.new 2015-05-28 01:54:55.248233862 +0200 -@@ -2829,7 +2829,7 @@ - #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) - sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1); - #else -- sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto); -+ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0); - #endif - if (!sk) { - return NULL; diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch deleted file mode 100644 index b2d93a66db84..000000000000 --- a/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru work.old/vmci-only/linux/driver.c work/vmci-only/linux/driver.c ---- work.old/vmci-only/linux/driver.c 2015-09-14 21:07:49.751696932 +0200 -+++ work/vmci-only/linux/driver.c 2015-09-14 22:10:48.015908198 +0200 -@@ -2467,8 +2467,6 @@ - static void __exit - vmci_exit(void) - { -- int retval; -- - if (guestDeviceInit) { - pci_unregister_driver(&vmci_driver); - vfree(data_buffer); -@@ -2480,12 +2478,8 @@ - - VMCI_HostCleanup(); - -- retval = misc_deregister(&linuxState.misc); -- if (retval) { -- Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME); -- } else { -- Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME); -- } -+ misc_deregister(&linuxState.misc); -+ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME); - - hostDeviceInit = FALSE; - } 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 9f0df66faa22..000000000000 --- 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.000000000 +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(&linuxState.misc)) { -- Warning("Module %s: error unregistering\n", linuxState.deviceName); -- } -+ misc_deregister(&linuxState.misc); - #endif - - Log("Module %s: unloaded\n", linuxState.deviceName); 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 deleted file mode 100644 index c13929243275..000000000000 --- a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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 -@@ -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); -+#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) - static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); -@@ -63,7 +65,11 @@ - struct inode_operations LinkInodeOps = { - #endif - .readlink = InodeOpReadlink, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) -+ .get_link = InodeOpFollowlink, -+#else - .follow_link = InodeOpFollowlink, -+#endif - }; - - /* -@@ -231,6 +237,9 @@ - static int - #endif - InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) -+ struct inode *inode, -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) - void **cookie) // OUT: stores opaque pointer - #else -@@ -241,12 +250,20 @@ - VMBlockInodeInfo *iinfo; - - if (!dentry) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) -+ ret = -ECHILD; -+#else - Warning("InodeOpReadlink: invalid args from kernel\n"); - ret = -EINVAL; -+#endif - goto out; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) -+ iinfo = INODE_TO_IINFO(inode); -+#else - iinfo = INODE_TO_IINFO(dentry->d_inode); -+#endif - if (!iinfo) { - ret = -EINVAL; - goto out; diff --git a/app-emulation/vmware-modules/files/308-apic.patch b/app-emulation/vmware-modules/files/308-apic.patch deleted file mode 100644 index 66cd45933246..000000000000 --- a/app-emulation/vmware-modules/files/308-apic.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/308-hardened.patch b/app-emulation/vmware-modules/files/308-hardened.patch deleted file mode 100644 index 31d5917c37ce..000000000000 --- a/app-emulation/vmware-modules/files/308-hardened.patch +++ /dev/null @@ -1,89 +0,0 @@ -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,16 @@ 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, -+ .unlocked_ioctl = LinuxDriver_Ioctl, -+ .compat_ioctl = LinuxDriver_Ioctl, -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close, -+ .mmap = LinuxDriverMmap -+}; -+ - static struct timer_list tscTimer; - static Atomic_uint32 tsckHz; - static VmTimeStart tsckHzStartTime; -@@ -357,21 +372,6 @@ init_module(void) - linuxState.fastClockPriority = -20; - linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE; - -- /* -- * 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; -- 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; -- - #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,16 @@ 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, -+ .unlocked_ioctl = VNetFileOpUnlockedIoctl, -+ .compat_ioctl = VNetFileOpUnlockedIoctl, -+ .open = VNetFileOpOpen, -+ .release = VNetFileOpClose -+}; - - /* - * Utility functions -@@ -476,22 +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; -- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; -- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; -- vnetFileOps.open = VNetFileOpOpen; -- vnetFileOps.release = VNetFileOpClose; -- - retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); - if (retval) { - LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/308-makefile-include.patch b/app-emulation/vmware-modules/files/308-makefile-include.patch deleted file mode 100644 index 39c300030805..000000000000 --- a/app-emulation/vmware-modules/files/308-makefile-include.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel -index ab7a727..e3ec9d2 100644 ---- a/vmblock-only/Makefile.kernel -+++ b/vmblock-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE += -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) -diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel -index ba343ee..861ea83 100644 ---- a/vmci-only/Makefile.kernel -+++ b/vmci-only/Makefile.kernel -@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI - - INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - obj-m += $(DRIVER).o - -diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel -index 8770d1d..c4746c3 100644 ---- a/vmmon-only/Makefile.kernel -+++ b/vmmon-only/Makefile.kernel -@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) - -diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel -index d1e3133..665d428 100644 ---- a/vmnet-only/Makefile.kernel -+++ b/vmnet-only/Makefile.kernel -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) -diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel -index b4629ee..264b8cb 100644 ---- a/vsock-only/Makefile.kernel -+++ b/vsock-only/Makefile.kernel -@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) - - diff --git a/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch deleted file mode 100644 index 1a647a3302d8..000000000000 --- a/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 2b81323..746c8b8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := ws -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 8e9c5be..6ec828b 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := ws -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index 5bd867b..91a83d4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @@PRODUCT@@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index d4eb73c..c7c6d38 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @@PRODUCT@@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index 93dd61d..9765696 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) - ifdef LINUXINCLUDE - HEADER_DIR = $(LINUXINCLUDE) - else --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - endif - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/308-netdevice.patch b/app-emulation/vmware-modules/files/308-netdevice.patch deleted file mode 100644 index 35231a3205e3..000000000000 --- a/app-emulation/vmware-modules/files/308-netdevice.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h -index 7a56304..9ff4548 100644 ---- a/vmnet-only/compat_netdevice.h -+++ b/vmnet-only/compat_netdevice.h -@@ -47,6 +47,19 @@ - # define net_device device - #endif - -+/* it looks like these have been removed from the kernel 3.1 -+ * probably because the "transition" is considered complete. -+ * so to keep this source compatible we just redefine them like they were -+ * previously -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -+#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev -+ functions are available. */ -+#define HAVE_FREE_NETDEV /* free_netdev() */ -+#define HAVE_NETDEV_PRIV /* netdev_priv() */ -+#define HAVE_NETIF_QUEUE -+#define HAVE_NET_DEVICE_OPS -+#endif - - /* - * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/files/hardened.patch b/app-emulation/vmware-modules/files/hardened.patch deleted file mode 100644 index ea1b0f300751..000000000000 --- a/app-emulation/vmware-modules/files/hardened.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c -index 921f25c..41a39e3 100644 ---- a/vmci-only/linux/driver.c -+++ b/vmci-only/linux/driver.c -@@ -241,7 +241,24 @@ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); - #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0) - #endif - --static struct file_operations vmuser_fops; -+/* -+ * Moved file operations initialize here because of incompatibilites -+ * with Gentoo hardened profile/hardend Linux 3. -+ */ -+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 -+}; - - - /* -@@ -378,26 +395,6 @@ vmci_host_init(void) - return -ENOMEM; - } - -- /* -- * 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; -- - sprintf(linuxState.deviceName, "vmci"); - linuxState.major = 10; - linuxState.misc.minor = MISC_DYNAMIC_MINOR; -diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c -index b21dd44..960c2aa 100644 ---- a/vmmon-only/linux/driver.c -+++ b/vmmon-only/linux/driver.c -@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = { - #endif - }; - --static struct file_operations vmuser_fops; -+static struct file_operations vmuser_fops = { -+ .owner = THIS_MODULE, -+ .poll = LinuxDriverPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl, -+#else -+ .ioctl = LinuxDriver_Ioctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = LinuxDriver_UnlockedIoctl, -+#endif -+ .open = LinuxDriver_Open, -+ .release = LinuxDriver_Close, -+ .mmap = LinuxDriverMmap -+}; -+ - static struct timer_list tscTimer; - - /* -@@ -357,27 +372,6 @@ init_module(void) - spin_lock_init(&linuxState.pollListLock); - #endif - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vmuser_fops, 0, sizeof vmuser_fops); -- vmuser_fops.owner = THIS_MODULE; -- vmuser_fops.poll = LinuxDriverPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl; --#else -- vmuser_fops.ioctl = LinuxDriver_Ioctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl; --#endif -- vmuser_fops.open = LinuxDriver_Open; -- vmuser_fops.release = LinuxDriver_Close; -- vmuser_fops.mmap = LinuxDriverMmap; -- - #ifdef VMX86_DEVEL - devel_init_module(); - linuxState.minor = 0; -diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c -index b12b982..40bd4cf 100644 ---- a/vmnet-only/driver.c -+++ b/vmnet-only/driver.c -@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, - unsigned int iocmd, unsigned long ioarg); - #endif - --static struct file_operations vnetFileOps; -+static struct file_operations vnetFileOps = { -+ .owner = THIS_MODULE, -+ .read = VNetFileOpRead, -+ .write = VNetFileOpWrite, -+ .poll = VNetFileOpPoll, -+#ifdef HAVE_UNLOCKED_IOCTL -+ .unlocked_ioctl = VNetFileOpUnlockedIoctl, -+#else -+ .ioctl = VNetFileOpIoctl, -+#endif -+#ifdef HAVE_COMPAT_IOCTL -+ .compat_ioctl = VNetFileOpUnlockedIoctl, -+#endif -+ .open = VNetFileOpOpen, -+ .release = VNetFileOpClose -+}; - - /* - * Utility functions -@@ -476,28 +491,6 @@ init_module(void) - goto err_proto; - } - -- /* -- * Initialize the file_operations structure. Because this code is always -- * compiled as a module, this is fine to do it here and not in a static -- * initializer. -- */ -- -- memset(&vnetFileOps, 0, sizeof vnetFileOps); -- vnetFileOps.owner = THIS_MODULE; -- vnetFileOps.read = VNetFileOpRead; -- vnetFileOps.write = VNetFileOpWrite; -- vnetFileOps.poll = VNetFileOpPoll; --#ifdef HAVE_UNLOCKED_IOCTL -- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; --#else -- vnetFileOps.ioctl = VNetFileOpIoctl; --#endif --#ifdef HAVE_COMPAT_IOCTL -- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; --#endif -- vnetFileOps.open = VNetFileOpOpen; -- vnetFileOps.release = VNetFileOpClose; -- - retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); - if (retval) { - LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml deleted file mode 100644 index dec09dcab00e..000000000000 --- a/app-emulation/vmware-modules/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>vmware@gentoo.org</email> - <name>Gentoo VMware Project</name> - </maintainer> - <longdescription> - VMware kernel modules. - </longdescription> - <use> - <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag> - <flag name="vmci">Build the Virtual Machine Communication Interface module; disable this if you want to use the module from the mainline kernel</flag> - <flag name="vsock">Build the VMware VMCI transport for Virtual Sockets; disable this if you want to use the module from the mainline kernel</flag> - </use> -</pkgmetadata> diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild deleted file mode 100644 index 68aa1dae9529..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils flag-o-matic linux-info linux-mod user versionator udev - -PV_MAJOR=$(get_major_version) -PV_MINOR=$(get_version_component_range 2) - -DESCRIPTION="VMware kernel modules" -HOMEPAGE="http://www.vmware.com/" - -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel" - -RDEPEND="" -DEPEND="${RDEPEND} - || ( =app-emulation/vmware-player-5.0.${PV_MINOR}* - =app-emulation/vmware-workstation-9.0.${PV_MINOR}* )" - -S=${WORKDIR} - -pkg_setup() { - CONFIG_CHECK="~HIGH_RES_TIMERS" - if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then - CONFIG_CHECK="${CONFIG_CHECK} BKL" - fi - - linux-info_pkg_setup - - linux-mod_pkg_setup - - VMWARE_GROUP=${VMWARE_GROUP:-vmware} - - VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock" - VMWARE_MOD_DIR="${PN}-${PVR}" - - BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" - - enewgroup "${VMWARE_GROUP}" - filter-flags -mfpmath=sse -mavx -mpclmul -maes - - for mod in ${VMWARE_MODULE_LIST}; do - MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" - done -} - -src_unpack() { - cd "${S}" - for mod in ${VMWARE_MODULE_LIST}; do - tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar - done -} - -src_prepare() { - epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" - epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" - epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" - use pax_kernel && epatch "${FILESDIR}/${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-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 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" - - kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-vmnet-warning.patch" - kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-vmblock-path.patch" - kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmci.patch" - 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-vmci_qpair.patch" - - # Allow user patches so they can support RC kernels and whatever else - epatch_user -} - -src_install() { - linux-mod_src_install - local udevrules="${T}/60-vmware.rules" - cat > "${udevrules}" <<-EOF - KERNEL=="vmci", GROUP="vmware", MODE="660" - KERNEL=="vmmon", GROUP="vmware", MODE="660" - KERNEL=="vsock", GROUP="vmware", MODE="660" - EOF - udev_dorules "${udevrules}" -} diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild deleted file mode 100644 index 9543d955b8b8..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 -mavx -mpclmul -maes - - 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}-5.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" - 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" - 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 -} - -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}" -} diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild deleted file mode 100644 index 64f231386494..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 -mavx -mpclmul -maes - - 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" - kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-inode.patch" - kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vmnetInt.patch" - kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-af_vsock.patch" - kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-04-driver.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}" -} diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild deleted file mode 100644 index 461d897ea8c7..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" - kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch" - 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" - 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 -} - -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}" -} diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild deleted file mode 100644 index 8c5f3412c69b..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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-3) - -DESCRIPTION="VMware kernel modules" -HOMEPAGE="http://www.vmware.com/" - -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="pax_kernel +vmci +vsock" -REQUIRED_USE="!vsock? ( !vmci )" - -RDEPEND="" -DEPEND="${RDEPEND} - || ( =app-emulation/vmware-player-12.${PV_MINOR}* - =app-emulation/vmware-workstation-12.${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 -mavx -mpclmul -maes - append-cflags -mno-sse # Found a problem similar to bug #492964 - - 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 10 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-02-vmblock-path.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" - 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 -} - -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}" - - if ! use vmci ; then - dodir /etc/modprobe.d/ - - cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF - # Support for vmware vmci in kernel module - alias vmci vmw_vmci - EOF - - export installed_modprobe_conf=1 - fi - if ! use vsock ; then - dodir /etc/modprobe.d/ - cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF - # Support for vmware vsock in kernel module - alias vsock vmw_vsock_vmci_transport - EOF - - export installed_modprobe_conf=1 - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - if [ "${installed_modprobe_conf}"x == "x" ] ; then - if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then - ewarn "Please check the /etc/modprobe.d/vmware.conf file and" - ewarn "possible conflicts when using vmci and/or vsock modules built" - ewarn "out of kernel" - fi - fi -} diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest deleted file mode 100644 index 998ca15fcc3c..000000000000 --- a/app-emulation/vmware-player/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST VMware-Player-12.1.0-3272444.x86_64.bundle.tar 138854400 SHA256 ae124888e3cef2cb8d687d0029b32ddf56dca8314d125cad66539c16501a1787 SHA512 0766ff543c4d61ff842ee8aa7b7ef7ed13c1a8adaadef2872cdd47b8029fb0b794588d9d49e4ad8cd5919793663e465439d2b7d8782f72f28461f8a008141151 WHIRLPOOL d972d76ba01295ece11cfee89a138ecea00b512de93f1a279a4ef8444333e672e094216ccaa59a4a8b78432d8b49998addb0b0a0b1abc566f8ccaa7724f7f580 -DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0 -DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6 diff --git a/app-emulation/vmware-player/files/vmware-11.0.rc b/app-emulation/vmware-player/files/vmware-11.0.rc deleted file mode 100644 index 2ba649336fdf..000000000000 --- a/app-emulation/vmware-player/files/vmware-11.0.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - - # quiet for vmci because it may not be there - modprobe -vq vmci || modprobe -v vmw_vmci - eend $? - - # vmci or vmw_vmci was loaded by the previous modprobe - # no need to do it here - modprobe -av vmmon vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - - # quiet for vmci because it may not be there - modprobe -rvq vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-player/files/vmware-11.2.rc b/app-emulation/vmware-player/files/vmware-11.2.rc deleted file mode 100644 index 2ba649336fdf..000000000000 --- a/app-emulation/vmware-player/files/vmware-11.2.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - - # quiet for vmci because it may not be there - modprobe -vq vmci || modprobe -v vmw_vmci - eend $? - - # vmci or vmw_vmci was loaded by the previous modprobe - # no need to do it here - modprobe -av vmmon vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - - # quiet for vmci because it may not be there - modprobe -rvq vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-player/files/vmware-12.1.rc b/app-emulation/vmware-player/files/vmware-12.1.rc deleted file mode 100644 index 2ba649336fdf..000000000000 --- a/app-emulation/vmware-player/files/vmware-12.1.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - - # quiet for vmci because it may not be there - modprobe -vq vmci || modprobe -v vmw_vmci - eend $? - - # vmci or vmw_vmci was loaded by the previous modprobe - # no need to do it here - modprobe -av vmmon vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - - # quiet for vmci because it may not be there - modprobe -rvq vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-player/files/vmware-network.service b/app-emulation/vmware-player/files/vmware-network.service deleted file mode 100644 index abc6648f3156..000000000000 --- a/app-emulation/vmware-player/files/vmware-network.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=VMware Network -Requires=local-fs.target -Wants=network.target vmware-usbarbitrator.service -After=local-fs.target network.target vmware-usbarbitrator.service - -[Service] -Type=simple -ExecStartPre=/sbin/modprobe -av vmci vmmon vsock vmblock vmnet -ExecStart=/opt/vmware/bin/vmware-networks --start -ExecStop=/opt/vmware/bin/vmware-networks --stop -ExecStopPost=/sbin/modprobe -rv vmmon vsock vmblock vmnet vmci -TimeoutSec=0 -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/vmware-player/files/vmware-usbarbitrator.service b/app-emulation/vmware-player/files/vmware-usbarbitrator.service deleted file mode 100644 index 16a0fb81bfc9..000000000000 --- a/app-emulation/vmware-player/files/vmware-usbarbitrator.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=VMware USB Arbitrator -Requires=local-fs.target -Before=vmware-network.service - -[Service] -Type=forking -ExecStart=/opt/vmware/bin/vmware-usbarbitrator - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml deleted file mode 100644 index 0bc0f1d5c46a..000000000000 --- a/app-emulation/vmware-player/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>vmware@gentoo.org</email> - <name>Gentoo VMware Project</name> - </maintainer> - <use> - <flag name="bundled-libs">Use precompiled bundled libraries instead of the system installation</flag> - <flag name="ovftool">Install OVF tool for importing and exporting appliance files</flag> - <flag name="vmware-tools">Install VMware Tools images</flag> - </use> - <upstream> - <remote-id type="github">akhuettel/systemd-vmware</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild deleted file mode 100644 index 85ad0cf2794a..000000000000 --- a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils systemd vmware-bundle - -MY_PN="VMware-Player" -MY_PV=$(get_version_component_range 1-3) -PV_MODULES="308.$(get_version_component_range 2-3)" -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-02" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/player/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - ${BASE_URI}${MY_P}.x86_64.bundle.tar - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz -" - -LICENSE="vmware GPL-2 GPL-3" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="bundled-libs cups doc ovftool +vmware-tools" -RESTRICT="mirror strip preserve-libs" - -BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib - -BUNDLED_LIBS=" - libXau.so.6 - libXcomposite.so.1 - libXcursor.so.1 - libXdamage.so.1 - libXdmcp.so.6 - libXfixes.so.3 - libXft.so.2 - libXinerama.so.1 - libXrandr.so.2 - libXrender.so.1 - libaio.so.1 - libatk-1.0.so.0 - libatkmm-1.6.so.1 - libatspi.so.0 - libcairo.so.2 - libcairomm-1.0.so.1 - libcrypto.so.1.0.1 - libcurl.so.4 - libdbus-1.so.3 - libfontconfig.so.1 - libfreetype.so.6 - libfuse.so.2 - libgailutil.so.18 - libgcc_s.so.1 - libgcrypt.so.11 - libgdk-x11-2.0.so.0 - libgdk_pixbuf-2.0.so.0 - libgdkmm-2.4.so.1 - libgio-2.0.so.0 - libgiomm-2.4.so.1 - libglib-2.0.so.0 - libglibmm-2.4.so.1 - libglibmm_generate_extra_defs-2.4.so.1 - libgmodule-2.0.so.0 - libgobject-2.0.so.0 - libgpg-error.so.0 - libgthread-2.0.so.0 - libgtk-x11-2.0.so.0 - libgtkmm-2.4.so.1 - libpango-1.0.so.0 - libpangocairo-1.0.so.0 - libpangoft2-1.0.so.0 - libpangomm-1.4.so.1 - libpangox-1.0.so.0 - libpangoxft-1.0.so.0 - libpcsclite.so.1 - libpixman-1.so.0 - libpng12.so.0 - librsvg-2.so.2 - libsigc-2.0.so.0 - libssl.so.1.0.1 - libstdc++.so.6 - libxml2.so.2 - libz.so.1 -" - -BUNDLED_LIB_DEPENDS=" - app-accessibility/at-spi2-core - dev-cpp/atkmm - dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/pangomm - dev-libs/atk - dev-libs/glib:2 - dev-libs/libaio - dev-libs/libgcrypt:11/11 - dev-libs/libgpg-error - dev-libs/libsigc++:2 - dev-libs/libxml2 - dev-libs/openssl:0 - gnome-base/librsvg:2 - media-libs/fontconfig - media-libs/freetype - media-libs/libpng:1.2 - net-misc/curl - sys-apps/dbus - sys-apps/pcsc-lite - sys-fs/fuse - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pango - x11-libs/pangox-compat - x11-libs/pixman -" - -# vmware should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND=" - app-arch/bzip2 - dev-libs/dbus-glib - dev-libs/expat - dev-libs/gmp:0 - dev-libs/icu - dev-libs/json-c - dev-libs/libcroco - dev-libs/libffi - dev-libs/libgcrypt:0/20 - dev-libs/libtasn1:0/6 - dev-libs/nettle:0/6 - gnome-base/gconf - gnome-base/libgnome-keyring - media-gfx/graphite2 - media-libs/alsa-lib - media-libs/harfbuzz:0/0.9.18 - media-libs/libart_lgpl - media-libs/libpng:0 - media-libs/libvorbis - media-libs/mesa - net-dns/libidn - net-libs/gnutls - net-print/cups - sys-apps/tcp-wrappers - sys-apps/util-linux - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/libdrm - x11-libs/libxcb - x11-libs/libxshmfence - x11-libs/startup-notification - x11-libs/xcb-util - x11-themes/hicolor-icon-theme - bundled-libs? ( - media-libs/jbigkit:0/2.1 - media-libs/tiff:3 - virtual/jpeg:62 - ) - !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) - !app-emulation/vmware-workstation -" -PDEPEND="~app-emulation/vmware-modules-${PV_MODULES} - vmware-tools? ( app-emulation/vmware-tools )" -DEPEND=">=dev-util/patchelf-0.9" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle=${MY_P}.x86_64.bundle - - local component; for component in \ - vmware-player \ - vmware-player-app \ - vmware-player-setup \ - vmware-vmx \ - vmware-network-editor \ - vmware-usbarbitrator - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -clean_bundled_libs() { - einfo "Removing bundled libraries" - for libname in ${BUNDLED_LIBS} ; do - rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" - done - - rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" - - # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 - # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. - # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link - # in libcds.so to be able to use system libs. - pushd >/dev/null . - cd "${S}"/lib/lib/libcds.so - einfo "Patching libcds.so" - patchelf --replace-needed libssl.so.1.0.{1,0} \ - --replace-needed libcrypto.so.1.0.{1,0} \ - libcds.so - popd >/dev/null - - # vmware-player seems to use a custom version of libgksu2.so, for this reason - # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED - # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage - # preserve-libs mechanism to be triggered when a system lib is available (but not required) - pushd >/dev/null . - cd "${S}"/lib/lib/libvmware-gksu.so - einfo "Patching libvmware-gksu.so" - patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ - libvmware-gksu.so - popd >/dev/null -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if ! use bundled-libs ; then - clean_bundled_libs - fi - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use ${PN}, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. -" -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # workaround for hardcoded search paths needed during shared objects loading - if ! use bundled-libs ; then - dosym /usr/$(get_libdir)/libglib-2.0.so.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0 - # Bug 432918 - dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 - dosym /usr/$(get_libdir)/libssl.so.1.0.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 - fi - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmplayer{,-daemon} \ - vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - - pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - - use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" - - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${MY_PV}" - product.buildNumber = "${PV_BUILD}" - EOF - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die - newinitd "${initscript}" vmware - - # fill in variable placeholders - if use bundled-libs ; then - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die - fi - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" || die - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog - - ewarn "${P} is using an old version of libgcrypt library which" - ewarn "is going to be soon removed from portage due to security reasons" - ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)." - ewarn "Until vmware is fixed upstream you're exposed to security issues!" -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild deleted file mode 100644 index 225ca12f528e..000000000000 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo fdo-mime gnome2-utils pax-utils systemd vmware-bundle - -MY_PN="VMware-Player" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/player/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - " - -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="cups doc ovftool +vmware-tools" -RESTRICT="strip" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libgnomecanvasmm:2.6 - dev-cpp/pangomm:1.4 - dev-libs/atk - dev-libs/glib:2 - dev-libs/libaio - dev-libs/libsigc++:2 - dev-libs/libxml2 - =dev-libs/openssl-0.9.8* - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - =media-libs/libpng-1.2* - net-misc/curl - cups? ( net-print/cups ) - sys-devel/gcc - sys-fs/fuse - sys-libs/glibc - sys-libs/zlib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - x11-libs/startup-notification - !app-emulation/vmware-workstation" -PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle=${A%.tar} - - local component ; for component in \ - vmware-player \ - vmware-player-app \ - vmware-vmx \ - vmware-usbarbitrator \ - vmware-network-editor \ - vmware-player-setup - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - use ovftool && \ - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use ${PN}, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group. -" -} - -src_install() { - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* || die "failed to install bin" - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # https://github.com/gentoo/vmware/issues/7 - dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - # install documentation - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmplayer{,-daemon} \ - vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - - pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - doenvd "${envd}" || die - - # create the configuration - dodir /etc/vmware || die - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${MY_PV}" - product.buildNumber = "${PV_BUILD}" - EOF - - # install the init.d script - local initscript="${T}/vmware.rc" - - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die - newinitd "${initscript}" vmware || die - - systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service" - systemd_dounit "${FILESDIR}/vmware-network.service" - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" || die - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_pkg_postinst -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest deleted file mode 100644 index 289d9c339ce9..000000000000 --- a/app-emulation/vmware-tools/Manifest +++ /dev/null @@ -1,36 +0,0 @@ -DIST vmware-tools-freebsd-9.2.3-1031769.i386.component.tar 15216640 SHA256 a54e3fa823495b18dca3635dde7f37c5c15a6374ec6a863bfccaf02bcb75fd9b SHA512 9d0eb0699ba3d36ed7a1810e553632fdc1ae0339848de2e4c2123222e3063da1164c73d2aca38bfd82b3825f1a8940fe76a461f9bdb9280f0f3473587824d890 WHIRLPOOL aa2309ef38995e301059ce9dbbe0c680aa74aa95b2cb07cf930e71a6c9f620be777b83ef3ad8e93f53760a7b266ffa08b77c34f137fe01d3b51d5ba68ffb4686 -DIST vmware-tools-freebsd-9.2.3-1031769.x86_64.component.tar 15216640 SHA256 4d4047a0ffaa13aa546f065a50e345d23128746fefa4e6f7ad7b54dc947b1276 SHA512 741b55b32a04957efe42684288447faf346c6a13cbb67819984c8efcf18995f75979f7db2ce7e37f4bfcc9b2a3c867c851e2d5e4db9ddf81209ea296813a8e44 WHIRLPOOL b44274d75a76214e1b4581143825f246a0345da4199d4692a3a0d6bceb360c8402bb0d6fc6594d2e20c0532cc40a27a03f1e1e98071be7ec67c4640b504936b8 -DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdfdddd455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b -DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220 -DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e -DIST vmware-tools-freebsd-9.9.4-3206955.x86_64.component.tar 15267840 SHA256 83206e70e79749f7fa50a26930046c58061b538e3b912d2270a93ee400c5a365 SHA512 3112c0cb5ff2cd6a2309f6bdf51bfccee5e1a8dc01910239a30adbdd516c7f9838133d245a3fd0c95eb909e9fe9b8df0b89135adeb90d5bd4843ddc2db7782ff WHIRLPOOL 29f36ad06ecd4cb7f9faa91924cb7a756cea9c18faf8fff67c0bbc1be10a8a1145724375f09467fefa1a41bd7f6f9196698806833ee105c6a86dd49910260b40 -DIST vmware-tools-linux-9.2.3-1031769.i386.component.tar 66211840 SHA256 0383d632139dbb463bba02c3f6770c877b2fc254710b05167b1d0d4213fbc11c SHA512 076d952a70bec0be1dcdc22534a57631faa1e74136cd1baac479d6f98d924a8d870958aa02aaaa9eef98e23609470ab85bde5ab7afacbc15516a5d7ad7b023c2 WHIRLPOOL 4429145db5528b8160115a7c55bc895e8b52745c9c3b08024a096e3bdefbb0e11ef6fdad976178e96fa32320711f30c2889c8830535dc6f6dfb8f6cbb214be03 -DIST vmware-tools-linux-9.2.3-1031769.x86_64.component.tar 66211840 SHA256 be5fa35af317058bffe98979b3b1f77eed416f17c7f6ee265a4717bbe3c9e718 SHA512 1f26d724e8e50df9d34333e44831d002ecd1a8af43cfed575c092316c4328ef3f34ac52b32c81ad6eb01dd362947ed462b09af080ee5e19cfd8aa89fbf83cd1d WHIRLPOOL 7292d3d69a46ad97b6decd5dff6c9c5dc19f76545965c6b95a904a14755072bc061742c458eecf974e8ca910af5d6464ccc6708c00c647095c3e98856ab628b0 -DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2 -DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c -DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed266ef888c8fd9a9f0d49083767f525b03bb2725d241c048308e8660b67254 SHA512 af12a60a70727db6ff98bfcc1693eda8c78fc09f3c5769eb42cd2ddfc36b6ae411309414d922d6fbcbfddab7875822a57d1bbe4afe2e00afd6afc09c8d959d89 WHIRLPOOL b46ef6bd824758bd2c4fdf8b3934a99baa23a4c2c6b9728a9ff464363c8c31050ffbe1392470191514f50d2f1ac208092f5d789e8cde1681d317636cce87d1b3 -DIST vmware-tools-linux-9.9.4-3206955.x86_64.component.tar 62085120 SHA256 d1482b6c78f5a7bf5820b174fe5fdd6f0fcaa3ed66c12eefa32e6b59358c376c SHA512 4c2b64b399a802fc1f7ef13878d0c8772507c971d5f515c6323e29a65b6d6fcb27ed48996ad5c6db0ff4d9a19db597b6d8b2eb1c3292cacd47cba9db5c65ef5f WHIRLPOOL 2ee2ad16b108aedf106f5dc017a08859505229734e4b87f81714c436f2fe43469acf6e41bd88473325d67c8396ea4330e7eb4141581da988bd2636ee153eadb8 -DIST vmware-tools-netware-9.2.3-1031769.i386.component.tar 81920 SHA256 906680d060a59414fa1726ef71b29f90f3923b823d4a123d72f345f6c35bab97 SHA512 892b0e9e18a80ab33dc6113447d281e31eb1925fea67ad9d90bfe6af808f855c8efaef6800540037062c4062bacc575fd638b7a49b34998006f5a49696558623 WHIRLPOOL b97bb7314868b1600a349d3b6af0b516aa3bd17124f3cf6bc309f1cdc21617b4c0abbbf74bb080aaaa64f31dc6ebb57905851678600cb6fce48e235428a5099c -DIST vmware-tools-netware-9.2.3-1031769.x86_64.component.tar 81920 SHA256 e1279aeb2d402fa87c643fb5bcdda695fa39c93495b9a2b75b4e80a713176817 SHA512 542c350d1052a9bad0930138042424a0c91f55f861511e10ce4b81327a40dc1c8a339606b9118ae1e37a3d4171b0617d0205f74e03c2e28b398b2663575206cc WHIRLPOOL 5b146c80e1537f30c8051266994e44d366cd5964539ab1f2d51e82e0e9c10802f78de38bfdcfd83a0f0f91299381aada5f77dc3a19a759bf69b932a9718a0900 -DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b -DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6 -DIST vmware-tools-netware-9.9.3-2780323.x86_64.component.tar 81920 SHA256 51ae6356bf0e28ef074f3e64363e1a360018f9be44f33ab6928e532f8f90af9a SHA512 9eadd29b6329eceaa4d90084d80bb635a46f0830420e947398391735935b626bef8d20dd8ec473c18d423c06cf4cf7a51ac77e2a2c95f9f417c7c73b08e100c6 WHIRLPOOL ce3d82023b378acf48efe3073e79ee272a8e3e36ff5cdee742870b7230ecfbcb8b3b2db7d8a7081e547176aae16f1e2df914593bdc2be4bb29e5ac1301158eae -DIST vmware-tools-netware-9.9.4-3206955.x86_64.component.tar 81920 SHA256 b95be3085178f75eb8b3f69a4c5ca8e4418615e72f42f3b254b3571f8b8e72d5 SHA512 758496e9cae854d02badec3474edeb7e53b4604edd5f1c84216d3488d8f65763a97840a4db023bb7513c91bb3c44d03a8fa67d4435cf6ccb16679ab995ee4159 WHIRLPOOL 4974e17b438633afd5a8046369dd1d935b6587a40d1e1e4bd378606a13914310f8f4e60d084a3ab735b510d8b13403afb41e078235227ce269786d54d0fabc64 -DIST vmware-tools-solaris-9.2.3-1031769.i386.component.tar 13096960 SHA256 bb38d98351c0bb7f1c268a5ec1140bf2023276fd82dc31895fc6039f983ce964 SHA512 5abbb8e7e31753301a02dc411ca41a4857fb41b0c97a1264e954a53a5f15869dec7e01f8b65190aaf20e86c04e929beb88d6f14261761801480f453ce6b3107b WHIRLPOOL 3ebfa56078c49d53bc17215124a901931fcc3fdcd660ad55f72ea0c8cb81a31463bc83ecc480d7e7cccba602c3a37157e560a99231edae3b8e2c1e26242ce252 -DIST vmware-tools-solaris-9.2.3-1031769.x86_64.component.tar 13096960 SHA256 94ed550543096d9e03326a5adea93928f24f69349e5bc6a995e1fefead7112d9 SHA512 04724855a497aefcbd1ccf6ddd1e793eb6fd4bc65960f59f0e0dc95096434d8fa1a5a12b49a20f7e293427a794e4c16df06e4a844042fd21537b2513992bae41 WHIRLPOOL 223977e8ff88601f58752b7a2fda99a15212858d8045504aefe181b18ca29ca4b09dd2b07ddc4091533fd07da5062777000dcbd1e557a789688dbec70fae9069 -DIST vmware-tools-solaris-9.6.5-2700073.i386.component.tar 12830720 SHA256 dfff56bd05aea2f732d893be9bd7b52d5b0a3f4f993bb8a275a429fabedd03d5 SHA512 e5c51665119fce5655cc24cc6ff5815250cd291ab7216eaa5eba6056b70e31734c111ae33189c4cb78c9f95336141f012c35c61cbf1ac2887dd264af8e5d7823 WHIRLPOOL 6429b2ed61a1ecba0ab290a9e37c642350782f257364b984abdda3b448e0b11996c0c1c909811620074b1b18a1206cc5f7a6872765766b3d0dcb2d1a978cc784 -DIST vmware-tools-solaris-9.6.5-2700073.x86_64.component.tar 12830720 SHA256 4995ee79f2aa8093fd8caa9bf5e9d2085f3b9a5b6de6b105069c68a97a01ef11 SHA512 f36aa070959bfe94dca921f7c776f878a56a116b5ab7a0da6a55acd34943b7b9631a4184d3aaa773387aed303922aa8d7e9f5b3f24c5d8d9eafbf3d02fb9bf88 WHIRLPOOL 558aa2a21da94b4741d3dc6195ee705e918947511408560ca836937ca094fe66efd2582e967e7fac941dabbaee86b4727f7010782eded8abdcfc05d66fe779a7 -DIST vmware-tools-solaris-9.9.3-2780323.x86_64.component.tar 13015040 SHA256 5ab7c353c8d73be85f756d34deaf5da7aa30a15a4d60f8c22565826d97d3f401 SHA512 8d9b1fe9f02a28da0cefc79d96accb0617a08928bed4189d00abe9f9424e83a28e06ca772c50ea7e4d14ac7f4d6a51b9e3e017b8d9cb5400811d8e2a05d470ea WHIRLPOOL addf9abb4cb07e2e015cdb5c2209dbc9b2371b712772dd337c577e3a7c83c2bc2fcbe468395b551c8b44d2366d0c12be74d76a513f4f690643dd0cbc6a74e57c -DIST vmware-tools-solaris-9.9.4-3206955.x86_64.component.tar 13015040 SHA256 3dfb5754640c100ae7047573be1b20f83e395e99592313e0f168f62a9a947163 SHA512 d56f859037aa5c9081ae036c719dd97e4ae2c20b65bd9d0670b189b030778058999f90656bc6ebe752ef2f22d43458752764cace8441bbfbb1086187dcaa2be3 WHIRLPOOL bd4464dc630ea0c2f310200a80d54171f60fc872fc83007672c4cd5d912db090a535ef46cb0c86931da9dfd44929850a0f8aee14f909d5b5512278cf90e8f27e -DIST vmware-tools-winPre2k-9.2.3-1031769.i386.component.tar 11253760 SHA256 a83173fbed35fd6484740fa1c3899ef18c84f0e2728e8db2cca442c809bafe1f SHA512 466625a1e342afae65203b1f04568c4d6c57eee2022890ca463a750d67c6fbbd1f9e5c557515298db0566d9297ffcb32183ff476a5e9368fa05b63b073ade467 WHIRLPOOL a5192928c6fc5c198e818bcf5f623660ae4741017a25cf4e691005ff8284666afb3d5e1dbc037a4caa5889e1bf102e91e4a9f06b630c041674cb0d53d8c0d0f4 -DIST vmware-tools-winPre2k-9.2.3-1031769.x86_64.component.tar 11253760 SHA256 9b51d31ca911ccf95db641834ae79220db44df53c2fd5a91d6b6e382cffdd39e SHA512 60f99dcb92794d3b798334c91966658f8bbb5cd11a435672094e0a0ccd0b070c0be277d38a9dfac9df77db6d7b91da806fa50a13e67b30d19c33fe153ff63a2e WHIRLPOOL 8426b651f35902f1ac87d556b330100f68ca1c615011301e6ab0dffb160fb4dab4f205f293ffd83ad74c67e9776d54c354f9fe98d70c596cec165929c5a1ba5c -DIST vmware-tools-winPre2k-9.6.5-2700073.i386.component.tar 11458560 SHA256 8b381b1c787466a96bf0f9536df05f58aa62c5c10d6fdeaedd136c6a49e09b8c SHA512 17bcbc4aa84e5e212732860cf34d4c4d8b4c806bd137b497e6dab9f023cf26af5a43a83f6f4d30f9d6e7df87f85b7a33e8ab0626c56450ea024b17e45ab1e1db WHIRLPOOL c3b45bbf5cc49f8b9dd64517dbd9e258ae60de59ea6beeed0b88745f7ba8beef1da9cba577d7829fa25dccf2c51ca919f36db5e7c141e7a4e1d62abe5b9fd187 -DIST vmware-tools-winPre2k-9.6.5-2700073.x86_64.component.tar 11458560 SHA256 55e856f7a701174c3f1f0257d2a8054b836b5e14b328cadcd21e792db03afd3f SHA512 bbc80f18ec0e08d26850220124d0e9187fe9d80472dbd55269c63d05b51ecc7374d7e6066aa5e9fc9bcd027b218925084fb30ddd48dc3828df9c09a9c3579699 WHIRLPOOL f01ad51f8944a167e19abc876f31a6e08f85920d1e17272edff44e4c4871090694e87749cdbd83ffab6deba8569cfec4b600b9de5f930e57405e831dc73a0cd9 -DIST vmware-tools-winPre2k-9.9.3-2780323.x86_64.component.tar 11530240 SHA256 5615f563e42b090a87e30423d5e930fc39712bd9bcf597a83b8df85341e0f563 SHA512 904c9323903f25fc1ffec2e0e7c21c7af9928b408a26e0d4e800597b134643e838a312f44b6600244cb3a855f025912384e10b4bc8f362ae7732216ea8ce642f WHIRLPOOL effa090a63d488738f0a17bf164b0594a33a7a5905d317d08589e1e3467783ac674b07b294a8678c3dbbb0ec6e8c784da74b3e3dd61b9b55e4a1bc4794cbdd8a -DIST vmware-tools-winPre2k-9.9.4-3206955.x86_64.component.tar 11530240 SHA256 58956405bda8c1eeda43dc22b5bbd9e077cc653f6b4bc2ff1bf0dc071152b2a6 SHA512 6394d73f0258bb831d52e4202ddded8173d3c0dbba3a5686f0eae362196a59b5fd7e9d40403483f7bffa90ab3d6daee340a86d69e9a9b5beb278e17b1c98f8e0 WHIRLPOOL a0620f05d8f6b9acdfdaf462a2718888e31e738c332aa189c367f277403c9a6e038eea0386f1ec4b8a9e9e5671a3e51bb67c7dc80d42f2f05b5244ed5ae79e04 -DIST vmware-tools-windows-9.2.3-1031769.i386.component.tar 61777920 SHA256 0fa4f7aac30b589292b6064c23702e6a257ac27ce1342c96755352f6f39e3b04 SHA512 776c834b49ad8f4bbe84ba800aa866e740e1dd236496065ebd46ddafa35621d4356f99a6f0bb45dfb1fe337bc75452236b5d5c87ec8c5ab6b5a1b6c18bc8d542 WHIRLPOOL 787725514f0ee1a48b64cc2f3b25f706290e386f9762857290ca2a84baea4a21205900b37df197976205baf27606023ea7626337b580299d4f6d63288c8ba39b -DIST vmware-tools-windows-9.2.3-1031769.x86_64.component.tar 61777920 SHA256 dbb7f6dbbcf9e44263193e40ad89944a45ef860f4f3b4b51d00ae1602f863f8c SHA512 818e2895c57be6792e82362c9616e2e6e8638997bde65ecea1416f71ccfa9681fc5cd44cd3356780ab35345e6b19ac8054a05eb8424dff1bcd779c9b686455a9 WHIRLPOOL ab847bddd07b029ba7a75fb6ae96133211d5a412fbe2059f851ae249854357dd0e25ab28df98fc2a3ee33f5aae08587a8b4bbfd6a60a2313f77fe6f98a1a3a3d -DIST vmware-tools-windows-9.6.5-2700073.i386.component.tar 69294080 SHA256 6aba23b1bd9f7877c7fd54102f634dbf6d0d61fe2640d2e56f280395ad595f45 SHA512 fb63d93dd2ca26aeae42f27ce4b0dcda4991f10e0077a8384b8c7bbc3dbf73fa1f62f986a6c5661b70aed59e3841dc9a63b0de76c637ef62d919f9b667149dae WHIRLPOOL 8969ab16cc660b39626f40af69563bd85f40547d4656e156c4ef79221b6d71f8c9cd1b9ec6e0657f1c61f7104748cf84c356a5ff50339462f998d677a762eee5 -DIST vmware-tools-windows-9.6.5-2700073.x86_64.component.tar 69294080 SHA256 effeb7d57c0c916de4b18f80df4cd8d9fcf00d0dda886b2ba0ce23179b3ad0fa SHA512 bcf036d3fa54b1b0ae98370a54f0e5d95ba68a6476fc79f60615d5754f370b8724d0ccaa6c826f843ebb3e1eb1afceb03701214774ff0b1e40742be5e9adad3f WHIRLPOOL 595918763b0b31ab07725b19c9642730bfb4ed14cec44ed4920bed0aed38b3d71ffab9a931b2923aef63514ff180f4f2221e1b6694418578ca1d2960531e4438 -DIST vmware-tools-windows-9.9.3-2780323.x86_64.component.tar 71495680 SHA256 fa53a1cb525876a5e809dd5429b4572091642ddc2d731ef3b9a242378c972696 SHA512 9e9db19c116f02e0885e07dd6803b6353439125331deb5722a949a10f023dcc694431599e2dd9a4f7a51dfd48510317854ce513684112444443f63e77e0d2c5d WHIRLPOOL dc32f12d603db31e0ec0853ab936c478f1eb0c04cf669e3b7e48ad058bc035e35ad8ba0783616f6370acb1d3c3ef777673d39c663f889998a62593e814aa93eb -DIST vmware-tools-windows-9.9.4-3206955.x86_64.component.tar 71516160 SHA256 1cce945c3d0678a3dda897685f658c585d6e7b085182b475bfc25f682e7e1530 SHA512 1aeac6144a33ad63d6020397af64966bc35e7cdfdaa434177058386c8466c24a95c2a9386da84f9973d65caa32126f89e422ae5cf8c63813310f1896781fc364 WHIRLPOOL 7cb6c351ab79edda774c101e66df7819c0d1e9a62585ffde4597189d5151669cafe23215c46230e2ed33c3f61e8c081e25141f549631a75eb2a20393a344416d diff --git a/app-emulation/vmware-tools/metadata.xml b/app-emulation/vmware-tools/metadata.xml deleted file mode 100644 index 4e48633499ff..000000000000 --- a/app-emulation/vmware-tools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>vmware@gentoo.org</email> - <name>Gentoo VMware Project</name> - </maintainer> -</pkgmetadata> diff --git a/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild b/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild deleted file mode 100644 index 51b46d81ef42..000000000000 --- a/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit versionator vmware-bundle - -MY_PV="$(replace_version_separator 3 - $PV)" -#BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/5.0.$(get_version_component_range 3)/$(get_version_component_range 4)/linux/packages/" -BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/5.0.2/$(get_version_component_range 4)/linux/packages/" - -DESCRIPTION="VMware Tools for guest operating systems" -HOMEPAGE="http://www.vmware.com/products/player/" - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="mirror" -IUSE="" - -DEPEND="" -RDEPEND="" - -IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k" - -VM_INSTALL_DIR="/opt/vmware" - -for guest in ${IUSE_VMWARE_GUEST} ; do - SRC_URI+=" vmware_guest_${guest}? ( - amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar ) - x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar ) - )" - IUSE+=" vmware_guest_${guest}" -done ; unset guest - -src_unpack() { - local arch - if use x86 ; then arch='i386' - elif use amd64 ; then arch='x86_64' - fi - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - local component="vmware-tools-${guest}-${MY_PV}.${arch}.component" - unpack "${component}.tar" - vmware-bundle_extract-component "${component}" - fi - done -} - -src_install() { - insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - doins "${guest}".iso{,.sig} - fi - done -} diff --git a/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild b/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild deleted file mode 100644 index 317af3d175d7..000000000000 --- a/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit versionator vmware-bundle - -MY_PV="$(replace_version_separator 3 - $PV)" -BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.6/$(get_version_component_range 4)/linux/packages/" - -DESCRIPTION="VMware Tools for guest operating systems" -HOMEPAGE="http://www.vmware.com/products/player/" - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="mirror" -IUSE="" - -DEPEND="" -RDEPEND="" - -IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k" - -VM_INSTALL_DIR="/opt/vmware" - -for guest in ${IUSE_VMWARE_GUEST} ; do - SRC_URI+=" vmware_guest_${guest}? ( - amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar ) - x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar ) - )" - IUSE+=" vmware_guest_${guest}" -done ; unset guest - -src_unpack() { - local arch - if use x86 ; then arch='i386' - elif use amd64 ; then arch='x86_64' - fi - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - local component="vmware-tools-${guest}-${MY_PV}.${arch}.component" - unpack "${component}.tar" - vmware-bundle_extract-component "${component}" - fi - done -} - -src_install() { - insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - doins "${guest}".iso{,.sig} - fi - done -} diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild deleted file mode 100644 index 40bad920c8ef..000000000000 --- a/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit versionator vmware-bundle - -MY_PV="$(replace_version_separator 3 - $PV)" -BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.2/$(get_version_component_range 4)/linux/packages/" - -DESCRIPTION="VMware Tools for guest operating systems" -HOMEPAGE="http://www.vmware.com/products/player/" - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="mirror" -IUSE="" - -DEPEND="" -RDEPEND="" - -IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k" - -VM_INSTALL_DIR="/opt/vmware" - -for guest in ${IUSE_VMWARE_GUEST} ; do - SRC_URI+=" vmware_guest_${guest}? ( - amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar ) - )" - IUSE+=" vmware_guest_${guest}" -done ; unset guest - -src_unpack() { - local arch - if use x86 ; then arch='i386' - elif use amd64 ; then arch='x86_64' - fi - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - local component="vmware-tools-${guest}-${MY_PV}.${arch}.component" - unpack "${component}.tar" - vmware-bundle_extract-component "${component}" - fi - done -} - -src_install() { - insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages - local somethingdone; - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - doins "${guest}".iso{,.sig} - somethingdone=yes - fi - done - - [ -n "${somethingdone}" ] || ewarn "You should set VMWARE_GUEST in make.conf to specify which operating systems you need." -} diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild deleted file mode 100644 index b6749751331d..000000000000 --- a/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit versionator vmware-bundle - -MY_PV="$(replace_version_separator 3 - $PV)" -BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.3/$(get_version_component_range 4)/linux/packages/" - -DESCRIPTION="VMware Tools for guest operating systems" -HOMEPAGE="http://www.vmware.com/products/player/" - -LICENSE="vmware" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="mirror" -IUSE="" - -DEPEND="" -RDEPEND="" - -IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k" - -VM_INSTALL_DIR="/opt/vmware" - -for guest in ${IUSE_VMWARE_GUEST} ; do - SRC_URI+=" vmware_guest_${guest}? ( - amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar ) - )" - IUSE+=" vmware_guest_${guest}" -done ; unset guest - -src_unpack() { - local arch - if use x86 ; then arch='i386' - elif use amd64 ; then arch='x86_64' - fi - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - local component="vmware-tools-${guest}-${MY_PV}.${arch}.component" - unpack "${component}.tar" - vmware-bundle_extract-component "${component}" - fi - done -} - -src_install() { - insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages - local somethingdone; - local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do - if use "vmware_guest_${guest}" ; then - doins "${guest}".iso{,.sig} - somethingdone=yes - fi - done - - [ -n "${somethingdone}" ] || ewarn "You should set VMWARE_GUEST in make.conf to specify which operating systems you need." -} diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest deleted file mode 100644 index 84c6065fb659..000000000000 --- a/app-emulation/vmware-workstation/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26ba33027344a943734e48cac03ed522a9cf09131837758af3ebd27ea60 SHA512 f65ce16784c9fccb0a6f09abe52bbbe1cc1567d366d03cfe0f79fdfbf4b9d5fef8238a6f62e969b8415112bf063f3d6a5e66239aa89159172520c80efd90c7e9 WHIRLPOOL 11ffae3b8a7e059e63afd2a8a19f9a07d8d63d2ef8f83c623b37e315750b09cb9a31537125614610fc988184017fe45b3ae5408670257c1dc9531dd6b6b17717 -DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa -DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca -DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094 -DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac -DIST VMware-Workstation-9.0.3-1410761.i386.bundle.tar 264908800 SHA256 dfe9aaa75987793eac096c0fbdb364f94e354ab668213774ea3e90d5ddcecdc0 SHA512 5d0943400cb1fefca20f1a81d3989bf5cdda5e123d1a70b09ebc20a56498d36f597ed7a0730d2f6f752c3c4baad2c86d5ef7691e8d245147d944c6f7e4e708b0 WHIRLPOOL 14a950f2deb03c3b7a088d4fb50378c7109330d89903965c28ead0be1e2223dbce05a628b1ea859215d31a8978f497bd8f807652cf266667d67893eaf2d7372b -DIST VMware-Workstation-9.0.3-1410761.x86_64.bundle.tar 232724480 SHA256 2612f8a523c9f23164d7557c105520bc6e010af82b3e6d4a3ada04d8ff03cbf0 SHA512 07923231e481550cb0348e40ef341c2d0682ac0daf6c8e0ada130c03113f43a37bf322e64fb9dc73511dea0fd2851f3cb4f5e755bbad4beba9e3cc4e69566070 WHIRLPOOL d979f2d9ef8888be89d5747c16e0db7ca45609cd9d77d84baf8485b4956f9e9f99bf46c33a2690b7b1fea851c0495ed0a06b36e3e69b51abfc11604d9a62fe4d -DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 -DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 -DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6 diff --git a/app-emulation/vmware-workstation/files/configure-hostd.sh b/app-emulation/vmware-workstation/files/configure-hostd.sh deleted file mode 100644 index 480e9037d86d..000000000000 --- a/app-emulation/vmware-workstation/files/configure-hostd.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -action="$1" - -case $action in - add) - rc-update -q add vmware-workstation-server default - rc-service vmware-workstation-server start - ;; - remove) - rc-update -q del vmware-workstation-server default - rc-service vmware-workstation-server stop - ;; - status) - rc-service -q vmware-workstation-server status - ;; - *) - exit 1 - ;; -esac diff --git a/app-emulation/vmware-workstation/files/vmware-10.0.rc b/app-emulation/vmware-workstation/files/vmware-10.0.rc deleted file mode 100644 index 396b6d705135..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-10.0.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - modprobe -v vmci || modprobe -v vmw_vmci - eend $? - modprobe -av vmmon vmci vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - modprobe -rv vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-11.1.rc b/app-emulation/vmware-workstation/files/vmware-11.1.rc deleted file mode 100644 index 2ba649336fdf..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-11.1.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - - # quiet for vmci because it may not be there - modprobe -vq vmci || modprobe -v vmw_vmci - eend $? - - # vmci or vmw_vmci was loaded by the previous modprobe - # no need to do it here - modprobe -av vmmon vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - - # quiet for vmci because it may not be there - modprobe -rvq vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-12.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc deleted file mode 100644 index 2ba649336fdf..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-12.1.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - - # quiet for vmci because it may not be there - modprobe -vq vmci || modprobe -v vmw_vmci - eend $? - - # vmci or vmw_vmci was loaded by the previous modprobe - # no need to do it here - modprobe -av vmmon vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - - # quiet for vmci because it may not be there - modprobe -rvq vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-9.0.rc b/app-emulation/vmware-workstation/files/vmware-9.0.rc deleted file mode 100644 index 396b6d705135..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-9.0.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use net -} - -start() { - ebegin Starting VMware USB Arbitrator - #start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator - @@BINDIR@@/vmware-usbarbitrator - eend $? - ebegin Starting VMware services - modprobe -v vmci || modprobe -v vmw_vmci - eend $? - modprobe -av vmmon vmci vsock vmblock vmnet - eend $? - @@BINDIR@@/vmware-networks --start - eend $? -} - -stop() { - ebegin Stopping VMware USB Arbitrator - #start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator - killall --wait @@BINDIR@@/vmware-usbarbitrator - eend $? - @@BINDIR@@/vmware-networks --stop - eend $? - ebegin Stopping VMware services - modprobe -rv vsock vmmon vmblock vmnet - eend $? - modprobe -rv vmci || modprobe -rv vmw_vmci - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-server-10.0.rc b/app-emulation/vmware-workstation/files/vmware-server-10.0.rc deleted file mode 100644 index a36d41e98416..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-server-10.0.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount vmware - use net -} - -checkconfig() { - # Check if certificates exist. If not, we need to generate them, ala sshd. - if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then - mkdir -p @@ETCDIR@@/ssl - openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config - chmod -R 600 @@ETCDIR@@/ssl - fi -} - -start() { - checkconfig - - ebegin Starting VMware Authentication Daemon - start-stop-daemon --start \ - --exec @@PREFIX@@/sbin/vmware-authdlauncher - eend $? - ebegin Starting VMware Workstation Server - start-stop-daemon --start \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd \ - -- -a -d @@ETCDIR@@/hostd/config.xml - - eend $? -} - -stop() { - ebegin "Shutdown VMs in the AutoStart Sequence" - local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" - - if [ "x" != "x${HOHO_ADMIN}" ]; then - @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop - fi - eend $? - - ebegin Stopping VMware Workstation Server - start-stop-daemon --stop \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd - eend $? - ebegin Stopping VMware Authentication Daemon - #start-stop-daemon --stop \ - # --exec @@PREFIX@@/sbin/vmware-authdlauncher - killall @@PREFIX@@/sbin/vmware-authdlauncher - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.1.rc b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc deleted file mode 100644 index a36d41e98416..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-server-11.1.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount vmware - use net -} - -checkconfig() { - # Check if certificates exist. If not, we need to generate them, ala sshd. - if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then - mkdir -p @@ETCDIR@@/ssl - openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config - chmod -R 600 @@ETCDIR@@/ssl - fi -} - -start() { - checkconfig - - ebegin Starting VMware Authentication Daemon - start-stop-daemon --start \ - --exec @@PREFIX@@/sbin/vmware-authdlauncher - eend $? - ebegin Starting VMware Workstation Server - start-stop-daemon --start \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd \ - -- -a -d @@ETCDIR@@/hostd/config.xml - - eend $? -} - -stop() { - ebegin "Shutdown VMs in the AutoStart Sequence" - local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" - - if [ "x" != "x${HOHO_ADMIN}" ]; then - @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop - fi - eend $? - - ebegin Stopping VMware Workstation Server - start-stop-daemon --stop \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd - eend $? - ebegin Stopping VMware Authentication Daemon - #start-stop-daemon --stop \ - # --exec @@PREFIX@@/sbin/vmware-authdlauncher - killall @@PREFIX@@/sbin/vmware-authdlauncher - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc deleted file mode 100644 index a36d41e98416..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount vmware - use net -} - -checkconfig() { - # Check if certificates exist. If not, we need to generate them, ala sshd. - if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then - mkdir -p @@ETCDIR@@/ssl - openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config - chmod -R 600 @@ETCDIR@@/ssl - fi -} - -start() { - checkconfig - - ebegin Starting VMware Authentication Daemon - start-stop-daemon --start \ - --exec @@PREFIX@@/sbin/vmware-authdlauncher - eend $? - ebegin Starting VMware Workstation Server - start-stop-daemon --start \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd \ - -- -a -d @@ETCDIR@@/hostd/config.xml - - eend $? -} - -stop() { - ebegin "Shutdown VMs in the AutoStart Sequence" - local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" - - if [ "x" != "x${HOHO_ADMIN}" ]; then - @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop - fi - eend $? - - ebegin Stopping VMware Workstation Server - start-stop-daemon --stop \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd - eend $? - ebegin Stopping VMware Authentication Daemon - #start-stop-daemon --stop \ - # --exec @@PREFIX@@/sbin/vmware-authdlauncher - killall @@PREFIX@@/sbin/vmware-authdlauncher - eend $? -} diff --git a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc b/app-emulation/vmware-workstation/files/vmware-server-9.0.rc deleted file mode 100644 index 28a364f19a0b..000000000000 --- a/app-emulation/vmware-workstation/files/vmware-server-9.0.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount vmware - use net -} - -checkconfig() { - # Check if certificates exist. If not, we need to generate them, ala sshd. - if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then - mkdir -p @@ETCDIR@@/ssl - openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config - chmod -R 600 @@ETCDIR@@/ssl - fi -} - -start() { - checkconfig - - ebegin Starting VMware Authentication Daemon - start-stop-daemon --start \ - --exec @@PREFIX@@/sbin/vmware-authdlauncher - eend $? - ebegin Starting VMware Workstation Server - start-stop-daemon --start \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd \ - -- -a -d @@ETCDIR@@/hostd/config.xml - - eend $? -} - -stop() { - ebegin "Shutdown VMs in the AutoStart Sequence" - local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" - - if [ "x" != "x${HOHO_ADMIN}" ]; then - @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop - fi - eend $? - - ebegin Stopping VMware Workstation Server - start-stop-daemon --stop \ - --pidfile /var/run/vmware/vmware-hostd.PID \ - --exec @@BINDIR@@/vmware-hostd - eend $? - ebegin Stopping VMware Authentication Daemon - #start-stop-daemon --stop \ - # --exec @@PREFIX@@/sbin/vmware-authdlauncher - killall @@PREFIX@@/sbin/vmware-authdlauncher - eend $? -} diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml deleted file mode 100644 index 984507154254..000000000000 --- a/app-emulation/vmware-workstation/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>vmware@gentoo.org</email> - <name>Gentoo VMware Project</name> - </maintainer> - <longdescription> - VMWare Workstation is a virtual machine which can be used to install - other operating systems in a virtual environment to run on top of Gentoo. - </longdescription> - <use> - <flag name="bundled-libs">Use precompiled bundled libraries instead of the system installation</flag> - <flag name="ovftool">Install OVF tool.</flag> - <flag name="server">Install VMware Workstation Server component.</flag> - <flag name="vix">Install VIX. The VIX API allows you to write programs and scripts - that automate virtual machine operations, and run programs or manipulate - files within guest operating systems. - </flag> - <flag name="vmware-tools">Install VMware Tools images</flag> - </use> - <upstream> - <remote-id type="github">akhuettel/systemd-vmware</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild deleted file mode 100644 index 905fd08b6481..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild +++ /dev/null @@ -1,498 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-01" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz - " -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="cups doc ovftool server vix vmware-tools" -RESTRICT="mirror strip" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libgnomecanvasmm - dev-cpp/pangomm - dev-libs/atk - dev-libs/glib:2 - dev-libs/icu - dev-libs/expat - dev-libs/libaio - || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) - dev-libs/libsigc++ - dev-libs/libxml2 - dev-libs/openssl:0.9.8 - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - media-libs/libpng:1.2 - media-libs/libpng - media-libs/tiff:3 - net-misc/curl - cups? ( net-print/cups ) - sys-devel/gcc - sys-fs/fuse - sys-libs/glibc - sys-libs/zlib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - x11-libs/pangox-compat - x11-libs/startup-notification - x11-themes/hicolor-icon-theme - !app-emulation/vmware-player" -PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -src_unpack() { - default - local bundle - use amd64 && bundle=${MY_P}.x86_64.bundle - use x86 && bundle=${MY_P}.i386.bundle - local component; for component in \ - vmware-vmx \ - vmware-player-app \ - vmware-player-setup \ - vmware-workstation \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix - fi - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - find "${S}" -name '*.a' -delete - -# clean_bundled_libs -} - -clean_bundled_libs() { - ebegin 'Removing superfluous libraries' - cd lib/lib || die - ldconfig -p | \ - sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \ - fgrep -vx 'libcrypto.so.0.9.8 -libssl.so.0.9.8i -libgcr.so.0 -libglib-2.0.so.0' | - xargs -d'\n' -r rm -rf - eend -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - local major_minor_revision=$(get_version_component_range 1-3 "${PV}") - local build=$(get_version_component_range 4 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - insinto /etc/xdg - doins -r etc/xdg/* - - # install documentation - doman man/man1/vmware.1.gz - - if use doc; then - dodoc doc/* - fi - - insinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doins vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-{hostd,wssc-adminTool} ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${major_minor_revision}" - product.version = "${major_minor_revision}" - product.buildNumber = "${build}" - product.name = "VMware Workstation" - workstation.product.version = "${major_minor_revision}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "/etc/env.d was updated. Please run:" - ewarn "env-update && source /etc/profile" - ewarn "" - ewarn "Before you can use vmware workstation, you must configure a default network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild deleted file mode 100644 index 3bc1abaa1eb7..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild +++ /dev/null @@ -1,548 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-01" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz - " -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="cups bundled-libs doc ovftool server vix vmware-tools" -RESTRICT="mirror strip preserve-libs" - -BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib - -BUNDLED_LIBS=" - libXau.so.6 - libXcomposite.so.1 - libXcursor.so.1 - libXdamage.so.1 - libXdmcp.so.6 - libXfixes.so.3 - libXft.so.2 - libXinerama.so.1 - libXrandr.so.2 - libXrender.so.1 - libaio.so.1 - libatk-1.0.so.0 - libatkmm-1.6.so.1 - libatspi.so.0 - libcairo.so.2 - libcairomm-1.0.so.1 - libcurl.so.4 - libdbus-1.so.3 - libfontconfig.so.1 - libfreetype.so.6 - libfuse.so.2 - libgailutil.so.18 - libgdk-x11-2.0.so.0 - libgcrypt.so.11 - libgdk_pixbuf-2.0.so.0 - libgdkmm-2.4.so.1 - libgio-2.0.so.0 - libgiomm-2.4.so.1 -" - -BUNDLED_LIB_DEPENDS=" - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - dev-libs/libaio - dev-libs/atk - dev-cpp/atkmm - app-accessibility/at-spi2-core - x11-libs/cairo - dev-cpp/cairomm - net-misc/curl - media-libs/fontconfig - media-libs/freetype - sys-fs/fuse - x11-libs/gtk+:2 - =dev-libs/libgcrypt-1.5* - x11-libs/gdk-pixbuf:2 - dev-cpp/gtkmm:2.4 - dev-libs/glib:2 - dev-cpp/glibmm:2 -" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND=" - dev-cpp/libgnomecanvasmm - dev-cpp/pangomm - dev-libs/icu - dev-libs/expat - dev-libs/libsigc++:2 - dev-libs/libxml2 - dev-libs/openssl:0.9.8 - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/libart_lgpl - media-libs/libpng:1.2 - media-libs/libpng - media-libs/tiff:3 - cups? ( net-print/cups ) - sys-devel/gcc - sys-libs/glibc - sys-libs/zlib - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/pango - x11-libs/pangox-compat - x11-libs/startup-notification - x11-themes/hicolor-icon-theme - !app-emulation/vmware-player - !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) - sys-apps/dbus -" -PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle - use amd64 && bundle=${MY_P}.x86_64.bundle - local component; for component in \ - vmware-vmx \ - vmware-player-app \ - vmware-player-setup \ - vmware-workstation \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix - fi - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -clean_bundled_libs() { - einfo Removing bundled libraries - for libname in ${BUNDLED_LIBS} ; do - rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" - done -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - find "${S}" -name '*.a' -delete - - if ! use bundled-libs ; then - clean_bundled_libs - fi - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use vmware workstation, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. -" -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - local major_minor_revision=$(get_version_component_range 1-3 "${PV}") - local build=$(get_version_component_range 4 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - insinto /etc/xdg - doins -r etc/xdg/* - - # install documentation - doman man/man1/vmware.1.gz - - if use doc; then - dodoc doc/* - fi - - insinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doins vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-{hostd,wssc-adminTool} ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - - use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" - - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${major_minor_revision}" - product.version = "${major_minor_revision}" - product.buildNumber = "${build}" - product.name = "VMware Workstation" - workstation.product.version = "${major_minor_revision}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_pkg_postinst -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild deleted file mode 100644 index bd2d9b4b5d14..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild +++ /dev/null @@ -1,548 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-01" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz - " -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="cups bundled-libs doc ovftool server vix vmware-tools" -RESTRICT="mirror strip" - -BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib - -BUNDLED_LIBS=" - libXau.so.6 - libXcomposite.so.1 - libXcursor.so.1 - libXdamage.so.1 - libXdmcp.so.6 - libXfixes.so.3 - libXft.so.2 - libXinerama.so.1 - libXrandr.so.2 - libXrender.so.1 - libaio.so.1 - libatk-1.0.so.0 - libatkmm-1.6.so.1 - libatspi.so.0 - libcairo.so.2 - libcairomm-1.0.so.1 - libcurl.so.4 - libdbus-1.so.3 - libfontconfig.so.1 - libfreetype.so.6 - libfuse.so.2 - libgailutil.so.18 - libgdk-x11-2.0.so.0 - libgcrypt.so.11 - libgdk_pixbuf-2.0.so.0 - libgdkmm-2.4.so.1 - libgio-2.0.so.0 - libgiomm-2.4.so.1 -" - -BUNDLED_LIB_DEPENDS=" - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - dev-libs/libaio - dev-libs/atk - dev-cpp/atkmm - app-accessibility/at-spi2-core - x11-libs/cairo - dev-cpp/cairomm - net-misc/curl - media-libs/fontconfig - media-libs/freetype - sys-fs/fuse - x11-libs/gtk+:2 - || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) - x11-libs/gdk-pixbuf:2 - dev-cpp/gtkmm:2.4 - dev-libs/glib:2 - dev-cpp/glibmm:2 -" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND=" - dev-cpp/libgnomecanvasmm - dev-cpp/pangomm - dev-libs/icu - dev-libs/expat - dev-libs/libsigc++:2 - dev-libs/libxml2 - dev-libs/openssl:0.9.8 - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/libart_lgpl - media-libs/libpng:1.2 - media-libs/libpng - media-libs/tiff:3 - cups? ( net-print/cups ) - sys-devel/gcc - sys-libs/glibc - sys-libs/zlib - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/pango - x11-libs/pangox-compat - x11-libs/startup-notification - x11-themes/hicolor-icon-theme - !app-emulation/vmware-player - !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) - sys-apps/dbus -" -PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle - use amd64 && bundle=${MY_P}.x86_64.bundle - local component; for component in \ - vmware-vmx \ - vmware-player-app \ - vmware-player-setup \ - vmware-workstation \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix - fi - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -clean_bundled_libs() { - einfo Removing bundled libraries - for libname in ${BUNDLED_LIBS} ; do - rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" - done -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - find "${S}" -name '*.a' -delete - - if ! use bundled-libs ; then - clean_bundled_libs - fi - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use vmware workstation, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. -" -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - local major_minor_revision=$(get_version_component_range 1-3 "${PV}") - local build=$(get_version_component_range 4 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - insinto /etc/xdg - doins -r etc/xdg/* - - # install documentation - doman man/man1/vmware.1.gz - - if use doc; then - dodoc doc/* - fi - - insinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doins vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-{hostd,wssc-adminTool} ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - - use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" - - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${major_minor_revision}" - product.version = "${major_minor_revision}" - product.buildNumber = "${build}" - product.name = "VMware Workstation" - workstation.product.version = "${major_minor_revision}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_pkg_postinst -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild deleted file mode 100644 index 6e19aa832ebc..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild +++ /dev/null @@ -1,548 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-01" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz - " -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="cups bundled-libs doc ovftool server vix vmware-tools" -RESTRICT="mirror strip" - -BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib - -BUNDLED_LIBS=" - libXau.so.6 - libXcomposite.so.1 - libXcursor.so.1 - libXdamage.so.1 - libXdmcp.so.6 - libXfixes.so.3 - libXft.so.2 - libXinerama.so.1 - libXrandr.so.2 - libXrender.so.1 - libaio.so.1 - libatk-1.0.so.0 - libatkmm-1.6.so.1 - libatspi.so.0 - libcairo.so.2 - libcairomm-1.0.so.1 - libcurl.so.4 - libdbus-1.so.3 - libfontconfig.so.1 - libfreetype.so.6 - libfuse.so.2 - libgailutil.so.18 - libgdk-x11-2.0.so.0 - libgcrypt.so.11 - libgdk_pixbuf-2.0.so.0 - libgdkmm-2.4.so.1 - libgio-2.0.so.0 - libgiomm-2.4.so.1 -" - -BUNDLED_LIB_DEPENDS=" - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - dev-libs/libaio - dev-libs/atk - dev-cpp/atkmm - app-accessibility/at-spi2-core - x11-libs/cairo - dev-cpp/cairomm - net-misc/curl - media-libs/fontconfig - media-libs/freetype - sys-fs/fuse - x11-libs/gtk+:2 - || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) - x11-libs/gdk-pixbuf:2 - dev-cpp/gtkmm:2.4 - dev-libs/glib:2 - dev-cpp/glibmm:2 -" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND=" - dev-cpp/libgnomecanvasmm - dev-cpp/pangomm - dev-libs/icu - dev-libs/expat - dev-libs/libsigc++:2 - dev-libs/libxml2 - dev-libs/openssl:0 - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/libart_lgpl - media-libs/libpng:1.2 - media-libs/libpng - media-libs/tiff:3 - cups? ( net-print/cups ) - sys-devel/gcc - sys-libs/glibc - sys-libs/zlib - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/pango - x11-libs/pangox-compat - x11-libs/startup-notification - x11-themes/hicolor-icon-theme - !app-emulation/vmware-player - !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) - sys-apps/dbus -" -PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle - use amd64 && bundle=${MY_P}.x86_64.bundle - local component; for component in \ - vmware-vmx \ - vmware-player-app \ - vmware-player-setup \ - vmware-workstation \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix - fi - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -clean_bundled_libs() { - einfo Removing bundled libraries - for libname in ${BUNDLED_LIBS} ; do - rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" - done -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - find "${S}" -name '*.a' -delete - - if ! use bundled-libs ; then - clean_bundled_libs - fi - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use vmware workstation, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. -" -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - local major_minor_revision=$(get_version_component_range 1-3 "${PV}") - local build=$(get_version_component_range 4 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.1.0.1 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.1.0.1 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - insinto /etc/xdg - doins -r etc/xdg/* - - # install documentation - doman man/man1/vmware.1.gz - - if use doc; then - dodoc doc/* - fi - - insinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doins vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-{hostd,wssc-adminTool} ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - - use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" - - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${major_minor_revision}" - product.version = "${major_minor_revision}" - product.buildNumber = "${build}" - product.name = "VMware Workstation" - workstation.product.version = "${major_minor_revision}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_pkg_postinst -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild deleted file mode 100644 index 9d8b6b484a8c..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild +++ /dev/null @@ -1,627 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MODULES="308.$(get_version_component_range 2-3)" -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-02" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz - " - -LICENSE="vmware GPL-2 GPL-3" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="bundled-libs cups doc ovftool server vix +vmware-tools" -RESTRICT="mirror strip" - -BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib - -BUNDLED_LIBS=" - libXau.so.6 - libXcomposite.so.1 - libXcursor.so.1 - libXdamage.so.1 - libXdmcp.so.6 - libXfixes.so.3 - libXft.so.2 - libXinerama.so.1 - libXrandr.so.2 - libXrender.so.1 - libaio.so.1 - libatk-1.0.so.0 - libatkmm-1.6.so.1 - libatspi.so.0 - libcairo.so.2 - libcairomm-1.0.so.1 - libcrypto.so.1.0.1 - libcurl.so.4 - libdbus-1.so.3 - libfontconfig.so.1 - libfreetype.so.6 - libfuse.so.2 - libgailutil.so.18 - libgcc_s.so.1 - libgcrypt.so.11 - libgdk-x11-2.0.so.0 - libgdk_pixbuf-2.0.so.0 - libgdkmm-2.4.so.1 - libgio-2.0.so.0 - libgiomm-2.4.so.1 - libglib-2.0.so.0 - libglibmm-2.4.so.1 - libglibmm_generate_extra_defs-2.4.so.1 - libgmodule-2.0.so.0 - libgobject-2.0.so.0 - libgpg-error.so.0 - libgthread-2.0.so.0 - libgtk-x11-2.0.so.0 - libgtkmm-2.4.so.1 - libpango-1.0.so.0 - libpangocairo-1.0.so.0 - libpangoft2-1.0.so.0 - libpangomm-1.4.so.1 - libpangox-1.0.so.0 - libpangoxft-1.0.so.0 - libpcsclite.so.1 - libpixman-1.so.0 - libpng12.so.0 - librsvg-2.so.2 - libsigc-2.0.so.0 - libssl.so.1.0.1 - libstdc++.so.6 - libxml2.so.2 - libz.so.1 -" - -BUNDLED_LIB_DEPENDS=" - app-accessibility/at-spi2-core - dev-cpp/atkmm - dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/pangomm - dev-libs/atk - dev-libs/glib:2 - dev-libs/libaio - dev-libs/libgcrypt:11/11 - dev-libs/libgpg-error - dev-libs/libsigc++:2 - dev-libs/libxml2 - dev-libs/openssl:0 - gnome-base/librsvg:2 - media-libs/fontconfig - media-libs/freetype - media-libs/libpng:1.2 - net-misc/curl - sys-apps/dbus - sys-apps/pcsc-lite - sys-fs/fuse - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libXau - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pango - x11-libs/pangox-compat - x11-libs/pixman -" - -# vmware should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND=" - app-arch/bzip2 - dev-libs/dbus-glib - dev-libs/expat - dev-libs/gmp:0 - dev-libs/icu - dev-libs/json-c - dev-libs/libcroco - dev-libs/libffi - dev-libs/libgcrypt:0/20 - dev-libs/libtasn1:0/6 - dev-libs/nettle:0/6 - gnome-base/gconf - gnome-base/libgnome-keyring - media-gfx/graphite2 - media-libs/alsa-lib - media-libs/harfbuzz:0/0.9.18 - media-libs/libart_lgpl - media-libs/libpng:0 - media-libs/libvorbis - media-libs/mesa - net-dns/libidn - net-libs/gnutls - net-print/cups - sys-apps/tcp-wrappers - sys-apps/util-linux - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/libdrm - x11-libs/libxcb - x11-libs/libxshmfence - x11-libs/startup-notification - x11-libs/xcb-util - x11-themes/hicolor-icon-theme - bundled-libs? ( - media-libs/jbigkit:0/2.1 - media-libs/tiff:3 - virtual/jpeg:62 - ) - !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) - !app-emulation/vmware-player -" -PDEPEND="~app-emulation/vmware-modules-${PV_MODULES} - vmware-tools? ( app-emulation/vmware-tools )" -DEPEND=">=dev-util/patchelf-0.9" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -QA_PREBUILT="/opt/*" - -QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" - -src_unpack() { - default - local bundle=${MY_P}.x86_64.bundle - - local component; for component in \ - vmware-workstation \ - vmware-player-app \ - vmware-player-setup \ - vmware-vmx \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix - fi -} - -clean_bundled_libs() { - einfo "Removing bundled libraries" - for libname in ${BUNDLED_LIBS} ; do - rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" - done - - rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" - - # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 - # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. - # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link - # in libcds.so to be able to use system libs. - pushd >/dev/null . - einfo "Patching libcds.so" - cd "${S}"/lib/lib/libcds.so || die - patchelf --replace-needed libssl.so.1.0.{1,0} \ - --replace-needed libcrypto.so.1.0.{1,0} \ - libcds.so || die - popd >/dev/null - - # vmware-workstation seems to use a custom version of libgksu2.so, for this reason - # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED - # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage - # preserve-libs mechanism to be triggered when a system lib is available (but not required) - pushd >/dev/null . - einfo "Patching libvmware-gksu.so" - cd "${S}"/lib/lib/libvmware-gksu.so || die - patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ - libvmware-gksu.so || die - popd >/dev/null -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - if ! use bundled-libs ; then - clean_bundled_libs - fi - - DOC_CONTENTS=" -/etc/env.d is updated during ${PN} installation. Please run:\n -env-update && source /etc/profile\n -Before you can use ${PN}, you must configure a default network setup. -You can do this by running 'emerge --config ${PN}'.\n -To be able to run ${PN} your user must be in the vmware group.\n -You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. -" -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} - doins "${T}"/10${PN} - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # workaround for hardcoded search paths needed during shared objects loading - if ! use bundled-libs ; then - dosym /usr/$(get_libdir)/libglib-2.0.so.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0 - # Bug 432918 - dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 - dosym /usr/$(get_libdir)/libssl.so.1.0.0 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 - fi - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-hostd wssc-adminTool ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" - - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${MY_PV}" - product.buildNumber = "${PV_BUILD}" - product.version = "${MY_PV}" - product.name = "VMware Workstation" - workstation.product.version = "${MY_PV}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - if use bundled-libs ; then - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die - fi - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" || die - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-workstation.desktop" || die - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" || die - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} - - readme.gentoo_create_doc -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog - - ewarn "${P} is using an old version of libgcrypt library which" - ewarn "is going to be soon removed from portage due to security reasons" - ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)." - ewarn "Until vmware is fixed upstream you're exposed to security issues!" -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild b/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild deleted file mode 100644 index f75690377903..000000000000 --- a/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild +++ /dev/null @@ -1,490 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle - -MY_PN="VMware-Workstation" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -SYSTEMD_UNITS_TAG="gentoo-01" - -DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/workstation/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz - " -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="cups doc ovftool server vix vmware-tools" -RESTRICT="mirror strip" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libgnomecanvasmm - dev-cpp/pangomm - dev-libs/atk - dev-libs/glib:2 - dev-libs/icu - dev-libs/expat - dev-libs/libaio - dev-libs/libsigc++ - dev-libs/libxml2 - =dev-libs/openssl-0.9.8* - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - =media-libs/libpng-1.2* - media-libs/libpng - net-misc/curl - cups? ( net-print/cups ) - sys-devel/gcc - sys-fs/fuse - sys-libs/glibc - sys-libs/zlib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - x11-libs/startup-notification - x11-themes/hicolor-icon-theme - !app-emulation/vmware-player" -PDEPEND="~app-emulation/vmware-modules-271.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" -VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" -VM_HOSTD_USER="root" - -src_unpack() { - default - local bundle - use amd64 && bundle=${MY_P}.x86_64.bundle - use x86 && bundle=${MY_P}.i386.bundle - local component; for component in \ - vmware-vmx \ - vmware-player-app \ - vmware-player-setup \ - vmware-workstation \ - vmware-network-editor \ - vmware-network-editor-ui \ - vmware-usbarbitrator \ - vmware-vprobe - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - if use server; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" - fi - - if use vix; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix - vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation900andvSphere510 vmware-vix - fi - if use ovftool; then - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool - fi -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ - - if use server; then - rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} - fi - - find "${S}" -name '*.a' -delete - -# clean_bundled_libs -} - -clean_bundled_libs() { - ebegin 'Removing superfluous libraries' - cd lib/lib || die - ldconfig -p | \ - sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \ - fgrep -vx 'libcrypto.so.0.9.8 -libssl.so.0.9.8i -libgcr.so.0 -libglib-2.0.so.0' | - xargs -d'\n' -r rm -rf - eend -} - -src_install() { - local major_minor=$(get_version_component_range 1-2 "${PV}") - local major_minor_revision=$(get_version_component_range 1-3 "${PV}") - local build=$(get_version_component_range 4 "${PV}") - - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - insinto /etc/xdg - doins -r etc/xdg/* - - # install documentation - doman man/man1/vmware.1.gz - - if use doc; then - dodoc doc/* - fi - - insinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doins vmware-config - - # install vmware workstation server - if use server; then - dosbin sbin/* - - cd "${S}"/vmware-workstation-server - - # install binaries - into "${VM_INSTALL_DIR}"/lib/vmware - dobin bin/* - - dobin "${FILESDIR}"/configure-hostd.sh - - dobin "${FILESDIR}"/configure-hostd.sh - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware/lib - doins -r lib/* - - into "${VM_INSTALL_DIR}" - for tool in vmware-{hostd,wssc-adminTool} ; do - cat > "${T}/${tool}" <<-EOF - #!/usr/bin/env bash - set -e - - . /etc/vmware/bootstrap - - exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ - "${VM_INSTALL_DIR}/lib/vmware/lib" \\ - "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ - "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" - EOF - dobin "${T}/${tool}" - done - - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r hostd - - # create the configuration - insinto /etc/vmware/hostd - doins -r config/etc/vmware/hostd/* - doins -r etc/vmware/hostd/* - - insinto /etc/vmware/ssl - doins etc/vmware/ssl/* - - # pam - pamd_mimic_system vmware-authd auth account - - # create directory for shared virtual machines. - keepdir "${VM_DATA_STORE_DIR}" - keepdir /var/log/vmware - fi - - # install vmware-vix - if use vix; then - cd "${S}"/vmware-vix - - # install the binary - into "${VM_INSTALL_DIR}" - dobin bin/* - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware-vix - doins -r lib/* - - dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so - - # install headers - insinto /usr/include/vmware-vix - doins include/* - - if use doc; then - dohtml -r doc/* - fi - fi - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} \ - vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config - fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - if use server; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} - fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd - fperms 1777 "${VM_DATA_STORE_DIR}" - fi - if use vix; then - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config - fi - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - doenvd "${envd}" - - # create the configuration - dodir /etc/vmware - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${major_minor_revision}" - product.version = "${major_minor_revision}" - product.buildNumber = "${build}" - product.name = "VMware Workstation" - workstation.product.version = "${major_minor_revision}" - EOF - - if use vix; then - cat >> "${D}"/etc/vmware/config <<-EOF - vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" - vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" - vix.config.version = "1" - EOF - fi - - if use server; then - cat >> "${D}"/etc/vmware/config <<-EOF - authd.client.port = "902" - authd.proxy.nfc = "vmware-hostd:ha-nfc" - authd.soapserver = "TRUE" - EOF - fi - - # install the init.d script - local initscript="${T}/vmware.rc" - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware - - if use server; then - # install the init.d script - local initscript="${T}/vmware-workstation-server.rc" - sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ - -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ - -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ - "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} - newinitd "${initscript}" vmware-workstation-server - fi - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-player.desktop" - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/vmware-netcfg.desktop" - - if use server; then - # Configuration for vmware-workstation-server - local hostdUser="${VM_HOSTD_USER:-root}" - sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ - -i "${D}/etc/vmware/hostd/authorization.xml" || die - - # Shared VMs Path: [standard]. - sed -e "s:##{DS_NAME}##:standard:g" \ - -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ - -i "${D}/etc/vmware/hostd/datastores.xml" || die - - sed -e "s:##{HTTP_PORT}##:-1:g" \ - -e "s:##{HTTPS_PORT}##:443:g" \ - -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ - -i "${D}/etc/vmware/hostd/proxy.xml" || die - - # See vmware-workstation-server.py for more details. - sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{CFGDIR}##:/etc/vmware/:g" \ - -e "s:##{ENABLE_AUTH}##:true:g" \ - -e "s:##{HOSTDMODE}##:ws:g" \ - -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ - -e "s:##{HOSTD_MOCKUP}##:false:g" \ - -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ - -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ - -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ - -e "s:##{LOGLEVEL}##:verbose:g" \ - -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ - -e "s:##{PLUGINDIR}##:./:g" \ - -e "s:##{SHLIB_PREFIX}##:lib:g" \ - -e "s:##{SHLIB_SUFFIX}##:.so:g" \ - -e "s:##{USE_BLKLISTSVC}##:false:g" \ - -e "s:##{USE_CBRCSVC}##:false:g" \ - -e "s:##{USE_CIMSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC}##:false:g" \ - -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ - -e "s:##{USE_DYNAMO}##:false:g" \ - -e "s:##{USE_DYNSVC}##:false:g" \ - -e "s:##{USE_GUESTSVC}##:false:g" \ - -e "s:##{USE_HBRSVC}##:false:g" \ - -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC}##:false:g" \ - -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ - -e "s:##{USE_NFCSVC}##:true:g" \ - -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_OVFMGRSVC}##:true:g" \ - -e "s:##{USE_PARTITIONSVC}##:false:g" \ - -e "s:##{USE_SECURESOAP}##:false:g" \ - -e "s:##{USE_SNMPSVC}##:false:g" \ - -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ - -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VDISKSVC}##:false:g" \ - -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ - -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ - -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ - -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ - -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ - -e "s:##{WORKINGDIR}##:./:g" \ - -i "${D}/etc/vmware/hostd/config.xml" || die - - sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ - -i "${D}/etc/vmware/hostd/environments.xml" || die - - # @@VICLIENT_URL@@=XXX - sed -e "s:@@AUTHD_PORT@@:902:g" \ - -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die - fi - - # install systemd unit files - systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}"/*.{service,target} -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "/etc/env.d was updated. Please run:" - ewarn "env-update && source /etc/profile" - ewarn "" - ewarn "Before you can use vmware workstation, you must configure a default network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} |