app-emulation/*: Sync up with stefantalpalaru-overlay

Signed-off-by: Quetzaly Solano Gómez <gentoo@sattvik.com>

5 files changed, 114 insertions, 7 deletions

diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 2baa475..232a9bb 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,3 +1,4 @@
+AUX vmware-modules-17.5.2-kernel-6.9.patch 2513 BLAKE2B 996793d0396f4448f814d4506d8023af3416ea0c7accfa217377378d06d82355eb123ea1677135c5f689cdd97cda1bd100d0c7122181c5067622950ce3a74cc8 SHA512 72deb228180bf070b9f289b03c4ddba7c5f9696b0362a240a6a8f237d80cd75b7333d62a3d3bcf7c6815e24f2579a3dab57c366ee75cfebf7c5e4c1d65cadb4e
 DIST vmware-modules-17.5.2-2c6d66f3f1947384038b765c897b102ecdb18298.tar.gz 488552 BLAKE2B 6864c9862af2a8c145c50d0a1215bb18adf6c5bfd5f2106a73ec807fc13c5f0938f3ec1d52836e988b233c92820736446d9a2e1d3f71c53985cea8d7803551ca SHA512 b3068632a2bc8d934473b271f8182954432fcec7b1ba297ee5f1ef7fd6db2289312cb94edfd15aa5842de2e3d529181aeb032f0fcfaee84bf3178681b8ba0104
-EBUILD vmware-modules-17.5.2.ebuild 3183 BLAKE2B 40fe4e094f56104d03d5b6f746f72d1b2829b0b030ea403082779eb9520cbc9408555ee0aa0a3a801f476240668a0e6fdce34f95ad24586af92bcce2218ec97b SHA512 99b3ed7e5a93a6463f855ba0eb724644f225e2ac9937b6572b9a6ffbd5621f11b1cb29c16569343cb1d5a2ea317a63a1d265540992f4b248dd558d99c9c0d85a
+EBUILD vmware-modules-17.5.2-r1.ebuild 3250 BLAKE2B cc39675d3346cdf9a9df7418f9246c683bddafa365fc414dd61397269c36273c48f8602aead50122ca83c788b84fb4c36143a8338dc7a876909e3f0b0045966f SHA512 b63aa3c3aaa7de1d6cc1f6f8cb55d6314ea92f455cc2147a624fc98803a80727ff6614edc87f13a264feb85b766a0e9e94c848a7f6048d6ed27c654d257d0e9b
 MISC metadata.xml 258 BLAKE2B 32ba82775278c15115ba95e0a7c4072d819e915d97801ab5efcd5a9c9408e1659cb1423f6bc21bb8928cfb29c401c0bad5331b917b44d21bbf279b07c4fefca3 SHA512 1c1b55777f8e757404ad5df42c46e00f344e28a4067129b2dd93b17c13fb2656130e948e1dc6295dbb6e6da81eee5b012f9b3a002a95521e9ee12c2cd6df10db
diff --git a/app-emulation/vmware-modules/files/vmware-modules-17.5.2-kernel-6.9.patch b/app-emulation/vmware-modules/files/vmware-modules-17.5.2-kernel-6.9.patch
new file mode 100644
index 0000000..ccdb30a
--- /dev/null
+++ b/app-emulation/vmware-modules/files/vmware-modules-17.5.2-kernel-6.9.patch
@@ -0,0 +1,71 @@
+From 48866f7a18736123e990559b9bb135e7114bfb22 Mon Sep 17 00:00:00 2001
+From: Veronika Kossmann <nanodesuu@gmail.com>
+Date: Sat, 18 May 2024 19:45:31 +0300
+Subject: [PATCH 1/2] Compiles and works for Workstation 17.5.2 and Mainline
+ kernel 6.9.1. Applied
+ https://github.com/mkubecek/vmware-host-modules/issues/243#issuecomment-2098516707
+ and
+ https://github.com/mkubecek/vmware-host-modules/issues/239#issuecomment-2118783046
+
+---
+ vmmon-only/include/x86msr.h | 2 +-
+ vmnet-only/vmnetInt.h       | 9 +++++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/vmmon-only/include/x86msr.h b/vmmon-only/include/x86msr.h
+index f67a0e12..74eaae03 100644
+--- a/vmmon-only/include/x86msr.h
++++ b/vmmon-only/include/x86msr.h
+@@ -67,7 +67,7 @@ typedef struct MSRReply {
+ typedef struct MSRQuery {
+    uint32 msrNum;           // IN
+    uint32 numLogicalCPUs;   // IN/OUT
+-   MSRReply logicalCPUs[0]; // OUT
++   MSRReply logicalCPUs[]; // OUT
+ } MSRQuery;
+ #pragma pack(pop)
+ 
+diff --git a/vmnet-only/vmnetInt.h b/vmnet-only/vmnetInt.h
+index b49c3990..f8fbc75a 100644
+--- a/vmnet-only/vmnetInt.h
++++ b/vmnet-only/vmnetInt.h
+@@ -41,8 +41,13 @@
+     compat_skb_set_network_header(skb, sizeof (struct ethhdr)),  \
+     dev_queue_xmit(skb)                                   \
+   )
+-#define dev_lock_list()    read_lock(&dev_base_lock)
+-#define dev_unlock_list()  read_unlock(&dev_base_lock)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)
++#   define dev_lock_list()    rcu_read_lock()
++#   define dev_unlock_list()  rcu_read_unlock()
++#else
++#   define dev_lock_list()    read_lock(&dev_base_lock)
++#   define dev_unlock_list()  read_unlock(&dev_base_lock)
++#endif
+ 
+ 
+ extern struct proto vmnet_proto;
+
+From d9f51eee7513715830ac214f1b25db79059f5270 Mon Sep 17 00:00:00 2001
+From: Veronika Kossmann <nanodesuu@gmail.com>
+Date: Sat, 18 May 2024 20:23:18 +0300
+Subject: [PATCH 2/2] Seems x86cpuid.h also need to be patched to prevent
+ array-index-out-of-bounds
+
+---
+ vmmon-only/include/x86cpuid.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmmon-only/include/x86cpuid.h b/vmmon-only/include/x86cpuid.h
+index e2d297bf..c46fad70 100644
+--- a/vmmon-only/include/x86cpuid.h
++++ b/vmmon-only/include/x86cpuid.h
+@@ -92,7 +92,7 @@ typedef struct CPUIDQuery {
+    uint32 eax;                // IN
+    uint32 ecx;                // IN
+    uint32 numLogicalCPUs;     // IN/OUT
+-   CPUIDReply logicalCPUs[0]; // OUT
++   CPUIDReply logicalCPUs[]; // OUT
+ } CPUIDQuery;
+ #pragma pack(pop)
+ #endif
diff --git a/app-emulation/vmware-modules/vmware-modules-17.5.2.ebuild b/app-emulation/vmware-modules/vmware-modules-17.5.2-r1.ebuild
index 901cf9f..2c0948d 100644
--- a/app-emulation/vmware-modules/vmware-modules-17.5.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-17.5.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="VMware kernel modules"
 HOMEPAGE="https://github.com/mkubecek/vmware-host-modules"
 
 # Highest kernel version known to work:
-MY_KERNEL_VERSION="6.8"
+MY_KERNEL_VERSION="6.9"
 
 # Upstream does not want to tag versions or anything that looks like properly
 # releasing the software, so we need to just pick a commit from
@@ -32,6 +32,10 @@ RDEPEND="
 	acct-group/vmware
 "
 
+PATCHES=(
+	"${FILESDIR}/vmware-modules-17.5.2-kernel-6.9.patch"
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~HIGH_RES_TIMERS"
 	if kernel_is -ge 5 5; then
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 2859aaf..6853da3 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -3,5 +3,12 @@ DIST VMware-Workstation-17.5.2-23775571.x86_64.bundle.tar 201635840 BLAKE2B 3b26
 DIST com.vmware.fusion-17.5.2.23775571.zip.tar 791531520 BLAKE2B 4b96a4f22744683cb0aedd10d9da0373e31723c58e0b068c492b5721b780a0dbc510c17c4da9aacaa5f26b00a4dd45409446a4266615a005288ed9f8dad3a83b SHA512 b00862714b631c05da83f9776a033ddb867641824b353b198728f298c592be039c4ec8b301a0a84c1043d479c5b4fb6440a2ee9afa8b0010ca4fa4bb60b62107
 DIST unlocker-3.0.5.tar.gz 10922 BLAKE2B a986c23b111f259ed14f284d2598d89a49d7e57cefdae164026385e195c601a569d16317dba2a4eb72c5f209c05220dbb9d3c7e8f7aed5c08c47de97e97eb7c0 SHA512 6e84cc9b69b8f6d2701e4b90320fa4aee1a2b21825b81d9380d0fef23b6720a0a86d9848d9bd4a3fcc7e35c9c5fd41759ded7ea0368a36ea0b8f1209d682c134
 DIST vmware-systemd-gentoo-02.tgz 14064 BLAKE2B 24ac2c2f295130f4aadad867ec88d652bd292cc60e6b471bb2e01069fe01d84dac3d8b0ca7690ebf218d663adfe0c1dc889d3f4f53cf3178b68291461260748b SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42
-EBUILD vmware-workstation-17.5.2.23775571.ebuild 15051 BLAKE2B 8aea64cea929a487337386d347de605549189649f05321f942b6ca87683d11af4b57c7ef5158067795f738ef18f7ffef612b84bc5086ff6fb9a9c29f89fb0a89 SHA512 0bd9081006249afcc4f9a41b1c023733151fa3a3335f184e08083a849c5c236783d93ce7f4a5d09b5e747e5099e7053d110de60a399e462309cc742adb1e79b0
+DIST vmware-tools-linux-12.4.0-23259341.x86_64.component.tar 56309760 BLAKE2B 28fc79d32d0b5670de8b040e642ab7b4d3394349b0769d884343625c9943bbf4752025c8024f5cbe8d8b9bfb8bc02342f22382b0814c578f39cc764758c2e572 SHA512 dd40626c77824d7376191740013e3c18f9ec2d56a2465d51cf9bbdba60b7ca20d67130496675f83068f36015e2e4f29003026eef9bc57296e59af3e9f94293f4
+DIST vmware-tools-linuxPreGlibc25-12.4.0-23259341.x86_64.component.tar 52817920 BLAKE2B eb9b05b02023adb4fdb1114c79a51a2a6bab80330db1d7adba022b6d33a7dddaac9b2dfde88082a958bc827894b5a8f8f343242352ae84c21061f8595b15ebe6 SHA512 f2528abae96e42256372e7e3800b8341ad4ba29c7b1b07e007d71eb9966496dfb303f508b45b510a359a704882417c2d6090d2f149fd14987acee5723dc01d80
+DIST vmware-tools-netware-12.4.0-23259341.x86_64.component.tar 81920 BLAKE2B aa77be01488d51801e73115ee112ee70e70082f47d76d0a8e24129901410fd998cbe096faa07acf35df4f923da4e08d1381c87272c395c14b83422a9cf2e9d84 SHA512 f5c053cb687b6b4f09e40379ef3eacc1319cbcda77c701610bd3ad599f6b768dc38abf18915c695a0b682e12fa7c351bc9affd5dac36193bc9b60bcf72f3459a
+DIST vmware-tools-solaris-12.4.0-23259341.x86_64.component.tar 15575040 BLAKE2B acfcbdaaaf3b90ad3ed950270972373d8e894baa965b9b45d66454f482019749890796b1d759b791a88a9bf1f06513673c3ef3f2894453e7bd314efd077fc0db SHA512 cf12b0462ff7a36f79f23edc7467b80b677fc93e47a8e54c086955da17356e0c65fde94a6cf8529aa015ca61a1348e58f919f488c8a24a7ddfe4ff9dd1219344
+DIST vmware-tools-winPre2k-12.4.0-23259341.x86_64.component.tar 11530240 BLAKE2B 57ea0845a15c1118cdcdd4b160a15f1017fefdea5bfd9904d0e221659a7e36588780b3a8a4dd43321478d3ca2fca62ba1db5b35efabc76b4797e022476dcac1b SHA512 474ff737966b34fed8a38480f3d340013c06acee381ff45ce46fcdb344a320a8df87dc38ea6289c8938e3f08198c45e32d73272a61a1fd9f6b9e5a1569593287
+DIST vmware-tools-winPreVista-12.4.0-23259341.x86_64.component.tar 58951680 BLAKE2B cfe13237e66328093d18aaaf79cd0ed35840c73963da16384b5ab04cbff0ac0c05f0c2ddff695d84d56cfdc76333b1ebbe7c7dee9e47645382dd34da7c3bbcc9 SHA512 5d3f6f630bfe5c4befe046f43238a0d7b7f9891a7e557dd346b5726ba46955e4445c0346fece386bc62828171886f3ec65e01a326f03d9cdbff557964b5ee0c3
+DIST vmware-tools-windows-12.4.0-23259341.x86_64.component.tar 138536960 BLAKE2B a63bc6a6395b6ea4975a916bd1d6ce5b8c482cc8ecde392e09a1656c05b01aa02fa56971cd7221e66596a87700917a47b2c8996c2ba4f09f9c6a7d47aced395e SHA512 732e633539ce215f25ea0f35ce852521d9e828e6ee7d005f3618b9070bc6f052c319170834e1df55e30559306d82f8c404b8a6d76c6dfbcad2fc731006c18f77
+EBUILD vmware-workstation-17.5.2.23775571-r2.ebuild 17199 BLAKE2B 51538146edd2571265b0f2ac51fef4c72552f506c0575b37ce0453e20215e84852bea25b757bdb1ceb143841defa2d64d04ebda61864a5cc700f9f80c82ce0aa SHA512 958ca7cd913195dfcde6ab292b3b4a08cd0829879c40451f60d523c4a4e0372ff43969da14a2c5679d2341899a9aee2c33e5594a5c1f29061a847bb667d6c215
 MISC metadata.xml 1852 BLAKE2B 3d3241e2fa53d92bd9ffdf6523ea0cb8dd798520656b1e4c8bc20723657704252c6c94d7231f2d047bcf2f5115ba7e3f9df90db718b4be8b103848dfd624a56f SHA512 0e9ff0f750609178cd5fb2ebb91411287ef49e60ce1577bf263f7d7b61555d69f34e23998a36edfc7887bcb7be066e798eb4b2a7773d790047107a7f07609e15
diff --git a/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571.ebuild b/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571-r2.ebuild
index 5bfd58b..fcbe7f0 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-17.5.2.23775571-r2.ebuild
@@ -6,21 +6,27 @@ EAPI=7
 PYTHON_COMPAT=( python3_{10..13} )
 inherit readme.gentoo-r1 pam python-any-r1 systemd xdg-utils
 
-#MY_PN="VMware-Workstation-Full"
 MY_PN="VMware-Workstation"
 MY_PV=$(ver_cut 1-3)
 PV_MODULES="${MY_PV}"
 PV_BUILD=$(ver_cut 4)
 MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
 VMWARE_FUSION_VER="13.5.2/23775688" # https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
+VMWARE_TOOLS_VER="12.4.0-23259341" # https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/
 SYSTEMD_UNITS_TAG="gentoo-02"
 UNLOCKER_VERSION="3.0.5"
 
 DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/workstation/"
-	#https://download3.vmware.com/software/WKST-${MY_PV//./}-LX/${MY_P}.x86_64.bundle
 SRC_URI="
 	https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/${MY_P}.x86_64.bundle.tar
+	vmware-tools-linux? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-linux-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-linuxPreGlibc25? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-linuxPreGlibc25-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-netware? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-netware-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-solaris? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-solaris-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-winPre2k? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-winPre2k-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-winPreVista? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-winPreVista-${VMWARE_TOOLS_VER}.x86_64.component.tar )
+	vmware-tools-windows? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/packages/vmware-tools-windows-${VMWARE_TOOLS_VER}.x86_64.component.tar )
 	macos-guests? (
 		https://github.com/paolo-projects/unlocker/archive/${UNLOCKER_VERSION}.tar.gz -> unlocker-${UNLOCKER_VERSION}.tar.gz
 		vmware-tools-darwinPre15? ( https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${VMWARE_FUSION_VER}/universal/core/com.vmware.fusion.zip.tar -> com.vmware.fusion-${PV}.zip.tar )
@@ -127,6 +133,19 @@ src_unpack() {
 		done
 		rm -rf __MACOSX payload manifest.plist preflight postflight com.vmware.fusion.zip
 	fi
+
+	echo "VMWARE_INSTALLER=\"${WORKDIR}/extracted/vmware-installer\"" >> bootstrap
+	echo "VMISPYVERSION="310"" >> bootstrap
+	chmod +x extracted/vmware-installer/vmis-launcher
+
+	for guest in ${IUSE_VMWARE_GUESTS}; do
+		component=$(echo vmware-tools-${guest}-*.component)
+		if [[ -e "${component}" ]]; then
+			VMWARE_BOOTSTRAP="bootstrap" bash extracted/vmware-installer/vmware-installer --install-component=${component} -x extracted/component-extracted/ || die
+			mv extracted/component-extracted/* extracted/ || die
+			rmdir extracted/component-extracted || die
+		fi
+	done
 }
 
 src_prepare() {
@@ -179,7 +198,7 @@ src_install() {
 
 	# install the installer
 	insinto "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}
-	doins -r vmware-installer/{cdsHelper,vmis,vmis-launcher,vmware-cds-helper,vmware-installer,vmware-installer.py,python}
+	doins -r vmware-installer/{cdsHelper,vmis,vmis-launcher,vmware-cds-helper,vmware-installer,vmware-installer.py,python,sopython}
 	chrpath -k -r '/../lib:$ORIGIN/../lib' "${ED}${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/python/lib/lib-dynload/*.so >/dev/null || die
 	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/{vmis-launcher,cdsHelper,vmware-installer}
 	dosym "${VM_INSTALL_DIR}"/lib/vmware-installer/${vmware_installer_version}/vmware-installer "${VM_INSTALL_DIR}"/bin/vmware-installer
@@ -390,8 +409,13 @@ src_install() {
 				local version="$(grep -oPm1 '(?<=<version>)[^<]+' ${manifest})"
 				sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('vmware-tools-${guest}','${version}','${PV_BUILD}',1,'${guest}','${guest}',1);"
 			else
-				sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('vmware-tools-${guest}','${VMWARE_FUSION_VER%/*}','${VMWARE_FUSION_VER#*/}',1,'${guest}','${guest}',1);"
+				if [[ "${guest}" =~ "darwin" ]]; then
+					sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('vmware-tools-${guest}','${VMWARE_FUSION_VER%/*}','${VMWARE_FUSION_VER#*/}',1,'${guest}','${guest}',1);"
+				else
+					sqlite3 "${dbfile}" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES('vmware-tools-${guest}','${VMWARE_TOOLS_VER%-*}','${VMWARE_TOOLS_VER#*-}',1,'${guest}','${guest}',1);"
+				fi
 			fi
+
 			insinto "${VM_INSTALL_DIR}/lib/vmware/isoimages"
 			if [[ -e "vmware-tools-${guest}/${guest}.iso" ]]; then
 				doins "vmware-tools-${guest}/${guest}.iso"