Update to 12.5.7

7 files changed, 46 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4429f7f532a..dd21679e7738 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmware-workstation
 	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
-	pkgver = 12.5.6_5528349
-	pkgrel = 2
+	pkgver = 12.5.7_5813279
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
@@ -33,7 +33,7 @@ pkgbase = vmware-workstation
 	backup = etc/vmware/netmap.conf
 	backup = etc/vmware/ssl/hostd.ssl.config
 	backup = etc/pam.d/vmware-authd
-	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-12.5.6-5528349.x86_64.bundle
+	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-12.5.7-5813279.x86_64.bundle
 	source = bootstrap
 	source = config
 	source = pam.d-vmware-authd
@@ -54,10 +54,10 @@ pkgbase = vmware-workstation
 	source = vmmon.patch
 	source = vmnet.patch
 	source = vsock.patch
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/8.5.7/5528452/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/8.5.7/5528452/packages/com.vmware.fusion.tools.darwin.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/8.5.8/5824040/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/8.5.8/5824040/packages/com.vmware.fusion.tools.darwin.zip.tar
 	source = unlocker.py
-	sha256sums = d8c0cf3a22a322189b0546862bc1173b3a99d69a5370970df37b351a85473c46
+	sha256sums = 82178c109f987bb6740171572516f533a725f3563a26d628c769a88bcd4a84f7
 	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = 55af509a4328fa88518e7008c65ff5598e6007e99ca2b4421a8f9b26126f6ff3
 	sha256sums = d50aa0a3fe94025178965d988e18d41eb60aa1ce2b28ee6e3ca15edeabfa2ca7
@@ -72,14 +72,14 @@ pkgbase = vmware-workstation
 	sha256sums = f9297948eba55fbaa6c9d1846b92070f27fda17afe78b41ed0e4c2eaa452b56c
 	sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
 	sha256sums = 71339774bf2b962735013e8683d80591a7cf073607cc992f94b75207f3337485
-	sha256sums = b9818230242a42a1bc4debc556febb7650cfcb95f9ac04dec051bd4ea8f12dc1
+	sha256sums = 3a62d45f046b22d1fba9c34db42d8b2774b084f82356b9f18f05bd2cef214ace
 	sha256sums = 7a321d06f9caeb69015bb1fe6cbc8c7113365589b64f18344b12f92fa21e7ebd
-	sha256sums = 5ffe492526293ca8fa1b573f54c96ca4d62f5d03ba79b8bc3dddfe33bd0ff6c3
-	sha256sums = 2472275ad2afa32e1c771f3bdf1773e9cfab7c300bbb6c6e962f0e06271a5094
-	sha256sums = a4d98e2f7654c6324a04765ef95a16d7f230c34b4132b29fb5ba5bbc62c70014
+	sha256sums = e37923167e181f57be4eeec1adba27a42d0d2240ece6b29aca44a61708ca16dd
+	sha256sums = 4339a98bd5aba421bc1043f2ee97ea00b082733c81bce321edc7bc72e16ce09b
+	sha256sums = c2eba38cc99534675e3c114ecf68cbb65cb14b3d52c95ff17dbf1273fc289947
 	sha256sums = d7e6b21fef94b4d3fe655a68c20a9556a718a252826a899fb46c4f2475046954
-	sha256sums = dc614b0926f74c5b5384e509c423d4ff017520b6c4a47e7f54cc31ab04f6ac38
-	sha256sums = f36358e3d451e77e5eae198c6be2d86679c80686347c82902500eed08697a936
+	sha256sums = 01b187cb9a951190eda545e5d0235a98b0018f50942b4485844b627c3617d8d2
+	sha256sums = 86702271b192c6116dbfe107206b10c0ab39d10cbbfcb53756dc09009f54f765
 	sha256sums = 2ad5c0e7a31d7c2009e449fe16acfd5a9036b9d69258be82004cbd0ee41b42cf
 
 pkgname = vmware-workstation
diff --git a/Makefile b/Makefile
index 37c0df8d23aa..4150713fed69 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ MODULES = \
 	vmci \
 	vmmon \
 	vmnet \
-	vsock
+	#vsock
 
 all: $(foreach m, $(MODULES), $m.ko)
 
diff --git a/PKGBUILD b/PKGBUILD
index 0d9f21b2970d..62ceff0f29c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation
-pkgver=12.5.6_5528349
-pkgrel=2
+pkgver=12.5.7_5813279
+pkgrel=1
 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
 arch=(x86_64)
 url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -58,7 +58,7 @@ backup=(
   'etc/pam.d/vmware-authd'
 )
 source=(
-  "https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-${pkgver/_/-}.x86_64.bundle"
+  "https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-${pkgver/_/-}.${CARCH}.bundle"
 
   'bootstrap'
   'config'
@@ -85,7 +85,7 @@ source=(
   'vsock.patch'
 )
 sha256sums=(
-  'd8c0cf3a22a322189b0546862bc1173b3a99d69a5370970df37b351a85473c46'
+  '82178c109f987bb6740171572516f533a725f3563a26d628c769a88bcd4a84f7'
 
   '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
   '55af509a4328fa88518e7008c65ff5598e6007e99ca2b4421a8f9b26126f6ff3'
@@ -104,11 +104,11 @@ sha256sums=(
   'd7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d'
 
   '71339774bf2b962735013e8683d80591a7cf073607cc992f94b75207f3337485'
-  'b9818230242a42a1bc4debc556febb7650cfcb95f9ac04dec051bd4ea8f12dc1'
+  '3a62d45f046b22d1fba9c34db42d8b2774b084f82356b9f18f05bd2cef214ace'
   '7a321d06f9caeb69015bb1fe6cbc8c7113365589b64f18344b12f92fa21e7ebd'
-  '5ffe492526293ca8fa1b573f54c96ca4d62f5d03ba79b8bc3dddfe33bd0ff6c3'
-  '2472275ad2afa32e1c771f3bdf1773e9cfab7c300bbb6c6e962f0e06271a5094'
-  'a4d98e2f7654c6324a04765ef95a16d7f230c34b4132b29fb5ba5bbc62c70014'
+  'e37923167e181f57be4eeec1adba27a42d0d2240ece6b29aca44a61708ca16dd'
+  '4339a98bd5aba421bc1043f2ee97ea00b082733c81bce321edc7bc72e16ce09b'
+  'c2eba38cc99534675e3c114ecf68cbb65cb14b3d52c95ff17dbf1273fc289947'
   'd7e6b21fef94b4d3fe655a68c20a9556a718a252826a899fb46c4f2475046954'
 )
 options=(!strip emptydirs)
@@ -118,7 +118,7 @@ _isoimages=(freebsd linux linuxPreGlibc25 netware solaris windows winPre2k winPr
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=8.5.7_5528452
+_vmware_fusion_ver=8.5.8_5824040
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
 makedepends+=(
@@ -132,8 +132,8 @@ source+=(
   'unlocker.py'
 )
 sha256sums+=(
-  'dc614b0926f74c5b5384e509c423d4ff017520b6c4a47e7f54cc31ab04f6ac38'
-  'f36358e3d451e77e5eae198c6be2d86679c80686347c82902500eed08697a936'
+  '01b187cb9a951190eda545e5d0235a98b0018f50942b4485844b627c3617d8d2'
+  '86702271b192c6116dbfe107206b10c0ab39d10cbbfcb53756dc09009f54f765'
   '2ad5c0e7a31d7c2009e449fe16acfd5a9036b9d69258be82004cbd0ee41b42cf'
 )
 
@@ -169,7 +169,7 @@ prepare() {
   [[ -d "$extracted_dir" ]] && rm -r "$extracted_dir"
 
   bash \
-    "$(readlink -f "$srcdir/VMware-Workstation-Full-${pkgver/_/-}.x86_64.bundle")" \
+    "$(readlink -f "$srcdir/VMware-Workstation-Full-${pkgver/_/-}.${CARCH}.bundle")" \
     --extract "$extracted_dir"
 
 if [ -n "$_enable_macOS_guests" ]; then
diff --git a/vmci.patch b/vmci.patch
index d52194e45cb0..baca38b4ccc9 100644
--- a/vmci.patch
+++ b/vmci.patch
@@ -39,7 +39,7 @@ index f676166..9e42f3f 100644
  #include <linux/init.h>
  #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
  #   include <linux/ioctl32.h>
-@@ -1467,12 +1468,19 @@ VMCIUserVALockPage(VA addr) // IN:
+@@ -1466,12 +1467,19 @@ VMCIUserVALockPage(VA addr) // IN:
     int retval;
  
     down_read(&current->mm->mmap_sem);
@@ -62,7 +62,7 @@ index f676166..9e42f3f 100644
     up_read(&current->mm->mmap_sem);
  
     if (retval != 1) {
-@@ -1687,7 +1695,11 @@ vmci_guest_init(void)
+@@ -1686,7 +1694,11 @@ vmci_guest_init(void)
     /* This should be last to make sure we are done initializing. */
     retval = pci_register_driver(&vmci_driver);
     if (retval < 0) {
@@ -74,7 +74,7 @@ index f676166..9e42f3f 100644
        data_buffer = NULL;
        return retval;
     }
-@@ -2474,7 +2486,11 @@ vmci_exit(void)
+@@ -2473,7 +2485,11 @@ vmci_exit(void)
  
     if (guestDeviceInit) {
        pci_unregister_driver(&vmci_driver);
@@ -86,7 +86,7 @@ index f676166..9e42f3f 100644
        guestDeviceInit = FALSE;
     }
  
-@@ -2483,7 +2499,7 @@ vmci_exit(void)
+@@ -2482,7 +2498,7 @@ vmci_exit(void)
  
        VMCI_HostCleanup();
  
diff --git a/vmmon.patch b/vmmon.patch
index f49a8b4ca124..ce7f29d745e5 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -127,7 +127,7 @@ index 87cf45b..5390a93 100644
  LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
  {
     TSCDelta tscDelta;
-@@ -1979,7 +1975,7 @@ LinuxDriver_Ioctl(struct file *filp,    // IN:
+@@ -1976,7 +1972,7 @@ LinuxDriver_Ioctl(struct file *filp,    // IN:
        break;
     }
  
@@ -608,18 +608,7 @@ index fd32013..583d6da 100644
  HostIF_SemaphoreForceWakeup(VMDriver *vm,       // IN:
                              const VCPUSet *vcs) // IN:
  {
-@@ -2822,8 +2832,8 @@
-  *
-  * HostIF_ReadPage --
-  *
-- *      puts the content of a machine page into a kernel or user mode 
-- *      buffer. 
-+ *      puts the content of a machine page into a kernel or user mode
-+ *      buffer.
-  *
-  * Results:
-  *      0 on success
-@@ -2854,7 +2864,7 @@
+@@ -2920,7 +2930,7 @@
     if (ptr == NULL) {
        return -ENOMEM;
     }
@@ -628,16 +617,7 @@ index fd32013..583d6da 100644
     if (kernelBuffer) {
        memcpy(buf, ptr, PAGE_SIZE);
     } else {
-@@ -2871,7 +2881,7 @@
-  *
-  * HostIF_WritePage --
-  *
-- *      Put the content of a kernel or user mode buffer into a machine 
-+ *      Put the content of a kernel or user mode buffer into a machine
-  *      page.
-  *
-  * Results:
-@@ -3001,7 +3011,7 @@
+@@ -3106,7 +3116,7 @@
   * Side effects:
   *    None.
   *
@@ -646,7 +626,7 @@ index fd32013..583d6da 100644
   */
  
  uint32
-@@ -3019,18 +3029,18 @@
+@@ -3124,18 +3134,18 @@
   *
   *      Wake up the fast clock thread.  Can't do this from the timer
   *      callback, because it holds locks that the scheduling code
@@ -668,7 +648,7 @@ index fd32013..583d6da 100644
  HostIFWakeupClockThread(unsigned long data)  //IN:
  {
     wake_up_process(linuxState.fastClockThread);
-@@ -3041,7 +3051,7 @@
+@@ -3146,7 +3156,7 @@
   *----------------------------------------------------------------------
   *
   * HostIFTimerCallback --
@@ -677,7 +657,7 @@ index fd32013..583d6da 100644
   *      Schedule a tasklet to wake up the fast clock thread.
   *
   * Results:
-@@ -3052,8 +3062,8 @@
+@@ -3157,8 +3167,8 @@
   *
   *----------------------------------------------------------------------
   */
@@ -688,7 +668,7 @@ index fd32013..583d6da 100644
  HostIFTimerCallback(struct hrtimer *timer)  //IN:
  {
     tasklet_schedule(&timerTasklet);
-@@ -3066,7 +3076,7 @@
+@@ -3171,7 +3181,7 @@
   *----------------------------------------------------------------------
   *
   * HostIFScheduleHRTimeout --
@@ -697,7 +677,7 @@ index fd32013..583d6da 100644
   *      Schedule an hrtimer to wake up the fast clock thread.
   *
   * Results:
-@@ -3078,7 +3088,7 @@
+@@ -3183,7 +3193,7 @@
   *----------------------------------------------------------------------
   */
  
@@ -706,7 +686,7 @@ index fd32013..583d6da 100644
  HostIFScheduleHRTimeout(ktime_t *expires)  //IN:
  {
     struct hrtimer t;
-@@ -3096,7 +3106,7 @@
+@@ -3201,7 +3211,7 @@
     if (hrtimer_active(&t)) {
        schedule();
     }
@@ -715,7 +695,7 @@ index fd32013..583d6da 100644
     hrtimer_cancel(&t);
     __set_current_state(TASK_RUNNING);
  }
-@@ -3119,7 +3129,7 @@
+@@ -3224,7 +3234,7 @@
   * Side effects:
   *    none.
   *
@@ -724,7 +704,7 @@ index fd32013..583d6da 100644
   */
  
  static long
-@@ -3152,7 +3162,7 @@
+@@ -3257,7 +3267,7 @@
   */
  
  int
@@ -733,7 +713,7 @@ index fd32013..583d6da 100644
  		 unsigned int rate, //IN: current clock rate
                   struct file *filp) //IN: /dev/rtc descriptor
  {
-@@ -3162,14 +3172,14 @@
+@@ -3267,14 +3277,14 @@
     int timerPeriod;
  
     if (rateChanged) {
@@ -750,7 +730,7 @@ index fd32013..583d6da 100644
        slack = timerPeriod / 100;
     }
     set_current_state(TASK_INTERRUPTIBLE);
-@@ -3515,7 +3525,7 @@
+@@ -3620,7 +3630,7 @@
  
     printk(KERN_DEBUG "%s: p = 0x%p, offset = 0x%p, numPagesNeeded = %"FMTSZ"u,"
            " handleSize = %"FMTSZ"u, mappedAddr = 0x%p\n",
@@ -759,7 +739,7 @@ index fd32013..583d6da 100644
  
     newHandle->numPages = numPagesNeeded;
     newHandle->addr = mappedAddr;
-@@ -3551,7 +3561,7 @@
+@@ -3656,7 +3666,7 @@
     }
  
     printk(KERN_DEBUG "%s: numPages = %"FMTSZ"u, addr = 0x%p\n",
diff --git a/vmnet.patch b/vmnet.patch
index 5c71097116c4..9d3981ccab4a 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -27,18 +27,6 @@ index 2d8e6f6..a14166b 100644
  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/vmnet/bridge.c b/vmnet/bridge.c
---- a/vmnet/bridge.c
-+++ b/vmnet/bridge.c
-@@ -1146,7 +1146,7 @@
-                  void *data)                  // IN: device pertaining to event
- {
-    VNetBridge *bridge = list_entry(this, VNetBridge, notifier);
--   struct net_device *dev = (struct net_device *) data;
-+ struct net_device *dev = netdev_notifier_info_to_dev(data);
- 
-    switch (msg) {
-    case NETDEV_UNREGISTER:
 diff --git a/vmnet/driver.c b/vmnet/driver.c
 index 7e7ad99..5f508f6 100644
 --- a/vmnet/driver.c
diff --git a/vmware-workstation.install b/vmware-workstation.install
index b00241c13f7c..fd6949615c52 100644
--- a/vmware-workstation.install
+++ b/vmware-workstation.install
@@ -5,8 +5,8 @@ post_install() {
   In a terminal on root: "modprobe vmci vmmon"
 ==> You may also need to enable some services:
 - vmware-networks.service: to have network access in VMs
-- vmware-usbarbitrator.service: to use USB devices inside VMs
-- vmware-hostd.service: to start VMware as a server
+- vmware-usbarbitrator.service: to connect USB devices inside VMs
+- vmware-hostd.service: to share VMs on the network
 
 EOF
 }
@@ -14,7 +14,7 @@ EOF
 post_remove() {
   cat << EOF
 
-==> To uninstall your VMware settings, remove /etc/vmware and /etc/vmware-installer directories.
+==> To also remove VMware settings, delete /etc/vmware and /etc/vmware-installer directories.
 
 EOF
 }