autu: Update to 1.19-5

3 files changed, 67 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a51076182542..3f5487dc6d48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = npreal2
 	pkgdesc = real tty driver for Moxa NPort serial console terminal server
 	pkgver = 1.19
-	pkgrel = 3
+	pkgrel = 5
 	url = https://www.moxa.com/support/sarch_result.aspx?type=soft&prod_id=237&type_id=9
 	install = npreal2-install.sh
 	arch = i686
@@ -21,10 +21,17 @@ pkgbase = npreal2
 	source = npreal2.sh
 	source = 0001-mxmknod-folder-fix-and-chgrp-uucp.patch
 	source = 0002-kernel-5.0.0-access_ok.patch
+	source = 0003-kernel-5.6-proc_dir_entry-proc_ops.patch
+	md5sums = 3852c44f8e6bc5a1194536eb846f4e60
+	md5sums = 2490e453084bd4e3157c8c3a621c3f40
+	md5sums = 043dac91330a15c38e41bb2e2e1d5598
+	md5sums = 9cda38abdd17b2af80475ed06bdf0889
+	md5sums = bcd835765a6451989195a3518d53088d
 	sha256sums = f99f38ef5618469a1d6f4824e41856616ee65ab8359069daa70d8d481f364462
 	sha256sums = 7241767fa8dead2dbe4cf4db32d39f5cf9d95b08f60daf79822ae306727af372
 	sha256sums = 7039ca0740be34a641424e3f57b896902f61fdfd2bfcc26e8e954035849e9605
 	sha256sums = 211f3b0ba50452bfe6d39076eb1a60a7557dd038288fb8dcd4374886f4c2844e
+	sha256sums = c3f8502c3e7e600ccc3e778ec25875ddda3a20ed3cb62bc56505e609ac346d79
 
 pkgname = npreal2
 
diff --git a/0003-kernel-5.6-proc_dir_entry-proc_ops.patch b/0003-kernel-5.6-proc_dir_entry-proc_ops.patch
new file mode 100644
index 000000000000..bdc1e66ad5f4
--- /dev/null
+++ b/0003-kernel-5.6-proc_dir_entry-proc_ops.patch
@@ -0,0 +1,46 @@
+--- npreal2.c.orig	2020-05-21 00:42:40.690229660 -0400
++++ npreal2.c	2020-05-21 00:40:48.857014581 -0400
+@@ -366,11 +366,15 @@ static struct proc_dir_entry *  npvar_pr
+  * memory if large numbers of serial ports are open.
+  */
+ static unsigned char *		npvar_tmp_buf;
+ static struct semaphore 	npvar_tmp_buf_sem;
+ 
++#if LINUX_VERSION_CODE >= VERSION_CODE(5,6,0)
++static struct proc_ops npreal_net_fops;
++#else
+ static struct file_operations npreal_net_fops;
++#endif
+ 
+ #ifdef MODULE
+ int		init_module(void);
+ void	cleanup_module(void);
+ #endif
+@@ -668,17 +672,26 @@ npreal_init(void)
+ 		put_tty_driver(DRV_VAR);
+ 		return -1;
+ 	}
+ 
+ 	/* Initialize the net node structure */
+-	memset(&npreal_net_fops,0,sizeof(struct file_operations));
++	memset(&npreal_net_fops,0,sizeof(npreal_net_fops));
++#if LINUX_VERSION_CODE >= VERSION_CODE(5,6,0)
++	npreal_net_fops.proc_read = npreal_net_read;
++	npreal_net_fops.proc_write = npreal_net_write;
++	npreal_net_fops.proc_ioctl = npreal_net_ioctl;
++	npreal_net_fops.proc_open = npreal_net_open;
++	npreal_net_fops.proc_release = npreal_net_close;
++	npreal_net_fops.proc_poll = npreal_net_select;
++#else
+ 	npreal_net_fops.read = npreal_net_read;
+ 	npreal_net_fops.write = npreal_net_write;
+ 	npreal_net_fops.unlocked_ioctl = npreal_net_ioctl;
+ 	npreal_net_fops.open = npreal_net_open;
+ 	npreal_net_fops.release = npreal_net_close;
+ 	npreal_net_fops.poll = npreal_net_select;
++#endif
+ 	if (npreal_init_tty() != 0)
+ 	{
+ 		tty_unregister_driver(DRV_VAR);
+ 		DBGPRINT(MX_DEBUG_ERROR, "Couldn't install MOXA Async/NPort server family Real TTY driver !\n");
+ 	}
diff --git a/PKGBUILD b/PKGBUILD
index 6aa8c4d9b130..695495fae786 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -81,7 +81,7 @@ set -u
 pkgname='npreal2'
 #pkgver='1.18.49'; _commit='6d9ef0dbafd487595c4f5e4e5e64c1faba98d060'
 pkgver='1.19'; _build='17110917'
-pkgrel='3'
+pkgrel='5'
 pkgdesc='real tty driver for Moxa NPort serial console terminal server'
 _pkgdescshort="Moxa NPort ${pkgname} TTY driver"
 arch=('i686' 'x86_64')
@@ -103,12 +103,19 @@ _patches=(
   #'0000-SSL-destroy-cf-configuration.patch'
   '0001-mxmknod-folder-fix-and-chgrp-uucp.patch'
   '0002-kernel-5.0.0-access_ok.patch' # https://lkml.org/lkml/2019/1/4/418
+  '0003-kernel-5.6-proc_dir_entry-proc_ops.patch'
 )
 source+=("${_patches[@]}")
+md5sums=('3852c44f8e6bc5a1194536eb846f4e60'
+         '2490e453084bd4e3157c8c3a621c3f40'
+         '043dac91330a15c38e41bb2e2e1d5598'
+         '9cda38abdd17b2af80475ed06bdf0889'
+         'bcd835765a6451989195a3518d53088d')
 sha256sums=('f99f38ef5618469a1d6f4824e41856616ee65ab8359069daa70d8d481f364462'
             '7241767fa8dead2dbe4cf4db32d39f5cf9d95b08f60daf79822ae306727af372'
             '7039ca0740be34a641424e3f57b896902f61fdfd2bfcc26e8e954035849e9605'
-            '211f3b0ba50452bfe6d39076eb1a60a7557dd038288fb8dcd4374886f4c2844e')
+            '211f3b0ba50452bfe6d39076eb1a60a7557dd038288fb8dcd4374886f4c2844e'
+            'c3f8502c3e7e600ccc3e778ec25875ddda3a20ed3cb62bc56505e609ac346d79')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -216,6 +223,10 @@ prepare() {
   #diff -pNau5 'npreal2.c'{.orig,} > '0002-kernel-5.0.0-access_ok.patch'
   patch -Nbup0 -i "${srcdir}/0002-kernel-5.0.0-access_ok.patch"
 
+  #cp -p 'npreal2.c'{,.orig}; false
+  #diff -pNau5 'npreal2.c'{.orig,} > '0003-kernel-5.6-proc_dir_entry-proc_ops.patch'
+  patch -Nbup0 -i "${srcdir}/0003-kernel-5.6-proc_dir_entry-proc_ops.patch"
+
   # Apply PKGBUILD options
   sed -e 's:^\(ttymajor\)=.*:'"\1=${_opt_ttymajor}:g" \
       -e 's:^\(calloutmajor\)=.*:'"\1=${_opt_calloutmajor}:g" \