Update to 15.5.1

3 files changed, 19 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2589d2ce9452..336904cb4744 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.0
-	pkgrel = 2
+	pkgver = 15.5.1
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
@@ -39,7 +39,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.0-14665864.x86_64.bundle
+	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-15.5.1-15018445.x86_64.bundle
 	source = vmware-bootstrap
 	source = vmware-vix-bootstrap
 	source = config
@@ -61,11 +61,10 @@ pkgbase = vmware-workstation
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
-	source = VMware-Fusion-11.5.0-14634996.zip.tar::https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/11.5.0/14634996/core/com.vmware.fusion.zip.tar
-	source = unlocker-3.0.2.py::https://raw.githubusercontent.com/DrDonk/unlocker/3.0.2/unlocker.py
-	source = unlocker.patch
+	source = VMware-Fusion-11.5.1-15018442.zip.tar::https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/11.5.1/15018442/core/com.vmware.fusion.zip.tar
+	source = unlocker-2fd359ec996419dc6c43253e3c728e1f2734c2ee.py::https://raw.githubusercontent.com/DrDonk/unlocker/2fd359ec996419dc6c43253e3c728e1f2734c2ee/unlocker.py
 	source = efi-unlocker-patch-1.0.0.txt::https://raw.githubusercontent.com/DrDonk/efi-unlocker/1.0.0/patches.txt
-	sha256sums = b557b4dcebefb51466da5b33dc51549537b0d381864b6155c3a48a66801a8597
+	sha256sums = 490f8fe8d874c27601c155c1b2c0055ad0d4f14feb32fa9f18643659a147d3c6
 	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
 	sha256sums = ce3b1a82d9ed023b7591168bd49b218040ef70d1752a07792b0af6ac15a68453
@@ -87,9 +86,8 @@ pkgbase = vmware-workstation
 	sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
 	sha256sums = 1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3
 	sha256sums = 22d1f23c272dd2f7d4644dfffe051503cf62311886f67d57de3b7502615ceec1
-	sha256sums = ed819604cb9c0f204e377f16b8678103467d2cf4a50129932e2b1a9a000ad8cf
-	sha256sums = 29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c
-	sha256sums = 4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d
+	sha256sums = c36048a42c03988068aab7474b6c48ebc5054b8c6324cb93f009aec45aa899f0
+	sha256sums = 89e3f41eade574c263b9afa0ba721d2179cd168f502e68b91ec3b6df4c5fee0e
 	sha256sums = 392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91
 
 pkgname = vmware-workstation
diff --git a/PKGBUILD b/PKGBUILD
index 8dc52ec17358..a5871138a3c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,10 +21,10 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation
-pkgver=15.5.0
-_buildver=14665864
+pkgver=15.5.1
+_buildver=15018445
 _pkgver=${pkgver}_${_buildver}
-pkgrel=2
+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'
@@ -99,7 +99,7 @@ source=(
   'vmnet.patch'
 )
 sha256sums=(
-  'b557b4dcebefb51466da5b33dc51549537b0d381864b6155c3a48a66801a8597'
+  '490f8fe8d874c27601c155c1b2c0055ad0d4f14feb32fa9f18643659a147d3c6'
 
   '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
   'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
@@ -140,10 +140,10 @@ _isovirtualprinterimages=(Linux Windows)
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=11.5.0_14634996
+_vmware_fusion_ver=11.5.1_15018442
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
-_unlocker_ver=3.0.2
+_unlocker_commit=2fd359ec996419dc6c43253e3c728e1f2734c2ee
 _efi_unlocker_ver=1.0.0
 
 makedepends+=(
@@ -154,14 +154,12 @@ makedepends+=(
 
 source+=(
   "VMware-Fusion-${_vmware_fusion_ver/_/-}.zip.tar::https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${_vmware_fusion_ver/_//}/core/com.vmware.fusion.zip.tar"
-  "unlocker-${_unlocker_ver}.py::https://raw.githubusercontent.com/DrDonk/unlocker/${_unlocker_ver}/unlocker.py"
-  'unlocker.patch'
+  "unlocker-${_unlocker_commit}.py::https://raw.githubusercontent.com/DrDonk/unlocker/${_unlocker_commit}/unlocker.py"
   "efi-unlocker-patch-${_efi_unlocker_ver}.txt::https://raw.githubusercontent.com/DrDonk/efi-unlocker/${_efi_unlocker_ver}/patches.txt"
 )
 sha256sums+=(
-  'ed819604cb9c0f204e377f16b8678103467d2cf4a50129932e2b1a9a000ad8cf'
-  '29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c'
-  '4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d'
+  'c36048a42c03988068aab7474b6c48ebc5054b8c6324cb93f009aec45aa899f0'
+  '89e3f41eade574c263b9afa0ba721d2179cd168f502e68b91ec3b6df4c5fee0e'
   '392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91'
 )
 
@@ -208,9 +206,7 @@ if [ -n "$_enable_macOS_guests" ]; then
   done
   rm -rf __MACOSX payload manifest.plist preflight postflight
 
-  cp "$srcdir/unlocker-${_unlocker_ver}.py" "$srcdir/unlocker.py"
-  patch -Np1 < unlocker.patch
-  sed -i -e "s|/usr/lib/vmware/|${pkgdir}/usr/lib/vmware/|" "$srcdir/unlocker.py"
+  sed -i -e "s|/usr/lib/vmware/|${pkgdir}/usr/lib/vmware/|" "$srcdir/unlocker-${_unlocker_commit}.py"
 fi
 }
 
@@ -458,7 +454,7 @@ fi
 
 if [ -n "$_enable_macOS_guests" ]; then
   msg "Patching VMware to enable macOS guest support"
-  python "$srcdir/unlocker.py" > /dev/null
+  python "$srcdir/unlocker-${_unlocker_commit}.py" > /dev/null
 
   for isoimage in ${_fusion_isoimages[@]}
   do
diff --git a/unlocker.patch b/unlocker.patch
deleted file mode 100644
index 7c32fa83f288..000000000000
--- a/unlocker.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/unlocker.py b/unlocker.py
-index decbc51..0f9d3f6 100755
---- a/unlocker.py
-+++ b/unlocker.py
-@@ -44,6 +44,7 @@
- from __future__ import print_function
- import codecs
- import os
-+import re
- import struct
- import sys
- 
-@@ -55,7 +56,11 @@
- if sys.platform == 'win32' \
-         or sys.platform == 'cli':
-     # noinspection PyUnresolvedReferences
--    from _winreg import *
-+    if sys.version_info > (3, 0):
-+        from winreg import *
-+    else:
-+        from _winreg import *
-+
- 
- 
- def bytetohex(data):
-@@ -301,9 +306,10 @@ def patchbase(name):
-     f = open(name, 'r+b')
- 
-     # Entry to search for in GOS table
--    # Should work for 12 & 14 of Workstation...
--    darwin = b'\x10\x00\x00\x00\x10\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00' \
--             '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-+    # Should work for Workstation 12-15...
-+    darwin = re.compile(
-+             b'\x10\x00\x00\x00[\x10|\x20]\x00\x00\x00[\x01|\x02]\x00\x00\x00\x00\x00\x00\x00'
-+             b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
- 
-     # Read file into string variable
-     base = f.read()
-@@ -311,19 +317,14 @@ def patchbase(name):
-     # Loop through each entry and set top bit
-     # 0xBE --> 0xBF (WKS 12)
-     # 0x3E --> 0x3F (WKS 14)
--    offset = 0
--    while offset < len(base):
--        offset = base.find(darwin, offset)
--        if offset == -1:
--            break
-+    for m in darwin.finditer(base):
-+        offset = m.start()
-         f.seek(offset + 32)
-         flag = ord(f.read(1))
-         flag = set_bit(flag, 0)
--        flag = chr(flag)
-         f.seek(offset + 32)
--        f.write(flag)
-+        f.write(bytes([flag]))
-         print('GOS Patched flag @: ' + hex(offset))
--        offset += 40
- 
-     # Tidy up
-     f.flush()