Adjust for parallels 12 provided tools

5 files changed, 65 insertions, 345 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e802c45050e0..999ab95965b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = parallels11-tools
+pkgbase = parallels12-tools
 	pkgdesc = Parallels virtualization integration services & drivers
-	pkgver = 11.2.2.32663
-	pkgrel = 5
+	pkgver = 12.2.1.41615
+	pkgrel = 0
 	url = https://parallels.com
 	arch = x86_64
 	license = custom: commercial
@@ -13,42 +13,37 @@ pkgbase = parallels11-tools
 	conflicts = xorg-server<1.16
 	conflicts = X-ABI-VIDEODRV_VERSION<20
 	conflicts = X-ABI-VIDEODRV_VERSION>=21
-	source = dir://parallels11-tools/tools/prltools.x64.tar.gz
-	source = dir://parallels11-tools/kmods/prl_mod.tar.gz
-	source = dir://parallels11-tools/tools/prlmouse.conf
-	source = dir://parallels11-tools/tools/xorg-prlmouse.rules
-	source = dir://parallels11-tools/tools/99prltoolsd-hibernate
-	source = dir://parallels11-tools/tools/mount.prl_fs.8
-	source = dir://parallels11-tools/installer/blacklist-parallels.conf
-	source = dir://parallels11-tools/installer/prltoolsd.sh
-	source = dir://parallels11-tools/installer/prltoolsd.service
-	source = dir://parallels11-tools/installer/prl-x11.sh
-	source = dir://parallels11-tools/installer/prl-x11.service
-	source = dir://parallels11-tools/installer/prlfsmountd.sh
-	source = 0001-fix-for-4.9.y.patch
-	source = 0001-fix-4.10.y.patch
-	source = 0001-fix-4.11.y.patch
-	sha1sums = 1bb6c8d9b1fc8ff781d89cdd3856995002670911
-	sha1sums = af8932e2abd88d50c8135b9d1effa38abb3664ff
-	sha1sums = 8d7b264653f8167904d0328e1fc540fc0b7bc7eb
-	sha1sums = a20911495461ed1950bee069d128fe6c7103c97d
-	sha1sums = da5fcbc6a93f1d3939752838e53d1daea13307cb
-	sha1sums = 9af7dba4990c69493e6d60bd60bb684f36aee13f
-	sha1sums = a5f638186352484b9153191ace3fb8a4ce826b1f
-	sha1sums = c8042c5ada41dd17f2b67347871dff41c4bce9c9
-	sha1sums = c50bf939719eba4ebb34e4bd8a0921e1cbe4d901
-	sha1sums = 82ab36a2876a1d30fad92ebf06d87b0d8d7210a8
-	sha1sums = bd681d740b4a1a68adfd4f94afec5934c2ea69ac
-	sha1sums = 56d3fc7c9abb7c63b9c6356422261f0a87cf3b22
-	sha1sums = e955e6d9215a0d104a0482b69bb7d7399f8c9f36
-	sha1sums = 078ecd2bb95b05006e94007dc8428d9c8fcc519e
-	sha1sums = dec42902094d221f14f453fa3281d62bb7731748
+	source = dir://parallels12-tools/tools/prltools.x64.tar.gz
+	source = dir://parallels12-tools/kmods/prl_mod.tar.gz
+	source = dir://parallels12-tools/tools/prlmouse.conf
+	source = dir://parallels12-tools/tools/xorg-prlmouse.rules
+	source = dir://parallels12-tools/tools/99prltoolsd-hibernate
+	source = dir://parallels12-tools/tools/mount.prl_fs.8
+	source = dir://parallels12-tools/installer/blacklist-parallels.conf
+	source = dir://parallels12-tools/installer/prltoolsd.sh
+	source = dir://parallels12-tools/installer/prltoolsd.service
+	source = dir://parallels12-tools/installer/prl-x11.sh
+	source = dir://parallels12-tools/installer/prl-x11.service
+	source = dir://parallels12-tools/installer/prlfsmountd.sh
+	sha1sums = fdd278b5caee0647f1c062512fb83e1da4d5fdb2
+	sha1sums = fa61d1eddb0d6c2130c3dbb9166e80b71c988584
+	sha1sums = 52a6c4b6cd493aac8c932a77a25efc17e0e075e5
+	sha1sums = 89aef4d9e61d5835e3133951fa34e889525ba7cc
+	sha1sums = 887812861a52271ea242b09fbfdf3b480cddc779
+	sha1sums = 75d753bfa2d352eec36bc0fcea2a6a6e068a85d3
+	sha1sums = a927134a9c51af9c372c9fa388bbdec53c56d808
+	sha1sums = 3bba1a27f912f8c8ef6167f5b19244215251189c
+	sha1sums = 32b2028480668ca8f75888de0c681c74d613864f
+	sha1sums = 8a20a07b905a5dcdd0b182844ff781344b78a8b5
+	sha1sums = ff52471a3c6acec6f4a59e2a8f2aff6a937bf09e
+	sha1sums = b3e540bd8b1a96bfff81e1fd7f90ab978f504475
 
-pkgname = parallels11-tools
+pkgname = parallels12-tools
 	provides = parallels-tools
 	conflicts = parallels-tools
 
-pkgname = parallels11-tools-dkms
+pkgname = parallels12-tools-dkms
+	arch = any
 	depends = dkms
 	provides = parallels-tools-dkms
 	conflicts = parallels-tools-dkms
diff --git a/0001-fix-4.10.y.patch b/0001-fix-4.10.y.patch
deleted file mode 100644
index bf3cbd43c9e2..000000000000
--- a/0001-fix-4.10.y.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 516856f60f8a47173aa71e067c37f8622245c80e Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Thu, 30 Mar 2017 15:44:05 -0400
-Subject: [PATCH] fix 4.10.y
-
----
- prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-index ccee80c..7cb3f3e 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-@@ -763,7 +763,9 @@ struct inode_operations prlfs_symlink_iops = {
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- 	.readlink = prlfs_readlink,
- #else
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
- 	.readlink = generic_readlink,
-+# endif
- 	.getattr  = prlfs_getattr,
- #endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
--- 
-2.12.1
-
diff --git a/0001-fix-4.11.y.patch b/0001-fix-4.11.y.patch
deleted file mode 100644
index a2bc087efc41..000000000000
--- a/0001-fix-4.11.y.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3864ee84372e03e080a2b7c830e30db47d9a4415 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Thu, 25 May 2017 13:15:56 -0400
-Subject: [PATCH] fix kernel 4.11.y
-
----
- prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c  | 7 ++++++-
- prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c | 8 ++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c
-index 7e987e8..d8a364b 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/file.c
-@@ -327,7 +327,9 @@ out:
- #endif
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+static int prlfs_fault (struct vm_fault *vmf)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- static int prlfs_fault (struct vm_area_struct *vma, struct vm_fault *vmf)
- #else
- static struct page *prlfs_nopage(struct vm_area_struct *vma,
-@@ -347,6 +349,9 @@ static struct page *prlfs_nopage(struct vm_area_struct *vma,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- 	int retval;
- #endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+	struct vm_area_struct *vma = vmf->vma;
-+#endif
- 
- 	DPRINTK("ENTER\n");
- 	if (!vma->vm_file) {
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-index 7cb3f3e..d1426d8 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-@@ -531,9 +531,17 @@ struct dentry_operations prlfs_dentry_ops = {
- };
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+static int prlfs_getattr(const struct path *p, struct kstat *stat,
-+		u32 request_mask, unsigned int flags)
-+#else
- static int prlfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
- 						 struct kstat *stat)
-+#endif
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+	struct dentry *dentry = p->dentry;
-+#endif
- 	int ret;
- 	DPRINTK("ENTER\n");
- 	if (check_dentry(dentry)) {
--- 
-2.13.0
-
diff --git a/0001-fix-for-4.9.y.patch b/0001-fix-for-4.9.y.patch
deleted file mode 100644
index 799ca7533fdd..000000000000
--- a/0001-fix-for-4.9.y.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 7d99b6d8e78946e06f066c25145fe7cf93b7d5b4 Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Mon, 30 Jan 2017 12:22:26 -0500
-Subject: [PATCH] fix for 4.9.y
-
----
- prl_fs/SharedFolders/Guest/Linux/prl_fs/Makefile    |  2 +-
- prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c     | 15 ++++++++++++++-
- prl_fs/SharedFolders/Guest/Linux/prl_fs/interface.c |  6 ++++++
- prl_fs/SharedFolders/Guest/Linux/prl_fs/prlfs.h     |  3 ++-
- prl_fs/SharedFolders/Guest/Linux/prl_fs/super.c     |  8 ++++++--
- prl_tg/Toolgate/Guest/Linux/prl_tg/Makefile         |  2 +-
- prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c          |  5 +++--
- prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_compat.h   | 10 ++++++++--
- 8 files changed, 41 insertions(+), 10 deletions(-)
-
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-index 5502d70..ccee80c 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c
-@@ -383,10 +383,22 @@ static int prlfs_rmdir(struct inode *dir, struct dentry *dentry)
- }
- 
- static int prlfs_rename(struct inode *old_dir, struct dentry *old_de,
--			struct inode *new_dir, struct dentry *new_de)
-+			struct inode *new_dir, struct dentry *new_de
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
-+			, unsigned int flags
-+#endif
-+	)
- {
- 	void *np, *nbuf;
- 	int nbuflen;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)
-+	if (flags) {
-+		pr_info_ratelimited("rename got invalid flags: 0x%x\n", flags);
-+		return -EINVAL;
-+	}
-+#endif
-+
-+	{
- 	PRLFS_STD_INODE_HEAD(old_de)
- 	nbuflen = PATH_MAX;
- 	nbuf = kmalloc(nbuflen, GFP_KERNEL);
-@@ -406,6 +418,7 @@ static int prlfs_rename(struct inode *old_dir, struct dentry *old_de,
- out_free1:
- 	kfree(nbuf);
- 	PRLFS_STD_INODE_TAIL
-+	}
- }
- 
- /*
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/interface.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/interface.c
-index 1665ed3..89b809f 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/interface.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/interface.c
-@@ -114,6 +114,9 @@ int host_request_get_sf_list(struct pci_dev *pdev, void *data, int size)
- 	ret = call_tg_sync(pdev, &sdesc);
- 	if ((ret == 0) && (Req.Req.Status != TG_STATUS_SUCCESS))
- 		ret = -TG_ERR(Req.Req.Status);
-+	if (ret < 0) {
-+		pr_warn("failed to get sf list: %d\n", ret);
-+	}
- 	return ret;
- }
- 
-@@ -136,6 +139,9 @@ int host_request_sf_param(struct pci_dev *pdev, void *data, int size,
- 	ret = call_tg_sync(pdev, &sdesc);
- 	if ((ret == 0) && (Req.Req.Status != TG_STATUS_SUCCESS))
- 		ret = -TG_ERR(Req.Req.Status);
-+	if (ret < 0) {
-+		pr_warn("sf_param failed: %d %d\n", ret, Req.Req.Status);
-+	}
- 	return ret;
- }
- 
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/prlfs.h b/prl_fs/SharedFolders/Guest/Linux/prl_fs/prlfs.h
-index 77660e0..c6d342a 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/prlfs.h
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/prlfs.h
-@@ -149,13 +149,14 @@ int host_request_symlink(struct super_block *sb, const void *src_path, int src_l
- 
- /* define to 1 to enable copious debugging info */
- #undef DRV_DEBUG
-+#define DRV_DEBUG 1
- 
- /* define to 1 to disable lightweight runtime debugging checks */
- #undef DRV_NDEBUG
- 
- #ifdef DRV_DEBUG
- /* note: prints function name for you */
--#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-+#  define DPRINTK(fmt, args...) pr_debug("%s: " fmt, __FUNCTION__ , ## args)
- #else
- #  define DPRINTK(fmt, args...)
- #endif
-diff --git a/prl_fs/SharedFolders/Guest/Linux/prl_fs/super.c b/prl_fs/SharedFolders/Guest/Linux/prl_fs/super.c
-index 5b7e5e8..2aae4ce 100644
---- a/prl_fs/SharedFolders/Guest/Linux/prl_fs/super.c
-+++ b/prl_fs/SharedFolders/Guest/Linux/prl_fs/super.c
-@@ -441,12 +441,16 @@ static int seq_sf_show(struct seq_file *s, void *v)
- 	psp.id = GET_SF_INFO;
- 	strncpy((char *)&psp.locale, "utf-8", LOCALE_NAME_LEN - 1);
- 	ret = host_request_sf_param(tg_dev, p, PAGE_SIZE, &psp);
--	if (ret < 0)
-+	if (ret < 0) {
-+		pr_warn("could not get info for %u: %d\n", psp.index, ret);
- 		goto free;
-+	}
- 
- 	prsp = p;
--	if (prsp->ret == 0)
-+	if (prsp->ret == 0) {
-+		pr_warn("empty info for %u\n", psp.index);
- 		goto free;
-+	}
- 
- 	*((char *)prsp + PAGE_SIZE - 1) = 0;
- 	seq_printf(s, "%x: %s ", psp.index, prsp->buf);
-diff --git a/prl_tg/Toolgate/Guest/Linux/prl_tg/Makefile b/prl_tg/Toolgate/Guest/Linux/prl_tg/Makefile
-index 014ae08..9af5c16 100644
---- a/prl_tg/Toolgate/Guest/Linux/prl_tg/Makefile
-+++ b/prl_tg/Toolgate/Guest/Linux/prl_tg/Makefile
-@@ -21,7 +21,7 @@ DRIVER_DIR ?= $(PWD)
- 
- export DRIVER_DIR
- 
--EXTRA_CFLAGS	+=  -I$(DRIVER_DIR)
-+EXTRA_CFLAGS	+=  -I$(DRIVER_DIR) -DDEBUG=1
- EXTRA_CFLAGS	+= -I$(DRIVER_DIR)/../../../../
- 
- # Get version from version.h in kernel source directory
-diff --git a/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c b/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c
-index a03e742..a48862d 100644
---- a/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c
-+++ b/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c
-@@ -42,13 +42,14 @@ static char version[] = KERN_INFO DRIVER_LOAD_MSG "\n";
- 
- /* define to 1 to enable copious debugging info */
- #undef DRV_DEBUG
-+#define DRV_DEBUG 1
- 
- /* define to 1 to disable lightweight runtime debugging checks */
- #undef DRV_NDEBUG
- 
- #ifdef DRV_DEBUG
- /* note: prints function name for you */
--#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-+#  define DPRINTK(fmt, args...) pr_debug("%s: " fmt, __FUNCTION__ , ## args)
- #else
- #  define DPRINTK(fmt, args...)
- #endif
-@@ -480,7 +481,7 @@ static TG_PAGED_BUFFER *map_user_request(TG_PAGED_BUFFER *buf, TG_BUFFER *sbuf,
- 	/* lock userspace pages */
- 	got = get_user_pages(
- 			     sbuf->u.Va, npages,
--			     sbuf->Writable, 0,
-+			     sbuf->Writable ? FOLL_WRITE : 0,
- 			     uple->p, NULL);
- 	up_read(&current->mm->mmap_sem);
- 
-diff --git a/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_compat.h b/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_compat.h
-index c158a70..37044b4 100644
---- a/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_compat.h
-+++ b/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_compat.h
-@@ -193,6 +193,12 @@ prltg_proc_create_data(char *name, umode_t mode, struct proc_dir_entry *parent,
- #define page_cache_get(x) get_page(x)
- #define page_cache_release(x) put_page(x)
- #else
--#define get_user_pages(_1, _2, _3, _4, _5, _6) \
--		get_user_pages(current, current->mm, _1, _2, _3, _4, _5, _6)
-+#endif
-+
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
-+#define get_user_pages(_start, _nr_pages, _gup_flags, _pages, _vmas) \
-+		get_user_pages(current, current->mm, _start, _nr_pages, !!(_gup_flags & FOLL_WRITE), !!(_gup_flags & FOLL_FORCE), _pages, _vmas)
-+# elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
-+#  define get_user_pages(_start, _nr_pages, _gup_flags, _pages, _vmas) \
-+		get_user_pages(_start, _nr_pages, !!(_gup_flags & FOLL_WRITE), !!(_gup_flags & FOLL_FORCE), _pages, _vmas)
- #endif
--- 
-2.11.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 8c912a74ad70..ddd2ea756d64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Cody P Schafer < aur [at] codyps.com >
-pkgbase=parallels11-tools
-pkgname=(parallels11-tools parallels11-tools-dkms)
-pkgver=11.2.2.32663
-pkgrel=5
+pkgbase=parallels12-tools
+pkgname=(parallels12-tools parallels12-tools-dkms)
+pkgver=12.2.1.41615
+pkgrel=0
 pkgdesc="Parallels virtualization integration services & drivers"
 arch=('x86_64')
 url="https://parallels.com"
@@ -32,43 +32,31 @@ source=(
 	dir://${pkgbase}/installer/prl-x11.sh
 	dir://${pkgbase}/installer/prl-x11.service
 	dir://${pkgbase}/installer/prlfsmountd.sh
-	'0001-fix-for-4.9.y.patch'
-	'0001-fix-4.10.y.patch'
-	'0001-fix-4.11.y.patch'
 )
 
-sha1sums=('1bb6c8d9b1fc8ff781d89cdd3856995002670911'
-          'af8932e2abd88d50c8135b9d1effa38abb3664ff'
-          '8d7b264653f8167904d0328e1fc540fc0b7bc7eb'
-          'a20911495461ed1950bee069d128fe6c7103c97d'
-          'da5fcbc6a93f1d3939752838e53d1daea13307cb'
-          '9af7dba4990c69493e6d60bd60bb684f36aee13f'
-          'a5f638186352484b9153191ace3fb8a4ce826b1f'
-          'c8042c5ada41dd17f2b67347871dff41c4bce9c9'
-          'c50bf939719eba4ebb34e4bd8a0921e1cbe4d901'
-          '82ab36a2876a1d30fad92ebf06d87b0d8d7210a8'
-          'bd681d740b4a1a68adfd4f94afec5934c2ea69ac'
-          '56d3fc7c9abb7c63b9c6356422261f0a87cf3b22'
-          'e955e6d9215a0d104a0482b69bb7d7399f8c9f36'
-          '078ecd2bb95b05006e94007dc8428d9c8fcc519e'
-          'dec42902094d221f14f453fa3281d62bb7731748')
-
-prepare() {
-	patch -p1 -i ../0001-fix-for-4.9.y.patch
-	patch -p1 -i ../0001-fix-4.10.y.patch
-	patch -p1 -i ../0001-fix-4.11.y.patch
-}
-
-package_parallels11-tools() {
+sha1sums=('fdd278b5caee0647f1c062512fb83e1da4d5fdb2'
+          'fa61d1eddb0d6c2130c3dbb9166e80b71c988584'
+          '52a6c4b6cd493aac8c932a77a25efc17e0e075e5'
+          '89aef4d9e61d5835e3133951fa34e889525ba7cc'
+          '887812861a52271ea242b09fbfdf3b480cddc779'
+          '75d753bfa2d352eec36bc0fcea2a6a6e068a85d3'
+          'a927134a9c51af9c372c9fa388bbdec53c56d808'
+          '3bba1a27f912f8c8ef6167f5b19244215251189c'
+          '32b2028480668ca8f75888de0c681c74d613864f'
+          '8a20a07b905a5dcdd0b182844ff781344b78a8b5'
+          'ff52471a3c6acec6f4a59e2a8f2aff6a937bf09e'
+          'b3e540bd8b1a96bfff81e1fd7f90ab978f504475')
+
+package_parallels12-tools() {
 	provides=(parallels-tools)
 	conflicts=(parallels-tools)
 
+	install -d "${pkgdir}/usr/bin"
+
 	cp -r "${srcdir}"/xorg.${XORG_VERSION}/usr "${pkgdir}"
 	# xorg.7.1 is COMMON_TOOLS_DIR
-	cp -r "${srcdir}"/xorg.7.1/usr/bin/{prlcc,prlcp,prlsga,prldnd} \
+	cp -r "${srcdir}"/xorg.7.1/usr/bin/{prlcc,prlcp,prlsga,prldnd,prltimesync} \
 		"${pkgdir}/usr/bin"
-	cp -r "${srcdir}"/xorg.7.1/usr/lib/libprl_wmouse_watcher.so \
-		"${pkgdir}/usr/lib/libprl_wmouse_watcher.so.1.0.0"
 
 	mkdir -p "${pkgdir}/usr/bin"
 	mkdir -p "${pkgdir}/usr/lib"
@@ -108,22 +96,28 @@ package_parallels11-tools() {
 	install -m 0755 99prltoolsd-hibernate "${pkgdir}/etc/pm/sleep.d"
 
 	# These have very strange /usr/local rpaths, strip them out
-	chrpath -d "${pkgdir}/usr/lib/libglx.so.1.0.0"
-	for b in prlshprint prl_wmouse_d prlshprof prlsga prl_nettool \
-		prl_showvmcfg prlhosttime prldnd prlcc prl_snapshot prlcp \
-		prltoolsd;
-	do
-		chrpath -d "${pkgdir}/usr/bin/$b"
-	done
+	#chrpath -d "${pkgdir}/usr/lib/libglx.so.1.0.0"
+	#for b in prlshprint prlshprof prlsga prl_nettool \
+	#	prl_showvmcfg prlhosttime prldnd prlcc prl_snapshot prlcp \
+	#	prltoolsd;
+	#do
+	#	chrpath -d "${pkgdir}/usr/bin/$b"
+	#done
 }
 
-package_parallels11-tools-dkms() {
+package_parallels12-tools-dkms() {
 	depends=('dkms')
 	provides=(parallels-tools-dkms)
 	conflicts=(parallels-tools-dkms)
+	arch=(any)
 
 	_dkms_dir="${pkgdir}"/usr/src/${pkgbase}-${pkgver}
 	install -d -m 0755 "${_dkms_dir}"
 	install -m0644 dkms.conf Makefile.kmods "${_dkms_dir}"
 	cp -r prl_fs prl_fs_freeze prl_tg prl_eth "${_dkms_dir}"
 }
+
+# TODO:
+#	- install script: udevadm control --reload-rules && udevadm trigger
+#         Unless pacman does that for us already
+