autu: Update to 2.2.1-4

4 files changed, 144 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a925719ae04a..ee79475b55e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jun  5 04:50:39 UTC 2019
 pkgbase = advantech-vcom
 	pkgdesc = tty driver for Advantech Adam EKI serial console terminal servers
 	pkgver = 2.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.advantech.com/intelligent-connectivity/
 	install = advantech-vcom-install.sh
 	arch = i686
@@ -24,10 +22,20 @@ pkgbase = advantech-vcom
 	source = 0000-advman.systemd.patch
 	source = 0001-adv_main-access_ok_kernel-5-0.patch
 	source = 0002-adv_mmap-vm_fault_t-5-1.patch
+	source = 0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch
+	source = 0004-adv_main-proc_create_data-kernel-5.6.patch
+	md5sums = 6a32b5ceb5a4dccc919462a61b7c228c
+	md5sums = 65bb3f58bf90650cd629b94057c80da5
+	md5sums = 6b07ea60f898b5586ad8f23a28c32ab7
+	md5sums = b30212f45f0dcebc9b88b17e4355d298
+	md5sums = 0aa930803ed243f4e45f0d31bde581c8
+	md5sums = 446602b4feef554ade9a137303883432
 	sha256sums = 98e670d7ab0b67c5ca1d7c61ffffdbf812e2bcc2680d408b749ae4f36f1c46d7
 	sha256sums = 02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32
 	sha256sums = 9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad
 	sha256sums = 77edc7a806085fc738fa4536e91fce98fb8e103f8207ec0d395f340107e83d0c
+	sha256sums = 61c4b0c92488cce93e6b9ffca4f13eb7aa7fd8b267eb1438094ce41d96aaef53
+	sha256sums = aa71ede3478a5b482cd085ed2406a1ccd6be3b3ef76ab1fc0b45f4133d3c5a59
 
 pkgname = advantech-vcom
 
diff --git a/0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch b/0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch
new file mode 100644
index 000000000000..ba9284961f0f
--- /dev/null
+++ b/0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch
@@ -0,0 +1,81 @@
+diff -pNarZu5 daemon.orig/vcom_client.c daemon/vcom_client.c
+--- daemon.orig/vcom_client.c	2018-11-14 11:29:12.000000000 -0500
++++ daemon/vcom_client.c	2020-05-20 22:49:01.768339863 -0400
+@@ -35,11 +35,12 @@
+ #include "vcom.h"
+ //#include "vcom_debug.h"
+ 
+ #define RBUF_SIZE	4096
+ 
+-extern void * stk_mon; 
++void * stk_mon; 
++struct vc_monitor vc_mon;
+ 
+ int recv_second_chance(int sock, char * buf, int buflen)
+ {
+ 	int ret;
+ 	struct timeval tv;
+diff -pNarZu5 daemon.orig/vcom.h daemon/vcom.h
+--- daemon.orig/vcom.h	2018-11-14 11:29:12.000000000 -0500
++++ daemon/vcom.h	2020-05-20 22:48:26.010912918 -0400
+@@ -112,11 +112,11 @@ static inline struct vc_ops * stk_curnt(
+ #define INO_PUSH_SWITCH 0
+ #define INO_POP_SWITCH 0
+ #define INO_RPLS_SWITCH 0
+ #define INO_RESTART_SWITCH 0
+ 
+-void * stk_mon;
++extern void * stk_mon;
+ 
+ /* 
+  *	state machine stack
+  */
+ #define _expmsg(msg, len) \
+diff -pNarZu5 daemon.orig/vcom_monitor_dbg.h daemon/vcom_monitor_dbg.h
+--- daemon.orig/vcom_monitor_dbg.h	2018-11-14 11:29:12.000000000 -0500
++++ daemon/vcom_monitor_dbg.h	2020-05-20 22:48:48.918064379 -0400
+@@ -29,11 +29,11 @@ struct vc_monitor{
+ 	int pid;
+ 	int max_statl;
+ 	int dbg_first;
+ 	char fname[FNAME_LEN];
+ };
+-struct vc_monitor vc_mon;
++extern struct vc_monitor vc_mon;
+ 
+ static inline int mon_init(char * fname)
+ {
+ 	vc_mon.fd = -1;
+ 	vc_mon.addr = 0;
+diff -pNarZu5 daemon.orig/vcom_monitor.h daemon/vcom_monitor.h
+--- daemon.orig/vcom_monitor.h	2018-11-14 11:29:12.000000000 -0500
++++ daemon/vcom_monitor.h	2020-05-20 22:49:32.225667990 -0400
+@@ -27,11 +27,11 @@ struct vc_monitor{
+ 	int fd;
+ 	int pid;
+ 	int msgl;
+ 	char fname[FNAME_LEN];
+ };
+-struct vc_monitor vc_mon;
++extern struct vc_monitor vc_mon;
+ 
+ static inline int mon_init(char * fname)
+ {
+ 	vc_mon.fd = -1;
+ 	vc_mon.addr = 0;
+diff -pNarZu5 daemon.orig/vcom_monitor_pre_stat.h daemon/vcom_monitor_pre_stat.h
+--- daemon.orig/vcom_monitor_pre_stat.h	2018-11-14 11:29:12.000000000 -0500
++++ daemon/vcom_monitor_pre_stat.h	2020-05-20 22:43:28.883368206 -0400
+@@ -27,11 +27,11 @@ struct vc_monitor{
+ 	int pid;
+ 	int msgl;
+ 	char pre_stat[16];
+ 	char fname[FNAME_LEN];
+ };
+-struct vc_monitor vc_mon;
++extern struct vc_monitor vc_mon;
+ 
+ static inline int mon_init(char * fname)
+ {
+ 	vc_mon.fd = -1;
+ 	vc_mon.addr = 0;
diff --git a/0004-adv_main-proc_create_data-kernel-5.6.patch b/0004-adv_main-proc_create_data-kernel-5.6.patch
new file mode 100644
index 000000000000..76d7e48b8008
--- /dev/null
+++ b/0004-adv_main-proc_create_data-kernel-5.6.patch
@@ -0,0 +1,31 @@
+--- driver/adv_main.c.orig	2020-05-20 23:34:17.254597551 -0400
++++ driver/adv_main.c	2020-05-20 23:37:12.236351943 -0400
+@@ -257,18 +257,28 @@ unsigned int adv_proc_poll(struct file *
+ 	return mask;
+ }
+ 
+ extern int adv_proc_mmap(struct file *filp, struct vm_area_struct *vma);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
++static const struct proc_ops adv_proc_fops = {
++	.proc_open		= adv_proc_open,
++	.proc_release	= adv_proc_release,
++	.proc_mmap		= adv_proc_mmap,
++	.proc_ioctl	= adv_proc_ioctl,
++	.proc_poll		= adv_proc_poll,
++};
++#else
+ static const struct file_operations adv_proc_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= adv_proc_open,
+ 	.release	= adv_proc_release,
+ 	.mmap		= adv_proc_mmap,
+ 	.unlocked_ioctl	= adv_proc_ioctl,
+ 	.poll		= adv_proc_poll,
+ };
++#endif
+ 
+ 
+ void adv_main_interrupt(struct adv_vcom * data, int mask)
+ {
+ 	if(mask & ADV_INT_RX){
diff --git a/PKGBUILD b/PKGBUILD
index 72fdd50878cc..8d81c31d67a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,7 +59,7 @@ pkgname='advantech-vcom'
 #pkgver='2.1.0'; _dl='4/1-15OSOW4'
 #pkgver='2.2.0'; _dl='4/1-1LPJPGD'
 pkgver='2.2.1'; _dl='5/1-1NOKMCV' # not compatible with Linux 3.16
-pkgrel='3'
+pkgrel='4'
 pkgdesc='tty driver for Advantech Adam EKI serial console terminal servers'
 _pkgdescshort="Advantech ${pkgname} TTY driver"
 arch=('i686' 'x86_64')
@@ -79,12 +79,22 @@ source+=(
   '0000-advman.systemd.patch'
   '0001-adv_main-access_ok_kernel-5-0.patch'
   '0002-adv_mmap-vm_fault_t-5-1.patch'
+  '0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch'
+  '0004-adv_main-proc_create_data-kernel-5.6.patch'
 )
+noextract=("${_srcrar}") # the RAR crashes bsdtar. Parsing filters is unsupported.
+md5sums=('6a32b5ceb5a4dccc919462a61b7c228c'
+         '65bb3f58bf90650cd629b94057c80da5'
+         '6b07ea60f898b5586ad8f23a28c32ab7'
+         'b30212f45f0dcebc9b88b17e4355d298'
+         '0aa930803ed243f4e45f0d31bde581c8'
+         '446602b4feef554ade9a137303883432')
 sha256sums=('98e670d7ab0b67c5ca1d7c61ffffdbf812e2bcc2680d408b749ae4f36f1c46d7'
             '02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32'
             '9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad'
-            '77edc7a806085fc738fa4536e91fce98fb8e103f8207ec0d395f340107e83d0c')
-noextract=("${_srcrar}") # the RAR crashes bsdtar. Parsing filters is unsupported.
+            '77edc7a806085fc738fa4536e91fce98fb8e103f8207ec0d395f340107e83d0c'
+            '61c4b0c92488cce93e6b9ffca4f13eb7aa7fd8b267eb1438094ce41d96aaef53'
+            'aa71ede3478a5b482cd085ed2406a1ccd6be3b3ef76ab1fc0b45f4133d3c5a59')
 makedepends+=('unrar')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
@@ -106,6 +116,14 @@ prepare() {
   #diff -pNau5 driver/adv_mmap.c{.orig,} > '../0002-adv_mmap-vm_fault_t-5-1.patch'
   patch -Nbup0 -i "${srcdir}/0002-adv_mmap-vm_fault_t-5-1.patch"
 
+  #cp -pr daemon{,.orig}; false
+  #diff -pNarZu5 daemon{.orig,} > '../0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch'
+  patch -Nbup0 -i "${srcdir}/0003-gcc-10-duplicate-variables-vc_mon-stk_mon.patch"
+
+  #cp -p driver/adv_main.c{,.orig}; false
+  #diff -pNau5 driver/adv_main.c{.orig,} > '../0004-adv_main-proc_create_data-kernel-5.6.patch'
+  patch -Nbup0 -i "${srcdir}/0004-adv_main-proc_create_data-kernel-5.6.patch"
+
   # Cosmetic correction of CRLF for Linux
   sed -e 's:\r$::g' -i 'readme.txt'