autu: Update to 1.9.40-7

3 files changed, 43 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7b8235fa87b..6932b92eb530 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 = 6
+	pkgrel = 7
 	url = https://www.digi.com/
 	install = dgrp-install.sh
 	arch = i686
@@ -67,6 +67,7 @@ pkgbase = dgrp
 	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
+	source = 0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch
 	md5sums = 175349c08d19158c88ad582c76916397
 	md5sums = b4af5022ba96fcc2429263cfbbe85bae
 	md5sums = 9feebec170552c9186e713e7f5852e14
@@ -110,6 +111,7 @@ pkgbase = dgrp
 	md5sums = 60a06421a819bc65bd5ba0c3841e0500
 	md5sums = 5dfc03b8f6b8d190b63271b8ef32986c
 	md5sums = f60c03c266bec028b4df4b7996deaacb
+	md5sums = 3b51a73b29843bfc6db748351dea464b
 	sha256sums = 2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a
 	sha256sums = 42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf
 	sha256sums = 66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3
@@ -153,5 +155,6 @@ pkgbase = dgrp
 	sha256sums = eaab5a80791644a24950fe0c6db2c09535655c63ed3a263eb70791ab30f86ab9
 	sha256sums = 50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0
 	sha256sums = 0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab
+	sha256sums = 1d6ab72eec4977b7789d0f5af3dc907bebdd21e417abb5dcfdac80c460a77bae
 
 pkgname = dgrp
diff --git a/0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch b/0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch
new file mode 100644
index 000000000000..c62f62fcdde1
--- /dev/null
+++ b/0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch
@@ -0,0 +1,21 @@
+diff -pNaru5 a/driver/2.6.27/dgrp_tty.c b/driver/2.6.27/dgrp_tty.c
+--- a/driver/2.6.27/dgrp_tty.c	2022-01-16 22:20:11.863319323 -0500
++++ b/driver/2.6.27/dgrp_tty.c	2022-01-16 22:21:00.024125434 -0500
+@@ -325,15 +325,17 @@ static void drp_param(struct ch_struct *
+ 	 * Determine if FAST writes can be performed.
+ 	 */
+ 
+ 	if ((ch->ch_digi.digi_flags & DIGI_COOK) != 0 &&
+ 	    (ch->ch_tun.un_open_count != 0)  &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,16,0)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ 	    !((un->un_tty)->ldisc->ops->flags & LDISC_FLAG_DEFINED) &&
+ #else
+ 	    !((un->un_tty)->ldisc.ops->flags & LDISC_FLAG_DEFINED) &&
+ #endif
++#endif
+ 	    !(L_XCASE(un->un_tty))) {
+ 		ch->ch_flag |= CH_FAST_WRITE;
+ 	} else {
+ 		ch->ch_flag &= ~CH_FAST_WRITE;
+ 	}
diff --git a/PKGBUILD b/PKGBUILD
index e9e3d2fc12b4..d182af5dc9f0 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='6'
+pkgrel='7'
 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')
@@ -196,6 +196,7 @@ source=(
   '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'
+  '0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch'
 )
 unset _mibsrc
 #source_i686=('http://ftp1.digi.com/support/utilities/40002890_A.tgz')
@@ -243,7 +244,8 @@ md5sums=('175349c08d19158c88ad582c76916397'
          '2596b5f38ef54d72af08dca05fcce369'
          '60a06421a819bc65bd5ba0c3841e0500'
          '5dfc03b8f6b8d190b63271b8ef32986c'
-         'f60c03c266bec028b4df4b7996deaacb')
+         'f60c03c266bec028b4df4b7996deaacb'
+         '3b51a73b29843bfc6db748351dea464b')
 sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             '42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf'
             '66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3'
@@ -286,7 +288,8 @@ sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             '82f2c244f169c1f5a9b6186e4e4436c116bd020a1be973e8be261097d38bc937'
             'eaab5a80791644a24950fe0c6db2c09535655c63ed3a263eb70791ab30f86ab9'
             '50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0'
-            '0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab')
+            '0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab'
+            '1d6ab72eec4977b7789d0f5af3dc907bebdd21e417abb5dcfdac80c460a77bae')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -385,39 +388,44 @@ prepare() {
   if [ "$(vercmp "${pkgver}" '1.9.39')" -le 0 ]; then
     #cp -p driver/2.6.27/dgrp_mon_ops.c{,.orig}; false
     #diff -pNau5 driver/2.6.27/dgrp_mon_ops.c{.orig,} > '0002-kernel-5.0.0-do_gettimeofday.patch'
-    patch -Nbup0 -i "${srcdir}/0002a-kernel-5.0.0-do_gettimeofday.patch"
+    patch -Nup0 -i "${srcdir}/0002a-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.0.0-dgrp_mon_ops-access_ok.patch'
-    patch -Nbup0 -i "${srcdir}/0003a-kernel-5.0.0-dgrp_mon_ops-access_ok.patch"
+    patch -Nup0 -i "${srcdir}/0003a-kernel-5.0.0-dgrp_mon_ops-access_ok.patch"
   fi
 
   if [ "$(vercmp "${pkgver}" '1.9.40')" -le 0 ]; then
     #cp -pr driver/2.6.27{,.orig}; false
     #diff -pNaru5 driver/2.6.27{.orig,} > '0004-kernel-5.6-proc_dir_entry-proc_ops.patch'
-    patch -Nbup0 -i "${srcdir}/0004-kernel-5.6-proc_dir_entry-proc_ops.patch"
+    patch -Nup0 -i "${srcdir}/0004-kernel-5.6-proc_dir_entry-proc_ops.patch"
   fi
 
   #cp -pr driver/2.6.27{,.orig}; false
   #diff -pNaru5 driver/2.6.27{.orig,} > '0005-kernel-5.12-MODULE_SUPPORTED_DEVICE.patch'
-  patch -Nbup0 -i "${srcdir}/0005-kernel-5.12-MODULE_SUPPORTED_DEVICE.patch"
+  patch -Nup0 -i "${srcdir}/0005-kernel-5.12-MODULE_SUPPORTED_DEVICE.patch"
 
   #cp -pr driver/2.6.27{,.orig}; false
   #diff -pNaru5 driver/2.6.27{.orig,} > '0006-kernel-5.13-dropped-tty_check_change.patch'
-  patch -Nbup0 -i "${srcdir}/0006-kernel-5.13-dropped-tty_check_change.patch"
+  patch -Nup0 -i "${srcdir}/0006-kernel-5.13-dropped-tty_check_change.patch"
 
   # unsigned write_room https://www.spinics.net/lists/linux-serial/msg42297.html
   # unsigned chars_in_buffer https://www.spinics.net/lists/linux-serial/msg42299.html
   # set_current_state https://linux-kernel.vger.kernel.narkive.com/xnPfKhYP/patch-2-5-52-use-set-current-state-instead-of-current-state-take-1
   #rm -f driver/2.6.27/*.orig; cp -pr driver/2.6.27{,.orig}; false
   #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"
+  patch -Nup0 -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"
+  patch -Nup0 -i "${srcdir}/0008-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
+
+  # https://lore.kernel.org/all/20210914091134.17426-2-jslaby@suse.cz/
+  #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+  # diff -pNaru5 'a' 'b' > '0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch'
+  patch -Nup1 -i "${startdir}/0009-kernel-5.16-remove-LDISC_FLAG_DEFINED.patch"
 
   # Standardize name of RealPort
   sed -e "s/RealPort/${_opt_RealPort}/gI" -i $(grep -lrF $'RealPort\nRealport' .)