autu: Update to 1.16-2

3 files changed, 50 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 508e58c392d1..218362c704cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug 14 16:13:07 UTC 2017
+# Mon Apr  8 00:37:20 UTC 2019
 pkgbase = moxa-mxser-mxupcie
 	pkgdesc = kernel module driver for Moxa Smartio Industio MUE ISA PCIe UPCI PCI Express CP multi port serial RS-232 422 485
 	pkgver = 1.16
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.moxa.com/product/PCIe_UPCI_PCI.htm
 	install = moxa-mxser-mxupcie-install.sh
 	arch = i686
@@ -19,9 +19,11 @@ pkgbase = moxa-mxser-mxupcie
 	source = https://www.moxa.com/drivers/MSB/SmartioIndustio/driv_linux_smart_v1.16_build_14030317.tgz
 	source = 0000-mxser-utilities-warnings.patch
 	source = 0001-mxser-kernel-4.12-IRQF_DISABLED.patch
+	source = 0003-kernel-5.0.0-access_ok.patch
 	sha256sums = 445f452eb7f56b70ef1b9795421556fb28284a90cde8746e5895316d5c67899f
 	sha256sums = a22021474be03194faba5e30b0bea15128a83e1eae05d602865a4cdc38309272
 	sha256sums = 7357da2ada66681705b2c6806fa3fe910ddd198e531d851bd0a97b548de4bbb3
+	sha256sums = ba1a55fa48f93f3a309bec5783d7deb5f728798ae39f28301d19384b5444113e
 
 pkgname = moxa-mxser-mxupcie
 
diff --git a/0003-kernel-5.0.0-access_ok.patch b/0003-kernel-5.0.0-access_ok.patch
new file mode 100644
index 000000000000..de4bae709bbc
--- /dev/null
+++ b/0003-kernel-5.0.0-access_ok.patch
@@ -0,0 +1,38 @@
+diff -pNaru5 driver.orig/mxpcie.h driver/mxpcie.h
+--- driver.orig/mxpcie.h	2019-04-07 20:25:51.730935029 -0400
++++ driver/mxpcie.h	2019-04-07 20:24:43.346725700 -0400
+@@ -334,11 +334,15 @@
+ #else
+ #define MX_TTY_DRV(x)	tty->driver.x
+ #endif
+ 
+ #if (LINUX_VERSION_CODE >= VERSION_CODE(2,6,0))
++#if (LINUX_VERSION_CODE >= VERSION_CODE(5,0,0))
++#define MX_ACCESS_CHK(type, addr, size)	access_ok(addr, size)	
++#else
+ #define MX_ACCESS_CHK(type, addr, size)	access_ok(type, addr, size)	
++#endif
+ #else
+ #define MX_ACCESS_CHK(type, addr, size)	verify_area(type, addr, size)	
+ #endif
+ 
+ #if (LINUX_VERSION_CODE >= VERSION_CODE(2,6,0))
+diff -pNaru5 driver.orig/mxser.h driver/mxser.h
+--- driver.orig/mxser.h	2019-04-07 20:25:51.730935029 -0400
++++ driver/mxser.h	2019-04-07 20:25:04.970332643 -0400
+@@ -487,11 +487,15 @@
+ #else
+ #define MX_CGRP()	current->pgrp	
+ #endif
+ 
+ #if (LINUX_VERSION_CODE >= VERSION_CODE(2,6,0))
++#if (LINUX_VERSION_CODE >= VERSION_CODE(5,0,0))
++#define MX_ACCESS_CHK(type, addr, size)	access_ok(addr, size)	
++#else
+ #define MX_ACCESS_CHK(type, addr, size)	access_ok(type, addr, size)	
++#endif
+ #else
+ #define MX_ACCESS_CHK(type, addr, size)	verify_area(type, addr, size)	
+ #endif
+ 
+ #if (LINUX_VERSION_CODE >= VERSION_CODE(2,6,0))
diff --git a/PKGBUILD b/PKGBUILD
index b5f5ec28a88c..f62269dfd2f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,7 +42,7 @@ _origmodname='8250_moxa'
 
 pkgname='moxa-mxser-mxupcie'
 pkgver='1.16'; _build='14030317'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='kernel module driver for Moxa Smartio Industio MUE ISA PCIe UPCI PCI Express CP multi port serial RS-232 422 485'
 arch=('i686' 'x86_64')
 url='https://www.moxa.com/product/PCIe_UPCI_PCI.htm'
@@ -57,10 +57,12 @@ source=(
   "https://www.moxa.com/drivers/MSB/SmartioIndustio/driv_linux_smart_v${pkgver}_build_${_build}.tgz"
   '0000-mxser-utilities-warnings.patch'
   '0001-mxser-kernel-4.12-IRQF_DISABLED.patch'
+  '0003-kernel-5.0.0-access_ok.patch'
 )
 sha256sums=('445f452eb7f56b70ef1b9795421556fb28284a90cde8746e5895316d5c67899f'
             'a22021474be03194faba5e30b0bea15128a83e1eae05d602865a4cdc38309272'
-            '7357da2ada66681705b2c6806fa3fe910ddd198e531d851bd0a97b548de4bbb3')
+            '7357da2ada66681705b2c6806fa3fe910ddd198e531d851bd0a97b548de4bbb3'
+            'ba1a55fa48f93f3a309bec5783d7deb5f728798ae39f28301d19384b5444113e')
 
 # Moxa https doesn't work with curl
 for _dlagentk in "${!DLAGENTS[@]}"; do
@@ -99,6 +101,10 @@ prepare() {
   # diff -pNaru5 'src.old/mxser' 'src/mxser' > '0000-mxser-utilities-warnings.patch'
   patch -Nup2 -i '../0000-mxser-utilities-warnings.patch'
 
+  #cp -pr driver{,.orig}; false
+  #diff -pNaru5 driver{.orig,} > '0003-kernel-5.0.0-access_ok.patch'
+  patch -Nbup0 -i "${srcdir}/0003-kernel-5.0.0-access_ok.patch"
+
   # Make package compatible
   #cp -p driver/Makefile{,.Arch}
   sed -e '# Fix path' \