diff -u crash-7.0.3/debian/changelog crash-7.0.3/debian/changelog --- crash-7.0.3/debian/changelog +++ crash-7.0.3/debian/changelog @@ -1,3 +1,9 @@ +crash (7.0.3-3ubuntu4.1) trusty; urgency=medium + + * Linux-4.0.patch: Backport support for 4.0+ kernel versions. (LP: #1444528) + + -- Chris J Arges Wed, 22 Apr 2015 13:36:49 -0500 + crash (7.0.3-3ubuntu4) trusty-proposed; urgency=medium * debian/patches/Updated-the-ARM64-implementation-to-support-Linux-3..patch: diff -u crash-7.0.3/debian/patches/series crash-7.0.3/debian/patches/series --- crash-7.0.3/debian/patches/series +++ crash-7.0.3/debian/patches/series @@ -1,0 +2 @@ +Linux-4.0.patch only in patch2: unchanged: --- crash-7.0.3.orig/debian/patches/Linux-4.0.patch +++ crash-7.0.3/debian/patches/Linux-4.0.patch @@ -0,0 +1,43 @@ +From 467f47840a6cf615389843656c033d48315a5ad8 Mon Sep 17 00:00:00 2001 +From: Dave Anderson +Date: Thu, 19 Feb 2015 16:16:33 -0500 +Subject: [PATCH] Prepare for the future increment of Linux 3.x to 4.x. + (anderson@redhat.com) + +(cherry picked from commit db07dbf5a7e19806b1629bd4125e6643978c6f9f) +Signed-off-by: Chris J Arges + +Conflicts: + kernel.c +--- + kernel.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/kernel.c b/kernel.c +index 32397bc..ad9eaa1 100644 +--- a/kernel.c ++++ b/kernel.c +@@ -1191,7 +1191,8 @@ verify_namelist() + sprintf(buffer3, "(unknown)"); + while (fgets(buffer, BUFSIZE-1, pipe)) { + if (!strstr(buffer, "Linux version 2.") && +- !strstr(buffer, "Linux version 3.")) ++ !strstr(buffer, "Linux version 3.") && ++ !strstr(buffer, "Linux version 4.")) + continue; + + if (strstr(buffer, kt->proc_version)) { +@@ -4775,7 +4776,9 @@ debug_kernel_version(char *namelist) + + argc = 0; + while (fgets(buf, BUFSIZE-1, pipe)) { +- if (!strstr(buf, "Linux version 2.")) ++ if (!strstr(buf, "Linux version 2.") && ++ !strstr(buf, "Linux version 3.") && ++ !strstr(buf, "Linux version 4.")) + continue; + + argc = parse_line(buf, arglist); +-- +1.9.1 +