[packages/dahdi-linux] - fix building with latest 4.14 kernel

[baggins]

commit 10f904f37ebe3ab0dcf5bf743c5a826f23e91cea
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 10 20:16:00 2019 +0100

    - fix building with latest 4.14 kernel

 dahdi-linux.spec  |  2 ++
 kernel-4.14.patch | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index b30b1ba..1e8a635 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -58,6 +58,7 @@ Source6:	%{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
 Source7:	%{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5:	a7f3886942bb3e9fed349a41b3390c9f
 Patch0:		kernel-5.0.patch
+Patch1:		kernel-4.14.patch
 URL:		http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires:	perl-base
@@ -156,6 +157,7 @@ cd ../..\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
 	ln -s $a drivers/dahdi/firmware
diff --git a/kernel-4.14.patch b/kernel-4.14.patch
new file mode 100644
index 0000000..65a7760
--- /dev/null
+++ b/kernel-4.14.patch
@@ -0,0 +1,16 @@
+--- dahdi-linux-3.0.0/include/dahdi/kernel.h~	2018-11-15 15:03:40.000000000 +0100
++++ dahdi-linux-3.0.0/include/dahdi/kernel.h	2019-03-10 20:14:29.249473418 +0100
+@@ -1406,9 +1406,13 @@
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 104)
+ #ifndef TIMER_DATA_TYPE
+ #define TIMER_DATA_TYPE unsigned long
+ #endif
++#else
++#define TIMER_DATA_TYPE struct timer_list *
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/10f904f37ebe3ab0dcf5bf743c5a826f23e91cea