Upgpkg: 12.0.0

5 files changed, 35 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3760710b339a..9e5d159ebe6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vmware-patch
 	pkgdesc = A post-install configuration solution for VMware Workstation (Pro) and Player (Plus and Pro)
 	pkgver = 12.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.archlinux.org/index.php/VMware#Configuration
 	install = vmware-patch.install
 	arch = i686
@@ -18,30 +18,32 @@ pkgbase = vmware-patch
 	source = vmware-usbarbitrator.service
 	source = vmware-workstation.service
 	source = vmnet-11.1.0-3.19.patch
-	source = vmci-10.0.6-4.0.patch
 	source = vmci-10.0.6-3.19.patch
+	source = vmci-10.0.6-4.0.patch
+	source = vmnet-10.0.6-3.17.patch
 	source = vsock-10.0.6-3.15.patch
 	source = vsock-10.0.6-3.19.patch
+	source = vsock-10.0.6-4.1.patch
 	source = vmmon-10.0.5-3.14.patch
-	source = vmnet-10.0.5-3.17.patch
 	source = vmci-10.0.4-3.14.patch
 	source = vmmon-10.0.4-3.14.patch
 	source = vmnet-10.0.4-3.14.patch
 	source = vsock-10.0.4-3.14.patch
 	source = vmnet-10.0.1-3.13.patch
-	md5sums = 5ead10eb9675f74d709586ce061e6f3a
+	md5sums = 1fe73e49d253eeba8be2c9d066cf42cb
 	md5sums = ba054b375308442d43a408dbae5e9401
 	md5sums = ca1382966804d694894539c7bcac6bbb
 	md5sums = c12e765985b324585a548718a6ac9b43
 	md5sums = ea3817fb7952932707bfedcf33a70697
 	md5sums = 56f7f642683e54250372bb57faaf4e95
 	md5sums = 350679df90d266fe7dd343922622c39e
-	md5sums = d5ba75849a3946851506ecbaa9ff3bb5
 	md5sums = 0a8dbce269c7ac34a63453435a4a9fad
+	md5sums = d5ba75849a3946851506ecbaa9ff3bb5
+	md5sums = 43dee79cc5f5980372e16a20962b3105
 	md5sums = 1893542f8144aa0bb96f5433b9c34158
 	md5sums = 2dbd8389e1a275ea734dcedba8510df1
+	md5sums = a176c9e7f6fb0a994249dcbb47390040
 	md5sums = 298e1b59a9e729525cc3fa9d06f127eb
-	md5sums = 43dee79cc5f5980372e16a20962b3105
 	md5sums = 0d7c84c3b611bedce3303c24aa666c64
 	md5sums = 4eca49060d2373c259a0c045520de9f9
 	md5sums = acd25c0daccb62af8abf750e6369ae25
diff --git a/PKGBUILD b/PKGBUILD
index 701712207a11..4340a4b7aabe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=vmware-patch
 pkgver=12.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-install configuration solution for VMware Workstation (Pro) and Player (Plus and Pro)"
 arch=('i686' 'x86_64')
 url="https://wiki.archlinux.org/index.php/VMware#Configuration"
@@ -15,13 +15,14 @@ source=('vmware-patch.sh' 'vmware-unpatch.sh' 'common-functions.sh' 'vmware.serv
         # Workstation 11.1.0 / Player (Pro) 7.1.0
         'vmnet-11.1.0-3.19.patch'
         # Workstation 10.0.6 / Player (Plus) 6.0.6
-        'vmci-10.0.6-4.0.patch'
         'vmci-10.0.6-3.19.patch'
+        'vmci-10.0.6-4.0.patch'
+        'vmnet-10.0.6-3.17.patch'
         'vsock-10.0.6-3.15.patch'
         'vsock-10.0.6-3.19.patch'
+        'vsock-10.0.6-4.1.patch'
         # Workstation 10.0.5 / Player (Plus) 6.0.5
         'vmmon-10.0.5-3.14.patch'
-        'vmnet-10.0.5-3.17.patch'
         # Workstation 10.0.4 / Player (Plus) 6.0.4
         'vmci-10.0.4-3.14.patch'
         'vmmon-10.0.4-3.14.patch'
@@ -49,19 +50,20 @@ package() {
 }
 
 # Generated using 'updpkgsums'
-md5sums=('5ead10eb9675f74d709586ce061e6f3a'
+md5sums=('1fe73e49d253eeba8be2c9d066cf42cb'
          'ba054b375308442d43a408dbae5e9401'
          'ca1382966804d694894539c7bcac6bbb'
          'c12e765985b324585a548718a6ac9b43'
          'ea3817fb7952932707bfedcf33a70697'
          '56f7f642683e54250372bb57faaf4e95'
          '350679df90d266fe7dd343922622c39e'
-         'd5ba75849a3946851506ecbaa9ff3bb5'
          '0a8dbce269c7ac34a63453435a4a9fad'
+         'd5ba75849a3946851506ecbaa9ff3bb5'
+         '43dee79cc5f5980372e16a20962b3105'
          '1893542f8144aa0bb96f5433b9c34158'
          '2dbd8389e1a275ea734dcedba8510df1'
+         'a176c9e7f6fb0a994249dcbb47390040'
          '298e1b59a9e729525cc3fa9d06f127eb'
-         '43dee79cc5f5980372e16a20962b3105'
          '0d7c84c3b611bedce3303c24aa666c64'
          '4eca49060d2373c259a0c045520de9f9'
          'acd25c0daccb62af8abf750e6369ae25'
diff --git a/vmnet-10.0.5-3.17.patch b/vmnet-10.0.6-3.17.patch
index b3f63a0c163d..b3f63a0c163d 100644
--- a/vmnet-10.0.5-3.17.patch
+++ b/vmnet-10.0.6-3.17.patch
diff --git a/vmware-patch.sh b/vmware-patch.sh
index 8899fca7a51f..d1463633c4fc 100644
--- a/vmware-patch.sh
+++ b/vmware-patch.sh
@@ -82,7 +82,7 @@ if [[ $ver = 9.* ]] || [[ $ver = 5.* ]]; then
     fi
 fi
 
-# Fix VMCI/VSOCK loading for Workstation 10 / Player (Plus) 6 and earlier
+# Fix VMCI/VSOCK loading
 if [[ $ver != 12.* ]] && [[ $ver != 11.* ]] && [[ $ver != 7.* ]]; then
     if grep -q '$vsock_alias' /etc/init.d/vmware; then
         sed -e 's/mod=$(vmwareRealModName $vmci $vmci_alias)/mod=vmci/' \
@@ -131,14 +131,10 @@ for kernel in ${kernels[@]}; do
         exit 1
     fi
 
-#     # Unload conflicting in-kernel modules in less than Workstation 11 / Player (Pro) 7
-#     if [[ $ver != 12.* ]] && [[ $ver != 11.* ]] && [[ $ver != 7.* ]]; then
-#         rmmod "vsock" "vmw_vsock_vmci_transport" "vmw_vmci" 2>/dev/null || true
-#     else
-#         for mod in "vsock" "vmw_vsock_vmci_transport" "vmw_vmci"; do
-#             modprobe $mod 2>/dev/null || true
-#         done
-#     fi
+    # Unload conflicting in-kernel modules in less than Workstation 11 / Player (Pro) 7
+    if [[ $ver != 12.* ]] && [[ $ver != 11.* ]] && [[ $ver != 7.* ]]; then
+        rmmod "vsock" "vmw_vsock_vmci_transport" "vmw_vmci" 2>/dev/null || true
+    fi
 
     # Detect applicable patches (/usr/lib/vmware/modules/patches/[mod]-[ver]-[kernel].patch)
     unset patches
diff --git a/vsock-10.0.6-4.1.patch b/vsock-10.0.6-4.1.patch
new file mode 100644
index 000000000000..5d7a147cfc8d
--- /dev/null
+++ b/vsock-10.0.6-4.1.patch
@@ -0,0 +1,14 @@
+diff --git vsock-only/linux/af_vsock.c vsock-only/linux/af_vsock.c
+index 4d0c6c3..1c29976 100644
+--- vsock-only/linux/af_vsock.c
++++ vsock-only/linux/af_vsock.c
+@@ -4285,7 +4285,7 @@ VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), &msg->msg_iter.iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
+