From ed31c74aba19ced525928dfc8b27e700e14b313b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:40:39 +0000 Subject: import kpatch-0.6.1-6.el7 --- diff --git a/SOURCES/0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch b/SOURCES/0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch new file mode 100644 index 0000000..1ec00a4 --- /dev/null +++ b/SOURCES/0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch @@ -0,0 +1,29 @@ +From 54c3d6d8fef188da10a5040c9cc841f35e01bfbf Mon Sep 17 00:00:00 2001 +From: Artem Savkov +Date: Tue, 7 May 2019 14:12:38 +0200 +Subject: [PATCH] Fix livepatch-enabled kernel detection in kpatch script + +We can no longer use klp_register_patch symbol to determine if the +kernel is livepatch-enabled. Use klp_enable_patch instead. + +Signed-off-by: Artem Savkov +--- + kpatch/kpatch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kpatch/kpatch b/kpatch/kpatch +index 1d9f90c..bdceff1 100755 +--- a/kpatch/kpatch ++++ b/kpatch/kpatch +@@ -126,7 +126,7 @@ find_core_module() { + } + + core_loaded () { +- grep -q -e "T klp_register_patch" -e "T kpatch_register" /proc/kallsyms ++ grep -q -e "T klp_enable_patch" -e "T kpatch_register" /proc/kallsyms + } + + get_module_name () { +-- +2.21.0 + diff --git a/SPECS/kpatch.spec b/SPECS/kpatch.spec index b6a69d1..e8a000c 100644 --- a/SPECS/kpatch.spec +++ b/SPECS/kpatch.spec @@ -1,6 +1,6 @@ Name: kpatch Version: 0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -11,6 +11,7 @@ Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-contrib-service-don-t-unload-modules-on-stop.patch Patch2: 0003-kpatch-script-don-t-fail-if-module-already-loaded-en.patch Patch3: 0004-kpatch-clarify-unload-unsupport.patch +Patch4: 0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch Requires: bash kmod binutils @@ -18,7 +19,7 @@ BuildArch: noarch %description -kpatch is a dynamic kernel patch module manager. It allows the user to manage +kpatch is a live kernel patch module manager. It allows the user to manage a collection of binary kernel patch modules which can be used to dynamically patch the kernel without rebooting. @@ -29,6 +30,7 @@ patch the kernel without rebooting. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build @@ -49,8 +51,11 @@ rm -f %{buildroot}/usr/share/man/man1/kpatch-build.1.gz %changelog -* Fri Sep 6 2019 Joe Lawrence 0.6.1-5 -- kpatch: clarify that "kpatch unload" isn't supported (rhbz#1749299) +* Tue Sep 17 2019 Artem Savkov 0.6.1-6 +- fix patch loading issue caused by recent kernel rebase (rhbz#1752698) + +* Wed Aug 28 2019 Joe Lawrence 0.6.1-5 +- kpatch: clarify that "kpatch unload" isn't supported (rhbz#1746461) * Sun Jun 23 2019 Joe Lawrence 0.6.1-3 - Rebuild with correct RHEL-7.7 bugzilla number (rhbz#1719309)