Fix nxusb share

3 files changed, 53 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13abb144f306..78247cfca947 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nomachine
 	pkgdesc = Remote desktop application
 	pkgver = 5.3.9
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nomachine.com
 	install = nomachine.install
 	arch = x86_64
@@ -15,6 +15,8 @@ pkgbase = nomachine
 	depends = openssh
 	conflicts = nxmanager nxwebplayer nxserver nxnode nxclient
 	options = !strip
+	source = fixnxusb.patch
+	sha512sums = 3680f376ae603fcbe8ad2c68c8f3c8c19798b914fd7fd29c6d57e03dae8f0a09b832c5886ad24fd3c33ad680c5975235665c55cc4908552178c731d475095195
 	source_x86_64 = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.9_6_x86_64.tar.gz
 	sha512sums_x86_64 = dca7d519f6c0d62625f2c6b78c0df1fb07019f09c40e60e6662e6af82348bc82abc92162bcaaa7c170556e15b5e8b177f1b563015f14c66081904708d24cc9b0
 	source_i686 = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.9_5_i686.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 7c94c08d03a8..08fa475a0a6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgrel_x86_64=6
 pkgrel_armv6h=3
 pkgrel_armv7h=1
 pkgrel_armv8h=3
-pkgrel=1
+pkgrel=2
 pkgdesc="Remote desktop application"
 groups=('network')
 url="http://www.nomachine.com"
@@ -26,6 +26,8 @@ arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'armv8h')
 options=('!strip')
 conflicts=('nxmanager nxwebplayer nxserver nxnode nxclient')
 depends=('bash' 'openssh')
+source=('fixnxusb.patch')
+sha512sums=('3680f376ae603fcbe8ad2c68c8f3c8c19798b914fd7fd29c6d57e03dae8f0a09b832c5886ad24fd3c33ad680c5975235665c55cc4908552178c731d475095195')
 sha512sums_x86_64=('dca7d519f6c0d62625f2c6b78c0df1fb07019f09c40e60e6662e6af82348bc82abc92162bcaaa7c170556e15b5e8b177f1b563015f14c66081904708d24cc9b0')
 sha512sums_i686=('00a53f377c0f17910d374ba7121c1eb895f26821b6aae15e188c8e654b81b7e3b37744dc9a50a0356277134004a54a5aa9ad45e3d8273a7dcfa4e46bccf8fd24')
 sha512sums_armv6h=('5493228bc567f9bf52b9efb223479f05d4665b4c64c39a4b3a500555b3dcba2a069fdfc46b763c083bc93e8650f4f1479c42105bd2bd762f553ee28176f8c7ee')
@@ -67,6 +69,17 @@ tar -rf $srcdir/NX/etc/NX/server/packages/nxserver.tar NX/etc/server-fedora.cfg.
 gzip $srcdir/NX/etc/NX/server/packages/nxserver.tar
 rm -fr $srcdir/NX/etc/server-fedora.cfg.sample
 fi
+#Fix nxusb share
+tar -zxf $srcdir/NX/etc/NX/server/packages/nxclient.tar.gz NX/share/src/nxusb/message_queue.c
+tar -zxf $srcdir/NX/etc/NX/server/packages/nxclient.tar.gz NX/share/src/nxusb/utils.h
+cd ${srcdir}/NX/share/src/nxusb
+patch -Np1 -i $srcdir/fixnxusb.patch
+cd ${srcdir}
+gzip -d $srcdir/NX/etc/NX/server/packages/nxclient.tar.gz
+tar -rf $srcdir/NX/etc/NX/server/packages/nxclient.tar NX/share/src/nxusb/message_queue.c -C $srcdir/NX/share/src/nxusb/message_queue.c
+tar -rf $srcdir/NX/etc/NX/server/packages/nxclient.tar NX/share/src/nxusb/utils.h -C $srcdir/NX/share/src/nxusb/utils.h
+gzip $srcdir/NX/etc/NX/server/packages/nxclient.tar
+rm -fr $srcdir/NX/share*
 }
 
 package()
diff --git a/fixnxusb.patch b/fixnxusb.patch
new file mode 100644
index 000000000000..9b19fbdf7c0f
--- /dev/null
+++ b/fixnxusb.patch
@@ -0,0 +1,36 @@
+--- ./message_queue.c	2017-06-14 17:20:08.326706223 +0200
++++ ./message_queue.c	2017-06-13 18:11:30.638151756 +0200
+@@ -517,7 +517,11 @@ static void precache_msg_hdr(size_t size
+ 
+ int message_queue_init(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+ 	unsigned long flags = eveusb_debug ? SLAB_DEBUG_FREE | SLAB_RED_ZONE | SLAB_POISON : 0; // module parameter
++#else
++	unsigned long flags = eveusb_debug ? SLAB_CONSISTENCY_CHECKS | SLAB_RED_ZONE | SLAB_POISON : 0; // module parameter
++#endif
+ 
+ 	message_up_cache = kmem_cache_create("message_up", // see KMEM_CACHE
+ 						sizeof(struct message_up),
+--- ./utils.h	2017-06-14 17:19:46.096726234 +0200
++++ ./utils.h	2017-06-13 18:11:30.638151756 +0200
+@@ -43,6 +43,7 @@
+ #ifndef EVEUSB_KERNEL_UTILS_H
+ #define EVEUSB_KERNEL_UTILS_H
+ /*****************************************************************************/
++#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/usb.h>
+ /*****************************************************************************/
+@@ -77,7 +78,11 @@ size_t get_list_size(const struct list_h
+ 
+ static inline int get_refcount(const struct kref *ref)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
+ 	return ref ? atomic_read(&ref->refcount) : 0;
++#else
++	return ref ? atomic_read(&ref->refcount.refs) : 0;
++#endif
+ }
+ 
+ /*****************************************************************************/