summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2019-03-29 22:47:34 +0100
committerJean-Marc Lenoir2019-03-29 22:47:34 +0100
commit30eb56e1df9424e1c012c27f7b97fb5fa2591998 (patch)
treec973f931de27c9254a0ff3f282dba52523590529
parent6b3d5c0eff59e85749dda62f44fcca38e56c858a (diff)
downloadaur-30eb56e1df9424e1c012c27f7b97fb5fa2591998.tar.gz
Update to 14.1.7
Compatibility with Linux 5.1.0-rc2
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD14
-rw-r--r--vmmon.patch97
3 files changed, 113 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad2942561cd..910c1d66662 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vmware-workstation14
pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
- pkgver = 14.1.6
+ pkgver = 14.1.7
pkgrel = 1
url = https://www.vmware.com/products/workstation-for-linux.html
install = vmware-workstation.install
@@ -19,7 +19,7 @@ pkgbase = vmware-workstation14
depends = pcsclite
depends = hicolor-icon-theme
optdepends = linux-headers: build modules against Arch kernel
- provides = vmware-workstation=14.1.6
+ provides = vmware-workstation=14.1.7
provides = vmware-ovftool
conflicts = vmware-workstation
conflicts = vmware-modules-dkms
@@ -39,7 +39,7 @@ pkgbase = vmware-workstation14
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-14.1.6-12368378.x86_64.bundle
+ source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.1.7-12989993.x86_64.bundle
source = bootstrap
source = vmware-vix-bootstrap
source = config
@@ -61,10 +61,10 @@ pkgbase = vmware-workstation14
source = Makefile
source = vmmon.patch
source = vmnet.patch
- source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.5/10950653/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
- source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.5/10950653/packages/com.vmware.fusion.tools.darwin.zip.tar
+ source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.6/12989998/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
+ source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.6/12989998/packages/com.vmware.fusion.tools.darwin.zip.tar
source = unlocker.py
- sha256sums = 0d59207fa5d5ac587469608ec763958376f9feb9860c401e086cbc7c78be2629
+ sha256sums = a9b5ff8adb885a064f582f700c2ad42aa6c2a3b1b8964f3f8cab35cc084c89c4
sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
sha256sums = d9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991
@@ -84,10 +84,10 @@ pkgbase = vmware-workstation14
sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487
sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
- sha256sums = 1ab029980b186d37a0f8da293e93239648ae89b438ea5341683489bd02f444f8
+ sha256sums = d9b31fbac3fe552b34af8585cc0bc7a70d8816e73a8c572bdd2510d5f1c7d474
sha256sums = 955329f91f25f523f5974992923238d2718bc6255acc7e18fabf80cf20206531
- sha256sums = c085cec6e2a57951fd2fb8e0832ef40da6c2f0012e08170f7f76aef77c215a39
- sha256sums = 1455cc7b683e758baff2bb1ff0300c10f049274f2613a00a73150798dd45ed3a
+ sha256sums = 195313791f2c2cf880b0ba6c9d130e40ab6729335c0980fcc40df4209c1ed52b
+ sha256sums = e36fb99a56a65d2c4d82168c8adb1ed19a9a7aaf75807c667c79a79f4968740a
sha256sums = 29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c
pkgname = vmware-workstation14
diff --git a/PKGBUILD b/PKGBUILD
index 9a06fd5a69b..8d37eeb9254 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@
#PKGEXT=.pkg.tar
pkgname=vmware-workstation14
-pkgver=14.1.6
-_buildver=12368378
+pkgver=14.1.7
+_buildver=12989993
_pkgver=${pkgver}_${_buildver}
pkgrel=1
pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
@@ -94,7 +94,7 @@ source=(
'vmnet.patch'
)
sha256sums=(
- '0d59207fa5d5ac587469608ec763958376f9feb9860c401e086cbc7c78be2629'
+ 'a9b5ff8adb885a064f582f700c2ad42aa6c2a3b1b8964f3f8cab35cc084c89c4'
'12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
@@ -118,7 +118,7 @@ sha256sums=(
'05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487'
'6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d'
- '1ab029980b186d37a0f8da293e93239648ae89b438ea5341683489bd02f444f8'
+ 'd9b31fbac3fe552b34af8585cc0bc7a70d8816e73a8c572bdd2510d5f1c7d474'
'955329f91f25f523f5974992923238d2718bc6255acc7e18fabf80cf20206531'
)
options=(!strip emptydirs)
@@ -128,7 +128,7 @@ _isoimages=(freebsd linux linuxPreGlibc25 netware solaris windows winPre2k winPr
if [ -n "$_enable_macOS_guests" ]; then
-_vmware_fusion_ver=10.1.5_10950653
+_vmware_fusion_ver=10.1.6_12989998
# List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
makedepends+=(
@@ -142,8 +142,8 @@ source+=(
'unlocker.py'
)
sha256sums+=(
- 'c085cec6e2a57951fd2fb8e0832ef40da6c2f0012e08170f7f76aef77c215a39'
- '1455cc7b683e758baff2bb1ff0300c10f049274f2613a00a73150798dd45ed3a'
+ '195313791f2c2cf880b0ba6c9d130e40ab6729335c0980fcc40df4209c1ed52b'
+ 'e36fb99a56a65d2c4d82168c8adb1ed19a9a7aaf75807c667c79a79f4968740a'
'29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c'
)
diff --git a/vmmon.patch b/vmmon.patch
index 27939af40f9..e960a58a905 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -204,3 +204,100 @@ index cf4197b..ef88a22 100644
printk(KERN_ERR "%s: Couldn't verify write to uva 0x%p with size %"
FMTSZ"u\n", __func__, p, size);
+From 41413a9b6e660a93600a438944d85b6f51eb680c Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Tue, 5 Mar 2019 13:21:35 +0100
+Subject: [PATCH] vmmon: use KERNEL_DS rather than get_ds()
+
+Commit 736706bee329 ("get rid of legacy 'get_ds()' function") in v5.1-rc1
+removed get_ds() helper. As this helper always returned KERNEL_DS on x86_64
+since the architecture was introduced (and even on i386, it did so since
+v2.1.0), simply use KERNEL_DS regardless of kernel version.
+---
+ vmmon-only/linux/hostif.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index ef88a22..8ca17de 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -2183,7 +2183,7 @@ isVAReadable(VA r) // IN:
+ int ret;
+
+ old_fs = get_fs();
+- set_fs(get_ds());
++ set_fs(KERNEL_DS);
+ r = APICR_TO_ADDR(r, APICR_VERSION);
+ ret = HostIF_CopyFromUser(&dummy, r, sizeof dummy);
+ set_fs(old_fs);
+@@ -2384,7 +2384,7 @@ HostIF_SemaphoreWait(VMDriver *vm, // IN:
+ }
+
+ old_fs = get_fs();
+- set_fs(get_ds());
++ set_fs(KERNEL_DS);
+
+ {
+ struct poll_wqueues table;
+@@ -2513,7 +2513,7 @@ HostIF_SemaphoreSignal(uint64 *args) // IN:
+ }
+
+ old_fs = get_fs();
+- set_fs(get_ds());
++ set_fs(KERNEL_DS);
+
+ /*
+ * Always write sizeof(uint64) bytes. This works fine for eventfd and
+From 2af9d566d0ccc78a93b46a79d23902e5ba2bc933 Mon Sep 17 00:00:00 2001
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Sat, 9 Mar 2019 11:11:29 +0100
+Subject: [PATCH] vmmon: fix return type of vm_operations_struct::fault handler
+
+Commit 3d3539018d2c ("mm: create the new vm_fault_t type") in mainline
+5.1-rc1 changed the definition of vm_fault_t type to unsigned to catch
+vm_operations_struct::fault handlers which still have int as return value.
+LinuxDriverFault() in vmmon module is one of those.
+
+As handler return type was changed by commit 1c8f422059ae ("mm: change
+return type to vm_fault_t") in 4.17-rc1, make LinuxDriverFault() always
+return vm_fault_t and define vm_fault_t as int when building against
+a pre-4.17 kernel.
+---
+ vmmon-only/linux/driver.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index 92a3529..248a95d 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -73,6 +73,9 @@ static Bool LinuxDriverCheckPadding(void);
+
+ struct VMXLinuxState linuxState;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
++typedef int vm_fault_t;
++#endif
+
+ /*
+ *----------------------------------------------------------------------
+@@ -97,9 +100,9 @@ long LinuxDriver_Ioctl(struct file *filp, u_int iocmd,
+
+ static int LinuxDriver_Close(struct inode *inode, struct file *filp);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-static int LinuxDriverFault(struct vm_fault *fault);
++static vm_fault_t LinuxDriverFault(struct vm_fault *fault);
+ #else
+-static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
++static vm_fault_t LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
+ #endif
+ static int LinuxDriverMmap(struct file *filp, struct vm_area_struct *vma);
+
+@@ -594,7 +597,7 @@ LinuxDriver_Close(struct inode *inode, // IN
+ *-----------------------------------------------------------------------------
+ */
+
+-static int
++static vm_fault_t
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+ LinuxDriverFault(struct vm_fault *fault) //IN/OUT
+ #else