autu: Update to 1.9.40-8

3 files changed, 134 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6932b92eb530..989f8c9eadf5 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 = 7
+	pkgrel = 8
 	url = https://www.digi.com/
 	install = dgrp-install.sh
 	arch = i686
@@ -68,6 +68,7 @@ pkgbase = dgrp
 	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
+	source = 0010-kernel-5.17-change-PDE_DATA.patch
 	md5sums = 175349c08d19158c88ad582c76916397
 	md5sums = b4af5022ba96fcc2429263cfbbe85bae
 	md5sums = 9feebec170552c9186e713e7f5852e14
@@ -112,6 +113,7 @@ pkgbase = dgrp
 	md5sums = 5dfc03b8f6b8d190b63271b8ef32986c
 	md5sums = f60c03c266bec028b4df4b7996deaacb
 	md5sums = 3b51a73b29843bfc6db748351dea464b
+	md5sums = a841defc71b4b1da33ac9b24cdff52ca
 	sha256sums = 2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a
 	sha256sums = 42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf
 	sha256sums = 66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3
@@ -156,5 +158,6 @@ pkgbase = dgrp
 	sha256sums = 50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0
 	sha256sums = 0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab
 	sha256sums = 1d6ab72eec4977b7789d0f5af3dc907bebdd21e417abb5dcfdac80c460a77bae
+	sha256sums = d1c641d3f024e8e11c4a36bf58570afb4b63fcaa4a22f05c59b513a35a6a4af7
 
 pkgname = dgrp
diff --git a/0010-kernel-5.17-change-PDE_DATA.patch b/0010-kernel-5.17-change-PDE_DATA.patch
new file mode 100644
index 000000000000..800ce09459d1
--- /dev/null
+++ b/0010-kernel-5.17-change-PDE_DATA.patch
@@ -0,0 +1,119 @@
+diff -pNaru5 a/driver/2.6.27/dgrp_dpa_ops.c b/driver/2.6.27/dgrp_dpa_ops.c
+--- a/driver/2.6.27/dgrp_dpa_ops.c	2022-06-05 01:06:30.412698077 -0400
++++ b/driver/2.6.27/dgrp_dpa_ops.c	2022-06-05 01:06:56.105865450 -0400
+@@ -332,10 +332,12 @@ static int dgrp_dpa_open(struct inode *i
+ 	if (!de) {
+ 		rtn = -ENXIO;
+ 		goto done;
+ 	}
+ 	nd = (struct nd_struct *)de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	nd = pde_data(inode);
+ #else
+ 	nd = (struct nd_struct *)PDE_DATA(inode);
+ #endif
+ 	if (!nd) {
+ 		rtn = -ENXIO;
+diff -pNaru5 a/driver/2.6.27/dgrp_mon_ops.c b/driver/2.6.27/dgrp_mon_ops.c
+--- a/driver/2.6.27/dgrp_mon_ops.c	2022-06-05 01:06:30.412698077 -0400
++++ b/driver/2.6.27/dgrp_mon_ops.c	2022-06-05 01:07:32.049073042 -0400
+@@ -294,10 +294,12 @@ static int dgrp_mon_open(struct inode *i
+ 	if (!de) {
+ 		rtn = -ENXIO;
+ 		goto done;
+ 	}
+ 	nd = (struct nd_struct *)de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	nd = pde_data(inode);
+ #else
+ 	nd = (struct nd_struct *)PDE_DATA(inode);
+ #endif
+ 	if (!nd) {
+ 		rtn = -ENXIO;
+diff -pNaru5 a/driver/2.6.27/dgrp_net_ops.c b/driver/2.6.27/dgrp_net_ops.c
+--- a/driver/2.6.27/dgrp_net_ops.c	2022-06-05 01:06:30.412698077 -0400
++++ b/driver/2.6.27/dgrp_net_ops.c	2022-06-05 01:07:45.312388401 -0400
+@@ -1485,10 +1485,12 @@ static int dgrp_net_open(struct inode *i
+ 		rtn = -ENXIO;
+ 		goto done;
+ 	}
+ 
+ 	nd = (struct nd_struct *) de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	nd = pde_data(inode);
+ #else
+ 	nd = (struct nd_struct *) PDE_DATA(inode);
+ 
+ #endif
+ 	if (!nd) {
+diff -pNaru5 a/driver/2.6.27/dgrp_ports_ops.c b/driver/2.6.27/dgrp_ports_ops.c
+--- a/driver/2.6.27/dgrp_ports_ops.c	2022-06-05 01:06:30.416031385 -0400
++++ b/driver/2.6.27/dgrp_ports_ops.c	2022-06-05 01:07:57.855717730 -0400
+@@ -284,10 +284,12 @@ static int dgrp_ports_open(struct inode
+ 	if (!de) {
+ 		rtn = -ENXIO;
+ 		goto done;
+ 	}
+ 	nd = (struct nd_struct *)de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	nd = pde_data(inode);
+ #else
+ 	nd = (struct nd_struct *)PDE_DATA(inode);
+ #endif
+ 	if (!nd) {
+ 		rtn = -ENXIO;
+diff -pNaru5 a/driver/2.6.27/dgrp_specproc.c b/driver/2.6.27/dgrp_specproc.c
+--- a/driver/2.6.27/dgrp_specproc.c	2022-06-05 01:06:30.416031385 -0400
++++ b/driver/2.6.27/dgrp_specproc.c	2022-06-05 01:09:03.378681962 -0400
+@@ -467,10 +467,12 @@ static int dgrp_gen_proc_open(struct ino
+ 		ret = -ENXIO;
+ 		goto done;
+ 	}
+ 
+ 	entry = (struct dgrp_proc_entry *) de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	entry = pde_data(file_inode(file));
+ #else /* >=3,10,0 */
+ 	entry = (struct dgrp_proc_entry *) PDE_DATA(file_inode(file));
+ #endif
+ 	if (!entry) {
+ 		ret = -ENXIO;
+@@ -512,10 +514,12 @@ static int dgrp_gen_proc_close(struct in
+ 	if (!de || !de->data) {
+ 		goto done;
+ 	}
+ 
+ 	entry = (struct dgrp_proc_entry *) de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	entry = pde_data(file_inode(file));
+ #else /* >=3,10,0 */
+ 	entry = (struct dgrp_proc_entry *) PDE_DATA(file_inode(file));
+ #endif
+ 	if (!entry)
+ 		goto done;
+@@ -548,10 +552,12 @@ static ssize_t dgrp_gen_proc_read(struct
+ #endif
+ 	if (!de || !de->data)
+ 		return -ENXIO;
+ 
+ 	entry = (struct dgrp_proc_entry *) de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	entry = pde_data(file_inode(file));
+ #else /* >=3,10,0 */
+ 	entry = (struct dgrp_proc_entry *) PDE_DATA(file_inode(file));
+ #endif
+ 	if (!entry)
+ 		return -ENXIO;
+@@ -589,10 +595,12 @@ static ssize_t dgrp_gen_proc_write(struc
+ #endif
+ 	if (!de || !de->data)
+ 		return-ENXIO;
+ 
+ 	entry = (struct dgrp_proc_entry *) de->data;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
++	entry = pde_data(file_inode(file));
+ #else /* >=3,10,0 */
+ 	entry = (struct dgrp_proc_entry *) PDE_DATA(file_inode(file));
+ #endif
+ 	if (!entry)
+ 		return -ENXIO;
diff --git a/PKGBUILD b/PKGBUILD
index d182af5dc9f0..1995c4c52f10 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='7'
+pkgrel='8'
 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')
@@ -197,6 +197,7 @@ source=(
   '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'
+  '0010-kernel-5.17-change-PDE_DATA.patch'
 )
 unset _mibsrc
 #source_i686=('http://ftp1.digi.com/support/utilities/40002890_A.tgz')
@@ -245,7 +246,8 @@ md5sums=('175349c08d19158c88ad582c76916397'
          '60a06421a819bc65bd5ba0c3841e0500'
          '5dfc03b8f6b8d190b63271b8ef32986c'
          'f60c03c266bec028b4df4b7996deaacb'
-         '3b51a73b29843bfc6db748351dea464b')
+         '3b51a73b29843bfc6db748351dea464b'
+         'a841defc71b4b1da33ac9b24cdff52ca')
 sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             '42898b9d24262de27e9b1f3067d51d01373810b7c9e4991403a7f0a5dd7a26cf'
             '66f8b106a052b4807513ace92978e5e6347cef08eee39e4b4ae31c60284cc0a3'
@@ -289,7 +291,8 @@ sha256sums=('2044715efa7a56fccad5ac76cdca9f71bca430e8c53ce31fa5c9563da3e7906a'
             'eaab5a80791644a24950fe0c6db2c09535655c63ed3a263eb70791ab30f86ab9'
             '50975ac2377ffd24874746df4b820de1734f53eb322bd25ccc9d51148129a2e0'
             '0ae424e8211836edbededafd308cf9ae73cdb791752c4fc43e1c194db7b77cab'
-            '1d6ab72eec4977b7789d0f5af3dc907bebdd21e417abb5dcfdac80c460a77bae')
+            '1d6ab72eec4977b7789d0f5af3dc907bebdd21e417abb5dcfdac80c460a77bae'
+            'd1c641d3f024e8e11c4a36bf58570afb4b63fcaa4a22f05c59b513a35a6a4af7')
 
 if [ "${_opt_DKMS}" -ne 0 ]; then
   depends+=('linux' 'dkms' 'linux-headers')
@@ -427,6 +430,11 @@ prepare() {
   # 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"
 
+  # https://www.spinics.net/lists/linux-fsdevel/msg207433.html
+  #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false
+  # diff -pNaru5 'a' 'b' > '0010-kernel-5.17-change-PDE_DATA.patch'
+  patch -Nup1 -i "${startdir}/0010-kernel-5.17-change-PDE_DATA.patch"
+
   # Standardize name of RealPort
   sed -e "s/RealPort/${_opt_RealPort}/gI" -i $(grep -lrF $'RealPort\nRealport' .)
   # grep -ri realport . | grep -vF $'RealPort\nRealport'