From 8768d236a0918958f1601f21eaca5d9ac46d8953 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:40:45 -0400 Subject: [PATCH] Fix ppc64 build failure on fedora-24 Signed-off-by: Peter Jones --- ...loaders-that-link-in-efi-mode-honor-.patch | 35 +++++++++++++++++-- ...ue-when-reading-username-and-passwor.patch | 2 +- ...01_users-Handle-GRUB_PASSWORD-better.patch | 2 +- 0073-Core-TPM-support.patch | 2 +- 0074-Measure-kernel-initrd.patch | 2 +- 0075-Add-BIOS-boot-measurement.patch | 2 +- 0076-Rework-linux-command.patch | 2 +- 0077-Rework-linux16-command.patch | 2 +- ...re-kernel-and-initrd-on-BIOS-systems.patch | 2 +- 0079-Measure-the-kernel-commandline.patch | 2 +- 0080-Measure-commands.patch | 2 +- ...Measure-multiboot-images-and-modules.patch | 2 +- 0082-Make-grub-editenv-build-again.patch | 2 +- ...le-issue-in-grub-setpassword-1294243.patch | 2 +- ...ix-up-some-man-pages-rpmdiff-noticed.patch | 2 +- 0085-Handle-rssd-storage-devices.patch | 2 +- 0086-Fix-boot-when-there-s-no-TPM.patch | 2 +- 0087-Rework-TPM-measurements.patch | 2 +- 0088-Fix-event-log-prefix.patch | 2 +- grub2.spec | 5 ++- 20 files changed, 55 insertions(+), 21 deletions(-) diff --git a/0070-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0070-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 0a8b4d1..245c977 100644 --- a/0070-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0070-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,4 +1,4 @@ -From 93653ab62a8c139654fc798fc4c7d74db267b2ee Mon Sep 17 00:00:00 2001 +From f14de1eb2cbd8aa451a231c9000f157a6e29b093 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 Subject: [PATCH 70/88] Make any of the loaders that link in efi mode honor @@ -24,9 +24,11 @@ Signed-off-by: Peter Jones grub-core/loader/xnu.c | 7 +++++ include/grub/efi/efi.h | 1 - include/grub/efi/sb.h | 29 +++++++++++++++++++ - 15 files changed, 146 insertions(+), 29 deletions(-) + include/grub/powerpc/linux.h | 23 +++++++++++++++ + 16 files changed, 169 insertions(+), 29 deletions(-) create mode 100644 grub-core/kern/efi/sb.c create mode 100644 include/grub/efi/sb.h + create mode 100644 include/grub/powerpc/linux.h diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 04e9395..fd715a8 100644 @@ -469,6 +471,35 @@ index 0000000..9629fbb +int EXPORT_FUNC (grub_efi_secure_boot) (void); + +#endif /* ! GRUB_EFI_SB_HEADER */ +diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h +new file mode 100644 +index 0000000..6cecb2e +--- /dev/null ++++ b/include/grub/powerpc/linux.h +@@ -0,0 +1,23 @@ ++/* linux.h - PowerPC linux specific definitions */ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2013 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++ ++#ifndef GRUB_LINUX_CPU_HEADER ++#define GRUB_LINUX_CPU_HEADER 1 ++ ++#endif /* ! GRUB_LINUX_CPU_HEADER */ -- 2.5.5 diff --git a/0071-Fix-security-issue-when-reading-username-and-passwor.patch b/0071-Fix-security-issue-when-reading-username-and-passwor.patch index 7add7ef..aea437e 100644 --- a/0071-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0071-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,4 +1,4 @@ -From 115128428dfd5552605152180ebe227d4b1e7b4e Mon Sep 17 00:00:00 2001 +From a350e596100ebdea5f698f81a58332118aee9841 Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 Subject: [PATCH 71/88] Fix security issue when reading username and password diff --git a/0072-01_users-Handle-GRUB_PASSWORD-better.patch b/0072-01_users-Handle-GRUB_PASSWORD-better.patch index afee8d3..8f9b933 100644 --- a/0072-01_users-Handle-GRUB_PASSWORD-better.patch +++ b/0072-01_users-Handle-GRUB_PASSWORD-better.patch @@ -1,4 +1,4 @@ -From 2a3ab6ddcff1015e9c6df6a1f61779d581e9a26d Mon Sep 17 00:00:00 2001 +From 8deb795073874f4f2153a6e26bfe3fb8dd03a301 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Dec 2015 09:28:38 -0500 Subject: [PATCH 72/88] 01_users: Handle GRUB_PASSWORD better. diff --git a/0073-Core-TPM-support.patch b/0073-Core-TPM-support.patch index a5b377a..10d0301 100644 --- a/0073-Core-TPM-support.patch +++ b/0073-Core-TPM-support.patch @@ -1,4 +1,4 @@ -From 4fa25a258abddce2c1c8a27decc4b9f554f731b8 Mon Sep 17 00:00:00 2001 +From 5517beacf74d58f5f80b0ca8b9b739ef4594930d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 17:06:35 -0700 Subject: [PATCH 73/88] Core TPM support diff --git a/0074-Measure-kernel-initrd.patch b/0074-Measure-kernel-initrd.patch index 42be695..ba17ee1 100644 --- a/0074-Measure-kernel-initrd.patch +++ b/0074-Measure-kernel-initrd.patch @@ -1,4 +1,4 @@ -From d24a5cf53175a3498b9c67a97ca6ad5604d0a678 Mon Sep 17 00:00:00 2001 +From ef38c89ec0a5898df9e9d50707baa3e705d60921 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 16 Jul 2015 15:22:34 -0700 Subject: [PATCH 74/88] Measure kernel + initrd diff --git a/0075-Add-BIOS-boot-measurement.patch b/0075-Add-BIOS-boot-measurement.patch index 23062cd..907f7eb 100644 --- a/0075-Add-BIOS-boot-measurement.patch +++ b/0075-Add-BIOS-boot-measurement.patch @@ -1,4 +1,4 @@ -From 69b26d3068903f543e0a7ba949c76d63467b10d5 Mon Sep 17 00:00:00 2001 +From 4990275dd9084a0ad3e544a5ca841b8cd0e06254 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 15:48:51 -0700 Subject: [PATCH 75/88] Add BIOS boot measurement diff --git a/0076-Rework-linux-command.patch b/0076-Rework-linux-command.patch index 7385d1b..59979ec 100644 --- a/0076-Rework-linux-command.patch +++ b/0076-Rework-linux-command.patch @@ -1,4 +1,4 @@ -From 47beae47e49806881000c479a5912d3bf2990da4 Mon Sep 17 00:00:00 2001 +From 7774b9780271782da56834b49f4f4ffd8e5b40c4 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 Subject: [PATCH 76/88] Rework linux command diff --git a/0077-Rework-linux16-command.patch b/0077-Rework-linux16-command.patch index a613d8e..55f06db 100644 --- a/0077-Rework-linux16-command.patch +++ b/0077-Rework-linux16-command.patch @@ -1,4 +1,4 @@ -From 4cd88ca039d62e64ee4ccbe46a4ea3500a70a6be Mon Sep 17 00:00:00 2001 +From a696b8eb6ea6e5a2a17b697f8b8f9ed0a57a0a96 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 Subject: [PATCH 77/88] Rework linux16 command diff --git a/0078-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0078-Measure-kernel-and-initrd-on-BIOS-systems.patch index a87b474..7eaf8ce 100644 --- a/0078-Measure-kernel-and-initrd-on-BIOS-systems.patch +++ b/0078-Measure-kernel-and-initrd-on-BIOS-systems.patch @@ -1,4 +1,4 @@ -From 05f686df4b9a012035854b082bb4c3b7c745da28 Mon Sep 17 00:00:00 2001 +From 443457897a9b415e6b7f7f41e93f78947b15d206 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:28:29 -0700 Subject: [PATCH 78/88] Measure kernel and initrd on BIOS systems diff --git a/0079-Measure-the-kernel-commandline.patch b/0079-Measure-the-kernel-commandline.patch index 7747be2..0cbd62b 100644 --- a/0079-Measure-the-kernel-commandline.patch +++ b/0079-Measure-the-kernel-commandline.patch @@ -1,4 +1,4 @@ -From 2ab937cba72f43241667db08b5e36cd31a77f331 Mon Sep 17 00:00:00 2001 +From 484cfd345f144e98639816de5c28696a1085f06f Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:32:29 -0700 Subject: [PATCH 79/88] Measure the kernel commandline diff --git a/0080-Measure-commands.patch b/0080-Measure-commands.patch index 570e887..472d2d5 100644 --- a/0080-Measure-commands.patch +++ b/0080-Measure-commands.patch @@ -1,4 +1,4 @@ -From e3aae28751e0f0128d877ed25b28d4d2f875b71a Mon Sep 17 00:00:00 2001 +From e6dbf1fb12a951b9d3c3e19b80852ce6c53b516c Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 10 Aug 2015 15:27:12 -0700 Subject: [PATCH 80/88] Measure commands diff --git a/0081-Measure-multiboot-images-and-modules.patch b/0081-Measure-multiboot-images-and-modules.patch index 66656fa..31786ef 100644 --- a/0081-Measure-multiboot-images-and-modules.patch +++ b/0081-Measure-multiboot-images-and-modules.patch @@ -1,4 +1,4 @@ -From ee0acf80b073cf652a949673bd750e7a9a302d37 Mon Sep 17 00:00:00 2001 +From cdcff708c76890986b9e3ae9be084da6b152adde Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 1 Sep 2015 16:02:55 -0700 Subject: [PATCH 81/88] Measure multiboot images and modules diff --git a/0082-Make-grub-editenv-build-again.patch b/0082-Make-grub-editenv-build-again.patch index ce04883..a7f27a3 100644 --- a/0082-Make-grub-editenv-build-again.patch +++ b/0082-Make-grub-editenv-build-again.patch @@ -1,4 +1,4 @@ -From 1c4338a7d3921e18364c696c679e77e23e7193b3 Mon Sep 17 00:00:00 2001 +From 0b2a179c9e1da39556fffd6a70ced539e41652e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 Subject: [PATCH 82/88] Make grub-editenv build again. diff --git a/0083-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0083-Fix-locale-issue-in-grub-setpassword-1294243.patch index 18a80a1..a2c3c89 100644 --- a/0083-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0083-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,4 +1,4 @@ -From d477086463fd9ea61a3df4b55a4adde56c386215 Mon Sep 17 00:00:00 2001 +From ee96c8d2dc827a1a4016bc9641d01b95c82155dd Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 17:34:02 -0500 Subject: [PATCH 83/88] Fix locale issue in grub-setpassword (#1294243) diff --git a/0084-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0084-Fix-up-some-man-pages-rpmdiff-noticed.patch index adf6cb3..12ef7b5 100644 --- a/0084-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0084-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,4 +1,4 @@ -From b4e66576c9fd1602aeb924b13cdc39d8c59a4255 Mon Sep 17 00:00:00 2001 +From 30a9147b7c93cbfd673fb0811d2e0f22b98cc498 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 Subject: [PATCH 84/88] Fix up some man pages rpmdiff noticed. diff --git a/0085-Handle-rssd-storage-devices.patch b/0085-Handle-rssd-storage-devices.patch index 91a66c9..01c68d9 100644 --- a/0085-Handle-rssd-storage-devices.patch +++ b/0085-Handle-rssd-storage-devices.patch @@ -1,4 +1,4 @@ -From 54d0f8d24fc634b71e8525703a6eea8c23f4c9e5 Mon Sep 17 00:00:00 2001 +From e78fda79e6171ab84d1d332197e46455b695f259 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 Subject: [PATCH 85/88] Handle rssd storage devices. diff --git a/0086-Fix-boot-when-there-s-no-TPM.patch b/0086-Fix-boot-when-there-s-no-TPM.patch index f48cb4f..60f1f2e 100644 --- a/0086-Fix-boot-when-there-s-no-TPM.patch +++ b/0086-Fix-boot-when-there-s-no-TPM.patch @@ -1,4 +1,4 @@ -From a9c95bf3bb50ee171c80e9fe643da618afa8fdf9 Mon Sep 17 00:00:00 2001 +From d06b75f95d8d61d55b4af0b0dcb0c6717fe228d0 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 16:49:42 -0700 Subject: [PATCH 86/88] Fix boot when there's no TPM diff --git a/0087-Rework-TPM-measurements.patch b/0087-Rework-TPM-measurements.patch index d67d9cb..45b29fd 100644 --- a/0087-Rework-TPM-measurements.patch +++ b/0087-Rework-TPM-measurements.patch @@ -1,4 +1,4 @@ -From 1388967d903a07c92a39fa4e8573f7ba12f45357 Mon Sep 17 00:00:00 2001 +From dd5035e338e7362db6ef5560e3dff09a255ef797 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 17:03:43 -0700 Subject: [PATCH 87/88] Rework TPM measurements diff --git a/0088-Fix-event-log-prefix.patch b/0088-Fix-event-log-prefix.patch index 3d087f2..2aae18e 100644 --- a/0088-Fix-event-log-prefix.patch +++ b/0088-Fix-event-log-prefix.patch @@ -1,4 +1,4 @@ -From 3fded5274e9d0968fac6d37ee16f2f2d53b8594d Mon Sep 17 00:00:00 2001 +From 84b0d0562f890820097726827e98f27a789011fc Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 29 Mar 2016 15:36:49 -0700 Subject: [PATCH 88/88] Fix event log prefix diff --git a/grub2.spec b/grub2.spec index de9404a..573bf91 100644 --- a/grub2.spec +++ b/grub2.spec @@ -45,7 +45,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 0.28%{?dist} +Release: 0.29%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -544,6 +544,9 @@ fi %{_datarootdir}/grub/themes/starfield %changelog +* Thu Apr 07 2016 Peter Jones - 2.02-0.29 +- Fix ppc64 build failure on fedora-24 + * Tue Apr 05 2016 pjones - 1:2.02-0.27 - Pull TPM updates from mjg59. Resolves: rhbz#1318067