Rebase to upstream.

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

0001-fix-EFI-detection-on-Windows.patch

@@ -1,7 +1,7 @@
 From a6e7719bbe05993613a8de69dba14fa092144925 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Wed, 25 Dec 2013 22:36:28 +0400
-Subject: [PATCH 001/112] fix EFI detection on Windows
+Subject: [PATCH 001/103] fix EFI detection on Windows
 
 We are on legacy BIOS if GetFirmwareEnvironmentVariable fails (returns
 zero) *and* extended error information is ERROR_INVALID_FUNCTION.
@@ -39,5 +39,5 @@ index f2b9d71..d217efe 100644
        platform = PLAT_BIOS;
        return;
 -- 
-1.8.5.3
+1.9.0
 

0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch

@@ -1,28 +1,21 @@
-From d2e7d923bf3ed70bb4aa38cb880d0677f2b8646f Mon Sep 17 00:00:00 2001
+From 5bda44d7f98c36f87144869ec58b518f80a69b56 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 25 Dec 2013 23:31:42 +0100
-Subject: [PATCH 002/112] 	* grub-core/kern/arm/cache_armv6.S: Remove
+Subject: [PATCH 002/103] 	* grub-core/kern/arm/cache_armv6.S: Remove
  .arch directive.
 
 	As these functions are used on pre-ARMv6 CPUs as well we don't want
 	to make assembler assume that architecture is higher than default one.
 ---
- ChangeLog                        | 12 ++++++++++++
- INSTALL                          | 10 +++++-----
- docs/grub-dev.texi               |  8 ++++----
+ ChangeLog                        | 7 +++++++
  grub-core/kern/arm/cache_armv6.S | 1 -
- 4 files changed, 21 insertions(+), 10 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 21ec1c7..bbb0f31 100644
+index 21ec1c7..153bc43 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,15 @@
-+2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
-+
-+	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
-+	* docs/grub.texi (Getting the source code): Likewise.
-+
+@@ -1,3 +1,10 @@
 +2013-12-25  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
@@ -33,66 +26,6 @@ index 21ec1c7..bbb0f31 100644
  2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>
  
  	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
-diff --git a/INSTALL b/INSTALL
-index afc957c..db12530 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -140,7 +140,7 @@ If build and host are different make check isn't available.
- If build and host are different man pages are not generated.
- 
- As an example imagine you have a build system running on FreeBSD on sparc
--which prepares packages for developpers running amd64 GNU/Linux laptop and
-+which prepares packages for developers running amd64 GNU/Linux laptop and
- they need to make images for ARM board running U-boot. In this case:
- 
- build=sparc64-freebsd
-@@ -149,7 +149,7 @@ target=arm-uboot
- 
- For this example the configure line might look like (more details below)
- (some options are optional and included here for completeness but some rarely
--used options are omited):
-+used options are omitted):
- 
- ./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
- CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
-@@ -196,9 +196,9 @@ corresponding platform are not needed for the platform in question.
-     11. TARGET_RANLIB= for ranlib for target.
- 
-   - Additionally for emu, for host and target.
--    1. SDL is looked for in stadard linker directories (-lSDL) (optional)
--    2. libpciaccess is looked for in stadard linker directories (-lpciaccess) (optional)
--    3. libusb is looked for in stadard linker directories (-lusb) (optional)
-+    1. SDL is looked for in standard linker directories (-lSDL) (optional)
-+    2. libpciaccess is looked for in standard linker directories (-lpciaccess) (optional)
-+    3. libusb is looked for in standard linker directories (-lusb) (optional)
- 
-   - Platform-agnostic tools and data.
-     1. make is the tool you execute after ./configure.
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index c796850..7c6244c 100644
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -108,16 +108,16 @@ The branches available are:
- 
- @table @samp
- @item master
--      Main developpement branch.
-+      Main development branch.
- @item grub-legacy
-       GRUB 0.97 codebase. Kept for reference and legal reasons
- @item multiboot
-       Multiboot specfication
- @item multiboot2
-       Multiboot2 specfication
--@item developper branches
--      Prefixed with developper name. Every developper of a team manages his own branches.
--      Developper branches do not need changelog entries.
-+@item developer branches
-+      Prefixed with developer name. Every developer of a team manages his own branches.
-+      Developer branches do not need changelog entries.
- @end table
- 
- Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
 diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S
 index 39da1df..dfaded0 100644
 --- a/grub-core/kern/arm/cache_armv6.S
@@ -106,5 +39,5 @@ index 39da1df..dfaded0 100644
  # define DMB	mcr	p15, 0, r0, c7, c10, 5
  # define DSB	mcr	p15, 0, r0, c7, c10, 4
 -- 
-1.8.5.3
+1.9.0
 

0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch

@@ -0,0 +1,90 @@
+From b3a04ee7745f9db87475ed926569ca1b3ba63994 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 6 May 2014 10:47:21 -0400
+Subject: [PATCH 003/103] * INSTALL (Cross-compiling the GRUB): Fix some
+ spelling mistakes. * docs/grub.texi (Getting the source code): Likewise.
+
+Conflicts:
+	ChangeLog
+---
+ ChangeLog          |  5 +++++
+ INSTALL            | 10 +++++-----
+ docs/grub-dev.texi |  8 ++++----
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 153bc43..bbb0f31 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
++
++	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
++	* docs/grub.texi (Getting the source code): Likewise.
++
+ 2013-12-25  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
+diff --git a/INSTALL b/INSTALL
+index afc957c..db12530 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -140,7 +140,7 @@ If build and host are different make check isn't available.
+ If build and host are different man pages are not generated.
+ 
+ As an example imagine you have a build system running on FreeBSD on sparc
+-which prepares packages for developpers running amd64 GNU/Linux laptop and
++which prepares packages for developers running amd64 GNU/Linux laptop and
+ they need to make images for ARM board running U-boot. In this case:
+ 
+ build=sparc64-freebsd
+@@ -149,7 +149,7 @@ target=arm-uboot
+ 
+ For this example the configure line might look like (more details below)
+ (some options are optional and included here for completeness but some rarely
+-used options are omited):
++used options are omitted):
+ 
+ ./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
+ CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
+@@ -196,9 +196,9 @@ corresponding platform are not needed for the platform in question.
+     11. TARGET_RANLIB= for ranlib for target.
+ 
+   - Additionally for emu, for host and target.
+-    1. SDL is looked for in stadard linker directories (-lSDL) (optional)
+-    2. libpciaccess is looked for in stadard linker directories (-lpciaccess) (optional)
+-    3. libusb is looked for in stadard linker directories (-lusb) (optional)
++    1. SDL is looked for in standard linker directories (-lSDL) (optional)
++    2. libpciaccess is looked for in standard linker directories (-lpciaccess) (optional)
++    3. libusb is looked for in standard linker directories (-lusb) (optional)
+ 
+   - Platform-agnostic tools and data.
+     1. make is the tool you execute after ./configure.
+diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
+index c796850..7c6244c 100644
+--- a/docs/grub-dev.texi
++++ b/docs/grub-dev.texi
+@@ -108,16 +108,16 @@ The branches available are:
+ 
+ @table @samp
+ @item master
+-      Main developpement branch.
++      Main development branch.
+ @item grub-legacy
+       GRUB 0.97 codebase. Kept for reference and legal reasons
+ @item multiboot
+       Multiboot specfication
+ @item multiboot2
+       Multiboot2 specfication
+-@item developper branches
+-      Prefixed with developper name. Every developper of a team manages his own branches.
+-      Developper branches do not need changelog entries.
++@item developer branches
++      Prefixed with developer name. Every developer of a team manages his own branches.
++      Developer branches do not need changelog entries.
+ @end table
+ 
+ Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
+-- 
+1.9.0
+

0004-NEWS-First-draft-of-2.02-entry.patch

@@ -1,42 +1,32 @@
-From ef30fb83d10ce26adfc613837eb69366ab02338f Mon Sep 17 00:00:00 2001
+From 4b4eebb6b2cb81455337137d75467db0e00c7d99 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 27 Dec 2013 03:05:38 +0000
-Subject: [PATCH 003/112] * NEWS: First draft of 2.02 entry.
+Subject: [PATCH 004/103] * NEWS: First draft of 2.02 entry.
 
 ---
- ChangeLog |  16 +++++++++
- NEWS      | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 134 insertions(+)
+ ChangeLog |   4 +++
+ NEWS      | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 123 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index bbb0f31..5639fdc 100644
+index bbb0f31..82dc61d 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,19 @@
-+2013-12-28  Colin Watson  <cjwatson@ubuntu.com>
-+
-+	* NEWS: The cmosclean command in fact dates back to 1.99.  Remove
-+	mention of it from 2.02.
-+
-+2013-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
-+
-+	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
-+
-+	As these functions are used on pre-ARMv6 CPUs as well we don't want
-+	to make assembler assume that architecture is higher than default one.
+@@ -1,5 +1,9 @@
+ 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
+ 
++	* NEWS: First draft of 2.02 entry.
 +
 +2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
 +
-+	* NEWS: First draft of 2.02 entry.
-+
- 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
- 
  	* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
+ 	* docs/grub.texi (Getting the source code): Likewise.
+ 
 diff --git a/NEWS b/NEWS
-index 4bb5f98..b74c05f 100644
+index 4bb5f98..577d9fd 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,121 @@
+@@ -1,3 +1,122 @@
 +New in 2.02:
 +
 +* New/improved filesystem and disk support:
@@ -85,7 +75,8 @@ index 4bb5f98..b74c05f 100644
 +
 +* New/improved platform support:
 +  * New `efifwsetup' and `lsefi' commands on EFI platforms.
-+  * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
++  * New `cmosclean', `cmosdump', and `cmosset' commands on platforms with
++    CMOS support.
 +  * New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
 +    coreboot.
 +  * Improve opcode parsing in ACPI halt implementation.
@@ -159,5 +150,5 @@ index 4bb5f98..b74c05f 100644
  
  * Appearance:
 -- 
-1.8.5.3
+1.9.0
 

0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch

@@ -0,0 +1,41 @@
+From 41a4b6d4b2fcf14e6f8dcc03dda3eb807a64c428 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Sat, 28 Dec 2013 02:20:27 +0000
+Subject: [PATCH 005/103] * NEWS: The cmosclean command in fact dates back to
+ 1.99.  Remove mention of it from 2.02.
+
+---
+ ChangeLog | 5 +++++
+ NEWS      | 3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 82dc61d..a606ca5 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2013-12-28  Colin Watson  <cjwatson@ubuntu.com>
++
++	* NEWS: The cmosclean command in fact dates back to 1.99.  Remove
++	mention of it from 2.02.
++
+ 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* NEWS: First draft of 2.02 entry.
+diff --git a/NEWS b/NEWS
+index 577d9fd..b74c05f 100644
+--- a/NEWS
++++ b/NEWS
+@@ -46,8 +46,7 @@ New in 2.02:
+ 
+ * New/improved platform support:
+   * New `efifwsetup' and `lsefi' commands on EFI platforms.
+-  * New `cmosclean', `cmosdump', and `cmosset' commands on platforms with
+-    CMOS support.
++  * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
+   * New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
+     coreboot.
+   * Improve opcode parsing in ACPI halt implementation.
+-- 
+1.9.0
+

0006-remove-unused-error.h-from-kern-emu-misc.c.patch

@@ -1,7 +1,7 @@
-From de40a1e74bd16b419f71f8e79cf7d62f69ef25a4 Mon Sep 17 00:00:00 2001
+From bdabacb90e48becc55a4f84e0166c573663879d4 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 28 Dec 2013 09:01:20 +0400
-Subject: [PATCH 004/112] remove unused error.h from kern/emu/misc.c
+Subject: [PATCH 006/103] remove unused error.h from kern/emu/misc.c
 
 Fixes compilation on mingw32, where include is apparently missing.
 ---
@@ -10,7 +10,7 @@ Fixes compilation on mingw32, where include is apparently missing.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 5639fdc..d2e9f19 100644
+index a606ca5..17c1c31 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -35,5 +35,5 @@ index 43471b4..bb606da 100644
  #include <stdlib.h>
  #include <stdint.h>
 -- 
-1.8.5.3
+1.9.0
 

0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch

@@ -1,7 +1,7 @@
-From e0589d5bbec8c6203ba299b782438030295803d5 Mon Sep 17 00:00:00 2001
+From 52bc775fbd3b6e4bb68fe3f5644a23a475ff0b26 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 28 Dec 2013 17:25:14 +0100
-Subject: [PATCH 005/112] 	Don't abort() on unavailable coreboot tables
+Subject: [PATCH 007/103] 	Don't abort() on unavailable coreboot tables
  if not running on coreboot.
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 005/112] 	Don't abort() on unavailable coreboot tables
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index d2e9f19..67d80bd 100644
+index 17c1c31..140b2d8 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -66,5 +66,5 @@ index 6b150b4..3314f02 100644
    grub_video_coreboot_fb_late_init ();
  
 -- 
-1.8.5.3
+1.9.0
 

0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch

@@ -1,7 +1,7 @@
-From 300c13fa40729ad32e85610a650c26516c66a560 Mon Sep 17 00:00:00 2001
+From e556fb6be8a3b3155723c26d02437a0a5bf26183 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 30 Dec 2013 06:49:15 +0100
-Subject: [PATCH 006/112] 	* NEWS: Add few missing entries. Correct
+Subject: [PATCH 008/103] 	* NEWS: Add few missing entries. Correct
  existing ones.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 006/112] 	* NEWS: Add few missing entries. Correct
  2 files changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 67d80bd..226f2a3 100644
+index 140b2d8..447dece 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -117,5 +117,5 @@ index b74c05f..49a2459 100644
    * HFS string is now treated like mac-roman and not UTF-8
    * HFS mtime support.
 -- 
-1.8.5.3
+1.9.0
 

0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch

@@ -1,7 +1,7 @@
-From b0e9367a147134da3599cf4d5485c0f29c93a73a Mon Sep 17 00:00:00 2001
+From e5b01b454769cec291160ffdeef706d04bedb342 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Mon, 30 Dec 2013 12:56:19 +0000
-Subject: [PATCH 007/112] strip .eh_frame section from arm64-efi kernel
+Subject: [PATCH 009/103] strip .eh_frame section from arm64-efi kernel
 
 Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
 ---
@@ -10,7 +10,7 @@ Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 226f2a3..16372cd 100644
+index 447dece..d2e5193 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index c916246..42443bc 100644
    i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
    i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
 -- 
-1.8.5.3
+1.9.0
 

0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch

@@ -1,7 +1,7 @@
-From d0bf697add07d1bcc2d4c648d66f5b49de8ba80d Mon Sep 17 00:00:00 2001
+From 907365b13dc4a1fb5a17dea673ad65130ebbcf7a Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 10:38:54 +0400
-Subject: [PATCH 008/112] use {grub,boot}aa64.efi for boot images on AArch64
+Subject: [PATCH 010/103] use {grub,boot}aa64.efi for boot images on AArch64
 
 According to UEFI 2.4 specification, default boot file name on AArch64
 is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default
@@ -33,5 +33,5 @@ index 8cfe0ea..4608b80 100644
  	    default:
  	      efi_file = "grub.efi";
 -- 
-1.8.5.3
+1.9.0
 

0011-fix-32-bit-compilation-on-MinGW-w64.patch

@@ -1,7 +1,7 @@
-From 5a062ab806006fd9f1d9268ddc7eb706782a1c22 Mon Sep 17 00:00:00 2001
+From 9ce80256f3246f13d083374980018e937737f101 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 18:43:02 +0400
-Subject: [PATCH 009/112] fix 32 bit compilation on MinGW-w64
+Subject: [PATCH 011/103] fix 32 bit compilation on MinGW-w64
 
 Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and
 32 bit under MinGW-64. The latter does not require fseeko/ftello
@@ -12,7 +12,7 @@ redefinition which it already does in case of _FILE_OFFSET_BITS=64.
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 16372cd..3489d53 100644
+index d2e5193..761e8c6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -41,5 +41,5 @@ index 36615b2..79efcfa 100644
  #endif
  
 -- 
-1.8.5.3
+1.9.0
 

0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch

@@ -1,7 +1,7 @@
-From 510402f407ab09f1e4892fbc33833818d6561eeb Mon Sep 17 00:00:00 2001
+From abb042d2a8c3787de2509eb6f7c219f9c921ab28 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 20:34:25 +0400
-Subject: [PATCH 010/112] Change grub-mkrescue to use bootaa64.efi too
+Subject: [PATCH 012/103] Change grub-mkrescue to use bootaa64.efi too
 
 Also add ChangeLog entry for previous change.
 ---
@@ -10,7 +10,7 @@ Also add ChangeLog entry for previous change.
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3489d53..bb73343 100644
+index 761e8c6..735748f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
@@ -40,5 +40,5 @@ index 317879d..0d03e55 100644
  			     imgname);
        free (imgname);
 -- 
-1.8.5.3
+1.9.0
 

0013-arm64-set-correct-length-of-device-path-end-entry.patch

@@ -1,7 +1,7 @@
-From c02a376131f807a04ed2cf8e9160a461b1568854 Mon Sep 17 00:00:00 2001
+From 60431c470d8ae9001d34e76f7b80d2b55007fd64 Mon Sep 17 00:00:00 2001
 From: Leif Lindholm <leif.lindholm@linaro.org>
 Date: Tue, 7 Jan 2014 17:52:50 +0000
-Subject: [PATCH 011/112] arm64: set correct length of device path end entry
+Subject: [PATCH 013/103] arm64: set correct length of device path end entry
 
 The length of the Device Path End entry in the grub_linux_boot()
 function was incorrectly set to 0. This triggers an assert failure
@@ -14,7 +14,7 @@ Set it to sizeof (grub_efi_device_path_t).
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index bb73343..13f3273 100644
+index 735748f..a1ecbe2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -39,5 +39,5 @@ index 9d15aad..75ad871 100644
    b = grub_efi_system_table->boot_services;
    status = b->load_image (0, grub_efi_image_handle,
 -- 
-1.8.5.3
+1.9.0
 

0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch

@@ -1,7 +1,7 @@
-From efb1d140dd18b4e1141e443c96dfd87e613e8dad Mon Sep 17 00:00:00 2001
+From ad0412ef8b5dcc14499d4ba318493db298ac7a79 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Wed, 8 Jan 2014 11:05:20 +0000
-Subject: [PATCH 012/112] * Makefile.util.def (grub-macbless): Change
+Subject: [PATCH 014/103] * Makefile.util.def (grub-macbless): Change
  mansection to 8.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 012/112] * Makefile.util.def (grub-macbless): Change
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 13f3273..61f33ce 100644
+index a1ecbe2..6a382e4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index 985e76c..3c99be2 100644
    common = grub-core/osdep/init.c;
    common = grub-core/kern/emu/argp_common.c;
 -- 
-1.8.5.3
+1.9.0
 

0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch

@@ -1,7 +1,7 @@
-From f887a3908a5f3ad124e6f447c64514e5e45a9192 Mon Sep 17 00:00:00 2001
+From ae32118428c545d74dcf2d708660b490d4740ca9 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sun, 12 Jan 2014 15:29:21 +0400
-Subject: [PATCH 013/112] add part_apple to EFI rescue image to fix missing
+Subject: [PATCH 015/103] add part_apple to EFI rescue image to fix missing
  prefix
 
 On Mac rescue image is booted from HFS+ partition, so bootpath looks like
@@ -44,5 +44,5 @@ index 0d03e55..34e0b7a 100644
    if (source_dirs[GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275])
      {
 -- 
-1.8.5.3
+1.9.0
 

0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch

@@ -1,7 +1,7 @@
-From 1ce3cb44b6488abe1ae0eb58902a5e968ee9aca8 Mon Sep 17 00:00:00 2001
+From 76455c52e6315685813dd1f880977d4781f3fe73 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:30:52 +0000
-Subject: [PATCH 014/112] freebsd/hostdisk.c is only ever compiled on FreeBSD
+Subject: [PATCH 016/103] freebsd/hostdisk.c is only ever compiled on FreeBSD
 
 * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
 redundant preprocessor conditional.
@@ -11,7 +11,7 @@ redundant preprocessor conditional.
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 61f33ce..4268e76 100644
+index 6a382e4..a80f172 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -44,5 +44,5 @@ index bd5fddb..eb202dc 100644
    return ret;
  }
 -- 
-1.8.5.3
+1.9.0
 

0017-Prefer-more-portable-test-1-constructs.patch

@@ -1,7 +1,7 @@
-From ae7cb4e6c3d74ddc3c3e61e62380d1807358a901 Mon Sep 17 00:00:00 2001
+From 942d03cf562e626418a0553a6e22e5c9cb7e7de4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 15:24:50 +0000
-Subject: [PATCH 015/112] Prefer more portable test(1) constructs
+Subject: [PATCH 017/103] Prefer more portable test(1) constructs
 
 * util/grub.d/00_header.in (make_timeout): Use && rather than test
 -a.
@@ -19,7 +19,7 @@ rather than test -o.
  5 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 4268e76..0710c08 100644
+index a80f172..30084cf 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,4 +1,14 @@
@@ -105,5 +105,5 @@ index 0470e66..7cf8487 100644
      continue
    fi
 -- 
-1.8.5.3
+1.9.0
 

0018-NEWS-Add-few-missing-entries.patch

@@ -1,7 +1,7 @@
-From 30ad0dfbb129fb6d7d072fd52fe127a5f053aa9c Mon Sep 17 00:00:00 2001
+From ed742dc11fee69471c07101c814fc27a36b83768 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:31:10 +0100
-Subject: [PATCH 016/112] 	* NEWS: Add few missing entries.
+Subject: [PATCH 018/103] 	* NEWS: Add few missing entries.
 
 ---
  ChangeLog |  4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 016/112] 	* NEWS: Add few missing entries.
  2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0710c08..a5474d1 100644
+index 30084cf..5eea8a3 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -96,5 +96,5 @@ index 49a2459..a61df94 100644
      improvements to the build system.
    * Remove variable length arrays.
 -- 
-1.8.5.3
+1.9.0
 

0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch

@@ -1,7 +1,7 @@
-From dc4cae71d718d12f6ddc01dd7296ad8d659e35ad Mon Sep 17 00:00:00 2001
+From cadbf009147f14d3e7f33bf0f29cefb7a26aeb26 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:41:47 +0100
-Subject: [PATCH 017/112] 	* grub-core/kern/efi/efi.c: Ensure that the
+Subject: [PATCH 019/103] 	* grub-core/kern/efi/efi.c: Ensure that the
  result starts with / 	and has no //.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 017/112] 	* grub-core/kern/efi/efi.c: Ensure that the
  2 files changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a5474d1..9dd67e4 100644
+index 5eea8a3..b42fd65 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -86,5 +86,5 @@ index b253141..b9eb1ab 100644
    return name;
  }
 -- 
-1.8.5.3
+1.9.0
 

0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch

@@ -1,7 +1,7 @@
-From c7c98ae6f72c00c569b2977e0a3e2a931286562b Mon Sep 17 00:00:00 2001
+From a97ddeedaa2d65158ea9489cb73ff187fd8ff306 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:43:29 +0100
-Subject: [PATCH 018/112] 	* util/grub-mount.c: Extend GCC warning
+Subject: [PATCH 020/103] 	* util/grub-mount.c: Extend GCC warning
  workaround to grub-mount.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 018/112] 	* util/grub-mount.c: Extend GCC warning
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9dd67e4..acebfc5 100644
+index b42fd65..7241046 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -43,5 +43,5 @@ index 118881e..19de2e6 100644
  static const char *root = NULL;
  grub_device_t dev = NULL;
 -- 
-1.8.5.3
+1.9.0
 

0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch

@@ -1,7 +1,7 @@
-From 823eab7afd99564aebcf6c553de97a5dde8cc140 Mon Sep 17 00:00:00 2001
+From 270a7a0d557ecdedc7aaba8dfba01d45635455e9 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 19:50:54 +0400
-Subject: [PATCH 019/112] reintroduce BUILD_LDFLAGS for the cross-compile case
+Subject: [PATCH 021/103] reintroduce BUILD_LDFLAGS for the cross-compile case
 
 This allows providing separate LDFLAGS for build and host environments, which
 are not necessary the same for cross-compile case. In particular, it allows
@@ -20,7 +20,7 @@ for build and host now.
  5 files changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index acebfc5..8a82048 100644
+index 7241046..86053ae 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
@@ -149,5 +149,5 @@ index 1b3142d..13b7979 100644
  
  # trigtables.c
 -- 
-1.8.5.3
+1.9.0
 

0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch

@@ -1,7 +1,7 @@
-From aee2201f80c42a44da152d918849860be73fd6a7 Mon Sep 17 00:00:00 2001
+From e5f0bfe517d7b07bcc940c16bbfe89daed17163f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:57:35 +0100
-Subject: [PATCH 020/112] 	* grub-core/term/terminfo.c: Recognize keys
+Subject: [PATCH 022/103] 	* grub-core/term/terminfo.c: Recognize keys
  F1-F12.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 020/112] 	* grub-core/term/terminfo.c: Recognize keys
  2 files changed, 54 insertions(+), 36 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 8a82048..57f77be 100644
+index 86053ae..1d530ce 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -151,5 +151,5 @@ index 3d48b19..f0d3e3d 100644
    }
  #undef CONTINUE_READ
 -- 
-1.8.5.3
+1.9.0
 

0023-Fix-ChangeLog-date.patch

@@ -1,14 +1,14 @@
-From c2e61b87fb4f7d7b9363bb1b5c58c03a0566e106 Mon Sep 17 00:00:00 2001
+From d55d279aaf9e05f5adee41f70eeca2533fa2bc03 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:01:16 +0400
-Subject: [PATCH 021/112] Fix ChangeLog date
+Subject: [PATCH 023/103] Fix ChangeLog date
 
 ---
  ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 57f77be..459ac23 100644
+index 1d530ce..da20112 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -2,7 +2,7 @@
@@ -21,5 +21,5 @@ index 57f77be..459ac23 100644
  	* configure.ac: Add support for BUILD_LDFLAGS.
  	* Makefile.am: Use BUILD_LDFLAGS for build time programs here ...
 -- 
-1.8.5.3
+1.9.0
 

0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch

@@ -1,7 +1,7 @@
-From b6f6d31b007ddbc4c6f7285afb36010af8f2af7a Mon Sep 17 00:00:00 2001
+From 458248c36f2ec209cfdd7564c8dedf0e443ced5e Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:04:11 +0400
-Subject: [PATCH 022/112] Use _W64 to detect MinGW W64-32 instead of
+Subject: [PATCH 024/103] Use _W64 to detect MinGW W64-32 instead of
  _FILE_OFFSET_BITS
 
 In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
@@ -15,7 +15,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00723.html
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 459ac23..3c45a35 100644
+index da20112..21fc87f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -43,5 +43,5 @@ index 79efcfa..bf6451b 100644
  #define ftello ftello64
  #endif
 -- 
-1.8.5.3
+1.9.0
 

0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch

@@ -1,7 +1,7 @@
-From 53478c3297bdc638f3742d35c8ace197f2abba3a Mon Sep 17 00:00:00 2001
+From 75db309b99ac486e9c6b5508722796c034cb36d6 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:41:24 +0400
-Subject: [PATCH 023/112] add BUILD_EXEEXT support to fix make clean on Windows
+Subject: [PATCH 025/103] add BUILD_EXEEXT support to fix make clean on Windows
 
 Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where
 appropriate.
@@ -14,7 +14,7 @@ appropriate.
  5 files changed, 40 insertions(+), 20 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3c45a35..130888a 100644
+index 21fc87f..8ae23e5 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
@@ -170,5 +170,5 @@ index 13b7979..826b3dd 100644
  
  # XXX Use Automake's LEX & YACC support
 -- 
-1.8.5.3
+1.9.0
 

0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch

@@ -1,7 +1,7 @@
-From 389b0154fe3978f7e74a7193be2d0d7a8cf0ef74 Mon Sep 17 00:00:00 2001
+From 925662e61e6becd12efb438d386b5aee45be4ecf Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 21:22:57 +0400
-Subject: [PATCH 024/112] fix include loop on MinGW due to libintl.h pulling
+Subject: [PATCH 026/103] fix include loop on MinGW due to libintl.h pulling
  stdio.h
 
 In file included from ./include/grub/dl.h:23:0,
@@ -45,7 +45,7 @@ into separate file grub/compiler.h and include it instead.
  create mode 100644 include/grub/compiler.h
 
 diff --git a/ChangeLog b/ChangeLog
-index 130888a..283dd80 100644
+index 8ae23e5..50ac180 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,19 @@
@@ -277,5 +277,5 @@ index d393da7..8cc331d 100644
  struct grub_procfs_entry
  {
 -- 
-1.8.5.3
+1.9.0
 

0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch

@@ -1,7 +1,7 @@
-From 2b945debd84085f04f45fe16db750528b12b3e6e Mon Sep 17 00:00:00 2001
+From 82a8398294fbb8ef767860e27d648df3e44f9b87 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:26:40 +0100
-Subject: [PATCH 025/112] 	* grub-core/commands/macbless.c: Rename FILE
+Subject: [PATCH 027/103] 	* grub-core/commands/macbless.c: Rename FILE
  and DIR to avoid 	conflicts.
 
 	Reported by: Andrey Borzenkov.
@@ -11,7 +11,7 @@ Subject: [PATCH 025/112] 	* grub-core/commands/macbless.c: Rename FILE
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 283dd80..7d11c52 100644
+index 50ac180..75ecd5f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
@@ -57,5 +57,5 @@ index c521083..4724edd 100644
  
  static grub_err_t
 -- 
-1.8.5.3
+1.9.0
 

0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch

@@ -1,7 +1,7 @@
-From a088c0ebf38e54325e10e2872bb56a02b3c97703 Mon Sep 17 00:00:00 2001
+From 5fd5c957af6bce9d59324a54e94c879285bd2897 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sat, 18 Jan 2014 19:41:15 +0100
-Subject: [PATCH 026/112] 	* Makefile.util.def: Link grub-ofpathname with
+Subject: [PATCH 028/103] 	* Makefile.util.def: Link grub-ofpathname with
  zfs libs.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 026/112] 	* Makefile.util.def: Link grub-ofpathname with
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 7d11c52..0629bfc 100644
+index 75ecd5f..40ffd93 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index 83df212..a286a89 100644
  
  program = {
 -- 
-1.8.5.3
+1.9.0
 

0029-Makefile.am-default_payload.elf-Add-modules.patch

@@ -1,7 +1,7 @@
-From dddf94cbf0d8e07744f28d24684aa6e29f8c1780 Mon Sep 17 00:00:00 2001
+From e7bf7f69fa55a08430efcd81472daf253fd1b7f3 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:43:19 +0100
-Subject: [PATCH 027/112] 	* Makefile.am (default_payload.elf): Add
+Subject: [PATCH 029/103] 	* Makefile.am (default_payload.elf): Add
  modules 	multiboot cbmemc linux16 gzio echo help.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 027/112] 	* Makefile.am (default_payload.elf): Add
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0629bfc..ef0ab77 100644
+index 40ffd93..23fa27e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,4 +1,9 @@
@@ -38,5 +38,5 @@ index aa526f5..97c062d 100644
  
  windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
 -- 
-1.8.5.3
+1.9.0
 

0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch

@@ -1,7 +1,7 @@
-From 02a2b7039c54c1786fc31ab2d34027eaec1c826a Mon Sep 17 00:00:00 2001
+From bad3b8b7be801e2213955727277f55d88325e714 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 22:48:04 +0400
-Subject: [PATCH 028/112] fix removal of {cpu,machine} links on mingw/msys
+Subject: [PATCH 030/103] fix removal of {cpu,machine} links on mingw/msys
 
 At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
 but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
@@ -15,7 +15,7 @@ Make it more clear in message that we are checking "ln -s".
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index ef0ab77..3c24157 100644
+index 23fa27e..58ae4f5 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -51,5 +51,5 @@ index 32d5477..b2bb88d 100644
    [link_dir=yes
  else
 -- 
-1.8.5.3
+1.9.0
 

0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch

@@ -1,7 +1,7 @@
-From b5453504f83bd29248fbae94d7c5ceea54ed65c6 Mon Sep 17 00:00:00 2001
+From 1e0b6198696c7ba23945468d81dff7a8ba28c361 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:54:09 +0100
-Subject: [PATCH 029/112] 	* grub-core/normal/main.c (read_config_file):
+Subject: [PATCH 031/103] 	* grub-core/normal/main.c (read_config_file):
  Buffer config file. 	Reduces boot time.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 029/112] 	* grub-core/normal/main.c (read_config_file):
  2 files changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3c24157..66e00d5 100644
+index 58ae4f5..0609420 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -64,5 +64,5 @@ index c36663f..3a926fc 100644
    if (ctmp)
      old_file = grub_strdup (ctmp);
 -- 
-1.8.5.3
+1.9.0
 

0032-util-grub-install.c-Fix-a-typo.patch

@@ -1,7 +1,7 @@
-From f11a0491a9ee60d66d5bd084841c7548db876be7 Mon Sep 17 00:00:00 2001
+From caa0ecbe148f596f021967fc4ef02cb4f6a02852 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 20:02:51 +0100
-Subject: [PATCH 030/112] 	* util/grub-install.c: Fix a typo.
+Subject: [PATCH 032/103] 	* util/grub-install.c: Fix a typo.
 
 ---
  ChangeLog           | 4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 030/112] 	* util/grub-install.c: Fix a typo.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 66e00d5..1b53ccd 100644
+index 0609420..dc6df34 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -36,5 +36,5 @@ index 4608b80..5903f34 100644
  
    if (disk_module && grub_strcmp (disk_module, "ata") == 0)
 -- 
-1.8.5.3
+1.9.0
 

0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch

@@ -1,7 +1,7 @@
-From 9cc802e03875429ff772eb3f007ee11eb1ad0c25 Mon Sep 17 00:00:00 2001
+From 656469fae69a5b7c6ddaaef717433b101c60e8c3 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 23:15:40 +0400
-Subject: [PATCH 031/112] use MODULE_FILES for genemuinit* instead of MOD_FILES
+Subject: [PATCH 033/103] use MODULE_FILES for genemuinit* instead of MOD_FILES
 
 MinGW native nm does not support ELF binaries.
 ---
@@ -12,7 +12,7 @@ MinGW native nm does not support ELF binaries.
  4 files changed, 16 insertions(+), 8 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1b53ccd..7d207e4 100644
+index dc6df34..9073b1e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,11 @@
@@ -87,5 +87,5 @@ index 6b83f59..a99a15d 100644
    fi
  done
 -- 
-1.8.5.3
+1.9.0
 

0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch

@@ -1,7 +1,7 @@
-From d03d817508bd52995ce9ea6c1fa697856b66de46 Mon Sep 17 00:00:00 2001
+From aa4a525fe853594ed566b2bafa7b8bc101c78a88 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:28:46 +0000
-Subject: [PATCH 032/112] Ignore EPERM when modifying kern.geom.debugflags
+Subject: [PATCH 034/103] Ignore EPERM when modifying kern.geom.debugflags
 
 Many tests fail when run as a non-root user on FreeBSD.  The failures
 all amount to an inability to open files using grub_util_fd_open,
@@ -16,7 +16,7 @@ perfectly reasonable operations.
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 7d207e4..cdeea66 100644
+index 9073b1e..a7aee43 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
@@ -54,5 +54,5 @@ index eb202dc..6145d07 100644
  
    ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
 -- 
-1.8.5.3
+1.9.0
 

0035-change-stop-condition-to-avoid-infinite-loops.patch

@@ -1,7 +1,7 @@
-From f18970e0e0c37f5407f3259fe343dc825dfa4170 Mon Sep 17 00:00:00 2001
+From fe1f47e9190113ad7318f46e0e66a4497ebb6135 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 21 Jan 2014 10:49:39 -0200
-Subject: [PATCH 033/112] change stop condition to avoid infinite loops
+Subject: [PATCH 035/103] change stop condition to avoid infinite loops
 
 In net/net.c there is a while (1) that only exits if there is a stop
 condition and more then 10 packages or if there is no package received.
@@ -15,7 +15,7 @@ this never happens.
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index cdeea66..bbbe539 100644
+index a7aee43..0df6854 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,15 @@
@@ -48,5 +48,5 @@ index 0e57e93..56355f3 100644
        /* Maybe should be better have a fixed number of packets for each card
  	 and just mark them as used and not used.  */ 
 -- 
-1.8.5.3
+1.9.0
 

0036-increase-network-try-interval-gradually.patch

@@ -1,7 +1,7 @@
-From 7533a737e4965d314c86f06a35a5f3f9cffb8318 Mon Sep 17 00:00:00 2001
+From ec46305a8533a9880dbfd157c2ba8cc1354ab504 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 21 Jan 2014 11:03:51 -0200
-Subject: [PATCH 034/112] increase network try interval gradually
+Subject: [PATCH 036/103] increase network try interval gradually
 
 * grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
 interval gradually.
@@ -19,7 +19,7 @@ interval gradually.
  6 files changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index bbbe539..33fa6b1 100644
+index 0df6854..b35563e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,14 @@
@@ -107,5 +107,5 @@ index de6259e..0e0a605 100644
  
  #endif /* ! GRUB_NET_HEADER */
 -- 
-1.8.5.3
+1.9.0
 

0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch

@@ -1,7 +1,7 @@
-From 35a28bea958018b24f6a2a7dc3cf2e72bc9e2953 Mon Sep 17 00:00:00 2001
+From e9cbf597953d597dd15c0dc0be77a9583fa733f7 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:29:33 +0400
-Subject: [PATCH 035/112] look for DejaVu also in /usr/share/fonts/truetype
+Subject: [PATCH 037/103] look for DejaVu also in /usr/share/fonts/truetype
 
 It is installed in this path on openSUSE.
 ---
@@ -10,7 +10,7 @@ It is installed in this path on openSUSE.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 33fa6b1..e884b4e 100644
+index b35563e..b2e6d39 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index cf3de3b..120263e 100644
            DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
            break 2
 -- 
-1.8.5.3
+1.9.0
 

0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch

@@ -1,7 +1,7 @@
-From 85db438f517cda4f9b9acfc0281ebf6cf7c47e1a Mon Sep 17 00:00:00 2001
+From 8dd8e1c0e27070d2f172ddaf4e7528496dfd8b45 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:41:11 +0400
-Subject: [PATCH 036/112] Show detected path to DejaVuSans in configure summary
+Subject: [PATCH 038/103] Show detected path to DejaVuSans in configure summary
 
 ---
  ChangeLog    | 1 +
@@ -9,7 +9,7 @@ Subject: [PATCH 036/112] Show detected path to DejaVuSans in configure summary
  2 files changed, 2 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index e884b4e..f463e8b 100644
+index b2e6d39..30b8e8a 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,6 +1,7 @@
@@ -33,5 +33,5 @@ index 120263e..8888c2f 100644
  echo starfield theme: No "($starfield_excuse)"
  fi
 -- 
-1.8.5.3
+1.9.0
 

0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch

@@ -1,7 +1,7 @@
-From 7954e6250ac4f0e1287c5a89dd13539dfaa711e8 Mon Sep 17 00:00:00 2001
+From b56a7569613e59c14d09c77b428884a9acb19e7d Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 20:54:09 +0400
-Subject: [PATCH 037/112] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
+Subject: [PATCH 039/103] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
  files
 
 Not all toolkits provide static libraries. This patch enables creation of self
@@ -24,7 +24,7 @@ targets.
  2 files changed, 9 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index f463e8b..749d27c 100644
+index 30b8e8a..f2c75dc 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -58,5 +58,5 @@ index 97c062d..f02ae0a 100644
  
  EXTRA_DIST += linguas.sh
 -- 
-1.8.5.3
+1.9.0
 

0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch

@@ -1,7 +1,7 @@
-From 898e360b77d581651cdb098d920868676055decf Mon Sep 17 00:00:00 2001
+From 4a640fa8d9e9f463dfc9a1c1e9adfc758c58ed16 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 23 Jan 2014 12:05:36 +0000
-Subject: [PATCH 038/112] * util/grub-install.c (write_to_disk): Add an info
+Subject: [PATCH 040/103] * util/grub-install.c (write_to_disk): Add an info
  message.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 038/112] * util/grub-install.c (write_to_disk): Add an info
  2 files changed, 5 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 749d27c..925e448 100644
+index f2c75dc..21417f8 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -34,5 +34,5 @@ index 5903f34..787dc90 100644
  			 core_size, core_img);
    free (core_img);
 -- 
-1.8.5.3
+1.9.0
 

0041-util-grub-install.c-List-available-targets.patch

@@ -1,7 +1,7 @@
-From d9a6e0c6231786a9f2e003606ee6ba16f1fb5f79 Mon Sep 17 00:00:00 2001
+From 9779a803f3368df23a4a90f2475d6d78672e83c0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:09:25 +0100
-Subject: [PATCH 039/112] 	* util/grub-install.c: List available targets.
+Subject: [PATCH 041/103] 	* util/grub-install.c: List available targets.
 
 ---
  ChangeLog                   |  4 ++++
@@ -11,7 +11,7 @@ Subject: [PATCH 039/112] 	* util/grub-install.c: List available targets.
  4 files changed, 44 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 925e448..f37f8b1 100644
+index 21417f8..f3bb077 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -105,5 +105,5 @@ index 787dc90..2e6226a 100644
        return xasprintf (text, program_name, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
      default:
 -- 
-1.8.5.3
+1.9.0
 

0042-Fix-several-translatable-strings.patch

@@ -1,7 +1,7 @@
-From a02fb69a9f830c19f5bf541a2c8e5ddd905e5904 Mon Sep 17 00:00:00 2001
+From 3886fbac17202ede59c051ef90046b01d199ecc9 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:20:27 +0100
-Subject: [PATCH 040/112] 	Fix several translatable strings.
+Subject: [PATCH 042/103] 	Fix several translatable strings.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
  4 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f37f8b1..192faac 100644
+index f3bb077..bc1a08a 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,11 @@
@@ -74,5 +74,5 @@ index 5e944c2..f4fda6d 100644
    {"output",  'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
    {"isolinux",     'i', 0,      0, N_("assume input is an isolinux configuration file."), 0},
 -- 
-1.8.5.3
+1.9.0
 

0043-do-not-set-default-prefix-in-grub-mkimage.patch

@@ -1,7 +1,7 @@
-From 1394cba424ec21b2d7f87b89517aeaa80125cb80 Mon Sep 17 00:00:00 2001
+From 7a7665be5063a4f2aa97fb7e8f8585d38f7821ac Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 19:54:51 +0400
-Subject: [PATCH 041/112] do not set default prefix in grub-mkimage
+Subject: [PATCH 043/103] do not set default prefix in grub-mkimage
 
 Default prefix is likely wrong on Unix and completely wrong on Windows.
 Let caller set it explicitly to avoid any ambiguity.
@@ -11,7 +11,7 @@ Let caller set it explicitly to avoid any ambiguity.
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 192faac..000cfe3 100644
+index bc1a08a..3b39980 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -71,5 +71,5 @@ index a2bd4c1..1e0bcf1 100644
  			       arguments.memdisk, arguments.pubkeys,
  			       arguments.npubkeys, arguments.config,
 -- 
-1.8.5.3
+1.9.0
 

0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch

@@ -1,7 +1,7 @@
-From 9a999c97353bddd8c3e6bfdbe7fd19d9f3d54a22 Mon Sep 17 00:00:00 2001
+From 67c5e4180039d4b98039620f1d109a9323e4d2fe Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 21:49:41 +0400
-Subject: [PATCH 042/112] fix Mingw W64-32 cross compile failure due to printf
+Subject: [PATCH 044/103] fix Mingw W64-32 cross compile failure due to printf
  redefinition in libintl.h
 
 In file included from util/misc.c:36:0:
@@ -25,7 +25,7 @@ v3: modify g10lib.h during import
  5 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 000cfe3..5707a2a 100644
+index 3b39980..50d07c8 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,12 @@
@@ -104,5 +104,5 @@ index 63ebb90..2b3322d 100644
      f.close ()
      fw.close ()
 -- 
-1.8.5.3
+1.9.0
 

0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch

@@ -1,7 +1,7 @@
-From 9c84b40fa784f6c991f1ad16327843f3998134e2 Mon Sep 17 00:00:00 2001
+From 7cb3659aebdd85ceb3b582b5c342b5c2ba84e904 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 26 Jan 2014 02:36:05 +0100
-Subject: [PATCH 043/112] 	* grub-core/term/serial.c
+Subject: [PATCH 045/103] 	* grub-core/term/serial.c
  (grub_serial_register): Fix invalid free. 	Ensure that pointers are
  inited to NULL and that pointers are not 	accessed after free.
 
@@ -11,7 +11,7 @@ Subject: [PATCH 043/112] 	* grub-core/term/serial.c
  2 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 5707a2a..1bb6bff 100644
+index 50d07c8..6727e6e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -56,5 +56,5 @@ index b581a76..c9b5574 100644
      }
  
 -- 
-1.8.5.3
+1.9.0
 

0046-grub-install-support-for-partitioned-partx-loop-devi.patch

@@ -1,7 +1,7 @@
-From 36e229c5a97a946fa5312e8c2db8deaa9ab19c5c Mon Sep 17 00:00:00 2001
+From bb87dccc37bf223ecf207660511efc93bd021a40 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sun, 26 Jan 2014 02:56:04 +0100
-Subject: [PATCH 044/112] 	grub-install: support for partitioned partx
+Subject: [PATCH 046/103] 	grub-install: support for partitioned partx
  loop devices.
 
 	* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
@@ -12,7 +12,7 @@ Subject: [PATCH 044/112] 	grub-install: support for partitioned partx
  2 files changed, 20 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1bb6bff..a0fd566 100644
+index 6727e6e..b80896b 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
@@ -51,5 +51,5 @@ index 772de0a..19581d3 100644
  
    return path;
 -- 
-1.8.5.3
+1.9.0
 

0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch

@@ -0,0 +1,40 @@
+From 2919748f67c5e4cf7ec9ce67604c5a82fb09036f Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Sun, 26 Jan 2014 03:31:10 +0100
+Subject: [PATCH 047/103] 	* grub-core/term/at_keyboard.c: Tolerate
+ missing keyboard.
+
+---
+ ChangeLog                    | 4 ++++
+ grub-core/term/at_keyboard.c | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index b80896b..44f018b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
++
+ 2014-01-26  Mike Gilbert <floppym@gentoo.org>
+ 
+ 	grub-install: support for partitioned partx loop devices.
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index f5071ce..b4257e8 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -396,6 +396,9 @@ fetch_key (int *is_break)
+   if (! KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
+     return -1;
+   at_key = grub_inb (KEYBOARD_REG_DATA);
++  /* May happen if no keyboard is connected. Just ignore this.  */
++  if (at_key == 0xff)
++    return -1;
+   if (at_key == 0xe0)
+     {
+       e0_received = 1;
+-- 
+1.9.0
+

0048-.gitignore-add-missing-files-and-.exe-variants.patch

@@ -0,0 +1,34 @@
+From 23537251e8447ea8a43b0ddc7c4e15fde69adfb2 Mon Sep 17 00:00:00 2001
+From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Date: Wed, 29 Jan 2014 13:26:00 -0200
+Subject: [PATCH 048/103] .gitignore: add missing files and .exe variants.
+
+---
+ .gitignore | 7 +++++++
+ ChangeLog  | 6 +++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 44f018b..f4cf40f 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
++
++	* .gitignore: add missing files and .exe variants.
++
+ 2014-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
+@@ -1113,7 +1117,7 @@
+ 
+ 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+-	* .gitignore: Add .exe variants. Add missing files. Remove few outdated
++	* .gitignore: add .exe variants. add missing files. remove few outdated
+ 	entries.
+ 
+ 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+-- 
+1.9.0
+

0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch

@@ -1,64 +1,27 @@
-From 47239a0fa4ac48ad86071d1bf6e1f9b0dc70b46b Mon Sep 17 00:00:00 2001
+From c3011bbece033baf950468e9c538a58822c839bc Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Sun, 26 Jan 2014 03:31:10 +0100
-Subject: [PATCH 045/112] 	* grub-core/term/at_keyboard.c: Tolerate
- missing keyboard.
+Date: Wed, 29 Jan 2014 23:41:48 +0100
+Subject: [PATCH 049/103] 	* util/grub-mkfont.c: Downgrade warnings about
+ unhandled features 	to debug.
 
 ---
- .gitignore                   |  7 +++++++
- ChangeLog                    | 19 ++++++++++++++++++-
- grub-core/term/at_keyboard.c |  3 +++
+ ChangeLog          |  5 +++++
  util/grub-mkfont.c | 14 ++++++++------
- 4 files changed, 36 insertions(+), 7 deletions(-)
+ 2 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a0fd566..fe06210 100644
+index f4cf40f..7aac69a 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,20 @@
+@@ -1,3 +1,8 @@
 +2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* util/grub-mkfont.c: Downgrade warnings about unhandled features
 +	to debug.
 +
-+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
-+
-+	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
-+
-+2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
-+
-+	* .gitignore: add missing files and .exe variants.
-+
-+2014-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
-+
-+	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
-+
- 2014-01-26  Mike Gilbert <floppym@gentoo.org>
+ 2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
  
- 	grub-install: support for partitioned partx loop devices.
-@@ -1116,7 +1133,7 @@
- 
- 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
- 
--	* .gitignore: Add .exe variants. Add missing files. Remove few outdated
-+	* .gitignore: add .exe variants. add missing files. remove few outdated
- 	entries.
- 
- 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
-diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index f5071ce..b4257e8 100644
---- a/grub-core/term/at_keyboard.c
-+++ b/grub-core/term/at_keyboard.c
-@@ -396,6 +396,9 @@ fetch_key (int *is_break)
-   if (! KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
-     return -1;
-   at_key = grub_inb (KEYBOARD_REG_DATA);
-+  /* May happen if no keyboard is connected. Just ignore this.  */
-+  if (at_key == 0xff)
-+    return -1;
-   if (at_key == 0xe0)
-     {
-       e0_received = 1;
+ 	* .gitignore: add missing files and .exe variants.
 diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
 index 3cb02ad..3de07ee 100644
 --- a/util/grub-mkfont.c
@@ -106,5 +69,5 @@ index 3cb02ad..3de07ee 100644
  	    }
  	}
 -- 
-1.8.5.3
+1.9.0
 

0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch

@@ -1,7 +1,7 @@
-From 8ce75765ddc6b174873e7d05c15e86535c4780e8 Mon Sep 17 00:00:00 2001
+From 8a51c8b80452b6156148177dff95532160a88541 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:43:25 +0100
-Subject: [PATCH 046/112] 	* grub-core/disk/ahci.c: Do not enable I/O
+Subject: [PATCH 050/103] 	* grub-core/disk/ahci.c: Do not enable I/O
  decoding and keep 	enabling busmaster for the end.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 046/112] 	* grub-core/disk/ahci.c: Do not enable I/O
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index fe06210..db12dad 100644
+index 7aac69a..1b8aae2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -53,5 +53,5 @@ index 0b13fb8..18c1327 100644
      if (adevs[i])
        {
 -- 
-1.8.5.3
+1.9.0
 

0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch

@@ -1,7 +1,7 @@
-From cc6729328fa91ee4fab14686cb892ecaf7681345 Mon Sep 17 00:00:00 2001
+From 8465dd514df3e1bbdec7e001c7d3c343cd355d42 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:45:18 +0100
-Subject: [PATCH 047/112] 	* grub-core/disk/ahci.c: Allocate and clean
+Subject: [PATCH 051/103] 	* grub-core/disk/ahci.c: Allocate and clean
  space for all possible 32 	slots to avoid pointing to uninited area.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 047/112] 	* grub-core/disk/ahci.c: Allocate and clean
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index db12dad..734f762 100644
+index 1b8aae2..2a8f372 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -51,5 +51,5 @@ index 18c1327..d63fd09 100644
  	  = grub_dma_get_phys (adevs[i]->command_table_chunk);
  
 -- 
-1.8.5.3
+1.9.0
 

0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch

@@ -1,7 +1,7 @@
-From baf35aa3bad71e184058a348e33469db74c88ac2 Mon Sep 17 00:00:00 2001
+From 1d7a31631db690d4159e1c1415cb074c9ef25c1f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:46:17 +0100
-Subject: [PATCH 048/112] 	* grub-core/disk/ahci.c: Add safety cleanups.
+Subject: [PATCH 052/103] 	* grub-core/disk/ahci.c: Add safety cleanups.
 
 ---
  ChangeLog             |  4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 048/112] 	* grub-core/disk/ahci.c: Add safety cleanups.
  2 files changed, 14 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 734f762..b144c49 100644
+index 2a8f372..0385937 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -58,5 +58,5 @@ index d63fd09..643e691 100644
        while ((dev->hba->ports[dev->port].command & GRUB_AHCI_HBA_PORT_CMD_CR))
  	if (grub_get_time_ms () > endtime)
 -- 
-1.8.5.3
+1.9.0
 

0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch

@@ -1,7 +1,7 @@
-From bb56ea0f455c89c582d41ef090ac9844cbf6d554 Mon Sep 17 00:00:00 2001
+From 056070c0cadb1af383d46ca6441f34d79c0298ca Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:49:51 +0100
-Subject: [PATCH 049/112] 	* grub-core/disk/ahci.c: Properly handle
+Subject: [PATCH 053/103] 	* grub-core/disk/ahci.c: Properly handle
  transactions with no 	transferred data.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 049/112] 	* grub-core/disk/ahci.c: Properly handle
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index b144c49..3ca4bb4 100644
+index 0385937..d84aff0 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -50,5 +50,5 @@ index 643e691..fdd40c6 100644
      | (parms->write ? GRUB_AHCI_CONFIG_WRITE : GRUB_AHCI_CONFIG_READ)
      | (parms->taskfile.cmd == 8 ? (1 << 8) : 0);
 -- 
-1.8.5.3
+1.9.0
 

0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch

@@ -1,7 +1,7 @@
-From dcff0582978093e3aa995a50120c35553e105edd Mon Sep 17 00:00:00 2001
+From a50391c562f002d026dad5ef14ab7fd175154e07 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:50:49 +0100
-Subject: [PATCH 050/112] 	* grub-core/disk/ahci.c: Increase timeout.
+Subject: [PATCH 054/103] 	* grub-core/disk/ahci.c: Increase timeout.
  Some SSDs take up to 	7 seconds to recover if last poweroff was bad.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 050/112] 	* grub-core/disk/ahci.c: Increase timeout.
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3ca4bb4..1151ced 100644
+index d84aff0..9d0b00b 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -38,5 +38,5 @@ index fdd40c6..5e4a639 100644
      if (grub_get_time_ms () > endtime)
        {
 -- 
-1.8.5.3
+1.9.0
 

0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch

@@ -1,7 +1,7 @@
-From 54d09228116ac505407e380bd123fddf64f0fb79 Mon Sep 17 00:00:00 2001
+From e4aba2a9e4a0e2f7966c8225fc4f500a65c81361 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:34:27 +0100
-Subject: [PATCH 051/112] 	* util/grub-mkfont.c: Build fix for argp.h
+Subject: [PATCH 055/103] 	* util/grub-mkfont.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 051/112] 	* util/grub-mkfont.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1151ced..2605dda 100644
+index 9d0b00b..f5472af 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -38,5 +38,5 @@ index 3de07ee..e6485b4 100644
  #include <assert.h>
  
 -- 
-1.8.5.3
+1.9.0
 

0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch

@@ -1,7 +1,7 @@
-From a598e74ddc4b0c4716b57ed65e804e4db8941486 Mon Sep 17 00:00:00 2001
+From 51490b569b3c08672685eaf85431f7015f55b86d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:35:51 +0100
-Subject: [PATCH 052/112] 	* util/grub-mkrescue.c: Build fix for argp.h
+Subject: [PATCH 056/103] 	* util/grub-mkrescue.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 052/112] 	* util/grub-mkrescue.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 2605dda..8307e11 100644
+index f5472af..2e0bdfc 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -40,5 +40,5 @@ index 34e0b7a..e719839 100644
  #include <sys/types.h>
  #include <sys/wait.h>
 -- 
-1.8.5.3
+1.9.0
 

0057-add-grub_env_set_net_property-function.patch

@@ -1,7 +1,7 @@
-From eefe8e5ad98edc3adedf6432969574ab3b68e090 Mon Sep 17 00:00:00 2001
+From d2f5eb3848747a696b94baf9bbc525d93dc0a81c Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 4 Feb 2014 18:41:38 -0200
-Subject: [PATCH 053/112] add grub_env_set_net_property function
+Subject: [PATCH 057/103] add grub_env_set_net_property function
 
 * grub-core/net/bootp.c: Remove set_env_limn_ro.
 * grub-core/net/net.c: Add grub_env_set_net_property.
@@ -14,7 +14,7 @@ Subject: [PATCH 053/112] add grub_env_set_net_property function
  4 files changed, 66 insertions(+), 47 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 8307e11..675475c 100644
+index 2e0bdfc..f7338f4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,11 @@
@@ -195,5 +195,5 @@ index 0e0a605..538baa3 100644
  grub_net_poll_cards (unsigned time, int *stop_condition);
  
 -- 
-1.8.5.3
+1.9.0
 

0058-add-bootpath-parser-for-open-firmware.patch

@@ -1,7 +1,7 @@
-From 91824aaef6ac5080f6c5419f33fdcc8efe329ebc Mon Sep 17 00:00:00 2001
+From bec34a014c4bad329869b5316204cd07e53fd0ac Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 4 Feb 2014 19:00:55 -0200
-Subject: [PATCH 054/112] add bootpath parser for open firmware
+Subject: [PATCH 058/103] add bootpath parser for open firmware
 
 It enables net boot even when there is no bootp/dhcp server.
 
@@ -17,7 +17,7 @@ call it at grub_ieee1275_net_config_real.
  4 files changed, 125 insertions(+), 7 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 675475c..d026637 100644
+index f7338f4..5e8eded 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,18 @@
@@ -207,5 +207,5 @@ index dc54bea..8e42513 100644
  /* Maps a device alias to a pathname.  */
  extern grub_ieee1275_phandle_t EXPORT_VAR(grub_ieee1275_chosen);
 -- 
-1.8.5.3
+1.9.0
 

0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch

@@ -1,7 +1,7 @@
-From f8cb2c7aec369b3f12d2a05289b6f65716264079 Mon Sep 17 00:00:00 2001
+From 009445ef577c51c6b9041f5525d8138977bc24ef Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Thu, 20 Feb 2014 10:11:43 +0100
-Subject: [PATCH 055/112] 	* grub-core/disk/ahci.c: Ignore NPORTS field
+Subject: [PATCH 059/103] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  and rely on PI 	exclusively.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 055/112] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index d026637..b6bcfd0 100644
+index 5e8eded..19e13d8 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -36,5 +36,5 @@ index 5e4a639..89365cd 100644
    grub_dprintf ("ahci", "%d AHCI ports, PI = 0x%x\n", nports,
  		hba->ports_implemented);
 -- 
-1.8.5.3
+1.9.0
 

0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch

@@ -1,7 +1,7 @@
-From 454a98fa890038be4581226c28727481a5d174d6 Mon Sep 17 00:00:00 2001
+From 77a4d6620a9a9a9ef83fc746d14b330d842b7298 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:47:57 +0100
-Subject: [PATCH 056/112] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
+Subject: [PATCH 060/103] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  out 0xa0000-0x100000 	region.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 056/112] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  2 files changed, 37 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index b6bcfd0..6aa347b 100644
+index 19e13d8..6af559a 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -78,5 +78,5 @@ index 1197975..4d29f6b 100644
  
    return 0;
 -- 
-1.8.5.3
+1.9.0
 

0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch

@@ -1,7 +1,7 @@
-From 131dca6803c35679d8ff9bc60a96f3060f44fda9 Mon Sep 17 00:00:00 2001
+From e1c64869c163e44957cca04844753c1dae60ebad Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:48:57 +0100
-Subject: [PATCH 057/112] 	* grub-core/loader/i386/multiboot_mbi.c
+Subject: [PATCH 061/103] 	* grub-core/loader/i386/multiboot_mbi.c
  (grub_multiboot_make_mbi): Limit 	location to 640K.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 057/112] 	* grub-core/loader/i386/multiboot_mbi.c
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 6aa347b..74485f3 100644
+index 6af559a..8087595 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -38,5 +38,5 @@ index 7431aa4..f10c087 100644
  					  GRUB_RELOCATOR_PREFERENCE_NONE, 0);
    if (err)
 -- 
-1.8.5.3
+1.9.0
 

0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch

@@ -1,7 +1,7 @@
-From f523d8c3a8d328369672320dbd43c1bbffa119ab Mon Sep 17 00:00:00 2001
+From 710c688efe8b10b3e6b889158d80d11cca6655ec Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:50:47 +0100
-Subject: [PATCH 058/112] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
+Subject: [PATCH 062/103] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  [COREBOOT]: Ignore low 	tables for low memory calculations.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 058/112] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 74485f3..f827cde 100644
+index 8087595..76ae629 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -43,5 +43,5 @@ index bd8b429..a6be989 100644
  }
  
 -- 
-1.8.5.3
+1.9.0
 

0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch

@@ -1,7 +1,7 @@
-From 31373f6367113bff201df6d9f8fcf47119e4e961 Mon Sep 17 00:00:00 2001
+From 2fecc871c9094c82a78d057d340fb4d83b895cdb Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:07:11 +0100
-Subject: [PATCH 059/112] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
+Subject: [PATCH 063/103] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
  EISA memory map 	if E820 failed to return any regions.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 059/112] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
  2 files changed, 26 insertions(+), 19 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f827cde..a79fafb 100644
+index 76ae629..25ca7db 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -84,5 +84,5 @@ index 8009e83..f1375f3 100644
        grub_uint32_t eisa_mmap = grub_get_eisa_mmap ();
  
 -- 
-1.8.5.3
+1.9.0
 

0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch

@@ -1,7 +1,7 @@
-From 27c4fcc66ec41707cd67ed4d7d789d437c391d07 Mon Sep 17 00:00:00 2001
+From d69dfa96c2765e9759d99bc808566b46c599ede0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:50:05 +0100
-Subject: [PATCH 060/112] 	* include/grub/i386/openbsd_bootarg.h: Add
+Subject: [PATCH 064/103] 	* include/grub/i386/openbsd_bootarg.h: Add
  addr and frequency fields. 	* grub-core/loader/i386/bsd.c
  (grub_cmd_openbsd): Fill addr field.
 MIME-Version: 1.0
@@ -16,7 +16,7 @@ Content-Transfer-Encoding: 8bit
  3 files changed, 11 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index a79fafb..bd34ec4 100644
+index 25ca7db..1b17e1b 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
@@ -66,5 +66,5 @@ index 01ca486..9ebe6b4 100644
  
  struct grub_openbsd_bootarg_pcibios
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From ba24acd4e6ee6f96ded477a062213879e06bac19 Mon Sep 17 00:00:00 2001
+From 4d75121a7fa86a60b646c96e2d75caa0d70c408e 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 061/112] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 065/103] 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.
@@ -150,5 +150,5 @@ index 0000000..10d6658
 +  terminfo -g ${X}x${Y} ${TERMINAL}
 +EOF
 -- 
-1.8.5.3
+1.9.0
 

0066-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
-From 43043c52e35c5e10917680785ffa424dded3ee2b Mon Sep 17 00:00:00 2001
+From ae053ae71b4d7e3168f6d97398f0d137929fafd0 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 062/112] Add fw_path variable (revised)
+Subject: [PATCH 066/103] 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
@@ -77,5 +77,5 @@ index 3a926fc..6f4970f 100644
        prefix = grub_env_get ("prefix");
        if (prefix)
 -- 
-1.8.5.3
+1.9.0
 

0067-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
-From cfff39b9ce8df82b953b43fae15bbff32d3d0e86 Mon Sep 17 00:00:00 2001
+From f84fdfda066a9b46598847f7af0f02c97fb8cdc5 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 063/112] Add support for linuxefi
+Subject: [PATCH 067/103] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +
@@ -478,5 +478,5 @@ index da0ca3b..fc36bda 100644
  
  /* Boot parameters for Linux based on 2.6.12. This is used by the setup
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 8fbe65e81f9f2d1c8595174b52e9652fd9ba1f2f Mon Sep 17 00:00:00 2001
+From f606b7dfc35082809dd68dccf47d16db7d741085 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 064/112] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 068/103] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--
@@ -46,5 +46,5 @@ index 00d1931..ad34cc0 100644
    sed "s/^/$submenu_indentation/" << EOF
  }
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 5bea89dbabf74ecc9214fe007af2332badc8539a Mon Sep 17 00:00:00 2001
+From 87edbb7d2e669de75f05d28329f72464ce5d4ee3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 065/112] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 069/103] Don't allow insmod when secure boot is enabled.
 
 Hi,
 
@@ -113,5 +113,5 @@ index 9370fd5..a000c38 100644
  EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
  					     const grub_efi_device_path_t *dp2);
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 6e8b72a26bc7a42903b6c75b131981ceac59f6ef Mon Sep 17 00:00:00 2001
+From 438e7306ea31c03ee86c4cdf97b2802443e5e4dd Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 066/112] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 070/103] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---
@@ -179,5 +179,5 @@ index afd5513..8f01c1b 100644
        case '$':
  	if (escaped)
 -- 
-1.8.5.3
+1.9.0
 

0071-Fix-crash-on-http.patch

@@ -1,7 +1,7 @@
-From 811019810ebfa189f344c0b383edd2b1e1c2642e Mon Sep 17 00:00:00 2001
+From 0a40f0fc38bf46df57c411b673299c20120cf9b2 Mon Sep 17 00:00:00 2001
 From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
 Date: Tue, 25 Sep 2012 18:40:55 -0400
-Subject: [PATCH 067/112] Fix crash on http
+Subject: [PATCH 071/103] Fix crash on http
 
 Don't free file->data on receiving FIN flag since it is used all over without
 checking. http_close() will be called later to free that memory.
@@ -24,5 +24,5 @@ index 4684f8b..ef9538c 100644
    if (!data->sock)
      {
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 63142e7aa720617eb8bbf36d6b6eb78b78337332 Mon Sep 17 00:00:00 2001
+From 751b9439b85ba9f6a6da7b08bc261fcf68f6ea94 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 068/112] IBM client architecture (CAS) reboot support
+Subject: [PATCH 072/103] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -170,5 +170,5 @@ index 8e42513..9f26c69 100644
  #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
  
 -- 
-1.8.5.3
+1.9.0
 

0073-Add-vlan-tag-support.patch

@@ -1,7 +1,7 @@
-From 6ab7728e1097f9f6968627b26c61c08af1b2643c Mon Sep 17 00:00:00 2001
+From e6fbb3e8b50fb1e41f1466d2ef11c88868702f49 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 069/112] Add vlan-tag support
+Subject: [PATCH 073/103] Add vlan-tag support
 
 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
@@ -182,5 +182,5 @@ index 538baa3..a799e6b 100644
 +
  #endif /* ! GRUB_NET_HEADER */
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 2f091e824e81e17008f0ba6bf36ac659e82df371 Mon Sep 17 00:00:00 2001
+From 6831a99c8594a644adb7da3fe8191c01b42f1912 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 070/112] Add %X option to printf functions.
+Subject: [PATCH 074/103] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--
@@ -54,5 +54,5 @@ index 54db2e1..50f7f53 100644
  	case 'd':
  	  {
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,21 +1,56 @@
-From 018833135590fe2791e44e4f3248f6d2908d0793 Mon Sep 17 00:00:00 2001
+From 3eb31d2652b19eb38b2a01bdc83540cbd67d96be 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 071/112] DHCP client ID and UUID options added.
+Subject: [PATCH 075/103] DHCP client ID and UUID options added.
 
 ---
- grub-core/net/bootp.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------
+ grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
  include/grub/net.h    |  2 ++
- 2 files changed, 46 insertions(+), 8 deletions(-)
+ 2 files changed, 81 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 6310ed4..420ec8a 100644
+index 6310ed4..88f2056 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
-@@ -25,6 +25,14 @@
+@@ -25,6 +25,49 @@
  #include <grub/net/udp.h>
  #include <grub/datetime.h>
  
++static char *
++grub_env_write_readonly (struct grub_env_var *var __attribute__ ((unused)),
++			 const char *val __attribute__ ((unused)))
++{
++  return NULL;
++}
++
++static void
++set_env_limn_ro (const char *intername, const char *suffix,
++		 const char *value, grub_size_t len)
++{
++  char *varname, *varvalue;
++  char *ptr;
++  varname = grub_xasprintf ("net_%s_%s", intername, suffix);
++  if (!varname)
++    return;
++  for (ptr = varname; *ptr; ptr++)
++    if (*ptr == ':')
++      *ptr = '_';
++  varvalue = grub_malloc (len + 1);
++  if (!varvalue)
++    {
++      grub_free (varname);
++      return;
++    }
++
++  grub_memcpy (varvalue, value, len);
++  varvalue[len] = 0;
++  grub_env_set (varname, varvalue);
++  grub_register_variable_hook (varname, 0, grub_env_write_readonly);
++  grub_env_export (varname);
++  grub_free (varname);
++  grub_free (varvalue);
++}
++
 +static char
 +hexdigit (grub_uint8_t val)
 +{
@@ -27,7 +62,7 @@ index 6310ed4..420ec8a 100644
  static void
  parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
  {
-@@ -55,6 +63,9 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+@@ -55,6 +98,9 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
  
        taglength = *ptr++;
  
@@ -37,12 +72,12 @@ index 6310ed4..420ec8a 100644
        switch (tagtype)
  	{
  	case GRUB_NET_BOOTP_NETMASK:
-@@ -120,6 +131,39 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
+@@ -120,6 +166,39 @@ parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
                                       taglength);
            break;
  
 +        case GRUB_NET_BOOTP_CLIENT_ID:
-+	  grub_env_set_net_property (name, "clientid", (char *) ptr, taglength);
++	  set_env_limn_ro (name, "clientid", (char *) ptr, taglength);
 +          break;
 +
 +        case GRUB_NET_BOOTP_CLIENT_UUID:
@@ -70,14 +105,14 @@ index 6310ed4..420ec8a 100644
 +                    }
 +                }
 +
-+              grub_env_set_net_property (name, "clientuuid", (char *) val, 2 * taglength + 4);
++              set_env_limn_ro (name, "clientuuid", (char *) val, 2 * taglength + 4);
 +            }
 +          break;
 +
  	  /* If you need any other options please contact GRUB
  	     development team.  */
  	}
-@@ -288,14 +332,6 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
+@@ -288,14 +367,6 @@ grub_net_process_dhcp (struct grub_net_buff *nb,
      }
  }
  
@@ -106,5 +141,5 @@ index a799e6b..59e5975 100644
    };
  
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From ff234fd6fe2cdc8514c16ee786d7b66bed123371 Mon Sep 17 00:00:00 2001
+From 430bea1ee5b48877f8ffd461b4a0c6e147a3c24e 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 072/112] Search for specific config file for netboot
+Subject: [PATCH 076/103] 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:
@@ -199,5 +199,5 @@ index 59e5975..88fc71c 100644
 +
  #endif /* ! GRUB_NET_HEADER */
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From af6d85a2f3a57b142e1f746e132a5a786d3d7a2b Mon Sep 17 00:00:00 2001
+From 8721b76fad30cce6f152f119a031422acd6ae13a 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 073/112] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 077/103] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -247,5 +247,5 @@ index 0000000..4274aca
 +  grub_unregister_extcmd (cmd);
 +}
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From b1a735a85211fb6485df569c68ccbff0d802f419 Mon Sep 17 00:00:00 2001
+From 35cc854569fc68a336072775fc7e3dc7debc99bc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 074/112] Move bash completion script (#922997)
+Subject: [PATCH 078/103] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---
@@ -22,5 +22,5 @@ index 136287c..0bcdb06 100644
  
  $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 5e088d722e5429cfa240d892651a5e2b10a21ed8 Mon Sep 17 00:00:00 2001
+From 9364753f4e7eaa65dceadba5652ddd2becabce0a 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 075/112] for ppc, reset console display attr when clear screen
+Subject: [PATCH 079/103] for ppc, reset console display attr when clear screen
 
 This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519
@@ -23,5 +23,5 @@ index f0d3e3d..7cb7909 100644
        data->reverse_video_off = grub_strdup ("\e[m");
        if (grub_strcmp ("ieee1275", str) == 0)
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From c363af23257c228d2380b4ddcc10bcd9081ebae7 Mon Sep 17 00:00:00 2001
+From 56d9ef35cfe88fdfc82f8b16908e839d62801b38 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 076/112] Don't write messages to the screen
+Subject: [PATCH 080/103] 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
@@ -154,5 +154,5 @@ index ad34cc0..e762e1f 100644
  EOF
      fi
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 13d4be835d61ce8deba306472ad26a8fe04fce79 Mon Sep 17 00:00:00 2001
+From c3cb9d2a7a43ef15f361e142be2a1abaa4067655 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 077/112] Don't print GNU GRUB header
+Subject: [PATCH 081/103] Don't print GNU GRUB header
 
 No one cares.
 ---
@@ -29,5 +29,5 @@ index 85d2a28..3777cd2 100644
  
  static void
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 01cd2e5801596931a09a3c4b6759915f7b04c08a Mon Sep 17 00:00:00 2001
+From 6a89fe8eff74f03b19a850e260c971b9ac3129ca 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 078/112] Don't add '*' to highlighted row
+Subject: [PATCH 082/103] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -22,5 +22,5 @@ index 2ff2941..daf92b5 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From ad87f63c1936729ae09871cfed7a5900cdabe626 Mon Sep 17 00:00:00 2001
+From ceaa93bab3ce4b8ed8ac4448e39bbf017749a757 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 079/112] Don't add '*' to highlighted row
+Subject: [PATCH 083/103] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -22,5 +22,5 @@ index daf92b5..2f84fcc 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-1.8.5.3
+1.9.0
 

0084-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
-From a235208d5de23499f7d6e801116fceea170ccd08 Mon Sep 17 00:00:00 2001
+From db36eff4717d7a05a9c17dabbf46ebf6a30d056b 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 080/112] Message string cleanups
+Subject: [PATCH 084/103] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---
@@ -67,5 +67,5 @@ index 2f84fcc..9d20c6b 100644
      {
        grub_print_error ();
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 8f07fb007025c69cb13fa0a9f3c74c89bd85e75a Mon Sep 17 00:00:00 2001
+From 7c1b0d6c8c79bfb55fcc9f81c4db225e63ba57a9 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 081/112] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 085/103] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---
@@ -28,5 +28,5 @@ index 9d20c6b..aa3454f 100644
    geo->timeout_lines = 2;
  
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 1ec2c6847fcf55a2fce2f1fdef5d3f5b3e0d55d2 Mon Sep 17 00:00:00 2001
+From 7188fc2fc1cc381e3ad0ca765c205bdc9ce44b1a 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 082/112] Use the correct indentation for the term help text
+Subject: [PATCH 086/103] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---
@@ -24,5 +24,5 @@ index 3777cd2..0da2a52 100644
        grub_print_message_indented (msg_formatted, 0, 0, term);
      grub_putcode ('\n', term);
 -- 
-1.8.5.3
+1.9.0
 

0087-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
-From ed8061445a585b697a74946d9b6e7d3dcd611824 Mon Sep 17 00:00:00 2001
+From 90dbb7aaa066c84e514af72530018ec71735c9d7 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 083/112] Indent menu entries
+Subject: [PATCH 087/103] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-
@@ -22,5 +22,5 @@ index aa3454f..01b6f1c 100644
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
 -- 
-1.8.5.3
+1.9.0
 

0088-Fix-margins.patch

@@ -1,7 +1,7 @@
-From 0bbd90ced7f33ffd5d8de3c552a2bd4c513f5024 Mon Sep 17 00:00:00 2001
+From 69d78859f1c3d2841a2519dddabcb656b0d61ad7 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 084/112] Fix margins
+Subject: [PATCH 088/103] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----
@@ -33,5 +33,5 @@ index 01b6f1c..ead3391 100644
      - geo->timeout_lines /* timeout */
      - 1 /* empty final line  */;
 -- 
-1.8.5.3
+1.9.0
 

0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -1,7 +1,7 @@
-From 04f3190eefe364984e6f46cb22e1852baf6a2b52 Mon Sep 17 00:00:00 2001
+From 57af230410edac066aa54ee1d008ead9e0405039 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 085/112] Add support for UEFI operating systems returned by
+Subject: [PATCH 089/103] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:
@@ -47,5 +47,5 @@ index 7cf8487..390bb0e 100644
    esac
  done
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 177a0a8aa023838195f34802125707428042a159 Mon Sep 17 00:00:00 2001
+From bd0e85e1590dec600e0a46fca6f88fa32d38701f 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 086/112] Disable GRUB video support for IBM power machines
+Subject: [PATCH 090/103] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -61,5 +61,5 @@ index 6a21f5d..663935d 100644
  
  extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 5155dc7742218bf40ec1c28430af4a8758dc101e Mon Sep 17 00:00:00 2001
+From dc24706a6f889f3562f642ab5c6a19fe0eeb49b5 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 087/112] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 091/103] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -23,5 +23,5 @@ index ead3391..bc1fc71 100644
    geo->first_entry_y = 3; /* three empty lines*/
  
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 30e29a3cad6153c188d809bdf5f939bbaf5f0941 Mon Sep 17 00:00:00 2001
+From e3c0c4cdf83eb8269984e3d33ce47e604247913e Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 088/112] Use linux16 when appropriate (#880840)
+Subject: [PATCH 092/103] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.
@@ -48,5 +48,5 @@ index e762e1f..600bfd2 100644
      fi
    fi
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 0fde3057b8c44516559de63a36fd0d4243988c13 Mon Sep 17 00:00:00 2001
+From 281b3060d667e35b84850b8943f2dd1b7c9d5e7c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 089/112] Enable pager by default. (#985860)
+Subject: [PATCH 093/103] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
@@ -22,5 +22,5 @@ index ce2ec81..fefa7dd 100644
    load_env
  fi
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From f6a7dbcc10c5d5268a0a72af27dc5bbcd2badec7 Mon Sep 17 00:00:00 2001
+From d550d551e833d56ffbf08166e12aa6c8a97b38fc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 090/112] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 094/103] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -23,5 +23,5 @@ index bc1fc71..6202c2a 100644
  					       STANDARD_MARGIN, STANDARD_MARGIN,
  					       term, dry_run);
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From b2a9d95e5e1ecaf5eb2814c6f35c26f432c4c810 Mon Sep 17 00:00:00 2001
+From 931f63ee792555882837c1287a361223d603d37c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 091/112] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 095/103] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
@@ -41,5 +41,5 @@ index a608435..79d4e38 100644
  fi
  
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 66fe0163ad12914729e064ec92364a1f0fb6a016 Mon Sep 17 00:00:00 2001
+From 9fd85bc9025a32e053b752c8de04e1ba48e83951 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 092/112] Don't draw a border around the menu
+Subject: [PATCH 096/103] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---
@@ -70,5 +70,5 @@ index 6202c2a..beddd7f 100644
    grub_term_highlight_color = old_color_highlight;
    geo->timeout_y = geo->first_entry_y + geo->num_entries
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 2941e05b1a087aa449373086d3d5518bb2d5fa9a Mon Sep 17 00:00:00 2001
+From 903bf51c8b9ca237e135d20a80ed7783584b3d8b 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 093/112] Use the standard margin for the timeout string
+Subject: [PATCH 097/103] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---
@@ -39,5 +39,5 @@ index beddd7f..33b208b 100644
      }
  
 -- 
-1.8.5.3
+1.9.0
 

0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch

@@ -1,7 +1,7 @@
-From 236f9489de02fc6d1c64cc428d78b55b269ec7c2 Mon Sep 17 00:00:00 2001
+From b45d96d3c8877f1194728152e8a23c3a85245ac6 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jan 2014 09:36:24 -0500
-Subject: [PATCH 094/112] Fix grub_script_execute_sourcecode() usage on ppc.
+Subject: [PATCH 098/103] Fix grub_script_execute_sourcecode() usage on ppc.
 
 593e430c made it not take the extra argc/argv that this code still
 passes it.
@@ -25,5 +25,5 @@ index 0da2a52..f66c03c 100644
          }
        grub_free (script);
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,7 +1,7 @@
-From 7f1cf8a3e6ba5c6eb64f8c3ef5a3b2274c53b5b5 Mon Sep 17 00:00:00 2001
+From 648dcde61e116b808c81a54f312de88a8ae2a672 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 095/112] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 099/103] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-
@@ -21,5 +21,5 @@ index e4c301f..6f836d8 100644
  CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
  LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
 -- 
-1.8.5.3
+1.9.0
 

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

@@ -1,31 +0,0 @@
-From 620f2b6d613c1a1c176a24d338ebb112e9db0c1d Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 11 Feb 2014 11:14:50 -0500
-Subject: [PATCH 099/112] 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.
-
-Resolves: rhbz#1030176
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- util/grub.d/10_linux.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index acf2e0e..136abd7 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
- export TEXTDOMAIN=@PACKAGE@
- export TEXTDOMAINDIR="@localedir@"
- 
--CLASS="--class gnu-linux --class gnu --class os"
-+CLASS="--class gnu-linux --class gnu --class os --unrestricted"
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-   OS="$(sed 's, release .*$,,g' /etc/system-release)"
--- 
-1.8.5.3
-