autu: Update to 1.46-1

1 files changed, 21 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2527575a09bb..d54e5801575c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ _opt_DKMS=1            # This can be toggled between installs
 
 set -u
 pkgname='connecttech-cti-serial'
-pkgver='1.45'
-pkgrel='3'
+pkgver='1.46'
+pkgrel='1'
 pkgdesc='tty UART driver for BlueStorm BlueHeat Xtreme/104-Plus Titan and Xtreme/104-Express families'
 arch=('i686' 'x86_64')
 url='http://connecttech.com/product/pci-express-bluestorm-express/'
@@ -35,20 +35,23 @@ source=(
   '0004-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch'
   '0005-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
   '0006-kernel-5.18-bitwise.patch'
+  '0007-kernel-6.0-set_termios-const-ktermios.patch'
 )
 _srcdir='.'
-md5sums=('ba01c0ad48061ff97429d1438739e211'
+md5sums=('6e56f2b93611e4b0f367aec3a430a8f0'
          '97cd518024af079d1188398af69ca6cb'
          'b8a139a882c8aa550f33cd34d2412c45'
          'd6cf91270e603716a90ea4120a928f9f'
          'e9181275b574a74c6a180129203b3dbf'
-         '052753de7460ae2e3cebd9baf3ef8332')
-sha256sums=('111efcbcd2ebad89db1692b11a0779cb806ff35de27b39a6427191cf96a233ab'
+         '052753de7460ae2e3cebd9baf3ef8332'
+         '7fc262419c1363af052950ea1312294d')
+sha256sums=('7c1d8ade5e605bc01f80e2ca0705d048b3c83e32e68422b836f32accb436925f'
             '3f1c0aec4f287803b0c571ce0258bf16163fed920170fb6eac2ec717f704e3e5'
             '4b5a12f5122252ccee5aec97c392f2b718284ed0d4b70ee8b506f64fb89eced7'
             '3b7b66ac199025183fe1b6e7ddb14524b88251ff6f7f739fbc3973dd4f5039d5'
             '34e3d2061b794ce52fdeed91c09561e03c424572185a65714e1fcff8878ddf9a'
-            '1437ae1873d5ed5215619a96962214ca5131b3629309d21c03a8795225d66273')
+            '1437ae1873d5ed5215619a96962214ca5131b3629309d21c03a8795225d66273'
+            'bdb5f5c268b3df15d1901a009b62e765e64788e4fbbe853fa069d0712b7ac44a')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -89,11 +92,11 @@ prepare() {
 
   #cp -p driver/serial_core.c{,.orig}; false
   #diff -pNau5 driver/serial_core.c{.orig,} > '0000-kernel-4.18-proc_fops-to-proc_show.patch'
-  #patch -Nbup0 -i "${srcdir}/0000-kernel-4.18-proc_fops-to-proc_show.patch"
+  #patch -Nup0 -i "${srcdir}/0000-kernel-4.18-proc_fops-to-proc_show.patch"
 
   #cp -p driver/8250_core.c{,.orig}; false
   #diff -pNau5 driver/8250_core.c{.orig,} > '0001-kernel-5.0.0-8250_core-access_ok.patch'
-  #patch -Nbup0 -i "${srcdir}/0001-kernel-5.0.0-8250_core-access_ok.patch"
+  #patch -Nup0 -i "${srcdir}/0001-kernel-5.0.0-8250_core-access_ok.patch"
 
   # Kernel 5.6
   #sed -e 's:ioremap_nocache:ioremap:g' -i 'driver/8250_core.c' 'driver/8250_pci.c'
@@ -103,13 +106,13 @@ prepare() {
   sed -n -E -e '/ASYNCB_INITIALIZED|ASYNCB_SUSPENDED|ASYNCB_CTS_FLOW|ASYNCB_CHECK_CD|ASYNCB_NORMAL_ACTIVE|ASYNCB_CLOSING/ p' "/usr/lib/modules/$(uname -r)/build/include/uapi/linux/tty_flags.h" >> 'driver/serial_core_kernel510.h'
   #cp -pr 'driver' 'driver.orig'; false
   #diff -pNau5 'driver'{.orig,} > '0002-kernel-5.10-async-initialized.patch'
-  patch -Nbup0 -i "${srcdir}/0002-kernel-5.10-async-initialized.patch"
+  patch -Nup0 -i "${srcdir}/0002-kernel-5.10-async-initialized.patch"
   sed -e '/ArchLinuxPatch-0002-Begin/ r driver/serial_core_kernel510.h' -i 'driver/serial_core.c' 'driver/8250_core.c'
   rm 'driver/serial_core_kernel510.h'
 
   #cp -p driver/serial_core.c{,.orig}; false
   #diff -pNau5 driver/serial_core.c{.orig,} > '0003-kernel-5.12-tty-low_latency.patch'
-  patch -Nbup0 -i "${srcdir}/0003-kernel-5.12-tty-low_latency.patch"
+  patch -Nup0 -i "${srcdir}/0003-kernel-5.12-tty-low_latency.patch"
 
   # tty.stopped https://lore.kernel.org/lkml/20210505091928.22010-13-jslaby@suse.cz/
   # unsigned write_room https://www.spinics.net/lists/linux-serial/msg42297.html
@@ -117,25 +120,30 @@ prepare() {
   # 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/*.orig; cp -pr 'driver' 'driver.orig'; false
   #diff -pNau5 'driver'{.orig,} > '0004-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch'
-  patch -Nbup0 -i "${srcdir}/0004-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch"
+  patch -Nup0 -i "${srcdir}/0004-kernel-5.14-task_struct.state-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 driver/*.orig; cp -pr 'driver' 'driver.orig'; false
   #diff -pNau5 'driver'{.orig,} > '0005-kernel-5.15-alloc_tty_driver-put_tty_driver.patch'
-  patch -Nbup0 -i "${srcdir}/0005-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
+  patch -Nup0 -i "${srcdir}/0005-kernel-5.15-alloc_tty_driver-put_tty_driver.patch"
 
   #rm -f driver/*.orig; cp -pr 'driver' 'a'; ln -s 'driver' 'b'; false
   #diff -pNaru5 'a' 'b' > '0006-kernel-5.18-bitwise.patch'
   patch -d 'driver' -Nup1 -i "${srcdir}/0006-kernel-5.18-bitwise.patch"
 
+  # https://lore.kernel.org/linux-arm-kernel/20220816115739.10928-9-ilpo.jarvinen@linux.intel.com/T/
+  #rm -f driver/*.orig; cp -pr 'driver' 'a'; ln -s 'driver' 'b'; false
+  #diff -pNaru5 'a' 'b' > '0007-kernel-6.0-set_termios-const-ktermios.patch'
+  patch -d 'driver' -Nup1 -i "${srcdir}/0007-kernel-6.0-set_termios-const-ktermios.patch"
+
   pushd 'driver' > /dev/null
   # Fix permissions
   find -type 'f' -perm '/111' -exec chmod 644 '{}' '+'
   chmod 755 *_dr
   local _ver
   #_ver="$(sed -n -e 's:^#define\sREVISION\s"\([^"]\+\).*$:\1:p' 'serial_core.c')"
-  _ver="$(sed -n -e 's:^Revision \([0-9.]\+\),.*$:\1:p' 'readme.txt' | tail -1)"
+  _ver="$(sed -n -e 's:^Revision \([0-9.]\+\),\?.*$:\1:p' 'readme.txt' | tail -1)"
   if [ "${pkgver}" != "${_ver}" ]; then
     echo "Version mismatch ${pkgver} != ${_ver}"
     set +u