autu: Update to 8.00-4

3 files changed, 57 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a1da517e5f8..f8807af8c7bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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 = 8.00
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.comtrol.com/
 	install = nslink-install.sh
 	arch = i686
@@ -29,6 +29,7 @@ pkgbase = nslink
 	source = 0003-tty_unregister_driver-void.patch
 	source = 0004-kernel-5.12-tty-low_latency.patch
 	source = 0005-kernel-5.14-unsigned-tty-flow-tty.patch
+	source = 0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
 	md5sums = b59906d80268e69a24c211b398ffd10c
 	md5sums = e3ffb36acfdd321c919e44d477f0774a
 	md5sums = 581cd5f582ed20c7cf85a4df23a9f78a
@@ -36,6 +37,7 @@ pkgbase = nslink
 	md5sums = 7e0659716e30c6e2ff5c16f20aac07be
 	md5sums = 4e0c61dc0c5da4c3125db7ac1e481aac
 	md5sums = 93e85c98fd375285887b78f2df44ce01
+	md5sums = f85645dfe886b57273b475d3c6cd0964
 	sha256sums = 092859a3c198f8e3f5083a752eab0af74ef71dce59ed503d120792be13cc5fa3
 	sha256sums = d21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb
 	sha256sums = 5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073
@@ -43,5 +45,6 @@ pkgbase = nslink
 	sha256sums = 7b7718789a4a23c3f16094f93b9fc0d8a5915e67e6a0aedef17cdb6adb22a1ac
 	sha256sums = a48cdf948f907b00919c3a2dadbaa2c41c28891d689195e072765c39b0b4af49
 	sha256sums = 12c55d7b898b5cdcd09d6927fef1585a702fde356e8e039e7e85bbce64f3eed8
+	sha256sums = 364a4fb9d8695067ee8d235d7763c59f6df417937b901a1810e00d397db21aee
 
 pkgname = nslink
diff --git a/0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch b/0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
new file mode 100644
index 000000000000..ac39dd01d743
--- /dev/null
+++ b/0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
@@ -0,0 +1,41 @@
+--- nslink.c.orig	2021-11-20 15:13:52.248938958 -0500
++++ nslink.c	2021-11-20 15:15:42.252800968 -0500
+@@ -5634,11 +5634,11 @@ int register_tty_driver(tBoxPortCount *u
+ 
+         numBoxes = bp.boxCount;
+ 
+         // Set up the tty driver structure and then register this
+         // driver with the tty layer.
+-        nslink_driver = alloc_tty_driver((MAX_NRP_TOTAL_PORTS - 1));
++        nslink_driver = tty_alloc_driver((MAX_NRP_TOTAL_PORTS - 1),0);
+ 
+         nslink_driver->magic = TTY_DRIVER_MAGIC;
+         nslink_driver->driver_name = "NS-Link";
+         nslink_driver->name = "ttySI";
+         nslink_driver->num = bp.portCount;
+@@ -5661,11 +5661,11 @@ int register_tty_driver(tBoxPortCount *u
+         nslink_driver->owner = THIS_MODULE;
+         tty_set_operations(nslink_driver, &nslink_ops);
+         retval = tty_register_driver(nslink_driver);
+         if (retval < 0) {
+                 printk(KERN_INFO "Couldn't install tty NS-Link driver (error %d)\n", -retval);
+-                put_tty_driver(nslink_driver);
++                tty_driver_kref_put(nslink_driver);
+                 return retval;
+         }
+         driver_registered = 1;
+         printk(KERN_INFO "NS-Link driver is major %d\n", nslink_driver->major);
+         return 0;
+@@ -5737,11 +5737,11 @@ static void nrp_cleanup_module(void)
+         for (i = 0; i < numBoxes; i++)
+                 free_si_box(i);
+ 
+         if (driver_registered) {
+                 tty_unregister_driver(nslink_driver);
+-                put_tty_driver(nslink_driver);
++                tty_driver_kref_put(nslink_driver);
+         }
+ 
+ 	printk(KERN_INFO "nslink: finished driver module shutdown\n");
+         return;
+ }
diff --git a/PKGBUILD b/PKGBUILD
index e984111d71cf..afb20e42f48d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ _opt_defaultmode='660' # default: 620
 set -u
 pkgname='nslink'
 pkgver='8.00'
-pkgrel='3'
+pkgrel='4'
 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"
@@ -52,6 +52,7 @@ source=(
   '0003-tty_unregister_driver-void.patch'
   '0004-kernel-5.12-tty-low_latency.patch'
   '0005-kernel-5.14-unsigned-tty-flow-tty.patch'
+  '0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
 )
 md5sums=('b59906d80268e69a24c211b398ffd10c'
          'e3ffb36acfdd321c919e44d477f0774a'
@@ -59,14 +60,16 @@ md5sums=('b59906d80268e69a24c211b398ffd10c'
          '36fcfa504772df4aabbde9f23d5459d5'
          '7e0659716e30c6e2ff5c16f20aac07be'
          '4e0c61dc0c5da4c3125db7ac1e481aac'
-         '93e85c98fd375285887b78f2df44ce01')
+         '93e85c98fd375285887b78f2df44ce01'
+         'f85645dfe886b57273b475d3c6cd0964')
 sha256sums=('092859a3c198f8e3f5083a752eab0af74ef71dce59ed503d120792be13cc5fa3'
             'd21c5eeefdbf08a202a230454f0bf702221686ba3e663eb41852719bb20b75fb'
             '5a4e2713a8d1fe0eebd94fc843839ce5daa647f9fa7d88f62507e660ae111073'
             'cbaa55f16357688b992a7d7c0f2fb56225edda286d97595918c50e05005d1318'
             '7b7718789a4a23c3f16094f93b9fc0d8a5915e67e6a0aedef17cdb6adb22a1ac'
             'a48cdf948f907b00919c3a2dadbaa2c41c28891d689195e072765c39b0b4af49'
-            '12c55d7b898b5cdcd09d6927fef1585a702fde356e8e039e7e85bbce64f3eed8')
+            '12c55d7b898b5cdcd09d6927fef1585a702fde356e8e039e7e85bbce64f3eed8'
+            '364a4fb9d8695067ee8d235d7763c59f6df417937b901a1810e00d397db21aee')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -111,6 +114,12 @@ prepare() {
   #diff -pNau5 nslink.c{.orig,} > '0005-kernel-5.14-unsigned-tty-flow-tty.patch'
   patch -Nbup0 -i "${srcdir}/0005-kernel-5.14-unsigned-tty-flow-tty.patch"
 
+  # http://lkml.iu.edu/hypermail/linux/kernel/2107.2/08799.html [PATCH 5/8] tty: drop alloc_tty_driver
+  # http://lkml.iu.edu/hypermail/linux/kernel/2107.2/08801.html [PATCH 7/8] tty: drop put_tty_driver
+  #rm -f *.orig; cp -p nslink.c{,.orig}; false
+  #diff -pNau5 nslink.c{.orig,} > '0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
+  patch -Nbup0 -i "${srcdir}/0006-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
+
   # Make package compatible
   #cp -p 'install.sh' 'install.sh.Arch' # testmode for diff comparison
   sed -e '# Fix some paths' \