diff --git a/kernel.spec b/kernel.spec index e82620443..a172d5cb6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 6 +%define stable_update 7 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -622,9 +622,6 @@ Patch501: Fix-for-module-sig-verification.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch -# rhbz 1470995 -Patch504: kexec-bzimage-verify-pe-signature-fix.patch - # Support for unique build ids # All queued in the kbuild tree Patch506: 0001-kbuild-Add-build-salt-to-the-kernel-and-modules.patch @@ -1912,6 +1909,9 @@ fi # # %changelog +* Mon Sep 10 2018 Laura Abbott - 4.18.7-300 +- Linux v4.18.7 + * Wed Sep 05 2018 Laura Abbott - 4.18.6-300 - Linux v4.18.6 diff --git a/kexec-bzimage-verify-pe-signature-fix.patch b/kexec-bzimage-verify-pe-signature-fix.patch deleted file mode 100644 index 6c8a51b95..000000000 --- a/kexec-bzimage-verify-pe-signature-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Dave Young - -Fix kexec_file_load pefile signature verification - -Similar with Fix-for-module-sig-verification.patch, kexec_file syscall also -need pass 1UL to verify_pefile_signature so that secondary keys can be used. - -Fedora bug -https://bugzilla.redhat.com/show_bug.cgi?id=1470995 - -Latest upstream effort is below: -https://www.spinics.net/lists/kernel/msg2825184.html - -Ideally this need an upstream fix, but since nobody response we can workaround -it like the module code did. - -Signed-off-by: Dave Young ---- - arch/x86/kernel/kexec-bzimage64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- linux-x86.orig/arch/x86/kernel/kexec-bzimage64.c -+++ linux-x86/arch/x86/kernel/kexec-bzimage64.c -@@ -533,7 +533,7 @@ static int bzImage64_cleanup(void *loade - static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) - { - return verify_pefile_signature(kernel, kernel_len, -- NULL, -+ (void *)1UL, - VERIFYING_KEXEC_PE_SIGNATURE); - } - #endif --- -2.17.0 diff --git a/sources b/sources index d94768bed..40ddc2a7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -SHA512 (patch-4.18.6.xz) = 9fe507cfc549e02fc52580cafa7a663522d3793830d2ac7e7f7686f68c20928b91395849cf5387831f79e42affe292665cb360541390be666987b3a0bab5ee1e +SHA512 (patch-4.18.7.xz) = 483ce39833de636cc8ba52908db14819fcd61bf3a3bfe6409dc858bd5a563de24beade909fb71c3a529a5761f638398bc30fdf2796220ae3da78e3e2a363fdb7