merged upstream

4 files changed, 39 insertions, 139 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 077b02df240c..bf3621474917 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmware-workstation-openrc
 	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC.
-	pkgver = 17.0.2
-	pkgrel = 2
+	pkgver = 17.5.0
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
@@ -30,7 +30,7 @@ pkgbase = vmware-workstation-openrc
 	options = emptydirs
 	backup = etc/vmware/config
 	backup = etc/conf.d/vmware
-	source = https://download3.vmware.com/software/WKST-1702-LX/VMware-Workstation-Full-17.0.2-21581411.x86_64.bundle
+	source = https://download3.vmware.com/software/WKST-1750-LX/VMware-Workstation-Full-17.5.0-22583795.x86_64.bundle
 	source = vmware-bootstrap
 	source = vmware-vix-bootstrap
 	source = config
@@ -43,8 +43,8 @@ pkgbase = vmware-workstation-openrc
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
-	sha256sums = f4e361faebcbe1818d1b16e93d7d6658ef0fe2828f529c334ec28a0493711cc7
-	sha256sums = 67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50
+	sha256sums = 7807f7bf10228c4c9950711694c34a7bc85f193366a2c3cc44996bb1601b38f8
+	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
 	sha256sums = bcf24ce469527844c60f8fd50fda61a6b65cc326ff6bf026d5ae0576cf749c2c
 	sha256sums = f2c9272dfa1e3de1de5f5545989e6e3d9f400084decaa5504559a20209648329
@@ -54,7 +54,7 @@ pkgbase = vmware-workstation-openrc
 	sha256sums = 452c1bfebac52f4808ba5f4bf2fc3eae9858f8745d60c13d3c46e7550a3e1eb1
 	sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e
 	sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac
-	sha256sums = 1209eefaaa7fa9bfc87b12af06a8f250e209a34f84ee5a7747af53cdf43cf48b
-	sha256sums = 2c03cd2aba3ac80e67f565c1a553c4a6ed1db980ff3c40aad1f6187d2332419b
+	sha256sums = 1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3
+	sha256sums = b86f61a37a9dd74257751eba2478c471b6e1ccac6476c5845d3371236833a4fb
 
 pkgname = vmware-workstation-openrc
diff --git a/PKGBUILD b/PKGBUILD
index 98c96b41d609..916c4c3b6c7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,10 +15,10 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation-openrc
-pkgver=17.0.2
-_buildver=21581411
+pkgver=17.5.0
+_buildver=22583795
 _pkgver=${pkgver}_${_buildver}
-pkgrel=2
+pkgrel=1
 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC.'
 arch=(x86_64)
 url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -77,7 +77,7 @@ source=(
   'vmnet.patch'
 )
 sha256sums=(
-  'f4e361faebcbe1818d1b16e93d7d6658ef0fe2828f529c334ec28a0493711cc7'
+  '7807f7bf10228c4c9950711694c34a7bc85f193366a2c3cc44996bb1601b38f8'
 
   '67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50'
   'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
@@ -91,8 +91,8 @@ sha256sums=(
 
   '10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e'
   '273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac'
-  '1209eefaaa7fa9bfc87b12af06a8f250e209a34f84ee5a7747af53cdf43cf48b'
-  '2c03cd2aba3ac80e67f565c1a553c4a6ed1db980ff3c40aad1f6187d2332419b'
+  '1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3'
+  'b86f61a37a9dd74257751eba2478c471b6e1ccac6476c5845d3371236833a4fb'
 )
 options=(!strip emptydirs)
 
@@ -104,12 +104,11 @@ fi
 
 
 _isoimages=(linux linuxPreGlibc25 netware solaris windows winPre2k winPreVista)
-_isovirtualprinterimages=(Linux Windows)
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=13.0.2
-_vmware_fusion_buildver=21581413
+_vmware_fusion_ver=13.5.0
+_vmware_fusion_buildver=22583790
 _vmware_fusion_ver_full=${_vmware_fusion_ver}_${_vmware_fusion_buildver}
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
@@ -126,7 +125,7 @@ source+=(
   "efi-patches.txt"
 )
 sha256sums+=(
-  'c86b40823b97334f20b4e6b475b488ec23faf06c986e291965b9e56f7b44c042'
+  '8c365b44fb8372eb2bd5146d28e163d50ec71b6b92ee6bb3a1965dee182748d1'
   '8a61e03d0edbbf60c1c84a43aa87a6e950f82d2c71b968888f019345c2f684f3'
   '392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91'
 )
@@ -180,10 +179,10 @@ package() {
   # Make directories and copy files.
 
   mkdir -p \
-    "$pkgdir/etc"/{cups,pam.d,modprobe.d,thnuclnt,vmware} \
+    "$pkgdir/etc"/{pam.d,modprobe.d,vmware} \
     "$pkgdir/usr"/{share,bin} \
     "$pkgdir/usr/include/vmware-vix" \
-    "$pkgdir/usr/lib"/{vmware/setup,vmware-vix,vmware-ovftool,vmware-installer/"$vmware_installer_version",cups/filter,modules-load.d} \
+    "$pkgdir/usr/lib"/{vmware/setup,vmware-vix,vmware-ovftool,vmware-installer/"$vmware_installer_version",modules-load.d} \
     "$pkgdir/usr/share"/{doc/vmware-vix,licenses/"$pkgname"} \
     "$pkgdir/var/lib/vmware/Shared VMs"
 
@@ -235,16 +234,6 @@ package() {
     "$pkgdir/usr/lib/vmware-installer/$vmware_installer_version"
 
   cp -r \
-    vmware-player-app/etc/cups/* \
-    "$pkgdir/etc/cups"
-  cp -r \
-    vmware-player-app/extras/.thnumod \
-    "$pkgdir/etc/thnuclnt"
-  cp -r \
-    vmware-player-app/extras/thnucups \
-    "$pkgdir/usr/lib/cups/filter"
-
-  cp -r \
     vmware-vix-core/include/* \
     "$pkgdir/usr/include/vmware-vix"
 
@@ -253,11 +242,6 @@ package() {
     install -Dm 644 "vmware-tools-$isoimage/$isoimage.iso" "$pkgdir/usr/lib/vmware/isoimages/$isoimage.iso"
   done
 
-  for isoimage in ${_isovirtualprinterimages[@]}
-  do
-    install -Dm 644 "vmware-virtual-printer/VirtualPrinter-$isoimage.iso" "$pkgdir/usr/lib/vmware/isoimages/VirtualPrinter-$isoimage.iso"
-  done
-
   install -Dm 644 "vmware-workstation/doc/EULA" "$pkgdir/usr/share/doc/vmware-workstation/EULA"
   ln -s "/usr/share/doc/vmware-workstation/EULA" "$pkgdir/usr/share/licenses/$pkgname/VMware Workstation - EULA.txt"
   ln -s "/usr/lib/vmware-ovftool/vmware.eula" "$pkgdir/usr/share/licenses/$pkgname/VMware OVF Tool - EULA.txt"
@@ -303,9 +287,7 @@ fi
     "$pkgdir/usr/lib/vmware/lib"/libvmware-gksu.so/gksu-run-helper \
     "$pkgdir/usr/lib/vmware-ovftool"/{ovftool,ovftool.bin} \
     "$pkgdir/usr/lib/vmware-installer/$vmware_installer_version"/{vmware-installer,vmis-launcher} \
-    "$pkgdir/usr/lib/cups/filter"/* \
-    "$pkgdir/usr/lib/vmware-vix/setup"/* \
-    "$pkgdir/etc/thnuclnt/.thnumod"
+    "$pkgdir/usr/lib/vmware-vix/setup"/*
 
   chmod +s \
     "$pkgdir/usr/bin"/vmware-authd \
diff --git a/vmmon.patch b/vmmon.patch
index 906c33906d39..f2e32d6d0270 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -12,15 +12,3 @@
  
  # Header directory for the running kernel
  ifdef LINUXINCLUDE
-Patch taken from https://raw.githubusercontent.com/jeffersonchua/linux-6.5.0/main/patch-17.0.2-6.5.0
---- a/vmmon/include/pgtbl.h
-+++ b/vmmon/include/pgtbl.h
-@@ -91,7 +91,7 @@
-          } else {
-             pte_t *pte;
- 
--            pte = pte_offset_map(pmd, addr);
-+            pte = pte_offset_kernel(pmd, addr);
-             if (pte_present(*pte) == 0) {
-                pte_unmap(pte);
-                return INVALID_MPN;
diff --git a/vmnet.patch b/vmnet.patch
index e32964bdd5e1..e4b5994aa94f 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -12,84 +12,14 @@
  
  # Header directory for the running kernel
  ifdef LINUXINCLUDE
---- a/vmnet/userif.c
-+++ b/vmnet/userif.c
-Fixing VMWare Player on Linux when using DHCP addresses: https://www.nikhef.nl/~janjust/vmnet/
-@@ -1029,6 +1029,9 @@
-    userIf = (VNetUserIF *)port->jack.private;
-    hubJack = port->jack.peer;
- 
-+   /* never send link down events */
-+   if (!linkUp) return 0;
-+
-    if (port->jack.state == FALSE || hubJack == NULL) {
-       return -EINVAL;
-    }
---- a/vmnet/vnetUserListener.c
---- b/vmnet/vnetUserListener.c
-@@ -42,10 +42,12 @@
- 
- struct VNetUserListener_EventNode {
-    VNetUserListener_EventNode *nextEvent;
--   VNet_EventHeader event;
-+   union {
-+       VNet_EventHeader header;
-+       VNet_LinkStateEvent lse;
-+   } event;
- };
- 
--#define EVENT_NODE_HEADER_SIZE offsetof(struct VNetUserListener_EventNode, event)
- 
- typedef struct VNetUserListener {
-    VNetPort port;                          /* base port/jack */
-@@ -220,7 +222,7 @@
-    VNetUserListener_EventNode *t;
- 
-    /* allocate and initialize event node */
--   t = kmalloc(EVENT_NODE_HEADER_SIZE + e->size, GFP_ATOMIC);
-+   t = kmalloc(sizeof *t, GFP_ATOMIC);
-    if (t == NULL) {
-       LOG(0, (KERN_DEBUG "VNetUserListenerEventHandler, out of memory\n"));
-       return;
-@@ -299,7 +301,7 @@
-    spin_unlock(&userListener->lock);
- 
-    /* return data and free event */
--   n = t->event.size;
-+   n = t->event.header.size;
-    if (count < n) {
-       n = count;
-    }
-From 0ca979d4bd06144204d720bb82f0a1e29024f9fa Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Wed, 18 Jan 2023 00:19:52 +0100
-Subject: [PATCH] vmnet: use explicit module_init() and module_exit() (#187)
-
-While vmmon module already uses explicit module_init() and module_exit()
-for its init and cleanup function, vmnet relies on traditional magic names
-init_module() and cleanup_module(). Apparently this has an unfortunate side
-effect that the two functions are not identified as indirect call targets
-by objdump and they get "sealed" when the module is built against and
-loaded into an IBT enabled kernel.
-
-Starting with 6.3-rc1, objtool is going to warn about this issue,
-indicating that the legacy module initialization is deprecated and
-module_init() and module_exit() macros should be used instead so do that
-for vmnet as well.
----
- vmnet-only/driver.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index 197a213..b22cbfb 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
+--- a/vmnet/driver.c
++++ b/vmnet/driver.c
 @@ -279,7 +279,7 @@ VNetRemovePortFromList(const VNetPort *port) // IN: port to remove from list
  /*
   *----------------------------------------------------------------------
   *
 - * init_module --
-+ * vmnet_init_module --
++ * LinuxDriverInit --
   *
   *      linux module entry point. Called by /sbin/insmod command.
   *      Initializes module and Registers this driver for a
@@ -98,7 +28,7 @@ index 197a213..b22cbfb 100644
  
  int
 -init_module(void)
-+vmnet_init_module(void)
++LinuxDriverInit(void)
  {
     int retval;
  
@@ -107,7 +37,7 @@ index 197a213..b22cbfb 100644
   *----------------------------------------------------------------------
   *
 - * cleanup_module --
-+ * vmnet_cleanup_module --
++ * LinuxDriverExit --
   *
   *      Called by /sbin/rmmod.  Unregisters this driver for a
   *      vnet major #, and deinitializes the modules.  The 64-bit
@@ -116,7 +46,7 @@ index 197a213..b22cbfb 100644
  
  void
 -cleanup_module(void)
-+vmnet_cleanup_module(void)
++LinuxDriverExit(void)
  {
     unregister_chrdev(VNET_MAJOR_NUMBER, "vmnet");
     VNetProtoUnregister();
@@ -124,18 +54,18 @@ index 197a213..b22cbfb 100644
   * by default (i.e., neither mkinitrd nor modprobe will accept it).
   */
  MODULE_INFO(supported, "external");
-+module_init(vmnet_init_module);
-+module_exit(vmnet_cleanup_module);
-Patch inspired from https://github.com/mkubecek/vmware-host-modules/commit/b75cd616cca0a4c9ff22124c4c91d218e64e6205.patch
---- a/vmnet/bridge.c
-+++ b/vmnet/bridge.c
-@@ -44,6 +44,9 @@
- #include <linux/if_arp.h>
- #include <net/tcp.h>
- #include <net/ipv6.h>
-+#if !defined(SKB_GSO_CB)
-+#include <net/gso.h>
-+#endif
++module_init(LinuxDriverInit);
++module_exit(LinuxDriverExit);
+--- a/vmnet/userif.c
++++ b/vmnet/userif.c
+Fixing VMWare Player on Linux when using DHCP addresses: https://www.nikhef.nl/~janjust/vmnet/
+@@ -1029,6 +1029,9 @@
+    userIf = (VNetUserIF *)port->jack.private;
+    hubJack = port->jack.peer;
  
- #ifdef CONFIG_NET_RADIO
- #   include <linux/wireless.h>
++   /* never send link down events */
++   if (!linkUp) return 0;
++
+    if (port->jack.state == FALSE || hubJack == NULL) {
+       return -EINVAL;
+    }