diff --git a/crash.spec b/crash.spec index 508c5e6..0d865d0 100644 --- a/crash.spec +++ b/crash.spec @@ -4,7 +4,7 @@ Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles Name: crash Version: 7.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Group: Development/Debuggers Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz @@ -17,6 +17,7 @@ Requires: binutils Provides: bundled(libiberty) Patch0: lzo_snappy.patch Patch1: use_system_readline_v2.patch +Patch2: linux_version_4_support.patch %description The core analysis suite is a self-contained tool that can be used to @@ -39,6 +40,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch. %setup -n %{name}-%{version} -q %patch0 -p1 -b lzo_snappy.patch %patch1 -p1 -b use_system_readline_v2.patch +%patch2 -p1 -b linux_version_4_support.patch %build make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" @@ -67,6 +69,9 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Mon Mar 2 2015 Dave Anderson - 7.1.0-3 +- Support increment of Linux version from 3 to 4 + * Sat Feb 21 2015 Till Maas - 7.1.0-2 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code diff --git a/linux_version_4_support.patch b/linux_version_4_support.patch new file mode 100644 index 0000000..c238ecb --- /dev/null +++ b/linux_version_4_support.patch @@ -0,0 +1,32 @@ +commit db07dbf5a7e19806b1629bd4125e6643978c6f9f +Author: Dave Anderson +Date: Thu Feb 19 16:16:33 2015 -0500 + + Prepare for the future increment of Linux 3.x to 4.x. + (anderson@redhat.com) + +diff --git a/kernel.c b/kernel.c +index cf858c2..a5e0c64 100644 +--- a/kernel.c ++++ b/kernel.c +@@ -1211,7 +1211,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)) { +@@ -4909,7 +4910,8 @@ debug_kernel_version(char *namelist) + argc = 0; + while (fgets(buf, BUFSIZE-1, pipe)) { + if (!strstr(buf, "Linux version 2.") && +- !strstr(buf, "Linux version 3.")) ++ !strstr(buf, "Linux version 3.") && ++ !strstr(buf, "Linux version 4.")) + continue; + + argc = parse_line(buf, arglist); +