commit vmware-horizon-client 4.5.0-2

6 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94873f83867e..e18d8d5fb342 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jun  8 15:09:11 UTC 2017
+# Thu Jun  8 17:13:59 UTC 2017
 pkgbase = vmware-horizon-client
 	pkgdesc = VMware Horizon Client connect to VMware Horizon virtual desktop
 	pkgver = 4.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://my.vmware.com/web/vmware/info/slug/desktop_end_user_computing/vmware_horizon_clients/4_0
 	arch = i686
 	arch = x86_64
@@ -12,12 +12,10 @@ pkgbase = vmware-horizon-client
 	source = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/vmware-bundle.eclass
 	source = vmware-horizon-usb
 	source = vmware-horizon-usb.service
-	source = vmware-horizon-usb-tmpfiles.conf
 	source = vmware-horizon-virtual-printing.service
 	sha256sums = d8794c22229afdeb698dae5908b7b2b3880e075b19be38e0b296bb28f4555163
-	sha256sums = 7c78953823f7307814104881b322dcf66c36ca02e44e559239ac51abcf1e7a37
+	sha256sums = 008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f
 	sha256sums = 5e737d69e49ea7e039bc94f358b45c8e6d9071b7c041a53800555d3dc21c8dac
-	sha256sums = ec763930dd50d6e77a31c40c939909752cfb124cafb0a4ca4f76860375a14d75
 	sha256sums = e47e770a1e19ed321de7c2765b2d682f59ac466aef92b2e4ea5e65cacf56de36
 	source_i686 = vmware-horizon-client-4.5.0-5650368-i686.bundle::https://download3.vmware.com/software/view/viewclients/CART17Q2/VMware-Horizon-Client-4.5.0-5650368.x86.bundle
 	sha256sums_i686 = 2fa5bac1445c3619a295b1f64ddc0432da3d6d9a4f1930885fcdc6fd111bd5df
diff --git a/PKGBUILD b/PKGBUILD
index 0ea033dcb079..3984f3e2995c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('vmware-horizon-client' 'vmware-horizon-rtav' 'vmware-horizon-smartcard
 pkgver=4.5.0
 _build=5650368
 _cart='CART17Q2'
-pkgrel=1
+pkgrel=2
 pkgdesc='VMware Horizon Client connect to VMware Horizon virtual desktop'
 arch=('i686' 'x86_64')
 url='https://my.vmware.com/web/vmware/info/slug/desktop_end_user_computing/vmware_horizon_clients/4_0'
@@ -14,14 +14,12 @@ makedepends=('libxslt')
 source=('http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/vmware-bundle.eclass'
 	'vmware-horizon-usb'
 	'vmware-horizon-usb.service'
-	'vmware-horizon-usb-tmpfiles.conf'
 	'vmware-horizon-virtual-printing.service')
 source_x86_64=("${pkgbase}-${pkgver}-${_build}-x86_64.bundle::https://download3.vmware.com/software/view/viewclients/${_cart}/VMware-Horizon-Client-${pkgver}-${_build}.x64.bundle")
 source_i686=("${pkgbase}-${pkgver}-${_build}-i686.bundle::https://download3.vmware.com/software/view/viewclients/${_cart}/VMware-Horizon-Client-${pkgver}-${_build}.x86.bundle")
 sha256sums=('d8794c22229afdeb698dae5908b7b2b3880e075b19be38e0b296bb28f4555163'
-            '7c78953823f7307814104881b322dcf66c36ca02e44e559239ac51abcf1e7a37'
+            '008b60ebf45f7d1e033c8ad8ce1688d5e1c59fc0668493067fb89b563b1dc00f'
             '5e737d69e49ea7e039bc94f358b45c8e6d9071b7c041a53800555d3dc21c8dac'
-            'ec763930dd50d6e77a31c40c939909752cfb124cafb0a4ca4f76860375a14d75'
             'e47e770a1e19ed321de7c2765b2d682f59ac466aef92b2e4ea5e65cacf56de36')
 sha256sums_x86_64=('70281bcac267e72b816e62cb0742c8707a5f29dccae977613d6b837e3248d429')
 sha256sums_i686=('2fa5bac1445c3619a295b1f64ddc0432da3d6d9a4f1930885fcdc6fd111bd5df')
@@ -169,10 +167,10 @@ package_vmware-horizon-usb() {
 
 	mkdir -p "${pkgdir}/usr/lib/vmware/view/"
 	cp -a bin/ "${pkgdir}/usr/lib/vmware/view/usb"
+	cp -a lib/ "${pkgdir}/usr/"
 
 	install -D -m0755 "${srcdir}/vmware-horizon-usb" "${pkgdir}/usr/lib/systemd/scripts/vmware-horizon-usb"
 	install -D -m0644 "${srcdir}/vmware-horizon-usb.service" "${pkgdir}/usr/lib/systemd/system/vmware-horizon-usb.service"
-	install -D -m0644 "${srcdir}/vmware-horizon-usb-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/vmware-horizon-usb.conf"
 }
 
 package_vmware-horizon-virtual-printing() {
diff --git a/vmware-horizon-usb b/vmware-horizon-usb
index b634fb578685..2bd0e5a88cb2 100644
--- a/vmware-horizon-usb
+++ b/vmware-horizon-usb
@@ -1,4 +1,17 @@
 #!/bin/sh
 
+# this is from /etc/init.d/vmware-USBArbitrator
+# changed to work on uids >= 1000
+for user in `awk -F'[/:]' '{if ($3 == 0 || ($3 >= 1000 && $3 != 65534)) print $1}' /etc/passwd`
+   do
+      aUser=$user
+      aGroup=`id -g $aUser`
+      aUID=`id -u $aUser`
+      if ! [ -f /var/run/vmware/"$aUID" ] ; then
+         mkdir -p /var/run/vmware/"$aUID"
+         chown -R -- "$aUser":"$aGroup" /var/run/vmware/"$aUID"
+         chmod 700 /var/run/vmware/"$aUID"
+      fi
+   done
+
 /usr/lib/vmware/view/usb/vmware-usbarbitrator
-/usr/lib/vmware/view/usb/vmware-view-usbd
diff --git a/vmware-horizon-usb-tmpfiles.conf b/vmware-horizon-usb-tmpfiles.conf
deleted file mode 100644
index 2a09e9f88013..000000000000
--- a/vmware-horizon-usb-tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d	/var/run/vmware	0755	root	-	-
diff --git a/vmware-horizon-usb.install b/vmware-horizon-usb.install
index 12241e2d35fe..9f41207f0045 100644
--- a/vmware-horizon-usb.install
+++ b/vmware-horizon-usb.install
@@ -1,7 +1,6 @@
 post_install() {
-	echo " > To enable USB redirection you have to launch"
-	echo " > /usr/lib/systemd/scripts/vmware-horizon-usb or start/enable"
+	echo " > To enable USB redirection you have to start/enable"
 	echo " > systemd service vmware-horizon-usb:"
-	echo " >  $ systemctl start vmware-horizon-usb"
+	echo " >  $ systemctl enable --now vmware-horizon-usb.service"
 }
 
diff --git a/vmware-horizon-virtual-printing.install b/vmware-horizon-virtual-printing.install
index 735e918b70fe..e7227f558a99 100644
--- a/vmware-horizon-virtual-printing.install
+++ b/vmware-horizon-virtual-printing.install
@@ -1,6 +1,6 @@
 post_install() {
-	echo " > To enable virtual printing you have to launch"
-	echo " > start/enable systemd service vmware-horizon-virtual-printing:"
-	echo " >  $ systemctl start vmware-horizon-virtual-printing"
+	echo " > To enable virtual printing you have to start/enable"
+	echo " > systemd service vmware-horizon-virtual-printing:"
+	echo " >  $ systemctl enable --now vmware-horizon-virtual-printing.service"
 }