From 9520486e1b1f381e7a4a1b4c12d93f47877c1895 Mon Sep 17 00:00:00 2001 From: Sergey Morozov Date: Wed, 20 Jun 2018 09:10:43 +0300 Subject: [PATCH] Upgrade vmware-workstation to 14.1.2.8497320-r3 Using ebuilds from stefantalpalaru overlay --- app-emulation/vmware-modules/Manifest | 5 +- ...on-fix-always_inline-attribute-usage.patch | 31 +++++++++ ...x-indirect-call-with-retpoline-build.patch | 49 ++++++++++++++ ...rd-definition-of-MSR_K7_HWCR_SMMLOCK.patch | 30 +++++++++ ...1.ebuild => vmware-modules-329.1.2.ebuild} | 67 ++++++------------- app-emulation/vmware-workstation/Manifest | 8 +-- ...ware-workstation-14.1.2.8497320-r3.ebuild} | 20 ++++-- 7 files changed, 153 insertions(+), 57 deletions(-) create mode 100644 app-emulation/vmware-modules/files/329-01-vmmon-fix-always_inline-attribute-usage.patch create mode 100644 app-emulation/vmware-modules/files/329-02-vmmon-fix-indirect-call-with-retpoline-build.patch create mode 100644 app-emulation/vmware-modules/files/329-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch rename app-emulation/vmware-modules/{vmware-modules-329.1.1-r1.ebuild => vmware-modules-329.1.2.ebuild} (66%) rename app-emulation/vmware-workstation/{vmware-workstation-14.1.1.7528167.ebuild => vmware-workstation-14.1.2.8497320-r3.ebuild} (96%) diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index 9fb5a08..e91fa85 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,10 +1,13 @@ AUX 329-00-vmmon-quick-workaround-for-objtool-warnings.patch 1555 BLAKE2B dd4a58e78634aed9d5fb64bcb02b999d55be6b87e496c8daf640f7027aba3942f4e415125ba8fb847fa832336560d4bdbb0f539fefea3b4d2c175f2cbb33a9d7 SHA512 892bde81c721c18264e154cdfadd6b560af37260c9a457ec321fdf6bdf78b1704df57532b0919ed7dbc5c1036230b95f0cbacb7acbfd15da2145e3445da795f7 +AUX 329-01-vmmon-fix-always_inline-attribute-usage.patch 1204 BLAKE2B faa201beb42ac4a04f660aa99d9cad76c12f47048b49f3c48f6932ec367ffebb9e94c5f06fd0957fb8451c183e6bf21954ce88c04910969f80370c2c85e1024b SHA512 b3ab5a62936bc1bed997f84401df998097062ca2b7425dcc2d01191c9b49ddafcee36e859b1bcd60de0d532c1c597aba2b406d6f90062674d5fe54c1534e3235 +AUX 329-02-vmmon-fix-indirect-call-with-retpoline-build.patch 1829 BLAKE2B 6b2efbd868cd3ecf9bbd5e9781d9e85fa733b5919b66040e9c6cdf9f65bf5c5aabb43e52af9cd224481fc60943df546b2812ae17a65bbb476651ec399194ac4f SHA512 6ea044d1b9096b48fa3825f474a758aa67698753646e62dd83d427bfbf8ebd2168c9d0130a35b4ee81391c3ce4d4459cee39f0354469d0485d30118b50f3463c AUX 329-4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch 1169 BLAKE2B 4e5a74961ff512748375bd1d90a6670fc519c2c4c0be94f89d14fdf39e4922b057ae2baa38d07d34aca9ec897b012c4b9326dfd51a44235418919708b789895e SHA512 727fb97a63399d7c19238ae864a38cf2297adccb466fc2deba2a72f0592eb655f653d3c8e45dac06bbd0e09fc71a59a8bfea491b7580b37d41d0729f6adc023d AUX 329-4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch 1131 BLAKE2B 1e07b4a15ff1180349348d84efb606c223f5cfa4accdcc0e1a41c8a0de52fb186bddd3c6cd3f5f48041c52ad2c29110726197f1d9352bd87caf4e646c4c4c001 SHA512 192d6a9a14757706f1c9345ff45592a559729619627a32c9f0a1d7203e60881312a4d0fc92ff750c8ff5b5350cf1a2b55238c16973e9c7eb4c2cfe2966abe7d1 AUX 329-4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch 1603 BLAKE2B 4eea61a743cb443e4a4c22a02a03410adbae66339ac7ed1c1aafe54e447135c1ed976ce3c97f22db9984926de9b9a09b1820e253978f457c0c2b9d22f8e4c59b SHA512 4413cd5e791dd19c4b47ba2178e386160912882b0e1a549151eafcceae484b5e48f527ee45b14584c98e06c11e28ee5bfef34b318e46b45704fbcf93a7b52b56 AUX 329-4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch 1167 BLAKE2B b5c1c4d98d2aed5bb473270ea9b5737da05bab45748aa84b0a83c26abf8d826960ff3251132ae2770bf87168bfb9c01ab7c81ec99036af576ca3fa0eb08b36e2 SHA512 1cf13f9c745bcfcf24ac1e8f762d057f1afde46ec1de4e651a07e63e08d9073eca9bdbaa53c5a1ced556ec83da3bfd80d3c65c979fb91566cf3c7ddae38eaeac AUX 329-4.14-00-vsock-gcc-plugins-randstruct.patch 3477 BLAKE2B 9d454174bd3cf888d92a5644a2f8078f9368e5db0ee1c1f0ca7f43a897efa69d9d28c3cd89af3e38a790a23c442898364bc9d189f7920cf0dea54ca20af6ece4 SHA512 a3b68de2664807715dff9648744bd345cdf007a7c1d173fc5c1f410baa65e3a8ef3063543fd369e969a60d2f2ec9cda6127b22b09c5e17aefe288de104d58871 +AUX 329-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch 1097 BLAKE2B edf94d85be2caa69ca8b7856e636dd1fc41d60b43e56e08e913b9decca7f1f3a2a39d98681366a4c2f948a60acdce513f873b1c080d7329720abd0f235ee739a SHA512 f2e359183999f0396406724a8e0a80ceb3551772958a8a1e31eec0af8a746191bf5c7b7a5282d0f59d5a7cdd14744e1b775ad5af45bc5ee030434bcbb686d50c AUX 329-vmblock.patch 15016 BLAKE2B 887159b5c526eea4fcc7d49664a4c7233ab9c73440bef9e8f4ceb2b9694a72cd9c4dcff131f9a74dabe5a0ec3a4e0437db405f6c74f9cfd49ef590b19a658ab8 SHA512 6cb922537009fe39e2e58e19ba9c8fda6a5ea484f3d28a94793de0fbd63d8d564822f2c83447d135f1c5e7f5da6734af218f86e31c20d322cbf00b675297c712 AUX 329-vmci.patch 9474 BLAKE2B 9e833fcafc39c4279a9d86c96c0d4b012d6f653d42a76ba7d7d65355876da469c0dcb746a6eab4be795c5c29f1d11ace5cbf705e066d12fff20df758b8ade901 SHA512 b8b46a3df7ee2f906dd474add6c0ec3d76566f1c643278e3a7faeb68c829c78926351359bd78e12ad744bb946a31324ee347bb67413c4d670e7a091379160e2e AUX 329-vsock.patch 10068 BLAKE2B d84f22a1623e2303c6aa2ea3624857fb2cf2dbb31b4747582285fc506ae208c1fb4b2a5925b02e6473b43ba178d871276584800d06cd2cdfb06273743814cc24 SHA512 73df6466b1df7be6ae40751596834d967b46d48218267afe5244abcdcacf5e263a78ed3bd3c4e6f2a5d81dd9c0c9e9042fc52fa9f1d4d000098ad20f19509001 -EBUILD vmware-modules-329.1.1-r1.ebuild 4307 BLAKE2B 9a36a42397b75bdcb24aae04ef98e3a37769382ccf064bcfbaef0d4ede848898428f36f6b01c46c72bc0ffb67133d0e6366d1e3986a6cf8cb5a7cf562fd63dda SHA512 82ea9316ef9315bcc80a1ed1b86b279f4af9e30b62cdfbeb79c152eb16f49c9c10c737871ff3b970fb2d5063d6ccc64a6e2a725cc0ca23279112430e19e8e82c +EBUILD vmware-modules-329.1.2.ebuild 3669 BLAKE2B 08c3d416e5eb5ce415e85cf6467f3846ec6506294677782c102f72dcb5bd928e62ace4733fda8041f1d12e27dfc130ea9ff6a7f3264d20b0bfe801e1d839bec2 SHA512 9317c9124ca131581fdb71351d5e4255fcf8989daa4199b19f56936d8bc75df8752990f8748d14238e671a534758b4b193ce4e32ee83c94ebd9d89532d6e8188 diff --git a/app-emulation/vmware-modules/files/329-01-vmmon-fix-always_inline-attribute-usage.patch b/app-emulation/vmware-modules/files/329-01-vmmon-fix-always_inline-attribute-usage.patch new file mode 100644 index 0000000..f9fb7a7 --- /dev/null +++ b/app-emulation/vmware-modules/files/329-01-vmmon-fix-always_inline-attribute-usage.patch @@ -0,0 +1,31 @@ +From c46d05eb1e2d32d82ec377a4c9b0dd0164eee68e Mon Sep 17 00:00:00 2001 +From: Michal Kubecek +Date: Thu, 22 Mar 2018 13:45:34 +0100 +Subject: [PATCH 08/10] vmmon: fix always_inline attribute usage + +Function declared with __attribute__((always_inline)) should also be +declared as inline, otherwise gcc issues a warning "always_inline function +might not be inlinable". It's just cosmetic but getting rid of known +harmless warnings makes it easier to spot actual problems. Use the +__always_inline macro for LinuxDriverSyncReadTSCs() as this is how always +inline functions should be declared in kernel code. +--- + vmmon-only/linux/driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c +index 1905aa4..b37454c 100644 +--- a/vmmon-only/linux/driver.c ++++ b/vmmon-only/linux/driver.c +@@ -981,7 +981,7 @@ LinuxDriverReadTSC(void *data, // OUT: TSC values + *----------------------------------------------------------------------------- + */ + +-__attribute__((always_inline)) static Bool ++__always_inline static Bool + LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min + { + TSCDelta tscDelta; +-- +2.17.0 + diff --git a/app-emulation/vmware-modules/files/329-02-vmmon-fix-indirect-call-with-retpoline-build.patch b/app-emulation/vmware-modules/files/329-02-vmmon-fix-indirect-call-with-retpoline-build.patch new file mode 100644 index 0000000..bde7a0e --- /dev/null +++ b/app-emulation/vmware-modules/files/329-02-vmmon-fix-indirect-call-with-retpoline-build.patch @@ -0,0 +1,49 @@ +From 6392262b68387299ee81d5d659cb5423a2ae1c9c Mon Sep 17 00:00:00 2001 +From: Michal Kubecek +Date: Mon, 26 Mar 2018 13:33:32 +0200 +Subject: [PATCH 09/10] vmmon: fix indirect call with retpoline build + +Build against kernel with retpoline support issues warning + + objtool: Task_Switch()+0x425: indirect call found in RETPOLINE build + +This is because an indirect call in TaskSwitchToMonitor() is encoded using +inline assembler so that it bypasses retpoline generation. For this +purpose, macro CALL_NOSPEC exists since v4.15-rc8 (and has been backported +into some distribution kernels with the rest of retpoline support). Use the +macro if available and fallback to the original code if not. +--- + vmmon-only/common/task.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/vmmon-only/common/task.c b/vmmon-only/common/task.c +index 98cc74a..400ebfe 100644 +--- a/vmmon-only/common/task.c ++++ b/vmmon-only/common/task.c +@@ -2203,12 +2203,23 @@ TaskSwitchToMonitor(VMCrossPage *crosspage) + { + uint64 raxGetsWiped, rcxGetsWiped; + ++#ifdef CALL_NOSPEC ++ __asm__ __volatile__(CALL_NOSPEC ++ : "=a" (raxGetsWiped), ++ "=c" (rcxGetsWiped) ++ : "0" (codePtr), ++ "1" (crosspage), ++ THUNK_TARGET(codePtr) ++ : "rdx", "r8", "r9", "r10", "r11", "cc", "memory"); ++#else + __asm__ __volatile__("call *%%rax" + : "=a" (raxGetsWiped), + "=c" (rcxGetsWiped) + : "0" (codePtr), + "1" (crosspage) + : "rdx", "r8", "r9", "r10", "r11", "cc", "memory"); ++#endif ++ + } + #elif defined(_MSC_VER) + /* +-- +2.17.0 + diff --git a/app-emulation/vmware-modules/files/329-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch b/app-emulation/vmware-modules/files/329-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch new file mode 100644 index 0000000..9be5642 --- /dev/null +++ b/app-emulation/vmware-modules/files/329-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch @@ -0,0 +1,30 @@ +From ae4d4697c6f48be9314d807480dac206c9889d46 Mon Sep 17 00:00:00 2001 +From: Michal Kubecek +Date: Sun, 11 Feb 2018 01:17:00 +0100 +Subject: [PATCH 07/10] vmmon: use standard definition of MSR_K7_HWCR_SMMLOCK + if available + +The MSR_K7_HWCR_SMMLOCK macro is defined in mainline since commit +18c71ce9c882 ("x86/CPU/AMD: Add the Secure Encrypted Virtualization CPU +feature") in v4.16-rc1. +--- + vmmon-only/include/x86msr.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vmmon-only/include/x86msr.h b/vmmon-only/include/x86msr.h +index e10a859..5618776 100644 +--- a/vmmon-only/include/x86msr.h ++++ b/vmmon-only/include/x86msr.h +@@ -441,7 +441,9 @@ typedef enum { + #define MSR_K7_HWCR_SSEDIS 0x00008000ULL // Disable SSE bit + #define MSR_K7_HWCR_MONMWAITUSEREN 0x00000400ULL // Enable MONITOR/MWAIT CPL>0 + #define MSR_K7_HWCR_TLBFFDIS 0x00000040ULL // Disable TLB Flush Filter ++#ifndef MSR_K7_HWCR_SMMLOCK + #define MSR_K7_HWCR_SMMLOCK 0x00000001ULL // Lock SMM environment ++#endif + + #ifndef MSR_K8_SYSCFG + #define MSR_K8_SYSCFG 0xc0010010 +-- +2.17.0 + diff --git a/app-emulation/vmware-modules/vmware-modules-329.1.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-329.1.2.ebuild similarity index 66% rename from app-emulation/vmware-modules/vmware-modules-329.1.1-r1.ebuild rename to app-emulation/vmware-modules/vmware-modules-329.1.2.ebuild index fee1a34..9e4356d 100644 --- a/app-emulation/vmware-modules/vmware-modules-329.1.1-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-329.1.2.ebuild @@ -16,8 +16,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="vmblock vmci vsock" -REQUIRED_USE="!vsock? ( !vmci )" +IUSE="" RDEPEND="" DEPEND=" @@ -31,28 +30,14 @@ pkg_setup() { 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 + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI VMWARE_VMCI_VSOCKETS" 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="vmmon vmnet" - use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" - use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock" - use vmblock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmblock" VMWARE_MOD_DIR="${PN}-${PVR}" @@ -70,29 +55,21 @@ pkg_setup() { src_unpack() { cd "${S}" - for mod in ${VMWARE_MODULE_LIST_ALL}; do + for mod in ${VMWARE_MODULE_LIST}; do tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar done } src_prepare() { - # from Arch Linux: https://aur.archlinux.org/packages/vmware-workstation/ - if use vmblock; then - epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch" - fi - if use vmci; then - epatch "${FILESDIR}/${PV_MAJOR}-vmci.patch" - fi - if use vsock; then - epatch "${FILESDIR}/${PV_MAJOR}-vsock.patch" - epatch "${FILESDIR}/${PV_MAJOR}-4.14-00-vsock-gcc-plugins-randstruct.patch" - fi - # from https://github.com/mkubecek/vmware-host-modules/tree/workstation-14.0.0 - epatch "${FILESDIR}/${PV_MAJOR}-00-vmmon-quick-workaround-for-objtool-warnings.patch" + # from https://github.com/mkubecek/vmware-host-modules/tree/workstation-14.1.1 kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch" kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-vmnet-use-standard-definition-of-PCI_VENDOR_ID_VMWAR.patch" kernel_is ge 4 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.12-00-vmmon-use-standard-definition-of-MSR_MISC_FEATURES_E.patch" kernel_is ge 4 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.13-00-vmmon-use-standard-definition-of-CR3_PCID_MASK-if-av.patch" + epatch "${FILESDIR}/${PV_MAJOR}-00-vmmon-quick-workaround-for-objtool-warnings.patch" + kernel_is ge 4 16 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.16-00-vmmon-use-standard-definition-of-MSR_K7_HWCR_SMMLOCK.patch" + epatch "${FILESDIR}/${PV_MAJOR}-01-vmmon-fix-always_inline-attribute-usage.patch" + epatch "${FILESDIR}/${PV_MAJOR}-02-vmmon-fix-indirect-call-with-retpoline-build.patch" # decouple the kernel include dir from the running kernel version: https://github.com/stefantalpalaru/gentoo-overlay/issues/17 sed -i -e "s%HEADER_DIR = /lib/modules/\$(VM_UNAME)/build/include%HEADER_DIR = ${KERNEL_DIR}/include%" */Makefile || die "sed failed" @@ -112,25 +89,21 @@ src_install() { EOF udev_dorules "${udevrules}" - if ! use vmci ; then - dodir /etc/modprobe.d/ + dodir /etc/modprobe.d/ - cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF - # Support for vmware vmci in kernel module - alias vmci vmw_vmci - EOF + 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 + 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 + export installed_modprobe_conf=1 } pkg_postinst() { diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index eaf825b..ab86075 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -1,9 +1,9 @@ AUX configure-hostd.sh 372 BLAKE2B 0ed2d479a46d69ff8498bfac180f0440fb57fb173fc1a427115872a40a47559725623399652e9663fa8a4ca0d7e020d5445bafb6c37f45449dea341fc9f6cce6 SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49 AUX vmware-14.1.rc 2476 BLAKE2B dff25b43c5fa57186be2a5f0ca4606d26cd1c3f3dbeb91d855fc07a9fd576f446983c852c8e0b112c5616bb95dfddc7e2c738b4d0ca341c781d7addcb45068cd SHA512 9bae224387128b2cd221d509e2933042e3925fb041670907d8a47c70a488214206912fe25ab24c0bdeb31591149e62aba374d3fa63fdd08644e09667e195967f AUX vmware-server-14.1.rc 1506 BLAKE2B 886ed1de7a99320611a28a43b48cf17715fcab8bf533a73c28a1aa2f8d150ee2b84e1e510e864b18347f3bd7e43faec3cfc90f09d5ac9c0afe821f67654a68c4 SHA512 548ff69f87bee2b6c82bd931d22dd560370c4a00641ae47d05af05bbc72cedc8fd25054abc405a590b72227b10c5997d79f16ded67f3e0cfac142eb248b47d44 -DIST VMware-Workstation-Full-14.1.1-7528167.x86_64.bundle 460769685 BLAKE2B c9807a94588989e7a1dd0d7964c5d9385f57f19aaf2cdb43be9b29a0b61edcd7cb93865ca8dc84394a306467fb80816334239fc3508d360f2c5e4aeecd5c93d1 SHA512 86f06796fc3657a895fd5766c5b83e4ff88c73e34f789c287f1e9b5b613d138067f151f1c0c92749bb0104490bd0e0ca223c55b71a3a98611b1e9dc5cec6c304 -DIST com.vmware.fusion.tools.darwin.zip.tar 2836480 BLAKE2B e434280c4cf1f9f38823546e7c15c8425d33db3253d203d56d39b012a17d4862c9aece3b4aad08629d303881ea7b4bdba1ded11686bc3bc8ebc804dea3ad07de SHA512 3a08e3670475ea84ddde8646e7a5b9b1efcaffd801aa3d64a5b0984c84aebff320114b0a8b9f9188a7cdd0640ec0bfae8c237625132fdac448501b4451c78488 -DIST com.vmware.fusion.tools.darwinPre15.zip.tar 2478080 BLAKE2B 27b0ea99545b33e079994da8f26c8c6c3ecce7dbc108062cedc787c9a20e53b591e119826875895d10d120a81efbe14d47563b24f6889cf9338367488e2a5e44 SHA512 dbac244995a16a3247c3eb81ec5a68979f454e6b9e28d2fe47678502441140bbe1c171da69945ea8f0581dcc9191002e02758ce9aafbd70b442263a5b8818f3c +DIST VMware-Workstation-Full-14.1.2-8497320.x86_64.bundle 461102809 BLAKE2B c0f3e8783e1c144aec5ac789d74f43099688034d7d23ab7159d118a60f3d8bc056641eddecf78a12d3275321be5f888668c0a9ba77f9c65d2c3f989dc16f6ffa SHA512 02432f8cd3000a334a04d20a4f9d0ad47801d3a582cc971f292d10be9346140c2b82bff7e4f32b6477882bc22f06d13046e1fe3b9236d00362f5f93d8a9f0f4d +DIST com.vmware.fusion.tools.darwin-14.1.2.8497320.zip.tar 2805760 BLAKE2B 66cedcbca1240ae20e2aabd7399ccfcf2f2fd8bfdbbe0b0020015307c0f7e166b24f3721387a3d1e11a8e8adb741f04da12c329643dc3c511eefc78957f215d9 SHA512 0c21860c3536745d9e3d838c405669c44ff5b337d64f1ab2a96973aabc2e3b8d116f333bcfc04953ff7bbdff73b1e023f01de2ef35296ac1829efb85873757ae +DIST com.vmware.fusion.tools.darwinPre15-14.1.2.8497320.zip.tar 2478080 BLAKE2B b3d6582eb57525bc6844f8f363b0935c58b6f516fb8d87435538de4e5f8c0ac5e93cdf7a8f34c250c3a14852a9b9eaa592d7167d8b134c569151a713a009b693 SHA512 9e09e4d74707dbc55426929ad3fb762dfef602ab276c820e563e42a01c482d76cfbe78b39f725b421fcaabbac711366a0a51dfa6afc6d0ae5807246a1c9856d3 DIST unlocker-2.1.1_p1.zip 16201234 BLAKE2B 486597ba7ef12d2ec5b021ff9f5b56a9d1a58251e26f7bd9df4e84d34df9602ada3eaf69967ea645082e3919187f14801e7f506fa08b457d5763bdba9ec75493 SHA512 4ccea825339ae9303e8676dc773ca54cc929ab4970d8a2ac225f05bf18bad0e0945b7df3dd2b65c5596fd164642296da0f64774b27d7c066597f4d1d4db82bee DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 -EBUILD vmware-workstation-14.1.1.7528167.ebuild 20620 BLAKE2B 302500222d7aa2ca368e26b703215d9122db2745d393b46f8ed55ba2302d2853becdfc384e9f8375d6e19b906fae0271f6cb116353b9d5003a448d02fa24de5d SHA512 5c67a627c23feb300307d22c31a4ad68f4674a8d0b831cf8c35bd842a68232995f9cdf4a6cb0ac88335f17b95b2a9586cffc00485ebc456e170ccf960fc4ca42 +EBUILD vmware-workstation-14.1.2.8497320-r3.ebuild 21159 BLAKE2B 89f1dfe69f80dd5b3331a42f13759bf9c56b6ca5bb04ecf173a0bd352f527d4843e4573a7a46519ac4a81736d245c8d20b3189b8132d7ec85eee7d6f66fd6d88 SHA512 7cb301a6e9bccc907af690855ab0cf902650eed5f0cb4dc1e13e7a49e00f9389e44e881b2bb9d9c0515e90df4f73e53193574703d4fd1599037dfbf14488371b diff --git a/app-emulation/vmware-workstation/vmware-workstation-14.1.1.7528167.ebuild b/app-emulation/vmware-workstation/vmware-workstation-14.1.2.8497320-r3.ebuild similarity index 96% rename from app-emulation/vmware-workstation/vmware-workstation-14.1.1.7528167.ebuild rename to app-emulation/vmware-workstation/vmware-workstation-14.1.2.8497320-r3.ebuild index 4dc2c60..f4e4e73 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-14.1.1.7528167.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-14.1.2.8497320-r3.ebuild @@ -10,7 +10,7 @@ MY_PV=$(get_version_component_range 1-3) PV_MODULES="329.$(get_version_component_range 2-3)" PV_BUILD=$(get_version_component_range 4) MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" -VMWARE_FUSION_VER="10.1.1_7520154" +VMWARE_FUSION_VER="10.1.2_8502123" SYSTEMD_UNITS_TAG="gentoo-02" DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" @@ -19,8 +19,8 @@ SRC_URI=" https://download3.vmware.com/software/wkst/file/${MY_P}.x86_64.bundle macos-guests? ( https://github.com/DrDonk/unlocker/archive/b036c40ab1922d9abf4f7d68e34f1eca3b4dc2ad.zip -> unlocker-2.1.1_p1.zip - vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER/_//}/packages/com.vmware.fusion.tools.darwinPre15.zip.tar ) - vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER/_//}/packages/com.vmware.fusion.tools.darwin.zip.tar ) + vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER/_//}/packages/com.vmware.fusion.tools.darwinPre15.zip.tar -> com.vmware.fusion.tools.darwinPre15-${PV}.zip.tar ) + vmware-tools-darwin? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER/_//}/packages/com.vmware.fusion.tools.darwin.zip.tar -> com.vmware.fusion.tools.darwin-${PV}.zip.tar ) ) systemd? ( https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz ) " @@ -117,6 +117,7 @@ BUNDLED_LIB_DEPENDS=" app-accessibility/at-spi2-core app-crypt/gcr[gtk] app-crypt/p11-kit + dev-cpp/gtkmm:3.0 dev-libs/atk dev-libs/expat dev-libs/glib:2 @@ -178,7 +179,7 @@ RDEPEND=" dev-libs/gmp:0 dev-libs/icu dev-libs/json-c - dev-libs/nettle:0/6.1 + dev-libs/nettle:0/6.2 gnome-base/gconf gnome-base/libgnome-keyring media-gfx/graphite2 @@ -186,6 +187,7 @@ RDEPEND=" media-libs/libart_lgpl media-libs/libvorbis media-libs/mesa + media-plugins/alsa-plugins[speex] net-dns/libidn net-libs/gnutls cups? ( net-print/cups ) @@ -198,6 +200,7 @@ RDEPEND=" x11-libs/startup-notification x11-libs/xcb-util x11-themes/hicolor-icon-theme + bundled-libs? ( media-libs/tiff:3 ) !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) !app-emulation/vmware-player !app-emulation/vmware-tools @@ -499,6 +502,7 @@ src_install() { EOF cat > "${D}"/etc/vmware/config <<-EOF + .encoding = "UTF-8" bindir = "${VM_INSTALL_DIR}/bin" libdir = "${VM_INSTALL_DIR}/lib/vmware" initscriptdir = "/etc/init.d" @@ -513,11 +517,17 @@ src_install() { product.version = "${MY_PV}" product.name = "VMware Workstation" workstation.product.version = "${MY_PV}" + vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" + installerDefaults.componentDownloadEnabled = "no" + installerDefaults.autoSoftwareUpdateEnabled.epoch = "4641104763" + installerDefaults.dataCollectionEnabled.epoch = "7910652514" + installerDefaults.dataCollectionEnabled = "no" + installerDefaults.transferVersion = "1" + installerDefaults.autoSoftwareUpdateEnabled = "no" 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