diff options
author | Chris Severance | 2023-01-03 03:46:38 -0500 |
---|---|---|
committer | Chris Severance | 2023-01-03 03:46:38 -0500 |
commit | 1c252c6245bb904e6b0562907b0943097911021f (patch) | |
tree | f3b685d72c51bcec180fa71fa31aa9c40704a46a | |
parent | 98bf97502923db139641e55f4090b31ac2e06860 (diff) | |
download | aur-1c252c6245bb904e6b0562907b0943097911021f.tar.gz |
autu: Update to 6.10.0.1-4
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | 0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch | 39 | ||||
-rw-r--r-- | 0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch | 18 | ||||
-rw-r--r-- | 0006-kernel-6.0-set_termios-const-ktermios.patch | 38 | ||||
-rw-r--r-- | PKGBUILD | 29 |
5 files changed, 131 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = trueport pkgdesc = tty driver for Perle IOLan+ DS TS SDS STS SCS JetStream LanStream LinkStream and 3rd party serial console terminal device servers pkgver = 6.10.0.1 - pkgrel = 3 + pkgrel = 4 url = https://www.perle.com/ install = trueport-install.sh arch = i686 @@ -30,17 +30,26 @@ pkgbase = trueport source = 0001-kernel-5.13-dropped-tty_check_change.patch source = 0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch source = 0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch + source = 0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch + source = 0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch + source = 0006-kernel-6.0-set_termios-const-ktermios.patch md5sums = 5a529676de30706133255ba4e8dae5b0 md5sums = 56444e2f404aa2e6a2c9e8e2bd919fcf md5sums = fb798f306553cb253b30ff5af5ba2f40 md5sums = a103f2791c03733b1fd75493864fb464 md5sums = 5206e863cf6340c05325d86935d4b40c md5sums = f464a0217b85a76657bcb7aa022f9a95 + md5sums = 835219e7c692cc699ec23f4e183f70bf + md5sums = 2cc11aa436180b3daabad46d1b6bf3fb + md5sums = f9cb0fd97631bfbe1adae4c65cf23155 sha256sums = c21340a7523593da3e229b79cfbcf9e656772b2039e972dbca3947d138d55ffa sha256sums = 28863731fd99e447dc456312ef33e40f93623b56da0d345e45f40e238ca49639 sha256sums = 5f806246751d3a91c59bd97273221d1066006bafc7ed598c3d93f9b7bdae65a1 sha256sums = 88181bc7a0a5fa5a1320cbed20e02e1329b03b4c9800fc691990754b9a9aac18 sha256sums = ee64f971753fb4fd8a488e32e8fe3de9c468a00a1d1b995329bcfe87c93cedf7 sha256sums = 04025f2dc6fe868e890853e355d1d31fff6d3c463ad89db1cedda5f3843078a3 + sha256sums = 31ffbbe3de9605aa5c974e92b24c22876c8091eac3c1ada8bb83c76ad829cc8c + sha256sums = 1ed2794858d1268e53d73f3d4a34a4d2bf84a24ffbfa8babca7ce10e97e60d6c + sha256sums = 106c1f10c0d132759c10d5fa7b3aa9594aa142b6cd718c0428805a112a8351dd pkgname = trueport diff --git a/0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch b/0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch new file mode 100644 index 000000000000..83f76934e232 --- /dev/null +++ b/0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch @@ -0,0 +1,39 @@ +diff -pNaru5 a/ptyx/ptymod.c b/ptyx/ptymod.c +--- a/ptyx/ptymod.c 2023-01-03 02:30:05.978629790 -0500 ++++ b/ptyx/ptymod.c 2023-01-03 02:33:52.608566523 -0500 +@@ -349,11 +349,10 @@ static int __init ptyx_init(void) + ptyx_info->c_driver = ptyx_control_driver; + } + + // Master Driver + ptyx_master_driver->owner = THIS_MODULE; +- ptyx_master_driver->magic = TTY_DRIVER_MAGIC; + ptyx_master_driver->driver_name = "ptyx_master"; + ptyx_master_driver->name = PTYX_MASTER_NAME; + ptyx_master_driver->major = PTYX_MASTER_MAJOR; + ptyx_master_driver->minor_start = 0; + ptyx_master_driver->type = TTY_DRIVER_TYPE_SERIAL; +@@ -368,11 +367,10 @@ static int __init ptyx_init(void) + tty_set_operations(ptyx_master_driver, &ptyx_ops_master); + + + // Slave driver + ptyx_slave_driver->owner = THIS_MODULE; +- ptyx_slave_driver->magic = TTY_DRIVER_MAGIC; + ptyx_slave_driver->driver_name = "ptyx_slave"; + ptyx_slave_driver->name = PTYX_SLAVE_NAME; + ptyx_slave_driver->major = PTYX_SLAVE_MAJOR; + ptyx_slave_driver->minor_start = 0; + ptyx_slave_driver->type = TTY_DRIVER_TYPE_SERIAL; +@@ -383,11 +381,10 @@ static int __init ptyx_init(void) + ptyx_slave_driver->driver_state = pty_state_table; // global pointer ot private data + tty_set_operations(ptyx_slave_driver, &ptyx_ops_slave); + + // Control status Driver + ptyx_control_driver->owner = THIS_MODULE; +- ptyx_control_driver->magic = TTY_DRIVER_MAGIC; + ptyx_control_driver->driver_name = "ptyx_control"; + ptyx_control_driver->name = PTYX_CTRL_NAME; + ptyx_control_driver->major = PTYX_CTRL_MAJOR; + ptyx_control_driver->minor_start = 0; + ptyx_control_driver->type = TTY_DRIVER_TYPE_SERIAL; diff --git a/0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch b/0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch new file mode 100644 index 000000000000..5f6cde644a2b --- /dev/null +++ b/0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch @@ -0,0 +1,18 @@ +diff -pNaru5 a/ptyx/ptym.c b/ptyx/ptym.c +--- a/ptyx/ptym.c 2023-01-03 03:02:48.143913958 -0500 ++++ b/ptyx/ptym.c 2023-01-03 03:08:12.439130071 -0500 +@@ -414,11 +414,13 @@ static int ptyx_master_ioctl(struct tty_ + { + ptyx_print(PTYX_DEBUG_IOCTL, ("ptyx_master_ioctl(%d): TCGETS, SLAVE NOT OPEN, returning default termios\n", ptyx_info->line)); + // slave not open so use the slave's default termios + tmp_termios = &ptyx_info->s_driver->init_termios; + } +-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)) // Greater than 2.6.23 ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ if (copy_to_user((struct termios *)arg, tmp_termios, sizeof(struct termios))) ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)) // Greater than 2.6.23 + #ifdef TCGETS2 + if (kernel_termios_to_user_termios_1((struct termios *)arg, tmp_termios)) + #else + if (kernel_termios_to_user_termios((struct termios *)arg, tmp_termios)) + #endif diff --git a/0006-kernel-6.0-set_termios-const-ktermios.patch b/0006-kernel-6.0-set_termios-const-ktermios.patch new file mode 100644 index 000000000000..0c1be7ad349c --- /dev/null +++ b/0006-kernel-6.0-set_termios-const-ktermios.patch @@ -0,0 +1,38 @@ +diff -pNaru5 a/ptyx/ptym.c b/ptyx/ptym.c +--- a/ptyx/ptym.c 2023-01-03 02:54:09.808495447 -0500 ++++ b/ptyx/ptym.c 2023-01-03 02:55:07.318357038 -0500 +@@ -728,11 +728,15 @@ out: + + return retval; + } + + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0)) + static void ptyx_master_set_termios(struct tty_struct *tty, STRUCT_TERMIOS *old_termios) ++#else ++static void ptyx_master_set_termios(struct tty_struct *tty, const STRUCT_TERMIOS *old_termios) ++#endif + { + + ptyx_print(PTYX_DEBUG_TERMIOS, ("ptyx_master_set_termios: called current->state=%lx\n",current->state)); + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)) // Less than 3.7.0 +diff -pNaru5 a/ptyx/ptys.c b/ptyx/ptys.c +--- a/ptyx/ptys.c 2023-01-03 02:54:09.805162119 -0500 ++++ b/ptyx/ptys.c 2023-01-03 02:56:49.417950986 -0500 +@@ -1107,11 +1107,15 @@ out: + + return retval; + } + + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) + static void ptyx_slave_set_termios(struct tty_struct *tty, STRUCT_TERMIOS *old_termios) ++#else ++static void ptyx_slave_set_termios(struct tty_struct *tty, const STRUCT_TERMIOS *old_termios) ++#endif + { + struct ptyx_struct *ptyx_info = (struct ptyx_struct *)tty->driver_data; + + ptyx_print(PTYX_DEBUG_TERMIOS, ("ptyx_slave_set_termios(%d): called current->state=%lx\n", + ptyx_info->line, current->state)); @@ -97,7 +97,7 @@ _dlver='6.10.0-1' pkgver="${_dlver//-/.}" #_dlver='6.8.0-2' # only use this with a version change patch set _srcdir="${pkgname}-${_dlver%%-*}" -pkgrel='3' +pkgrel='4' pkgdesc='tty driver for Perle IOLan+ DS TS SDS STS SCS JetStream LanStream LinkStream and 3rd party serial console terminal device servers' _pkgdescshort='Perle TruePort driver for Ethernet serial servers' arch=('i686' 'x86_64') @@ -125,19 +125,28 @@ source=( '0001-kernel-5.13-dropped-tty_check_change.patch' '0002-kernel-5.14-task_struct.state-unsigned-tty-flow-tty.patch' '0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch' + '0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch' + '0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch' + '0006-kernel-6.0-set_termios-const-ktermios.patch' ) md5sums=('5a529676de30706133255ba4e8dae5b0' '56444e2f404aa2e6a2c9e8e2bd919fcf' 'fb798f306553cb253b30ff5af5ba2f40' 'a103f2791c03733b1fd75493864fb464' '5206e863cf6340c05325d86935d4b40c' - 'f464a0217b85a76657bcb7aa022f9a95') + 'f464a0217b85a76657bcb7aa022f9a95' + '835219e7c692cc699ec23f4e183f70bf' + '2cc11aa436180b3daabad46d1b6bf3fb' + 'f9cb0fd97631bfbe1adae4c65cf23155') sha256sums=('c21340a7523593da3e229b79cfbcf9e656772b2039e972dbca3947d138d55ffa' '28863731fd99e447dc456312ef33e40f93623b56da0d345e45f40e238ca49639' '5f806246751d3a91c59bd97273221d1066006bafc7ed598c3d93f9b7bdae65a1' '88181bc7a0a5fa5a1320cbed20e02e1329b03b4c9800fc691990754b9a9aac18' 'ee64f971753fb4fd8a488e32e8fe3de9c468a00a1d1b995329bcfe87c93cedf7' - '04025f2dc6fe868e890853e355d1d31fff6d3c463ad89db1cedda5f3843078a3') + '04025f2dc6fe868e890853e355d1d31fff6d3c463ad89db1cedda5f3843078a3' + '31ffbbe3de9605aa5c974e92b24c22876c8091eac3c1ada8bb83c76ad829cc8c' + '1ed2794858d1268e53d73f3d4a34a4d2bf84a24ffbfa8babca7ce10e97e60d6c' + '106c1f10c0d132759c10d5fa7b3aa9594aa142b6cd718c0428805a112a8351dd') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -177,6 +186,20 @@ prepare() { # diff -pNaru5 trueport-6.10.0{.orig,} > '0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch' patch -Nup1 -i "${srcdir}/0003-kernel-5.15-alloc_tty_driver-put_tty_driver.patch" + #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch' + patch -Nup1 -i "${srcdir}/0004-kernel-6.1-TTY_DRIVER_MAGIC-remove-dead-code.patch" + + #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0005-kernel-6.1-kernel_termios_to_user_termios_1-termios_internal.badpatch' + # diff -pNaru5 'a' 'b' > '0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch' + patch -Nup1 -i "${srcdir}/0005-kernel-6.1-kernel_termios_to_user_termios_1-copy_to_user.patch" + + # https://lore.kernel.org/linux-arm-kernel/20220816115739.10928-9-ilpo.jarvinen@linux.intel.com/T/ + #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0006-kernel-6.0-set_termios-const-ktermios.patch' + patch -Nup1 -i "${srcdir}/0006-kernel-6.0-set_termios-const-ktermios.patch" + # insert parameters and make install script non interactive. set +u; msg2 'Checking SSL with rpm_build'; set -u sed -e 's:^\(DONE\)=.*$:'"\1='done';SSL='${_opt_SSL}':g" \ |