Update to 15.5.2

4 files changed, 14 insertions, 168 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39f1ec299f9b..73ea83ef6829 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 = 15.5.1
-	pkgrel = 4
+	pkgver = 15.5.2
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
@@ -36,7 +36,7 @@ pkgbase = vmware-workstation
 	backup = etc/vmware/ssl/hostd.ssl.config
 	backup = etc/pam.d/vmware-authd
 	backup = etc/conf.d/vmware
-	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-15.5.1-15018445.x86_64.bundle
+	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-15.5.2-15785246.x86_64.bundle
 	source = vmware-bootstrap
 	source = vmware-vix-bootstrap
 	source = config
@@ -58,7 +58,7 @@ pkgbase = vmware-workstation
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
-	sha256sums = 490f8fe8d874c27601c155c1b2c0055ad0d4f14feb32fa9f18643659a147d3c6
+	sha256sums = d3a1358dad46ba0d52f25b5b721b6fa7a9f57b47eb82e972607e53e3c6733967
 	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
 	sha256sums = ce3b1a82d9ed023b7591168bd49b218040ef70d1752a07792b0af6ac15a68453
@@ -78,8 +78,8 @@ pkgbase = vmware-workstation
 	sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
 	sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487
 	sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
-	sha256sums = 9745f7628932fb74d7eec36cfd40fd268d1df4bbdcdb7e858726a25881905f06
-	sha256sums = 02baa12b97e58be0b820d1a6c5a120c5b523dea35456a7e0fd25a33cb75d30c4
+	sha256sums = 1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3
+	sha256sums = 7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0
 
 pkgname = vmware-workstation
 
diff --git a/PKGBUILD b/PKGBUILD
index df9542922b4d..e36611ccccbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation
-pkgver=15.5.1
-_buildver=15018445
+pkgver=15.5.2
+_buildver=15785246
 _pkgver=${pkgver}_${_buildver}
-pkgrel=4
+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'
@@ -92,7 +92,7 @@ source=(
   'vmnet.patch'
 )
 sha256sums=(
-  '490f8fe8d874c27601c155c1b2c0055ad0d4f14feb32fa9f18643659a147d3c6'
+  'd3a1358dad46ba0d52f25b5b721b6fa7a9f57b47eb82e972607e53e3c6733967'
 
   '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
   'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
@@ -116,8 +116,8 @@ sha256sums=(
 
   '05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487'
   '6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d'
-  '9745f7628932fb74d7eec36cfd40fd268d1df4bbdcdb7e858726a25881905f06'
-  '02baa12b97e58be0b820d1a6c5a120c5b523dea35456a7e0fd25a33cb75d30c4'
+  '1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3'
+  '7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0'
 )
 options=(!strip emptydirs)
 
@@ -133,7 +133,7 @@ _isovirtualprinterimages=(Linux Windows)
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=11.5.1_15018442
+_vmware_fusion_ver=11.5.2_15794494
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
 _unlocker_ver=3.0.3
@@ -151,7 +151,7 @@ source+=(
   "efi-unlocker-patch-${_efi_unlocker_ver}.txt"
 )
 sha256sums+=(
-  'c36048a42c03988068aab7474b6c48ebc5054b8c6324cb93f009aec45aa899f0'
+  '2d425804fa0c4ec21664497ad6769d8c9db5f165f16bcf5360f1e01e41dd6a37'
   '1c27547dcf6fb2f436c96ee62ae8c7f5cfd14b40d8bbd35dc385e247c4fb7e0f'
   '392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91'
 )
diff --git a/vmmon.patch b/vmmon.patch
index 1e8d0dbdff0f..f2e32d6d0270 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -12,30 +12,3 @@
  
  # Header directory for the running kernel
  ifdef LINUXINCLUDE
-From d74ce8b7b4e734140235f219ccd87eff3c6fedae Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Tue, 28 Jan 2020 07:16:30 +0100
-Subject: [PATCH] vmmon: replace ioremap_nocache() with ioremap()
-
-Mainline commit 4bdc0d676a64 ("remove ioremap_nocache and
-devm_ioremap_nocache") in v5.6-rc1 removes ioremap_nocache() and replaces
-all uses with ioremap(). As the commit message says that "ioremap has
-provided non-cached semantics by default since the Linux 2.6", do the same
-unconditionally.
----
- vmmon-only/linux/hostif.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
-index 1e1be1a..6f51cad 100644
---- a/vmmon-only/linux/hostif.c
-+++ b/vmmon-only/linux/hostif.c
-@@ -2323,7 +2323,7 @@ SetVMAPICAddr(VMDriver *vm, // IN/OUT: driver state
-    volatile void *hostapic;
- 
-    ASSERT_ON_COMPILE(APICR_SIZE <= PAGE_SIZE);
--   hostapic = (volatile void *) ioremap_nocache(ma, PAGE_SIZE);
-+   hostapic = (volatile void *) ioremap(ma, PAGE_SIZE);
-    if (hostapic) {
-       if ((APIC_VERSIONREG(hostapic) & 0xF0) == 0x10) {
-          vm->hostAPIC.base = (volatile uint32 (*)[4]) hostapic;
diff --git a/vmnet.patch b/vmnet.patch
index 4bfb6c58c075..60fc5a12d86f 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -12,130 +12,3 @@
  
  # Header directory for the running kernel
  ifdef LINUXINCLUDE
-From f404bc6855ea2c731b617d3b0a2971481eb31cbd Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Thu, 19 Sep 2019 12:20:20 +0200
-Subject: [PATCH] vmnet: handle switch of skb_frag_t to bio_vec
-
-The switch from custom skb_frag_t implementation to bio_vec in v5.4-rc1 is
-mostly transparent for modules which use accessor for skb_frag_t members.
-Unfortunately many users access the members directly and function
-VNetCsumCopyDatagram() in vmnet is one of those.
-
-Use accessors everywhere so that vmnet code is compatible with kernel 5.4
-and newer. Use "compat_" prefix to avoid clashes with backports adding the
-accessors to older codebase.
----
- vmnet-only/userif.c | 39 +++++++++++++++++++++++++++++----------
- 1 file changed, 29 insertions(+), 10 deletions(-)
-
-diff --git a/vmnet-only/userif.c b/vmnet-only/userif.c
-index d385088..aab9478 100644
---- a/vmnet-only/userif.c
-+++ b/vmnet-only/userif.c
-@@ -78,13 +78,31 @@ static int  VNetUserIfSetUplinkState(VNetPort *port, uint8 linkUp);
- extern unsigned int  vnet_max_qlen;
- 
- #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
--#   define compat_kmap(page) kmap(page)
--#   define compat_kunmap(page) kunmap(page)
-+#   define compat_kmap_frag(frag) kmap((frag)->page)
-+#   define compat_kunmap_frag(page) kunmap((frag)->page)
- #else
--#   define compat_kmap(page) kmap((page).p)
--#   define compat_kunmap(page) kunmap((page).p)
-+#   define compat_kmap_frag(frag) kmap(skb_frag_page(frag))
-+#   define compat_kunmap_frag(frag) kunmap(skb_frag_page(frag))
- #endif
- 
-+static unsigned int compat_skb_frag_size(const skb_frag_t *frag)
-+{
-+#if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
-+	return frag->size;
-+#else
-+	return skb_frag_size(frag);
-+#endif
-+}
-+
-+static unsigned int compat_skb_frag_off(const skb_frag_t *frag)
-+{
-+#if COMPAT_LINUX_VERSION_CHECK_LT(5, 4, 0)
-+	return frag->page_offset;
-+#else
-+	return skb_frag_off(frag);
-+#endif
-+}
-+
- /*
-  *-----------------------------------------------------------------------------
-  *
-@@ -568,20 +586,21 @@ VNetCsumCopyDatagram(const struct sk_buff *skb,	// IN: skb to copy
-    for (frag = skb_shinfo(skb)->frags;
- 	frag != skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags;
- 	frag++) {
--      if (frag->size > 0) {
-+      if (compat_skb_frag_size(frag) > 0) {
- 	 unsigned int tmpCsum;
- 	 const void *vaddr;
- 
--	 vaddr = compat_kmap(frag->page);
--	 tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
--					 curr, frag->size, 0, &err);
--	 compat_kunmap(frag->page);
-+	 vaddr = compat_kmap_frag(frag);
-+	 tmpCsum = csum_and_copy_to_user(vaddr + compat_skb_frag_off(frag),
-+					 curr, compat_skb_frag_size(frag), 0,
-+					 &err);
-+	 compat_kunmap_frag(frag);
- 
- 	 if (err) {
- 	    return err;
- 	 }
- 	 csum = csum_block_add(csum, tmpCsum, curr - buf);
--	 curr += frag->size;
-+	 curr += compat_skb_frag_size(frag);
-       }
-    }
- 
-From d8e6c50b735f95af01ddfe8b9d2775ed68aaa625 Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Wed, 5 Feb 2020 07:29:14 +0100
-Subject: [PATCH] vmnet: convert from file_operations to proc_ops
-
-Manline commit 97a32539b956 ("proc: convert everything to "struct
-proc_ops"") in v5.6-rc1 introduces struct proc_ops and converts procfs file
-operations to it. Convert vmnet to do the same.
-
-As the same commit also introduces DEFINE_PROC_SHOW_ATTRIBUTE macro, we can
-use it for detection rather than rely on version comparison.
----
- vmnet-only/procfs.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/vmnet-only/procfs.c b/vmnet-only/procfs.c
-index 165cda0..58e1c4e 100644
---- a/vmnet-only/procfs.c
-+++ b/vmnet-only/procfs.c
-@@ -161,6 +161,14 @@ VNetProcOpen(struct inode *inode,   // IN:
- }
- 
- /* Our procfs callbacks.  We only need to specialize open. */
-+#ifdef DEFINE_PROC_SHOW_ATTRIBUTE
-+static const struct proc_ops fops = {
-+   .proc_open    = VNetProcOpen,
-+   .proc_read    = seq_read,
-+   .proc_lseek   = seq_lseek,
-+   .proc_release = single_release,
-+};
-+#else
- static struct file_operations fops = {
-    .open    = VNetProcOpen,
-    .read    = seq_read,
-@@ -168,6 +176,7 @@ static struct file_operations fops = {
-    .release = single_release,
- };
- #endif
-+#endif
- 
- 
- /*