autu: Update to 7.28-5

3 files changed, 55 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b50a471b40bf..4d7b9fd57318 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jun 19 01:36:22 UTC 2018
+# Fri Sep 14 19:33:11 UTC 2018
 pkgbase = nslink
 	pkgdesc = tty driver and firmware update for Comtrol DeviceMaster, RTS, LT, PRO, 500, UP, RPSH-SI, RPSH, and Serial port Hub console terminal device server
 	pkgver = 7.28
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.comtrol.com/
 	install = nslink-install.sh
 	arch = i686
@@ -27,11 +27,13 @@ pkgbase = nslink
 	source = http://downloads.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz
 	source = dmupdate.py.usage.patch
 	source = 0000-Invalid-MKDEV-macro.patch
+	source = 0001-kernel-4.18-proc_fops-to-proc_show.patch
 	source = http://downloads.comtrol.com/legacy/dev_mstr/rts/drivers/linux/7.26/devicemaster-linux-7.26.tar.gz
 	sha256sums = 900d0681a86d0732cf3e71e56a013456d5a77a68f7faa2afb955e275f73353fb
 	sha256sums = d21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb
 	sha256sums = 5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073
 	sha256sums = 6968b10cd66d783f86f587a03584e78af4a2766d223b8d5c24c3ea4fe79f7230
+	sha256sums = a97fba21795f14d3253e9f702279299fcba0522c6a998ac91ae83abfafd955c2
 	sha256sums = 5c00939eb945c98336211cd61408b5a8623b01a7059356e663ccc638b0d159fb
 
 pkgname = nslink
diff --git a/0001-kernel-4.18-proc_fops-to-proc_show.patch b/0001-kernel-4.18-proc_fops-to-proc_show.patch
new file mode 100644
index 000000000000..4d70335bc419
--- /dev/null
+++ b/0001-kernel-4.18-proc_fops-to-proc_show.patch
@@ -0,0 +1,42 @@
+--- nslink.c.orig	2018-09-14 14:35:19.112262632 -0400
++++ nslink.c	2018-09-14 14:38:10.124709662 -0400
+@@ -5349,10 +5349,11 @@ static int nrp_proc_show(struct seq_file
+                 }
+         }
+         return 0;
+ }
+ 
++#if LINUX_VERSION_CODE < VERSION_CODE(4,18,0)
+ static int nrp_proc_open(struct inode *inode, struct file *file)
+ {
+         return single_open(file, nrp_proc_show, NULL);
+ }
+ 
+@@ -5361,10 +5362,11 @@ static const struct file_operations nrp_
+         .open		= nrp_proc_open,
+         .read		= seq_read,
+         .llseek		= seq_lseek,
+         .release	= single_release,
+ };
++#endif
+ 
+ static struct tty_operations nslink_ops = {
+         .open = nrp_open,
+         .close = nrp_close,
+         .write = nrp_write,
+@@ -5382,11 +5384,15 @@ static struct tty_operations nslink_ops
+         .break_ctl = nrp_break,
+         .send_xchar = nrp_send_xchar,
+         .wait_until_sent = nrp_wait_until_sent,
+         .tiocmget = nrp_tiocmget,
+         .tiocmset = nrp_tiocmset,
++#if LINUX_VERSION_CODE < VERSION_CODE(4,18,0)
+         .proc_fops = &nrp_proc_fops,
++#else
++        .proc_show = &nrp_proc_show,
++#endif
+ };
+ static const struct tty_port_operations nslink_port_ops = {
+         .carrier_raised = nrp_port_carrier_raised,
+         .dtr_rts = nrp_port_dtr_rts,
+         .activate = nrp_port_activate,
diff --git a/PKGBUILD b/PKGBUILD
index 6248a4276d95..f4e830f3c2ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _opt_defaultmode='660' # default: 620
 set -u
 pkgname='nslink'
 pkgver='7.28'
-pkgrel='4'
+pkgrel='5'
 pkgdesc='tty driver and firmware update for Comtrol DeviceMaster, RTS, LT, PRO, 500, UP, RPSH-SI, RPSH, and Serial port Hub console terminal device server'
 # UP is not explicitly supported by NS-Link, only by the firmware updater.
 _pkgdescshort="Comtrol DeviceMaster ${pkgname} TTY driver"
@@ -45,10 +45,12 @@ source=("http://downloads.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-li
 source+=('http://downloads.comtrol.com/dev_mstr/rts/utility/linux_firmware_uploader/DM-Firmware-Updater-1.06.tar.gz')
 source+=('dmupdate.py.usage.patch')
 source+=('0000-Invalid-MKDEV-macro.patch')
+source+=('0001-kernel-4.18-proc_fops-to-proc_show.patch') # https://patchwork.kernel.org/patch/10349751/
 sha256sums=('900d0681a86d0732cf3e71e56a013456d5a77a68f7faa2afb955e275f73353fb'
             'd21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb'
             '5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073'
             '6968b10cd66d783f86f587a03584e78af4a2766d223b8d5c24c3ea4fe79f7230'
+            'a97fba21795f14d3253e9f702279299fcba0522c6a998ac91ae83abfafd955c2'
             '5c00939eb945c98336211cd61408b5a8623b01a7059356e663ccc638b0d159fb')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
@@ -81,6 +83,12 @@ _fn_patch_km() {
   #diff -pNau5 nslinkd.c{.orig,} > '0000-Invalid-MKDEV-macro.patch'
   patch -Nbup0 -i "${srcdir}/0000-Invalid-MKDEV-macro.patch"
 
+  #diff -pNau5 nslink.c{.orig,} > '0001-kernel-4.18-proc_fops-to-proc_show.patch'
+  patch -Nbup0 -i "${srcdir}/0001-kernel-4.18-proc_fops-to-proc_show.patch"
+
+  # Fix namespace collision in 4.18
+  sed -e 's:\btcp_data_ready\b:nslink_&:g' -i 'nslink.c'
+
   # Version check
   local _ver
   _ver="$(sed -n -e 's:^#define\sSI_VERSION\s"\([^"]\+\).*$:\1:p' 'version.h')"