autu: Update to 1.3.29-4

3 files changed, 96 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5c69f527203..57d5ff3f4d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = digi-dgnc
 	pkgdesc = tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port
 	pkgver = 1.3.29
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.digi.com/
 	install = digi-dgnc-install.sh
 	arch = i686
@@ -15,10 +15,17 @@ pkgbase = digi-dgnc
 	source = 0000-Kernel-4-14-DRIVER-ATTR.patch
 	source = 0001-Kernel-4-15-timers.patch
 	source = 0002-kernel-5.0.0-do_gettimeofday.patch
+	source = 0003-kernel-5.6--proc_dir_entry-proc_ops.patch
+	md5sums = 6171349852f6d02228d6e30c79b7a434
+	md5sums = a171e9ea1a4ff8340c3c58b303632edf
+	md5sums = 6c16c3c24c79fb558bcf27f780829c75
+	md5sums = 8e46a778c648ab4f0ca63a337d36df60
+	md5sums = 394d24a150676d8123300d6715b81fb8
 	sha256sums = e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5
 	sha256sums = 625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae
 	sha256sums = 88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f
 	sha256sums = 737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d
+	sha256sums = 3496e90914e1fa2f209dd85c336e7b1c0b784dbbf67cc45e0f0f55f0b1ef5a0e
 
 pkgname = digi-dgnc
 
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..e9b11a4b5ad4
--- /dev/null
+++ b/0003-kernel-5.6--proc_dir_entry-proc_ops.patch
@@ -0,0 +1,72 @@
+diff -pNaru5 driver/2.6.27.orig/dgnc_proc.c driver/2.6.27/dgnc_proc.c
+--- driver/2.6.27.orig/dgnc_proc.c	2017-10-21 10:39:21.000000000 -0400
++++ driver/2.6.27/dgnc_proc.c	2020-05-22 05:56:03.148214713 -0400
+@@ -69,18 +69,28 @@ static int dgnc_proc_chk_perm(struct ino
+ #else
+ static int dgnc_proc_chk_perm(struct inode *, int);
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++static const struct proc_ops dgnc_proc_file_ops =
++{
++	.proc_read =		dgnc_gen_proc_read,	/* read		*/
++	.proc_write =	dgnc_gen_proc_write,	/* write	*/
++	.proc_open =		dgnc_gen_proc_open,	/* open		*/
++	.proc_release =	dgnc_gen_proc_close,	/* release	*/
++};
++#else
+ static const struct file_operations dgnc_proc_file_ops =
+ {
+ 	.owner =	THIS_MODULE,
+ 	.read =		dgnc_gen_proc_read,	/* read		*/
+ 	.write =	dgnc_gen_proc_write,	/* write	*/
+ 	.open =		dgnc_gen_proc_open,	/* open		*/
+ 	.release =	dgnc_gen_proc_close,	/* release	*/
+ };
++#endif
+ 
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+ static struct inode_operations dgnc_proc_inode_ops =
+ {
+diff -pNaru5 driver/2.6.27.orig/dgnc_tty.c driver/2.6.27/dgnc_tty.c
+--- driver/2.6.27.orig/dgnc_tty.c	2020-05-22 05:54:38.907639099 -0400
++++ driver/2.6.27/dgnc_tty.c	2020-05-22 05:54:48.157702308 -0400
+@@ -519,13 +519,22 @@ void dgnc_tty_uninit(struct board_t *brd
+ }
+ 
+ 
+ #define TMPBUFLEN (1024)
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++struct DGNC_timeval {
++  __kernel_old_time_t	tv_sec;		/* seconds */
++  __kernel_suseconds_t	tv_usec;	/* microseconds */
++};
++#else
++#define DGNC_timeval timeval
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)
+ /* Temporary until reimplemented with 64 bit functions */
+-static inline void do_gettimeofday(struct timeval *tv)
++static inline void do_gettimeofday(struct DGNC_timeval *tv)
+ {
+   struct timespec64 now;
+ 
+   ktime_get_real_ts64(&now);
+   tv->tv_sec = now.tv_sec;
+@@ -537,11 +546,11 @@ static inline void do_gettimeofday(struc
+  * dgnc_sniff - Dump data out to the "sniff" buffer if the
+  * proc sniff file is opened...
+  */
+ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int len)
+ {
+-	struct timeval tv;
++	struct DGNC_timeval tv;
+ 	int n;
+ 	int r;
+ 	int nbuf;
+ 	int i;
+ 	int tmpbuflen;
diff --git a/PKGBUILD b/PKGBUILD
index d04989e15144..d4b93fb7fd73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ pkgname='digi-dgnc'
 #_pkgver='1.3-28'; _dl='40002369_G.tgz'
 _pkgver='1.3-29'; _dl='40002369_H.src.rpm'
 pkgver="${_pkgver//-/.}"
-pkgrel='3'
+pkgrel='4'
 pkgdesc='tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port'
 arch=('i686' 'x86_64')
 url='https://www.digi.com/'
@@ -30,11 +30,18 @@ source=(
   '0000-Kernel-4-14-DRIVER-ATTR.patch' # https://patchwork.kernel.org/patch/9851919/ Available since 3.11-rc2
   '0001-Kernel-4-15-timers.patch'
   '0002-kernel-5.0.0-do_gettimeofday.patch'
+  '0003-kernel-5.6--proc_dir_entry-proc_ops.patch'
 )
+md5sums=('6171349852f6d02228d6e30c79b7a434'
+         'a171e9ea1a4ff8340c3c58b303632edf'
+         '6c16c3c24c79fb558bcf27f780829c75'
+         '8e46a778c648ab4f0ca63a337d36df60'
+         '394d24a150676d8123300d6715b81fb8')
 sha256sums=('e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5'
             '625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae'
             '88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f'
-            '737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d')
+            '737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d'
+            '3496e90914e1fa2f209dd85c336e7b1c0b784dbbf67cc45e0f0f55f0b1ef5a0e')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -72,19 +79,23 @@ prepare() {
   fi
   cd "${_srcdir}"
 
-  #cp -pr "${srcdir}/${_srcdir}"{,.orig-0000}
+  #cp -pr "${srcdir}/${_srcdir}"{,.orig-0000}; false
   #diff -pNaru5 dgnc-1.3{.orig-0000,} > '0000-Kernel-4-14-DRIVER-ATTR.patch'
   patch -Nup1 -i "${srcdir}/0000-Kernel-4-14-DRIVER-ATTR.patch"
   test ! -d "${srcdir}/${_srcdir}.orig-0000" || echo "${}"
 
-  #cp -pr "${srcdir}/${_srcdir}"{,.orig-0001}
+  #cp -pr "${srcdir}/${_srcdir}"{,.orig-0001}; false
   #diff -pNaru5 dgnc-1.3{.orig-0001,} > '0001-Kernel-4-15-timers.patch'
   patch -Nup1 -i "${srcdir}/0001-Kernel-4-15-timers.patch"
   test ! -d "${srcdir}/${_srcdir}.orig-0001" || echo "${}"
 
   #cp -p driver/2.6.27/dgnc_tty.c{,.orig}; false
   #diff -pNau5 driver/2.6.27/dgnc_tty.c{.orig,} > '0002-kernel-5.0.0-do_gettimeofday.patch'
-  patch -Nbup0 -i "${srcdir}/0002-kernel-5.0.0-do_gettimeofday.patch"
+  patch -Nup0 -i "${srcdir}/0002-kernel-5.0.0-do_gettimeofday.patch"
+
+  #cp -pr driver/2.6.27{,.orig}; false
+  #diff -pNaru5 driver/2.6.27{.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"
 
   # Version check
   local _ver