Update to 5.3.12

3 files changed, 20 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7a808fdb8a1..be3879b335f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nomachine
 	pkgdesc = Remote desktop application
-	pkgver = 5.3.10
+	pkgver = 5.3.12
 	pkgrel = 1
 	url = http://www.nomachine.com
 	install = nomachine.install
@@ -15,18 +15,16 @@ 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.10_6_x86_64.tar.gz
-	sha512sums_x86_64 = d2f39cc514fcf33d9993832c432e7d2fe2a55fb5dfec67f57c830a2878f9a12a9b4431be00ad6f5c5eeda7badba0a68042400fbfe810300df603a853940b8373
-	source_i686 = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.10_7_i686.tar.gz
-	sha512sums_i686 = da8d80d7aeea0edc5e719fd8fd4eec501605d09baaef0ac1ac8fbfac8dc324653a11e751bc93f4d6c01af2077e663c9a36b425a9d979d1774860355397be4af3
-	source_armv6h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.10_1_armv6hl.tar.gz
-	sha512sums_armv6h = 623f7aed249219dcb006568d61062b6c1fe1bf99a135dac23901635a0e5c6261c8bbdd5807b0421402a7185c051f3bedfe5b14194567f77f2e2e686efdfe3ed7
-	source_armv7h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.10_1_armv7hl.tar.gz
-	sha512sums_armv7h = 424fb5bc196e79db32b61c32d0da55d7cdb0b0854e0080713a039db2f3d6fd7f2f291db6aadb08a1368fc4d4dd57d93b4cb8ebf00b2b95d5a278f67420f61265
-	source_armv8h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.10_1_aarch64.tar.gz
-	sha512sums_armv8h = 6c0777083bcb2e4972ea99b2d289c8a7f02b216d2ebcbedeaa82553a691d0ae6eb01a9ae7974147420638735b0602d802a97c7e361e1beb1ace9df5a737305aa
+	source_x86_64 = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.12_10_x86_64.tar.gz
+	sha512sums_x86_64 = 8cb7470b41beb215a43be19f493e415726795618c9af1e63c2d16b8026ec133b65599e1c3eba77aa7d08b019939676e3773085b668fdbd081a079fa2572d2e9e
+	source_i686 = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.12_10_i686.tar.gz
+	sha512sums_i686 = 7ce0b77da438132acab4e05562f676c30054ef38242d418ad69e9caf371a47ab624be89634cc105023be51d1aa822b743fb629114caa2c4d461bae8dabb0965d
+	source_armv6h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.12_3_armv6hl.tar.gz
+	sha512sums_armv6h = 38c3aefb753a432d209193eb419ae60cf18661d661f6bc398bb518973b13ef268457a91100dbc63ca82b5d9fa801af5da283e3722a669b1cafc0efcd64322c7b
+	source_armv7h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.12_1_armv7hl.tar.gz
+	sha512sums_armv7h = c758e802c1752f563027e0ca14f2443404b5a1dca6538273e89f9de05be0c850b60e662c9f654ca155ef7c8c6a1c752cc14d162e66b042fac5bcdcb50bad1aba
+	source_armv8h = http://download.nomachine.com/download/5.3/Linux/nomachine_5.3.12_1_aarch64.tar.gz
+	sha512sums_armv8h = 2ff365c4f96baa9a2bab64e76c6c0bb17361394f036b797463143525268c7a8ad9fb1911b1ee796993ae54882f7ba1ce902c9dc3e4bb1732b9257990d977d203
 
 pkgname = nomachine
 
diff --git a/PKGBUILD b/PKGBUILD
index 53e94dd0491c..84ef416f1291 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,10 +11,10 @@ _autofirewall=y
 ### END BUILD OPTIONS
 
 pkgname=nomachine
-pkgver=5.3.10
-_pkgrel_i686=7
-_pkgrel_x86_64=6
-_pkgrel_armv6h=1
+pkgver=5.3.12
+_pkgrel_i686=10
+_pkgrel_x86_64=10
+_pkgrel_armv6h=3
 _pkgrel_armv7h=1
 _pkgrel_armv8h=1
 pkgrel=1
@@ -26,13 +26,11 @@ 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=('d2f39cc514fcf33d9993832c432e7d2fe2a55fb5dfec67f57c830a2878f9a12a9b4431be00ad6f5c5eeda7badba0a68042400fbfe810300df603a853940b8373')
-sha512sums_i686=('da8d80d7aeea0edc5e719fd8fd4eec501605d09baaef0ac1ac8fbfac8dc324653a11e751bc93f4d6c01af2077e663c9a36b425a9d979d1774860355397be4af3')
-sha512sums_armv6h=('623f7aed249219dcb006568d61062b6c1fe1bf99a135dac23901635a0e5c6261c8bbdd5807b0421402a7185c051f3bedfe5b14194567f77f2e2e686efdfe3ed7')
-sha512sums_armv7h=('424fb5bc196e79db32b61c32d0da55d7cdb0b0854e0080713a039db2f3d6fd7f2f291db6aadb08a1368fc4d4dd57d93b4cb8ebf00b2b95d5a278f67420f61265')
-sha512sums_armv8h=('6c0777083bcb2e4972ea99b2d289c8a7f02b216d2ebcbedeaa82553a691d0ae6eb01a9ae7974147420638735b0602d802a97c7e361e1beb1ace9df5a737305aa')
+sha512sums_x86_64=('8cb7470b41beb215a43be19f493e415726795618c9af1e63c2d16b8026ec133b65599e1c3eba77aa7d08b019939676e3773085b668fdbd081a079fa2572d2e9e')
+sha512sums_i686=('7ce0b77da438132acab4e05562f676c30054ef38242d418ad69e9caf371a47ab624be89634cc105023be51d1aa822b743fb629114caa2c4d461bae8dabb0965d')
+sha512sums_armv6h=('38c3aefb753a432d209193eb419ae60cf18661d661f6bc398bb518973b13ef268457a91100dbc63ca82b5d9fa801af5da283e3722a669b1cafc0efcd64322c7b')
+sha512sums_armv7h=('c758e802c1752f563027e0ca14f2443404b5a1dca6538273e89f9de05be0c850b60e662c9f654ca155ef7c8c6a1c752cc14d162e66b042fac5bcdcb50bad1aba')
+sha512sums_armv8h=('2ff365c4f96baa9a2bab64e76c6c0bb17361394f036b797463143525268c7a8ad9fb1911b1ee796993ae54882f7ba1ce902c9dc3e4bb1732b9257990d977d203')
 source_x86_64=("http://download.nomachine.com/download/5.3/Linux/${pkgname}_${pkgver}_${_pkgrel_x86_64}_x86_64.tar.gz")
 source_i686=("http://download.nomachine.com/download/5.3/Linux/${pkgname}_${pkgver}_${_pkgrel_i686}_i686.tar.gz")
 source_armv6h=("http://download.nomachine.com/download/5.3/Linux/${pkgname}_${pkgver}_${_pkgrel_armv6h}_armv6hl.tar.gz")
@@ -69,17 +67,6 @@ tar -rf "$srcdir/NX/etc/NX/server/packages/nxserver.tar" NX/etc/server-fedora.cf
 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
deleted file mode 100644
index 9b19fbdf7c0f..000000000000
--- a/fixnxusb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./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
- }
- 
- /*****************************************************************************/