autu: Update to 1.9.40-6

3 files changed, 97 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac930055b618..d7b8235fa87b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dgrp
 	pkgdesc = tty driver for Digi RealPort ConnectPort EtherLite Flex One CM PortServer TS IBM RAN serial console terminal servers
 	pkgver = 1.9.40
-	pkgrel = 5
+	pkgrel = 6
 	url = https://www.digi.com/
 	install = dgrp-install.sh
 	arch = i686
@@ -66,6 +66,7 @@ pkgbase = dgrp
 	source = 0005-kernel-5.12-MODULE_SUPPORTED_DEVICE.patch
 	source = 0006-kernel-5.13-dropped-tty_check_change.patch
 	source = 0007-kernel-5.14-task_struct.state-unsigned-tty.patch
+	source = 0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
 	md5sums = 175349c08d19158c88ad582c76916397
 	md5sums = b4af5022ba96fcc2429263cfbbe85bae
 	md5sums = 9feebec170552c9186e713e7f5852e14
@@ -108,6 +109,7 @@ pkgbase = dgrp
 	md5sums = 2596b5f38ef54d72af08dca05fcce369
 	md5sums = 60a06421a819bc65bd5ba0c3841e0500
 	md5sums = 5dfc03b8f6b8d190b63271b8ef32986c
+	md5sums = f60c03c266bec028b4df4b7996deaacb
 	sha256sums = 2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a
 	sha256sums = 42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf
 	sha256sums = 66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3
@@ -150,5 +152,6 @@ pkgbase = dgrp
 	sha256sums = 82f2c244f169c1f5a9b6186e4e4436c116bd020a1be973e8be261097d38bc937
 	sha256sums = eaab5a80791644a24950fe0c6db2c09535655c63ed3a263eb70791ab30f86ab9
 	sha256sums = 50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0
+	sha256sums = 0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab
 
 pkgname = dgrp
diff --git a/0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch b/0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
new file mode 100644
index 000000000000..729e9db28d26
--- /dev/null
+++ b/0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch
@@ -0,0 +1,81 @@
+diff -pNaru5 driver/2.6.27.orig/dgrp_tty.c driver/2.6.27/dgrp_tty.c
+--- driver/2.6.27.orig/dgrp_tty.c	2021-11-20 14:56:04.993491404 -0500
++++ driver/2.6.27/dgrp_tty.c	2021-11-20 14:57:49.520506448 -0500
+@@ -4105,11 +4105,11 @@ dgrp_tty_uninit(struct nd_struct *nd)
+ 
+ 		if (nd->nd_serial_ttdriver->ttys) {
+ 			kfree(nd->nd_serial_ttdriver->ttys);
+ 			nd->nd_serial_ttdriver->ttys = NULL;
+ 		}
+-		put_tty_driver(nd->nd_serial_ttdriver);
++		tty_driver_kref_put(nd->nd_serial_ttdriver);
+ 		nd->nd_ttdriver_flags &= ~SERIAL_TTDRV_REG;
+ 	}
+ 
+ 	if (nd->nd_ttdriver_flags & CALLOUT_TTDRV_REG) {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+@@ -4121,11 +4121,11 @@ dgrp_tty_uninit(struct nd_struct *nd)
+ 
+ 		if (nd->nd_callout_ttdriver->ttys) {
+ 			kfree(nd->nd_callout_ttdriver->ttys);
+ 			nd->nd_callout_ttdriver->ttys = NULL;
+ 		}
+-		put_tty_driver(nd->nd_callout_ttdriver);
++		tty_driver_kref_put(nd->nd_callout_ttdriver);
+ 		nd->nd_ttdriver_flags &= ~CALLOUT_TTDRV_REG;
+ 	}
+ 
+ 	if (nd->nd_ttdriver_flags & XPRINT_TTDRV_REG) {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+@@ -4137,11 +4137,11 @@ dgrp_tty_uninit(struct nd_struct *nd)
+ 
+ 		if (nd->nd_xprint_ttdriver->ttys) {
+ 			kfree(nd->nd_xprint_ttdriver->ttys);
+ 			nd->nd_xprint_ttdriver->ttys = NULL;
+ 		}
+-		put_tty_driver(nd->nd_xprint_ttdriver);
++		tty_driver_kref_put(nd->nd_xprint_ttdriver);
+ 		nd->nd_ttdriver_flags &= ~XPRINT_TTDRV_REG;
+ 	}
+ 
+ 	dbg_tty_trace(UNINIT, ("tty uninit: done\n"));
+ }
+@@ -4163,11 +4163,11 @@ dgrp_tty_init(struct nd_struct *nd)
+ 
+ 	/*
+ 	 *  Initialize the TTDRIVER structures.
+ 	 */
+ 
+-	nd->nd_serial_ttdriver = alloc_tty_driver(CHAN_MAX);
++	nd->nd_serial_ttdriver = tty_alloc_driver(CHAN_MAX,0);
+ 	sprintf(nd->nd_serial_name,  "tty_dgrp_%s_", id);
+ 
+ 	nd->nd_serial_ttdriver->owner        = THIS_MODULE;
+ 	nd->nd_serial_ttdriver->name         = nd->nd_serial_name;
+ 	nd->nd_serial_ttdriver->name_base    = 0;
+@@ -4227,11 +4227,11 @@ dgrp_tty_init(struct nd_struct *nd)
+ 			}
+ 		}
+ 		nd->nd_ttdriver_flags |= SERIAL_TTDRV_REG;
+ 	}
+ 
+-	nd->nd_callout_ttdriver = alloc_tty_driver(CHAN_MAX);
++	nd->nd_callout_ttdriver = tty_alloc_driver(CHAN_MAX,0);
+ 	sprintf(nd->nd_callout_name, "cu_dgrp_%s_",  id);
+ 
+ 	nd->nd_callout_ttdriver->owner        = THIS_MODULE;
+ 	nd->nd_callout_ttdriver->name         = nd->nd_callout_name;
+ 	nd->nd_callout_ttdriver->name_base    = 0;
+@@ -4268,11 +4268,11 @@ dgrp_tty_init(struct nd_struct *nd)
+ 			nd->nd_ttdriver_flags |= CALLOUT_TTDRV_REG;
+ 		}
+ 	}
+ 
+ 
+-	nd->nd_xprint_ttdriver = alloc_tty_driver(CHAN_MAX);
++	nd->nd_xprint_ttdriver = tty_alloc_driver(CHAN_MAX,0);
+ 	sprintf(nd->nd_xprint_name,  "pr_dgrp_%s_", id);
+ 
+ 	nd->nd_xprint_ttdriver->owner         = THIS_MODULE;
+ 	nd->nd_xprint_ttdriver->name          = nd->nd_xprint_name;
+ 	nd->nd_xprint_ttdriver->name_base     = 0;
diff --git a/PKGBUILD b/PKGBUILD
index b307d399f11e..e9e3d2fc12b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -105,7 +105,7 @@ pkgname='dgrp'
 #_pkgver='1.9-39'; _dl='40002086_Z.tgz'
 _pkgver='1.9-40'; _dl='40002086_AA.tgz'
 pkgver="${_pkgver//-/.}"
-pkgrel='5'
+pkgrel='6'
 pkgdesc="tty driver for Digi ${_opt_RealPort} ConnectPort EtherLite Flex One CM PortServer TS IBM RAN serial console terminal servers"
 #_pkgdescshort="Digi ${_opt_RealPort} driver for Ethernet serial servers" # For when we used to generate the autorebuild from here
 arch=('i686' 'x86_64')
@@ -195,6 +195,7 @@ source=(
   '0005-kernel-5.12-MODULE_SUPPORTED_DEVICE.patch'
   '0006-kernel-5.13-dropped-tty_check_change.patch'
   '0007-kernel-5.14-task_struct.state-unsigned-tty.patch'
+  '0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
 )
 unset _mibsrc
 #source_i686=('http://ftp1.digi.com/support/utilities/40002890_A.tgz')
@@ -241,7 +242,8 @@ md5sums=('175349c08d19158c88ad582c76916397'
          'c25c1fdfbdc1fa38d87e45cf1c8511c2'
          '2596b5f38ef54d72af08dca05fcce369'
          '60a06421a819bc65bd5ba0c3841e0500'
-         '5dfc03b8f6b8d190b63271b8ef32986c')
+         '5dfc03b8f6b8d190b63271b8ef32986c'
+         'f60c03c266bec028b4df4b7996deaacb')
 sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             '42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf'
             '66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3'
@@ -283,7 +285,8 @@ sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             'b812176f6061d135ab45facecf5a05922d9ffd5ec0a6f17c3e3a5a74729034b1'
             '82f2c244f169c1f5a9b6186e4e4436c116bd020a1be973e8be261097d38bc937'
             'eaab5a80791644a24950fe0c6db2c09535655c63ed3a263eb70791ab30f86ab9'
-            '50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0')
+            '50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0'
+            '0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -410,6 +413,12 @@ prepare() {
   #diff -pNaru5 driver/2.6.27{.orig,} > '0007-kernel-5.14-task_struct.state-unsigned-tty.patch'
   patch -Nbup0 -i "${srcdir}/0007-kernel-5.14-task_struct.state-unsigned-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 driver/2.6.27/*.orig; cp -pr driver/2.6.27{,.orig}; false
+  #diff -pNaru5 driver/2.6.27{.orig,} > '0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
+  patch -Nbup0 -i "${srcdir}/0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
+
   # Standardize name of RealPort
   sed -e "s/RealPort/${_opt_RealPort}/gI" -i $(grep -lrF $'RealPort\nRealport' .)
   # grep -ri realport . | grep -vF $'RealPort\nRealport'