Revert 27e66193, which was replaced by upstream's 49426e9fd

Resolves: rhbz#1251600

Signed-off-by: Peter Jones <pjones@redhat.com>

0001-IBM-client-architecture-CAS-reboot-support.patch

@@ -1,7 +1,7 @@
 From ea9eb6e9fb40a19264fc453778087e7e5fec24fa Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 01/88] IBM client architecture (CAS) reboot support
+Subject: [PATCH 01/89] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 

0002-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -1,7 +1,7 @@
 From 6c2b5d14fe79a8e0eefabef4b711133b5ce02c94 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 02/88] for ppc, reset console display attr when clear screen
+Subject: [PATCH 02/89] for ppc, reset console display attr when clear screen
 
 v2: Also use \x0c instead of a literal ^L to make future patches less
 awkward.

0003-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -1,7 +1,7 @@
 From 4b4bbc963438157b29fec6b38b6567e16d1e2e56 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 03/88] Disable GRUB video support for IBM power machines
+Subject: [PATCH 03/89] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205

0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch

@@ -1,7 +1,7 @@
 From 668d1227194fc45d19dec7c90b4d004378c822af Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 7 Jul 2015 10:13:14 -0400
-Subject: [PATCH 04/88] Fix bzr's ignore artificats in .gitignore
+Subject: [PATCH 04/89] Fix bzr's ignore artificats in .gitignore
 
 We lost a man page because of incompatibilities between bzr's ignore
 system and .gitignore, so solve that slightly better.

0005-Honor-a-symlink-when-generating-configuration-by-gru.patch

@@ -1,7 +1,7 @@
 From 3be0a8cb87161ffb64ef9e94cf893e228a84f630 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 05/88] Honor a symlink when generating configuration by
+Subject: [PATCH 05/89] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that

0006-Move-bash-completion-script-922997.patch

@@ -1,7 +1,7 @@
 From 3dca3dbb01a52fdc90f548a2461c8fc8e04336ab Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 06/88] Move bash completion script (#922997)
+Subject: [PATCH 06/89] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---

0007-Update-to-minilzo-2.08.patch

@@ -1,7 +1,7 @@
 From fcbba25979fc9e26ab8e6eed5c84668a5f134b12 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Dec 2014 15:36:09 -0500
-Subject: [PATCH 07/88] Update to minilzo-2.08
+Subject: [PATCH 07/89] Update to minilzo-2.08
 
 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow
 

0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch

@@ -1,7 +1,7 @@
 From 99745ca3450dbbd364569a13b61fbf2a36cb3a88 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 08/88] Add vlan-tag support on IBM PPC machines
+Subject: [PATCH 08/89] Add vlan-tag support on IBM PPC machines
 
 This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
 multiple VLANs in a bridged network to share the same physical network link but

0009-Allow-fallback-to-include-entries-by-title-not-just-.patch

@@ -1,7 +1,7 @@
 From 10da6e0e6bf723e99332fb1c34e6355a98bbb83f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 5 Sep 2014 10:07:04 -0400
-Subject: [PATCH 09/88] Allow "fallback" to include entries by title, not just
+Subject: [PATCH 09/89] Allow "fallback" to include entries by title, not just
  number.
 
 Resolves: rhbz#1026084

0010-Add-GRUB_DISABLE_UUID.patch

@@ -1,7 +1,7 @@
 From c13e60be8ff3c4b1c2ba0a1aebd4b09f8ec7dbc0 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 16:49:25 -0400
-Subject: [PATCH 10/88] Add GRUB_DISABLE_UUID.
+Subject: [PATCH 10/89] Add GRUB_DISABLE_UUID.
 
 This will cause "search --fs-uuid --set=root ..." not to be generated by
 grub2-mkconfig, and instead simply attempt to use the grub device name

0011-Make-exit-take-a-return-code.patch

@@ -1,7 +1,7 @@
 From 898b245564f15fbbe02692423d40e1dad08f60ad Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 26 Feb 2014 21:49:12 -0500
-Subject: [PATCH 11/88] Make "exit" take a return code.
+Subject: [PATCH 11/89] Make "exit" take a return code.
 
 This adds "exit" with a return code.  With this patch, any "exit"
 command /may/ include a return code, and on platforms that support

0012-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch

@@ -1,7 +1,7 @@
 From db6df67d0aca17b1ebf6a73dc21cc09ec44c2187 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 22 Jul 2015 11:21:01 -0400
-Subject: [PATCH 12/88] Mark po/exclude.pot as binary so git won't try to diff
+Subject: [PATCH 12/89] Mark po/exclude.pot as binary so git won't try to diff
  nonprintables.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0013-Make-efi-machines-load-an-env-block-from-a-variable.patch

@@ -1,7 +1,7 @@
 From 09d7e9f1a0bfbbdcf816c0165a95b2fee6a0297e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 7 Dec 2015 14:20:49 -0500
-Subject: [PATCH 13/88] Make efi machines load an env block from a variable
+Subject: [PATCH 13/89] Make efi machines load an env block from a variable
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0014-DHCP-client-ID-and-UUID-options-added.patch

@@ -1,7 +1,7 @@
 From 9a13b0203bf45cdc961bbc6bdcce763aec289038 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 14/88] DHCP client ID and UUID options added.
+Subject: [PATCH 14/89] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

0015-trim-arp-packets-with-abnormal-size.patch

@@ -1,7 +1,7 @@
 From 03011792061af809b53023bb4458627af80f0b8f Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 5 Feb 2014 09:42:42 -0200
-Subject: [PATCH 15/88] trim arp packets with abnormal size
+Subject: [PATCH 15/89] trim arp packets with abnormal size
 
 GRUB uses arp request to create the arp response. If the incoming packet
 is foobared, GRUB needs to trim the arp response packet before sending it.

0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -1,7 +1,7 @@
 From ff07352c36d9d307428f55881d951f0513af40fa Mon Sep 17 00:00:00 2001
 From: Prarit Bhargava <prarit@redhat.com>
 Date: Wed, 12 Mar 2014 10:58:16 -0400
-Subject: [PATCH 16/88] Fix bad test on GRUB_DISABLE_SUBMENU.
+Subject: [PATCH 16/89] Fix bad test on GRUB_DISABLE_SUBMENU.
 
 The file /etc/grub.d/10_linux does
 

0017-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -1,7 +1,7 @@
 From 672a3f12ad7f52da6e03e2dc361cfe6ef1b4e52b Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 17/88] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 17/89] Migrate PPC from Yaboot to Grub2
 
 Add configuration support for serial terminal consoles.  This will set the
 maximum screen size so that text is not overwritten.

0018-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
 From 88c7ba4163340b2652f9009b65d850625588b6a9 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 18/88] Add fw_path variable (revised)
+Subject: [PATCH 18/89] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the

0019-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
 From b1ce49059c27b9d2f35ced805acd09d867954a5e Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 19/88] Add support for linuxefi
+Subject: [PATCH 19/89] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +

0020-Use-linuxefi-and-initrdefi-where-appropriate.patch

@@ -1,7 +1,7 @@
 From fa62e2f81abb3a06357cc48a1f983bd2579b7a28 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 20/88] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 20/89] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--

0021-Don-t-allow-insmod-when-secure-boot-is-enabled.patch

@@ -1,7 +1,7 @@
 From ad7ed5502c54e6979dbc77604e14afc637c34abe Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 21/88] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 21/89] Don't allow insmod when secure boot is enabled.
 
 Hi,
 

0022-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -1,7 +1,7 @@
 From 5645686a740bfa3689a139bf1131e0330054d09f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 22/88] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 22/89] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---

0023-Add-X-option-to-printf-functions.patch

@@ -1,7 +1,7 @@
 From 4cf5e2dd84a0842bf20d5371ec8b9f6b38562458 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 23/88] Add %X option to printf functions.
+Subject: [PATCH 23/89] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--

0024-Search-for-specific-config-file-for-netboot.patch

@@ -1,7 +1,7 @@
 From 48251724559eba74c10106007edb373a9a9261e5 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 24/88] Search for specific config file for netboot
+Subject: [PATCH 24/89] Search for specific config file for netboot
 
 This patch implements a search for a specific configuration when the config
 file is on a remoteserver. It uses the following order:

0025-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -1,7 +1,7 @@
 From fbc0fcdfd649c1c053be735311ca15deea7a40ff Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 25/88] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 25/89] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec

0026-Don-t-write-messages-to-the-screen.patch

@@ -1,7 +1,7 @@
 From 0b4548eb7f9c6f9d5b2ca5650f404a55bc3c0e9b Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH 26/88] Don't write messages to the screen
+Subject: [PATCH 26/89] Don't write messages to the screen
 
 Writing messages to the screen before the menus or boot splash
 happens so quickly it looks like something is wrong and isn't

0027-Don-t-print-GNU-GRUB-header.patch

@@ -1,7 +1,7 @@
 From 2f50942631fb6cc004ee527831eaab37803e379e Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:53:48 -0400
-Subject: [PATCH 27/88] Don't print GNU GRUB header
+Subject: [PATCH 27/89] Don't print GNU GRUB header
 
 No one cares.
 ---

0028-Don-t-add-to-highlighted-row.patch

@@ -1,7 +1,7 @@
 From fc2611a52df05b340939f26787a2a2357b9e233f Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 28/88] Don't add '*' to highlighted row
+Subject: [PATCH 28/89] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---

0029-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
 From 960e7ed921ae6ce005d621fa251a77c2d1fc799d Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH 29/88] Message string cleanups
+Subject: [PATCH 29/89] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---

0030-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -1,7 +1,7 @@
 From 469c9b26660bf04751c0d53c302fb43693399447 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH 30/88] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 30/89] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---

0031-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -1,7 +1,7 @@
 From bc50b0f8f8e15860ba13c71d373f7456993832fe Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH 31/88] Use the correct indentation for the term help text
+Subject: [PATCH 31/89] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---

0032-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
 From e7da891c287928fec2e88db06073485ce84b39ef Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH 32/88] Indent menu entries
+Subject: [PATCH 32/89] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-

0033-Fix-margins.patch

@@ -1,7 +1,7 @@
 From 40b049c635b0ebd9d98010facbbeb668e8cb90a7 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH 33/88] Fix margins
+Subject: [PATCH 33/89] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----

0034-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -1,7 +1,7 @@
 From a7358954fc6bbcadadc3c6421bed25eb10c53815 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 34/88] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 34/89] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

0035-Use-linux16-when-appropriate-880840.patch

@@ -1,7 +1,7 @@
 From 6de3939ead9a9d895f708bf445b36ddf4eef67f4 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 35/88] Use linux16 when appropriate (#880840)
+Subject: [PATCH 35/89] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.

0036-Enable-pager-by-default.-985860.patch

@@ -1,7 +1,7 @@
 From c821c54717446a38213d4c440207728877e06758 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 36/88] Enable pager by default. (#985860)
+Subject: [PATCH 36/89] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0037-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -1,7 +1,7 @@
 From 0108e8e1d09affa11f7b365be1499bfb25ff50c1 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 37/88] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 37/89] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0038-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -1,7 +1,7 @@
 From 801b0d582436988fd2806b919a095f2987fc3ef5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 38/88] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 38/89] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--

0039-Don-t-draw-a-border-around-the-menu.patch

@@ -1,7 +1,7 @@
 From 3cb9a57c4bd888c7513700deb4026c86080778ff Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 39/88] Don't draw a border around the menu
+Subject: [PATCH 39/89] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---

0040-Use-the-standard-margin-for-the-timeout-string.patch

@@ -1,7 +1,7 @@
 From 06c049445cc4fd428072e849c3098796dc9becd7 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 40/88] Use the standard margin for the timeout string
+Subject: [PATCH 40/89] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---

0041-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -1,7 +1,7 @@
 From 0b6d27b7407be21d753a66c09444ed8c19815854 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 41/88] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 41/89] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-

0042-Make-10_linux-work-with-our-changes-for-linux16-and-.patch

@@ -1,7 +1,7 @@
 From 48e48d6b9b6f75bf01a080272f260df7132ab9c7 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 42/88] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 42/89] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0043-Don-t-print-during-fdt-loading-method.patch

@@ -1,7 +1,7 @@
 From 6b35fd42bdd803b1b38fd3b04eb642ff822b700f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 43/88] Don't print during fdt loading method.
+Subject: [PATCH 43/89] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0044-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -1,7 +1,7 @@
 From dd7c64ce04e1e95265b85163427bb8ff570c12f0 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH 44/88] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 44/89] Don't munge raw spaces when we're doing our cmdline
  escaping (#923374)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0045-Don-t-require-a-password-to-boot-entries-generated-b.patch

@@ -1,7 +1,7 @@
 From 84d97657cf6af3929cf8ff3c9faea002ac6d77c3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 45/88] Don't require a password to boot entries generated by
+Subject: [PATCH 45/89] Don't require a password to boot entries generated by
  grub-mkconfig.
 
 When we set a password, we just want that to mean you can't /edit/ an entry.

0046-Don-t-emit-Booting-.-message.patch

@@ -1,7 +1,7 @@
 From 72d44b7bd5aa2bff64d8a6e40d086dc51aab5684 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH 46/88] Don't emit "Booting ..." message.
+Subject: [PATCH 46/89] Don't emit "Booting ..." message.
 
 UI team still hates this stuff, so we're disabling it for RHEL 7.
 

0047-May-as-well-try-it.patch

@@ -1,7 +1,7 @@
 From 1f68f3b40b8b476e95f29eac40c76dbba892cd17 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 4 Mar 2014 11:00:23 -0500
-Subject: [PATCH 47/88] May as well try it.
+Subject: [PATCH 47/89] May as well try it.
 
 ---
  conf/Makefile.extra-dist          |   1 -

0048-use-fw_path-prefix-when-fallback-searching-for-grub-.patch

@@ -1,7 +1,7 @@
 From 4fd04da5eded81f854dd058f6435c4aef4f31f2d Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 19 Feb 2014 15:58:43 -0500
-Subject: [PATCH 48/88] use fw_path prefix when fallback searching for grub
+Subject: [PATCH 48/89] use fw_path prefix when fallback searching for grub
  config
 
 When PXE booting via UEFI firmware, grub was searching for grub.cfg

0049-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch

@@ -1,7 +1,7 @@
 From f0925300caaea3344007689452e24a543fd6cf8a Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 6 Mar 2014 11:51:33 -0500
-Subject: [PATCH 49/88] Try mac/guid/etc before grub.cfg on tftp config files.
+Subject: [PATCH 49/89] Try mac/guid/etc before grub.cfg on tftp config files.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0050-Fix-convert-function-to-support-NVMe-devices.patch

@@ -1,7 +1,7 @@
 From 31bfe8719af1e91099d8b56793ad175e3f4bd335 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 18 Feb 2014 11:34:00 -0500
-Subject: [PATCH 50/88] Fix convert function to support NVMe devices
+Subject: [PATCH 50/89] Fix convert function to support NVMe devices
 
 This is adapted from the patch at
 https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against

0051-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch

@@ -1,7 +1,7 @@
 From b6f8f9ef2dcde4ad9db1a270740ed60705c31e7b Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 10 Feb 2014 16:13:10 -0500
-Subject: [PATCH 51/88] Switch to use APM Mustang device tree, for hardware
+Subject: [PATCH 51/89] Switch to use APM Mustang device tree, for hardware
  testing.
 
 Signed-off-by: David A. Marlin <d.marlin@redhat.com>

0052-Use-the-default-device-tree-from-the-grub-default-fi.patch

@@ -1,7 +1,7 @@
 From 8b7bd5624770ad0aeef2c2f21d4e667bcef77e74 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Wed, 12 Feb 2014 14:54:04 -0500
-Subject: [PATCH 52/88] Use the default device tree from the grub default file
+Subject: [PATCH 52/89] Use the default device tree from the grub default file
 
 instead of hardcoding a value.
 

0053-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -1,7 +1,7 @@
 From 27e661936f8f001100c143036749a0e620d63cbf Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Sat, 15 Feb 2014 15:10:22 -0500
-Subject: [PATCH 53/88] reopen SNP protocol for exclusive use by grub
+Subject: [PATCH 53/89] reopen SNP protocol for exclusive use by grub
 
 ---
  grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++

0054-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -0,0 +1,52 @@
+From a78e0a65325ad61e378acbf8facc94497c519787 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 7 Apr 2016 10:58:06 -0400
+Subject: [PATCH 54/89] Revert "reopen SNP protocol for exclusive use by grub"
+
+I *think* this should have been replaced by upstream's
+49426e9fd2e562c73a4f1206f32eff9e424a1a73, so I'm reverting for now.
+
+May resolve rhbz#1251600 .
+
+This reverts commit 27e661936f8f001100c143036749a0e620d63cbf.
+---
+ grub-core/net/drivers/efi/efinet.c | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index ea0e0ca..5388f95 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ {
+   struct grub_net_card *card;
+   grub_efi_device_path_t *dp;
+-  grub_efi_simple_network_t *net;
+ 
+   dp = grub_efi_get_device_path (hnd);
+   if (! dp)
+@@ -384,21 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ 				    &pxe_mode->dhcp_ack,
+ 				    sizeof (pxe_mode->dhcp_ack),
+ 				    1, device, path);
+-    net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
+-				  GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
+-    if (net) {
+-      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
+-	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
+-	continue;
+-
+-      if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
+-	continue;
+-
+-      if (net->mode->state == GRUB_EFI_NETWORK_STARTED
+-	  && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
+-	continue;
+-      card->efi_net = net;
+-    }
+     return;
+   }
+ }
+-- 
+2.5.5
+

0055-Add-grub_util_readlink.patch

@@ -1,7 +1,7 @@
-From bb7d6c1820634b4da2d36b83aa621a8a79ea0701 Mon Sep 17 00:00:00 2001
+From 2cca74e577dc886b099ba66b6ebb2d320587d1e3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:01:03 -0400
-Subject: [PATCH 54/88] Add grub_util_readlink()
+Subject: [PATCH 55/89] Add grub_util_readlink()
 
 Add grub_util_readlink().  This requires pulling in stat and readlink from
 gnulib, which pulls in stat and related headers, but after that the

0056-Make-editenv-chase-symlinks-including-those-across-d.patch

@@ -1,7 +1,7 @@
-From f3a6739b6848501f01c4b5a1218d80f8354c5d75 Mon Sep 17 00:00:00 2001
+From 265457ae86fae6837b05b7790ea734680434f13f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Sep 2014 10:38:00 -0400
-Subject: [PATCH 55/88] Make editenv chase symlinks including those across
+Subject: [PATCH 56/89] Make editenv chase symlinks including those across
  devices.
 
 This lets us make /boot/grub2/grubenv a symlink to

0057-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch

@@ -1,7 +1,7 @@
-From 1143239b299a86c18b4a474260f677653dbeb49a Mon Sep 17 00:00:00 2001
+From e0e8ef8a46fbc9009129e5598fb977f08260e250 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 14:23:23 -0400
-Subject: [PATCH 56/88] Generate OS and CLASS in 10_linux from /etc/os-release
+Subject: [PATCH 57/89] Generate OS and CLASS in 10_linux from /etc/os-release
 
 This makes us use pretty names in the titles we generate in
 grub2-mkconfig when GRUB_DISTRIBUTOR isn't set.

0058-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch

@@ -1,7 +1,7 @@
-From dee9d5669ff3cedf0013fb53af7cfbca5bfd31c1 Mon Sep 17 00:00:00 2001
+From ef7d69e6362a0204349c4097913d8cff1c944b44 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 4 Sep 2014 15:52:08 -0400
-Subject: [PATCH 57/88] Minimize the sort ordering for .debug and -rescue-
+Subject: [PATCH 58/89] Minimize the sort ordering for .debug and -rescue-
  kernels.
 
 Resolves: rhbz#1065360

0059-Load-arm-with-SB-enabled.patch

@@ -1,7 +1,7 @@
-From 3205f86c5dd01523bd233e247c1f463f8f892f42 Mon Sep 17 00:00:00 2001
+From 9450fbbbb6ac6a9973a3e6d85477afe0ded656c8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 18 Sep 2014 11:26:14 -0400
-Subject: [PATCH 58/88] Load arm with SB enabled.
+Subject: [PATCH 59/89] Load arm with SB enabled.
 
 Make sure we actually try to validate secure boot on this platform (even
 though we're not shipping it enabled by default.)

0060-Try-prefix-if-fw_path-doesn-t-work.patch

@@ -1,7 +1,7 @@
-From 5623928606eedef63ca57e7679fadb2dbca6e667 Mon Sep 17 00:00:00 2001
+From 2218efcd483112983b1bff2a3c7f232a2279a00f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 3 Oct 2014 11:08:03 -0400
-Subject: [PATCH 59/88] Try $prefix if $fw_path doesn't work.
+Subject: [PATCH 60/89] Try $prefix if $fw_path doesn't work.
 
 Related: rhbz#1148652
 

0061-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch

@@ -1,7 +1,7 @@
-From 44bbf278339fa37f99b6c825f746ae4b661cf5ab Mon Sep 17 00:00:00 2001
+From adafd393d61acdfdda0217740748233318b6a0e8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 27 Oct 2014 09:22:55 -0400
-Subject: [PATCH 60/88] Try to emit linux16/initrd16 and linuxefi/initrdefi in
+Subject: [PATCH 61/89] Try to emit linux16/initrd16 and linuxefi/initrdefi in
  30-os_prober.
 
 Resolves: rhbz#1108296

0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch

@@ -1,7 +1,7 @@
-From 6926564fb4e43fe2b30189df1afd4a68cb70cf96 Mon Sep 17 00:00:00 2001
+From 3c30052fb24e5f4cd4d9e1ab86ec107f90e54cc6 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:15:03 -0400
-Subject: [PATCH 61/88] Make grub2-mkconfig construct titles that look like the
+Subject: [PATCH 62/89] Make grub2-mkconfig construct titles that look like the
  ones we want elsewhere.
 
 Resolves: rhbz#1215839

0063-Make-rescue-and-debug-entries-sort-right-again-in-gr.patch

@@ -1,7 +1,7 @@
-From 9e58670eba056f4a502d0c52f0e9663a99a31651 Mon Sep 17 00:00:00 2001
+From 3debfb747ba8b289514dd399a0af6f47897c1913 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 28 Apr 2015 11:17:02 -0400
-Subject: [PATCH 62/88] Make rescue and debug entries sort right /again/ in
+Subject: [PATCH 63/89] Make rescue and debug entries sort right /again/ in
  grub2-mkconfig.
 
 Related: rhbz#12145839

0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch

@@ -1,7 +1,7 @@
-From 12f88d5f1d4a685efa0839e5026d027f29af9a48 Mon Sep 17 00:00:00 2001
+From 06b2144858484c69f77387211ffeac90b590c409 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 16:34:51 -0400
-Subject: [PATCH 63/88] Update info with grub.cfg netboot selection order
+Subject: [PATCH 64/89] Update info with grub.cfg netboot selection order
  (#1148650)
 
 Added documentation to the grub info page that specifies the order

0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch

@@ -1,7 +1,7 @@
-From 45361b630a6f3e751ad1d6b90eaabb33356ff96e Mon Sep 17 00:00:00 2001
+From c448414b19a09f4f2815e8a65de4e3d1a8e65330 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH 64/88] Use Distribution Package Sort for grub2-mkconfig
+Subject: [PATCH 65/89] Use Distribution Package Sort for grub2-mkconfig
  (#1124074)
 
 Users reported that newly installed kernels on their systems installed

0066-Add-friendly-grub2-password-config-tool-985962.patch

@@ -1,7 +1,7 @@
-From c1613d899c70d7e138fac7c55a82af71cdda5a78 Mon Sep 17 00:00:00 2001
+From 0a0766bc5edf53ea319126c8582b2568303c4c8d Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Thu, 25 Jun 2015 11:13:11 -0400
-Subject: [PATCH 65/88] Add friendly grub2 password config tool (#985962)
+Subject: [PATCH 66/89] Add friendly grub2 password config tool (#985962)
 
 Provided a tool for users to reset the grub2 root user password
 without having to alter the grub.cfg. The hashed password now

0067-Fix-race-in-EFI-validation.patch

@@ -1,7 +1,7 @@
-From a3f3818f3d8b18ea7e19b5ff92380ce0e41683ba Mon Sep 17 00:00:00 2001
+From 8c9e77f5664df793aa6e38a04d0be519d8061ebf Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 16:58:51 -0700
-Subject: [PATCH 66/88] Fix race in EFI validation
+Subject: [PATCH 67/89] Fix race in EFI validation
 
 ---
  grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------

0068-ppc64le-sync-mkconfig-to-disk-1212114.patch

@@ -1,7 +1,7 @@
-From 5eb595b341b207d36bb6342b54104c6cb122b7bc Mon Sep 17 00:00:00 2001
+From 1ef61c2257c1fc19d35346f6c47c0c4d8b184783 Mon Sep 17 00:00:00 2001
 From: Don Zickus <dzickus@redhat.com>
 Date: Wed, 22 Jul 2015 13:59:55 -0400
-Subject: [PATCH 67/88] ppc64le sync mkconfig to disk (#1212114)
+Subject: [PATCH 68/89] ppc64le sync mkconfig to disk (#1212114)
 
 If creating a new grub2 entry using grub2-mkconfig, the entry is not
 immediately sync'd to disk.  If a crash happens before the writeback,

0069-Use-device-part-of-chainloader-target-if-present.patch

@@ -1,7 +1,7 @@
-From e30cb265bcb8597e0bcb21b21ffb9014599ece51 Mon Sep 17 00:00:00 2001
+From 8c140c6ed73af6c0a39619dab7f50a4c1bc6ac66 Mon Sep 17 00:00:00 2001
 From: Raymund Will <rw@suse.com>
 Date: Fri, 10 Apr 2015 01:45:02 -0400
-Subject: [PATCH 68/88] Use device part of chainloader target, if present.
+Subject: [PATCH 69/89] Use device part of chainloader target, if present.
 
 Otherwise chainloading is restricted to '$root', which might not even
 be readable by EFI!

0070-Add-secureboot-support-on-efi-chainloader.patch

@@ -1,7 +1,7 @@
-From af00ac0c54f0d893a4afb44713ebd2e87f3195f5 Mon Sep 17 00:00:00 2001
+From abaf10c18b70eede23dd6fcc7398835fac9cd2ce Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 13:04:37 -0400
-Subject: [PATCH 69/88] Add secureboot support on efi chainloader
+Subject: [PATCH 70/89] Add secureboot support on efi chainloader
 
 Expand the chainloader to be able to verify the image by means of shim
 lock protocol. The PE/COFF image is loaded and relocated by the

0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -1,7 +1,7 @@
-From f14de1eb2cbd8aa451a231c9000f157a6e29b093 Mon Sep 17 00:00:00 2001
+From 50f24247c94609c146042aa1a260267b2abba412 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 6 Oct 2015 16:09:25 -0400
-Subject: [PATCH 70/88] Make any of the loaders that link in efi mode honor
+Subject: [PATCH 71/89] Make any of the loaders that link in efi mode honor
  secure boot.
 
 And in this case "honor" means "even if somebody does link this in, they

0072-Fix-security-issue-when-reading-username-and-passwor.patch

@@ -1,7 +1,7 @@
-From a350e596100ebdea5f698f81a58332118aee9841 Mon Sep 17 00:00:00 2001
+From 6c7c6069398cc5e1affa51f4f2ccf515c5f9908f Mon Sep 17 00:00:00 2001
 From: Hector Marco-Gisbert <hecmargi@upv.es>
 Date: Fri, 13 Nov 2015 16:21:09 +0100
-Subject: [PATCH 71/88] Fix security issue when reading username and password
+Subject: [PATCH 72/89] Fix security issue when reading username and password
 
   This patch fixes two integer underflows at:
     * grub-core/lib/crypto.c

0073-01_users-Handle-GRUB_PASSWORD-better.patch

@@ -1,7 +1,7 @@
-From 8deb795073874f4f2153a6e26bfe3fb8dd03a301 Mon Sep 17 00:00:00 2001
+From 59e628d70d795e2cc7aafad78aba4ef5d5006160 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Dec 2015 09:28:38 -0500
-Subject: [PATCH 72/88] 01_users: Handle GRUB_PASSWORD better.
+Subject: [PATCH 73/89] 01_users: Handle GRUB_PASSWORD better.
 
 Only handle GRUB2_PASSWORD not GRUB_PASSWORD.
 

0074-Core-TPM-support.patch

@@ -1,7 +1,7 @@
-From 5517beacf74d58f5f80b0ca8b9b739ef4594930d Mon Sep 17 00:00:00 2001
+From 41608d2581dda4672d6a41c931d0b08fefe6308b Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 14 Jul 2015 17:06:35 -0700
-Subject: [PATCH 73/88] Core TPM support
+Subject: [PATCH 74/89] Core TPM support
 
 Add support for performing basic TPM measurements. Right now this only
 supports extending PCRs statically and only on UEFI and BIOS systems, but

0075-Measure-kernel-initrd.patch

@@ -1,7 +1,7 @@
-From ef38c89ec0a5898df9e9d50707baa3e705d60921 Mon Sep 17 00:00:00 2001
+From 400fcf2edf17eb587f0ac084af59c073d117fedc Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Thu, 16 Jul 2015 15:22:34 -0700
-Subject: [PATCH 74/88] Measure kernel + initrd
+Subject: [PATCH 75/89] Measure kernel + initrd
 
 Measure the kernel and initrd when loaded on UEFI systems
 ---

0076-Add-BIOS-boot-measurement.patch

@@ -1,7 +1,7 @@
-From 4990275dd9084a0ad3e544a5ca841b8cd0e06254 Mon Sep 17 00:00:00 2001
+From 004209cacbcae811af6399439da98be452322f63 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 15:48:51 -0700
-Subject: [PATCH 75/88] Add BIOS boot measurement
+Subject: [PATCH 76/89] Add BIOS boot measurement
 
 Measure the on-disk grub core on BIOS systems - unlike UEFI, the firmware
 can't do this stage for us.

0077-Rework-linux-command.patch

@@ -1,7 +1,7 @@
-From 7774b9780271782da56834b49f4f4ffd8e5b40c4 Mon Sep 17 00:00:00 2001
+From b8f66041637fd7a2f131f6239e693c26c7c5b7d9 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:12:39 -0700
-Subject: [PATCH 76/88] Rework linux command
+Subject: [PATCH 77/89] Rework linux command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel into it

0078-Rework-linux16-command.patch

@@ -1,7 +1,7 @@
-From a696b8eb6ea6e5a2a17b697f8b8f9ed0a57a0a96 Mon Sep 17 00:00:00 2001
+From 90a9b1d29e8e65cfa9567fbb5be57e705ad05db0 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:20:58 -0700
-Subject: [PATCH 77/88] Rework linux16 command
+Subject: [PATCH 78/89] Rework linux16 command
 
 We want a single buffer that contains the entire kernel image in order to
 perform a TPM measurement. Allocate one and copy the entire kernel int it

0079-Measure-kernel-and-initrd-on-BIOS-systems.patch

@@ -1,7 +1,7 @@
-From 443457897a9b415e6b7f7f41e93f78947b15d206 Mon Sep 17 00:00:00 2001
+From 14b0cec058b100b50a5e373249cef19df05a812a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:28:29 -0700
-Subject: [PATCH 78/88] Measure kernel and initrd on BIOS systems
+Subject: [PATCH 79/89] Measure kernel and initrd on BIOS systems
 
 Measure the kernel and initrd when loaded on BIOS systems
 ---

0080-Measure-the-kernel-commandline.patch

@@ -1,7 +1,7 @@
-From 484cfd345f144e98639816de5c28696a1085f06f Mon Sep 17 00:00:00 2001
+From 64e659a7843a49aab05a7ff29c52e52f78845831 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Sun, 9 Aug 2015 16:32:29 -0700
-Subject: [PATCH 79/88] Measure the kernel commandline
+Subject: [PATCH 80/89] Measure the kernel commandline
 
 Measure the kernel commandline to ensure that it hasn't been modified
 ---

0081-Measure-commands.patch

@@ -1,7 +1,7 @@
-From e6dbf1fb12a951b9d3c3e19b80852ce6c53b516c Mon Sep 17 00:00:00 2001
+From d73f9224234a35ad371891f3dd3f005274969d86 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@srcf.ucam.org>
 Date: Mon, 10 Aug 2015 15:27:12 -0700
-Subject: [PATCH 80/88] Measure commands
+Subject: [PATCH 81/89] Measure commands
 
 Measure each command executed by grub, which includes script execution.
 ---

0082-Measure-multiboot-images-and-modules.patch

@@ -1,7 +1,7 @@
-From cdcff708c76890986b9e3ae9be084da6b152adde Mon Sep 17 00:00:00 2001
+From dbbb480855f86c3c47cd941de6511d1a1dfdeb31 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 1 Sep 2015 16:02:55 -0700
-Subject: [PATCH 81/88] Measure multiboot images and modules
+Subject: [PATCH 82/89] Measure multiboot images and modules
 
 ---
  grub-core/loader/i386/multiboot_mbi.c | 3 +++

0083-Make-grub-editenv-build-again.patch

@@ -1,7 +1,7 @@
-From 0b2a179c9e1da39556fffd6a70ced539e41652e5 Mon Sep 17 00:00:00 2001
+From b24ff20535415944f34bc7e36fc9bc2d9a58849e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 4 Mar 2016 16:29:13 -0500
-Subject: [PATCH 82/88] Make grub-editenv build again.
+Subject: [PATCH 83/89] Make grub-editenv build again.
 
 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage
 utility functions are defined, and they wind up being linked into

0084-Fix-locale-issue-in-grub-setpassword-1294243.patch

@@ -1,7 +1,7 @@
-From ee96c8d2dc827a1a4016bc9641d01b95c82155dd Mon Sep 17 00:00:00 2001
+From 805a40238db66c43f1d847530704664352621a90 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Fri, 29 Jan 2016 17:34:02 -0500
-Subject: [PATCH 83/88] Fix locale issue in grub-setpassword (#1294243)
+Subject: [PATCH 84/89] Fix locale issue in grub-setpassword (#1294243)
 
 A shell substitution was expecting non-translated output to grab the
 hashed password and put it in the user.cfg file. Modified code to force

0085-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -1,7 +1,7 @@
-From 30a9147b7c93cbfd673fb0811d2e0f22b98cc498 Mon Sep 17 00:00:00 2001
+From 3b1718192f814b2705bfdafbbdaa0d65cd97247f Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 23 Sep 2014 09:58:49 -0400
-Subject: [PATCH 84/88] Fix up some man pages rpmdiff noticed.
+Subject: [PATCH 85/89] Fix up some man pages rpmdiff noticed.
 
 ---
  configure.ac             |  2 ++

0086-Handle-rssd-storage-devices.patch

@@ -1,7 +1,7 @@
-From e78fda79e6171ab84d1d332197e46455b695f259 Mon Sep 17 00:00:00 2001
+From 9857940f9b685eda3711ee6533c2669c70198b2b Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 30 Jun 2015 15:50:41 -0400
-Subject: [PATCH 85/88] Handle rssd storage devices.
+Subject: [PATCH 86/89] Handle rssd storage devices.
 
 Resolves: rhbz#1087962
 

0087-Fix-boot-when-there-s-no-TPM.patch

@@ -1,7 +1,7 @@
-From d06b75f95d8d61d55b4af0b0dcb0c6717fe228d0 Mon Sep 17 00:00:00 2001
+From 3c140c43b91594e2fdd90362499c63733e2d0a8a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Wed, 23 Mar 2016 16:49:42 -0700
-Subject: [PATCH 86/88] Fix boot when there's no TPM
+Subject: [PATCH 87/89] Fix boot when there's no TPM
 
 If the firmware has TPM support but has no TPM, we're jumping to core.img
 without popping the registers back onto the stack. Fix that.

0088-Rework-TPM-measurements.patch

@@ -1,7 +1,7 @@
-From dd5035e338e7362db6ef5560e3dff09a255ef797 Mon Sep 17 00:00:00 2001
+From f4ed8103fcc767b5a39b0b051e72901b543bf8d5 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Wed, 23 Mar 2016 17:03:43 -0700
-Subject: [PATCH 87/88] Rework TPM measurements
+Subject: [PATCH 88/89] Rework TPM measurements
 
 Rework TPM measurements to use fewer PCRs. After discussion with upstream,
 it's preferable to avoid using so many PCRs. Instead, measure into PCRs 8

0089-Fix-event-log-prefix.patch

@@ -1,7 +1,7 @@
-From 84b0d0562f890820097726827e98f27a789011fc Mon Sep 17 00:00:00 2001
+From c11f14d8b152ea83349670b029470d779e8b0ec7 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg59@coreos.com>
 Date: Tue, 29 Mar 2016 15:36:49 -0700
-Subject: [PATCH 88/88] Fix event log prefix
+Subject: [PATCH 89/89] Fix event log prefix
 
 We're not passing the prefixed version of the description to the event log.
 Fix that.

grub.patches

@@ -52,38 +52,39 @@ Patch0050: 0050-Fix-convert-function-to-support-NVMe-devices.patch
 Patch0051: 0051-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
 Patch0052: 0052-Use-the-default-device-tree-from-the-grub-default-fi.patch
 Patch0053: 0053-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
-Patch0054: 0054-Add-grub_util_readlink.patch
-Patch0055: 0055-Make-editenv-chase-symlinks-including-those-across-d.patch
-Patch0056: 0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0057: 0057-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0058: 0058-Load-arm-with-SB-enabled.patch
-Patch0059: 0059-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0060: 0060-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
-Patch0061: 0061-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0062: 0062-Make-rescue-and-debug-entries-sort-right-again-in-gr.patch
-Patch0063: 0063-Update-info-with-grub.cfg-netboot-selection-order-11.patch
-Patch0064: 0064-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
-Patch0065: 0065-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0066: 0066-Fix-race-in-EFI-validation.patch
-Patch0067: 0067-ppc64le-sync-mkconfig-to-disk-1212114.patch
-Patch0068: 0068-Use-device-part-of-chainloader-target-if-present.patch
-Patch0069: 0069-Add-secureboot-support-on-efi-chainloader.patch
-Patch0070: 0070-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
-Patch0071: 0071-Fix-security-issue-when-reading-username-and-passwor.patch
-Patch0072: 0072-01_users-Handle-GRUB_PASSWORD-better.patch
-Patch0073: 0073-Core-TPM-support.patch
-Patch0074: 0074-Measure-kernel-initrd.patch
-Patch0075: 0075-Add-BIOS-boot-measurement.patch
-Patch0076: 0076-Rework-linux-command.patch
-Patch0077: 0077-Rework-linux16-command.patch
-Patch0078: 0078-Measure-kernel-and-initrd-on-BIOS-systems.patch
-Patch0079: 0079-Measure-the-kernel-commandline.patch
-Patch0080: 0080-Measure-commands.patch
-Patch0081: 0081-Measure-multiboot-images-and-modules.patch
-Patch0082: 0082-Make-grub-editenv-build-again.patch
-Patch0083: 0083-Fix-locale-issue-in-grub-setpassword-1294243.patch
-Patch0084: 0084-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0085: 0085-Handle-rssd-storage-devices.patch
-Patch0086: 0086-Fix-boot-when-there-s-no-TPM.patch
-Patch0087: 0087-Rework-TPM-measurements.patch
-Patch0088: 0088-Fix-event-log-prefix.patch
+Patch0054: 0054-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0055: 0055-Add-grub_util_readlink.patch
+Patch0056: 0056-Make-editenv-chase-symlinks-including-those-across-d.patch
+Patch0057: 0057-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0058: 0058-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0059: 0059-Load-arm-with-SB-enabled.patch
+Patch0060: 0060-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0061: 0061-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+Patch0062: 0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0063: 0063-Make-rescue-and-debug-entries-sort-right-again-in-gr.patch
+Patch0064: 0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+Patch0065: 0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+Patch0066: 0066-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0067: 0067-Fix-race-in-EFI-validation.patch
+Patch0068: 0068-ppc64le-sync-mkconfig-to-disk-1212114.patch
+Patch0069: 0069-Use-device-part-of-chainloader-target-if-present.patch
+Patch0070: 0070-Add-secureboot-support-on-efi-chainloader.patch
+Patch0071: 0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+Patch0072: 0072-Fix-security-issue-when-reading-username-and-passwor.patch
+Patch0073: 0073-01_users-Handle-GRUB_PASSWORD-better.patch
+Patch0074: 0074-Core-TPM-support.patch
+Patch0075: 0075-Measure-kernel-initrd.patch
+Patch0076: 0076-Add-BIOS-boot-measurement.patch
+Patch0077: 0077-Rework-linux-command.patch
+Patch0078: 0078-Rework-linux16-command.patch
+Patch0079: 0079-Measure-kernel-and-initrd-on-BIOS-systems.patch
+Patch0080: 0080-Measure-the-kernel-commandline.patch
+Patch0081: 0081-Measure-commands.patch
+Patch0082: 0082-Measure-multiboot-images-and-modules.patch
+Patch0083: 0083-Make-grub-editenv-build-again.patch
+Patch0084: 0084-Fix-locale-issue-in-grub-setpassword-1294243.patch
+Patch0085: 0085-Fix-up-some-man-pages-rpmdiff-noticed.patch
+Patch0086: 0086-Handle-rssd-storage-devices.patch
+Patch0087: 0087-Fix-boot-when-there-s-no-TPM.patch
+Patch0088: 0088-Rework-TPM-measurements.patch
+Patch0089: 0089-Fix-event-log-prefix.patch

grub2.spec

@@ -45,7 +45,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.02
-Release:        0.29%{?dist}
+Release:        0.30%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -544,6 +544,10 @@ fi
 %{_datarootdir}/grub/themes/starfield
 
 %changelog
+* Thu Apr 07 2016 pjones <pjones@redhat.com> - 1:2.02-0.30
+- Revert 27e66193, which was replaced by upstream's 49426e9fd
+  Resolves: rhbz#1251600
+
 * Thu Apr 07 2016 Peter Jones <pjones@redhat.com> - 2.02-0.29
 - Fix ppc64 build failure and rebase to newer f24 code.