Reconcile with upstream once again.

Also include some minor fixes for gcc 5.1.1

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/152] fix EFI detection on Windows
+Subject: [PATCH 001/506] 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
 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/152] 	* grub-core/kern/arm/cache_armv6.S: Remove
+Subject: [PATCH 002/506] 	* 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
@@ -39,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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 8ebe593c564edc8ae62086df8a1448e898ef259b Mon Sep 17 00:00:00 2001
+From 51f941a0d871fe9af20d57574272e62d52b3375c Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 27 Dec 2013 03:03:32 +0000
-Subject: [PATCH 003/152] * INSTALL (Cross-compiling the GRUB): Fix some
+Subject: [PATCH 003/506] * INSTALL (Cross-compiling the GRUB): Fix some
  spelling mistakes. * docs/grub.texi (Getting the source code): Likewise.
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 003/152] * INSTALL (Cross-compiling the GRUB): Fix some
  3 files changed, 14 insertions(+), 9 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 153bc43..bbb0f31 100644
+index 21ec1c7..e61d48b 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -20,9 +20,9 @@ index 153bc43..bbb0f31 100644
 +	* 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>
+ 2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>
  
- 	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
+ 	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
 diff --git a/INSTALL b/INSTALL
 index afc957c..db12530 100644
 --- a/INSTALL
@@ -84,5 +84,5 @@ index c796850..7c6244c 100644
  
  Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From c0e2febef52139e0e580e52f553bf3aa521e390c Mon Sep 17 00:00:00 2001
+From 30a338460ad97c190502a1067979dac2fc548f16 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 27 Dec 2013 03:05:38 +0000
-Subject: [PATCH 004/152] * NEWS: First draft of 2.02 entry.
+Subject: [PATCH 004/506] * NEWS: First draft of 2.02 entry.
 
 ---
  ChangeLog |   4 +++
@@ -9,7 +9,7 @@ Subject: [PATCH 004/152] * NEWS: First draft of 2.02 entry.
  2 files changed, 123 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index bbb0f31..82dc61d 100644
+index e61d48b..53f0481 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -150,5 +150,5 @@ index 4bb5f98..577d9fd 100644
  
  * Appearance:
 -- 
-1.9.3
+2.4.3
 

0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch

@@ -1,43 +0,0 @@
-From 9ee79da5bf54babe11178ced48470b5f09d3dda3 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Fri, 27 Dec 2013 11:20:37 +0100
-Subject: [PATCH 005/152] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
-
-Conflicts:
-    ChangeLog
----
- ChangeLog | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 82dc61d..da3c2df 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+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.
-+
- 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
- 
- 	* NEWS: First draft of 2.02 entry.
-@@ -7,13 +14,6 @@
- 	* 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.
--
--	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.
--
- 2013-12-25  Andrey Borzenkov <arvidjaar@gmail.com>
- 
- 	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
--- 
-1.9.3
-

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

@@ -1,7 +1,7 @@
-From 94763697f5f33614b7bd6da91707a27b6872b750 Mon Sep 17 00:00:00 2001
+From 8442d3e956fa3775419b0b3ce65f4289875e7ecf Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Sat, 28 Dec 2013 02:20:27 +0000
-Subject: [PATCH 006/152] * NEWS: The cmosclean command in fact dates back to
+Subject: [PATCH 005/506] * NEWS: The cmosclean command in fact dates back to
  1.99.  Remove mention of it from 2.02.
 
 ---
@@ -37,5 +37,5 @@ index 577d9fd..b74c05f 100644
      coreboot.
    * Improve opcode parsing in ACPI halt implementation.
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 904bd6b3cb12977def4f940e90aca3fe557c3bb5 Mon Sep 17 00:00:00 2001
+From 989af025829b20a19f4d3ee01e86f4ee9de7cf1e Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 28 Dec 2013 09:01:20 +0400
-Subject: [PATCH 007/152] remove unused error.h from kern/emu/misc.c
+Subject: [PATCH 006/506] remove unused error.h from kern/emu/misc.c
 
 Fixes compilation on mingw32, where include is apparently missing.
 ---
@@ -35,5 +35,5 @@ index 43471b4..bb606da 100644
  #include <stdlib.h>
  #include <stdint.h>
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 23cd074c57ee6f35776fd5122a050bcef6c9eef5 Mon Sep 17 00:00:00 2001
+From 093dec7370650ecfa9b770210e21b8d6b03f1df3 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 28 Dec 2013 17:25:14 +0100
-Subject: [PATCH 008/152] 	Don't abort() on unavailable coreboot tables
+Subject: [PATCH 007/506] 	Don't abort() on unavailable coreboot tables
  if not running on coreboot.
 
 ---
@@ -66,5 +66,5 @@ index 6b150b4..3314f02 100644
    grub_video_coreboot_fb_late_init ();
  
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3eff91e86e4df2cf8a5e1b26f98e96bf4731f526 Mon Sep 17 00:00:00 2001
+From 0e309454f6f184c3704d7b78687e314f14a07b3c Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 30 Dec 2013 06:49:15 +0100
-Subject: [PATCH 009/152] 	* NEWS: Add few missing entries. Correct
+Subject: [PATCH 008/506] 	* NEWS: Add few missing entries. Correct
  existing ones.
 
 ---
@@ -117,5 +117,5 @@ index b74c05f..49a2459 100644
    * HFS string is now treated like mac-roman and not UTF-8
    * HFS mtime support.
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 9e9507d2e1eaed4fc2ebe2959c5405687485f613 Mon Sep 17 00:00:00 2001
+From 668add258ff7ffcfdc2c501fe5eb32e53c69b6f4 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Mon, 30 Dec 2013 12:56:19 +0000
-Subject: [PATCH 010/152] strip .eh_frame section from arm64-efi kernel
+Subject: [PATCH 009/506] strip .eh_frame section from arm64-efi kernel
 
 Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
 ---
@@ -35,5 +35,5 @@ index c916246..42443bc 100644
    i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
    i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x9000';
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 7e782c6996ee433c94fb378cbc8db0fa0f663c84 Mon Sep 17 00:00:00 2001
+From c9e839e2caaf278491f99e7d181cf20dcf5f0b75 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 10:38:54 +0400
-Subject: [PATCH 011/152] use {grub,boot}aa64.efi for boot images on AArch64
+Subject: [PATCH 010/506] 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From afda7f47601f36a98074d8d21ffb640256f02267 Mon Sep 17 00:00:00 2001
+From 94cee4a4c201bb506377b2c26e072eee8cb19d6f Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 18:43:02 +0400
-Subject: [PATCH 012/152] fix 32 bit compilation on MinGW-w64
+Subject: [PATCH 011/506] 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
@@ -41,5 +41,5 @@ index 36615b2..79efcfa 100644
  #endif
  
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 9981c4e3f366b4795655368a78baa058b18711c6 Mon Sep 17 00:00:00 2001
+From e7cfa8d5e1c6d54d40731065e535889b2e8bc9a2 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 20:34:25 +0400
-Subject: [PATCH 013/152] Change grub-mkrescue to use bootaa64.efi too
+Subject: [PATCH 012/506] Change grub-mkrescue to use bootaa64.efi too
 
 Also add ChangeLog entry for previous change.
 ---
@@ -40,5 +40,5 @@ index 317879d..0d03e55 100644
  			     imgname);
        free (imgname);
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From f493e0d352e1e8ff8cbafee69878d00487a04808 Mon Sep 17 00:00:00 2001
+From 4d21c1019904598a991e847eef049c65f9c49bd9 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 014/152] arm64: set correct length of device path end entry
+Subject: [PATCH 013/506] 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
@@ -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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 1c0db34a9597ecccb3ad4899892fb6ff6e22304d Mon Sep 17 00:00:00 2001
+From ccd21a65ed5ebce27b1e78b56208169fbf30351e Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Wed, 8 Jan 2014 11:05:20 +0000
-Subject: [PATCH 015/152] * Makefile.util.def (grub-macbless): Change
+Subject: [PATCH 014/506] * Makefile.util.def (grub-macbless): Change
  mansection to 8.
 
 ---
@@ -35,5 +35,5 @@ index 985e76c..3c99be2 100644
    common = grub-core/osdep/init.c;
    common = grub-core/kern/emu/argp_common.c;
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3aea6cc46177a90056ba60381e6387377fe40c99 Mon Sep 17 00:00:00 2001
+From 0776112c5311196889a15058a3b1be4c81ba5e05 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sun, 12 Jan 2014 15:29:21 +0400
-Subject: [PATCH 016/152] add part_apple to EFI rescue image to fix missing
+Subject: [PATCH 015/506] 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From a433d177585c8355c6ede67469a521d05cf1e9d7 Mon Sep 17 00:00:00 2001
+From 09a836e59c1103ed9aa238dcd526da670c9b0d90 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:30:52 +0000
-Subject: [PATCH 017/152] freebsd/hostdisk.c is only ever compiled on FreeBSD
+Subject: [PATCH 016/506] freebsd/hostdisk.c is only ever compiled on FreeBSD
 
 * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
 redundant preprocessor conditional.
@@ -44,5 +44,5 @@ index bd5fddb..eb202dc 100644
    return ret;
  }
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 4ec08b960f6de1190dea9fe7e6ab3b4b249840e5 Mon Sep 17 00:00:00 2001
+From ff66b8e7d8397c40bdd57ada31665b605c20c565 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 15:24:50 +0000
-Subject: [PATCH 018/152] Prefer more portable test(1) constructs
+Subject: [PATCH 017/506] Prefer more portable test(1) constructs
 
 * util/grub.d/00_header.in (make_timeout): Use && rather than test
 -a.
@@ -105,5 +105,5 @@ index 0470e66..7cf8487 100644
      continue
    fi
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From e18da008f74a3c5f27a191e4f7be80c02a49f2fe Mon Sep 17 00:00:00 2001
+From 5acc8020b46605703a59915d4166520788dfdf00 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:31:10 +0100
-Subject: [PATCH 019/152] 	* NEWS: Add few missing entries.
+Subject: [PATCH 018/506] 	* NEWS: Add few missing entries.
 
 ---
  ChangeLog |  4 ++++
@@ -96,5 +96,5 @@ index 49a2459..a61df94 100644
      improvements to the build system.
    * Remove variable length arrays.
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 29c96f00677e1dd2a9df4de645a7f5fab7b736a1 Mon Sep 17 00:00:00 2001
+From 7e7293d745ef7c0a13d8cbf12f474843edfdd0ab Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:41:47 +0100
-Subject: [PATCH 020/152] 	* grub-core/kern/efi/efi.c: Ensure that the
+Subject: [PATCH 019/506] 	* grub-core/kern/efi/efi.c: Ensure that the
  result starts with / 	and has no //.
 
 ---
@@ -86,5 +86,5 @@ index b253141..b9eb1ab 100644
    return name;
  }
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From fa9e3a9aa30988c2339e9d05c81b5d91534f4049 Mon Sep 17 00:00:00 2001
+From ae80f312700c72fcb0222a7865ea69f37517a313 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:43:29 +0100
-Subject: [PATCH 021/152] 	* util/grub-mount.c: Extend GCC warning
+Subject: [PATCH 020/506] 	* util/grub-mount.c: Extend GCC warning
  workaround to grub-mount.
 
 ---
@@ -43,5 +43,5 @@ index 118881e..19de2e6 100644
  static const char *root = NULL;
  grub_device_t dev = NULL;
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3bea802b45b9c98f70753370522fa6e47ba8966b Mon Sep 17 00:00:00 2001
+From dcecae1a49996bbaefb4133a878215594eb5094a Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 19:50:54 +0400
-Subject: [PATCH 022/152] reintroduce BUILD_LDFLAGS for the cross-compile case
+Subject: [PATCH 021/506] 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
@@ -149,5 +149,5 @@ index 1b3142d..13b7979 100644
  
  # trigtables.c
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From ac660e42875162e599f50c085cb646c633cf376d Mon Sep 17 00:00:00 2001
+From 3abb9563712f73bc48a33d428a3ab4c756191904 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:57:35 +0100
-Subject: [PATCH 023/152] 	* grub-core/term/terminfo.c: Recognize keys
+Subject: [PATCH 022/506] 	* grub-core/term/terminfo.c: Recognize keys
  F1-F12.
 
 ---
@@ -151,5 +151,5 @@ index 3d48b19..f0d3e3d 100644
    }
  #undef CONTINUE_READ
 -- 
-1.9.3
+2.4.3
 

0023-Fix-ChangeLog-date.patch

@@ -1,7 +1,7 @@
-From 6e5cf6b00fa82e5a02135ea5e21230ee44c72087 Mon Sep 17 00:00:00 2001
+From 9b9c4686f07644eb9c4f4786ff121bb9e19e31cd Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:01:16 +0400
-Subject: [PATCH 024/152] Fix ChangeLog date
+Subject: [PATCH 023/506] Fix ChangeLog date
 
 ---
  ChangeLog | 2 +-
@@ -21,5 +21,5 @@ index bdfbf44..fcbf220 100644
  	* configure.ac: Add support for BUILD_LDFLAGS.
  	* Makefile.am: Use BUILD_LDFLAGS for build time programs here ...
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From bb3e1a1e8448f3ea9489b5ebfcec799196bc862f Mon Sep 17 00:00:00 2001
+From 5ef569df5b359048ee55c5000e2679855cb87e06 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:04:11 +0400
-Subject: [PATCH 025/152] Use _W64 to detect MinGW W64-32 instead of
+Subject: [PATCH 024/506] Use _W64 to detect MinGW W64-32 instead of
  _FILE_OFFSET_BITS
 
 In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
@@ -43,5 +43,5 @@ index 79efcfa..bf6451b 100644
  #define ftello ftello64
  #endif
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 5ac7afd762d11b4c91d5756222c3abf5862203de Mon Sep 17 00:00:00 2001
+From 1ecf96fcc4bd882381bf21a461a12baf3c5ecf77 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:41:24 +0400
-Subject: [PATCH 026/152] add BUILD_EXEEXT support to fix make clean on Windows
+Subject: [PATCH 025/506] add BUILD_EXEEXT support to fix make clean on Windows
 
 Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where
 appropriate.
@@ -170,5 +170,5 @@ index 13b7979..826b3dd 100644
  
  # XXX Use Automake's LEX & YACC support
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 09194ac15b3c348cbf147e8ea27b982b57a7a778 Mon Sep 17 00:00:00 2001
+From f371dd5da81701f7bc3d28c67cb4c2c289728691 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 21:22:57 +0400
-Subject: [PATCH 027/152] fix include loop on MinGW due to libintl.h pulling
+Subject: [PATCH 026/506] fix include loop on MinGW due to libintl.h pulling
  stdio.h
 
 In file included from ./include/grub/dl.h:23:0,
@@ -277,5 +277,5 @@ index d393da7..8cc331d 100644
  struct grub_procfs_entry
  {
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 9cbb9fc3d79e449affe7ed5e104aa828b72ad2cd Mon Sep 17 00:00:00 2001
+From 6c519b5c6c95a0d486c548157b2af3d4fb4e0bbe Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:26:40 +0100
-Subject: [PATCH 028/152] 	* grub-core/commands/macbless.c: Rename FILE
+Subject: [PATCH 027/506] 	* grub-core/commands/macbless.c: Rename FILE
  and DIR to avoid 	conflicts.
 
 	Reported by: Andrey Borzenkov.
@@ -57,5 +57,5 @@ index c521083..4724edd 100644
  
  static grub_err_t
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 6c3fa2da4fd22c3ebda0c6cf69f97d578c04e704 Mon Sep 17 00:00:00 2001
+From 6ba983559dcffa0fa69c7fc861b5a16b4877a92c Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sat, 18 Jan 2014 19:41:15 +0100
-Subject: [PATCH 029/152] 	* Makefile.util.def: Link grub-ofpathname with
+Subject: [PATCH 028/506] 	* Makefile.util.def: Link grub-ofpathname with
  zfs libs.
 
 ---
@@ -35,5 +35,5 @@ index 83df212..a286a89 100644
  
  program = {
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3f6bd432acbf2244e6f4b83dd3a259392b10afb6 Mon Sep 17 00:00:00 2001
+From 0b47c57ad62e314fac9c77cc17bdea032f945fca Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:43:19 +0100
-Subject: [PATCH 030/152] 	* Makefile.am (default_payload.elf): Add
+Subject: [PATCH 029/506] 	* Makefile.am (default_payload.elf): Add
  modules 	multiboot cbmemc linux16 gzio echo help.
 
 ---
@@ -38,5 +38,5 @@ index aa526f5..97c062d 100644
  
  windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From d0cf0d7dcd4813a168d2bd94ec77ee0ae8ff860e Mon Sep 17 00:00:00 2001
+From e0a850947f541e5078304699106f9f66a79e4151 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 22:48:04 +0400
-Subject: [PATCH 031/152] fix removal of {cpu,machine} links on mingw/msys
+Subject: [PATCH 030/506] 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.
@@ -51,5 +51,5 @@ index 32d5477..b2bb88d 100644
    [link_dir=yes
  else
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 221f6e1ac22f66881276d4cb012d588ecfb17e47 Mon Sep 17 00:00:00 2001
+From 41155a57223e346b990a3d1b6708fa85351ab256 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:54:09 +0100
-Subject: [PATCH 032/152] 	* grub-core/normal/main.c (read_config_file):
+Subject: [PATCH 031/506] 	* grub-core/normal/main.c (read_config_file):
  Buffer config file. 	Reduces boot time.
 
 ---
@@ -64,5 +64,5 @@ index c36663f..3a926fc 100644
    if (ctmp)
      old_file = grub_strdup (ctmp);
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From d353b169aa6b2a9cd03d0c2987da7da059aa6f99 Mon Sep 17 00:00:00 2001
+From b204b718cc00432f18be861b8bf4342e50feef90 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 20:02:51 +0100
-Subject: [PATCH 033/152] 	* util/grub-install.c: Fix a typo.
+Subject: [PATCH 032/506] 	* util/grub-install.c: Fix a typo.
 
 ---
  ChangeLog           | 4 ++++
@@ -36,5 +36,5 @@ index 4608b80..5903f34 100644
  
    if (disk_module && grub_strcmp (disk_module, "ata") == 0)
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 85cc4b1abfed85fd8504da4acc391d5936de2812 Mon Sep 17 00:00:00 2001
+From 015045471ed815fc45ba9fba52cb34582d129a96 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 23:15:40 +0400
-Subject: [PATCH 034/152] use MODULE_FILES for genemuinit* instead of MOD_FILES
+Subject: [PATCH 033/506] use MODULE_FILES for genemuinit* instead of MOD_FILES
 
 MinGW native nm does not support ELF binaries.
 ---
@@ -87,5 +87,5 @@ index 6b83f59..a99a15d 100644
    fi
  done
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 97fca4331e317b0491912c3cf3d02a9fac96c419 Mon Sep 17 00:00:00 2001
+From 049f63824c654ca10dc9073decc139ccd2f9a06b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:28:46 +0000
-Subject: [PATCH 035/152] Ignore EPERM when modifying kern.geom.debugflags
+Subject: [PATCH 034/506] 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,
@@ -54,5 +54,5 @@ index eb202dc..6145d07 100644
  
    ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 547d1e84df5d57c7600ead4556d43d5dbbe33c4b Mon Sep 17 00:00:00 2001
+From d99d2f84166b0f60673d5c0714605a153946c0fc 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 036/152] change stop condition to avoid infinite loops
+Subject: [PATCH 035/506] 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.
@@ -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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From d3652ff33623d842fc4422ffd98e4303795e9519 Mon Sep 17 00:00:00 2001
+From 6f65e36cc4f92fe40672181eccf12eac4afb6738 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 037/152] increase network try interval gradually
+Subject: [PATCH 036/506] increase network try interval gradually
 
 * grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
 interval gradually.
@@ -107,5 +107,5 @@ index de6259e..0e0a605 100644
  
  #endif /* ! GRUB_NET_HEADER */
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 90d83cda679fef485f7bb1a318bd682c4eb86cb4 Mon Sep 17 00:00:00 2001
+From 36387ece6be1b912c778d4a5f068801f99385fa2 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:29:33 +0400
-Subject: [PATCH 038/152] look for DejaVu also in /usr/share/fonts/truetype
+Subject: [PATCH 037/506] look for DejaVu also in /usr/share/fonts/truetype
 
 It is installed in this path on openSUSE.
 ---
@@ -35,5 +35,5 @@ index cf3de3b..120263e 100644
            DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
            break 2
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3e02e2fbd2089645ac2c482dad59318394b62252 Mon Sep 17 00:00:00 2001
+From 443b3222621b6df1e5e01bd6fb2c496568065f92 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:41:11 +0400
-Subject: [PATCH 039/152] Show detected path to DejaVuSans in configure summary
+Subject: [PATCH 038/506] Show detected path to DejaVuSans in configure summary
 
 ---
  ChangeLog    | 1 +
@@ -33,5 +33,5 @@ index 120263e..8888c2f 100644
  echo starfield theme: No "($starfield_excuse)"
  fi
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 6e9483ee94033f4bb7b9a17bd032c4af4479abc0 Mon Sep 17 00:00:00 2001
+From eec4237a3265b024cc97d3cd287bdea7cd187f48 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 20:54:09 +0400
-Subject: [PATCH 040/152] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
+Subject: [PATCH 039/506] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
  files
 
 Not all toolkits provide static libraries. This patch enables creation of self
@@ -58,5 +58,5 @@ index 97c062d..f02ae0a 100644
  
  EXTRA_DIST += linguas.sh
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 100e7015f7dcf2cee0c4ddbbd7498a67bac695d0 Mon Sep 17 00:00:00 2001
+From d08059309f83388312b7f3e533f4b70d803f7bda Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 23 Jan 2014 12:05:36 +0000
-Subject: [PATCH 041/152] * util/grub-install.c (write_to_disk): Add an info
+Subject: [PATCH 040/506] * util/grub-install.c (write_to_disk): Add an info
  message.
 
 ---
@@ -34,5 +34,5 @@ index 5903f34..787dc90 100644
  			 core_size, core_img);
    free (core_img);
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From d25ddbcafa537525f606938df0e500c50a5e93e1 Mon Sep 17 00:00:00 2001
+From 95cd131ea0085ce16a4f2bfabc22d83548fc85cf Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:09:25 +0100
-Subject: [PATCH 042/152] 	* util/grub-install.c: List available targets.
+Subject: [PATCH 041/506] 	* util/grub-install.c: List available targets.
 
 ---
  ChangeLog                   |  4 ++++
@@ -105,5 +105,5 @@ index 787dc90..2e6226a 100644
        return xasprintf (text, program_name, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
      default:
 -- 
-1.9.3
+2.4.3
 

0042-Fix-several-translatable-strings.patch

@@ -1,7 +1,7 @@
-From 2cd73ec6b2efeaff2bdcd40cce0cd3145d9e07d0 Mon Sep 17 00:00:00 2001
+From 61c8482b2097dfc08d76c36a1087bc3d243f4db1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:20:27 +0100
-Subject: [PATCH 043/152] 	Fix several translatable strings.
+Subject: [PATCH 042/506] 	Fix several translatable strings.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 2b2a550c14e70d17af4140e64d08022ed170f0c8 Mon Sep 17 00:00:00 2001
+From 1440b7ebae47e1cb710e920bec9d88c4d75ff432 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 19:54:51 +0400
-Subject: [PATCH 044/152] do not set default prefix in grub-mkimage
+Subject: [PATCH 043/506] 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.
@@ -71,5 +71,5 @@ index a2bd4c1..1e0bcf1 100644
  			       arguments.memdisk, arguments.pubkeys,
  			       arguments.npubkeys, arguments.config,
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 90efd351fa4f81df97473e1bb8c8234a801f8ebe Mon Sep 17 00:00:00 2001
+From 5ae584c0b0c64b445c0820037d74058595133af3 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 21:49:41 +0400
-Subject: [PATCH 045/152] fix Mingw W64-32 cross compile failure due to printf
+Subject: [PATCH 044/506] fix Mingw W64-32 cross compile failure due to printf
  redefinition in libintl.h
 
 In file included from util/misc.c:36:0:
@@ -104,5 +104,5 @@ index 63ebb90..2b3322d 100644
      f.close ()
      fw.close ()
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From c18e39b667adb11624f3f4162c1342b76712d655 Mon Sep 17 00:00:00 2001
+From 9afe2053c9b37820888bd5e77acd35c0eacf6699 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 26 Jan 2014 02:36:05 +0100
-Subject: [PATCH 046/152] 	* grub-core/term/serial.c
+Subject: [PATCH 045/506] 	* 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.
 
@@ -56,5 +56,5 @@ index b581a76..c9b5574 100644
      }
  
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From c889057e089d69bd187c8ba134c9669247744628 Mon Sep 17 00:00:00 2001
+From 35f2d96c0d68772c831952b2ee4eba6519d6ea1b Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sun, 26 Jan 2014 02:56:04 +0100
-Subject: [PATCH 047/152] 	grub-install: support for partitioned partx
+Subject: [PATCH 046/506] 	grub-install: support for partitioned partx
  loop devices.
 
 	* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
@@ -51,5 +51,5 @@ index 772de0a..19581d3 100644
  
    return path;
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 379cbd6233fe227544ff3073b60b295fe841b654 Mon Sep 17 00:00:00 2001
+From 7f64fb590cd80517e1381693a16d7cf2486fa808 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 26 Jan 2014 03:31:10 +0100
-Subject: [PATCH 048/152] 	* grub-core/term/at_keyboard.c: Tolerate
+Subject: [PATCH 047/506] 	* grub-core/term/at_keyboard.c: Tolerate
  missing keyboard.
 
 ---
@@ -36,5 +36,5 @@ index f5071ce..b4257e8 100644
      {
        e0_received = 1;
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 58ca3abc65a64d950d6da8b473e91f16d410f1ac Mon Sep 17 00:00:00 2001
+From ba584da163bc4dc2a36988ae327733ba10251143 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 049/152] .gitignore: add missing files and .exe variants.
+Subject: [PATCH 048/506] .gitignore: add missing files and .exe variants.
 
 ---
  .gitignore | 7 +++++++
@@ -48,7 +48,7 @@ index 2b0156a..18ab8e8 100644
  grub-core/gnulib/alloca.h
  grub-core/gnulib/arg-nonnull.h
 diff --git a/ChangeLog b/ChangeLog
-index d37d4a6..a49f5f1 100644
+index bbec1e7..b996df8 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -56,10 +56,10 @@ index d37d4a6..a49f5f1 100644
 +
 +	* .gitignore: add missing files and .exe variants.
 +
- 2014-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
+ 2014-01-26  Mike Gilbert <floppym@gentoo.org>
  
- 	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
+ 	grub-install: support for partitioned partx loop devices.
-@@ -1113,7 +1117,7 @@
+@@ -1109,7 +1113,7 @@
  
  2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
  
@@ -69,5 +69,5 @@ index d37d4a6..a49f5f1 100644
  
  2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,31 +1,29 @@
-From f21c40f33c95d908cee32a5063f285d22574a507 Mon Sep 17 00:00:00 2001
+From ba424f37a95cf3f9c9995e051383424e328d13f6 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:41:48 +0100
-Subject: [PATCH 050/152] 	* util/grub-mkfont.c: Downgrade warnings about
+Subject: [PATCH 049/506] 	* util/grub-mkfont.c: Downgrade warnings about
  unhandled features 	to debug.
 
 ---
- ChangeLog          |  9 +++++++++
+ ChangeLog          |  5 +++++
  util/grub-mkfont.c | 14 ++++++++------
- 2 files changed, 17 insertions(+), 6 deletions(-)
+ 2 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a49f5f1..9837c7f 100644
+index 5692a5b..ce0ea89 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,12 @@
+@@ -1,5 +1,10 @@
-+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+ 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.
+ 	* 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-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
 diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
 index 3cb02ad..3de07ee 100644
 --- a/util/grub-mkfont.c
@@ -73,5 +71,5 @@ index 3cb02ad..3de07ee 100644
  	    }
  	}
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 5795341bb64a4e101d7c067d688b19a41dd50662 Mon Sep 17 00:00:00 2001
+From 4686e163f278ae7cfaab3bebbde215f5688c7e3f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:43:25 +0100
-Subject: [PATCH 051/152] 	* grub-core/disk/ahci.c: Do not enable I/O
+Subject: [PATCH 050/506] 	* grub-core/disk/ahci.c: Do not enable I/O
  decoding and keep 	enabling busmaster for the end.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 051/152] 	* grub-core/disk/ahci.c: Do not enable I/O
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9837c7f..51eba95 100644
+index ce0ea89..8c37450 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -53,5 +53,5 @@ index 0b13fb8..18c1327 100644
      if (adevs[i])
        {
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 50cb0018044359180aa57e6aa7ec944def83bbcc Mon Sep 17 00:00:00 2001
+From 3142b2feacc45ae42f4d3e6891d233727da4c3e1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:45:18 +0100
-Subject: [PATCH 052/152] 	* grub-core/disk/ahci.c: Allocate and clean
+Subject: [PATCH 051/506] 	* 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 052/152] 	* grub-core/disk/ahci.c: Allocate and clean
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 51eba95..9bb1817 100644
+index 8c37450..b2b54b9 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3f00de9c207fb4b3f9e45fd775650404ce087aac Mon Sep 17 00:00:00 2001
+From 07ea8daa8606160a18778af9a806d61b884d8d73 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:46:17 +0100
-Subject: [PATCH 053/152] 	* grub-core/disk/ahci.c: Add safety cleanups.
+Subject: [PATCH 052/506] 	* grub-core/disk/ahci.c: Add safety cleanups.
 
 ---
  ChangeLog             |  4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 053/152] 	* grub-core/disk/ahci.c: Add safety cleanups.
  2 files changed, 14 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9bb1817..15300b0 100644
+index b2b54b9..148607f 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 5e8c619b17cdf70b30d37412738b149d80874c28 Mon Sep 17 00:00:00 2001
+From d6b94c5eb2a968ebb64f7937d244a267d56f10ab Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:49:51 +0100
-Subject: [PATCH 054/152] 	* grub-core/disk/ahci.c: Properly handle
+Subject: [PATCH 053/506] 	* grub-core/disk/ahci.c: Properly handle
  transactions with no 	transferred data.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 054/152] 	* grub-core/disk/ahci.c: Properly handle
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 15300b0..bc1ab23 100644
+index 148607f..1cd2b39 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 45dd39fb467d061a550113fd5e5431209f0db73c Mon Sep 17 00:00:00 2001
+From 9abbaae7cdc5ffba6065c089c9ebb076864d9bbd Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:50:49 +0100
-Subject: [PATCH 055/152] 	* grub-core/disk/ahci.c: Increase timeout.
+Subject: [PATCH 054/506] 	* 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 055/152] 	* grub-core/disk/ahci.c: Increase timeout.
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index bc1ab23..1a822f3 100644
+index 1cd2b39..cfa9c83 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -38,5 +38,5 @@ index fdd40c6..5e4a639 100644
      if (grub_get_time_ms () > endtime)
        {
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 767cf43a2e5c738df50155cc8729ad0f57d6ab47 Mon Sep 17 00:00:00 2001
+From 511ece7cebe261bcdd4a1d3f50ed9c05a234bcc6 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:34:27 +0100
-Subject: [PATCH 056/152] 	* util/grub-mkfont.c: Build fix for argp.h
+Subject: [PATCH 055/506] 	* util/grub-mkfont.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 056/152] 	* util/grub-mkfont.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1a822f3..f2bba84 100644
+index cfa9c83..7891088 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -38,5 +38,5 @@ index 3de07ee..e6485b4 100644
  #include <assert.h>
  
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 3365d3eb4062cee9581f3560ec3e93f8c8ababb2 Mon Sep 17 00:00:00 2001
+From 006c78f378629e83db718ce6e3f83d2f2c68ce7e Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:35:51 +0100
-Subject: [PATCH 057/152] 	* util/grub-mkrescue.c: Build fix for argp.h
+Subject: [PATCH 056/506] 	* util/grub-mkrescue.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 057/152] 	* util/grub-mkrescue.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index f2bba84..f4a4721 100644
+index 7891088..eb72cc3 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.9.3
+2.4.3
 

0057-add-grub_env_set_net_property-function.patch

@@ -1,7 +1,7 @@
-From 533058df7c164a4d3498dfaa626923904597f162 Mon Sep 17 00:00:00 2001
+From e4dbf247b656eb9577020af653ff37159fc340f2 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 058/152] add grub_env_set_net_property function
+Subject: [PATCH 057/506] 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 058/152] add grub_env_set_net_property function
  4 files changed, 66 insertions(+), 47 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f4a4721..63f5aa3 100644
+index eb72cc3..5af5748 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 1a768cc5a65094e19c216caf92dd190317df25fc Mon Sep 17 00:00:00 2001
+From 9585647a25b65f98db6bd22c569b34795512f046 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 059/152] add bootpath parser for open firmware
+Subject: [PATCH 058/506] 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 63f5aa3..5237631 100644
+index 5af5748..07caf46 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 7f4e3839c9b872f0981e1ecdecfa2bd91065f99c Mon Sep 17 00:00:00 2001
+From d0949e374731e3f36c279774cd08fadd6553dcee Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Thu, 20 Feb 2014 10:11:43 +0100
-Subject: [PATCH 060/152] 	* grub-core/disk/ahci.c: Ignore NPORTS field
+Subject: [PATCH 059/506] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  and rely on PI 	exclusively.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 060/152] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 5237631..be41aa5 100644
+index 07caf46..aec689d 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From c65d7e05498edecd560753768114b574f7c3543d Mon Sep 17 00:00:00 2001
+From f94b2b4eeb5ec804671d5a0efa4ce779c179b68f Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:47:57 +0100
-Subject: [PATCH 061/152] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
+Subject: [PATCH 060/506] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  out 0xa0000-0x100000 	region.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 061/152] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  2 files changed, 37 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index be41aa5..4f6f6d6 100644
+index aec689d..c2983f2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -78,5 +78,5 @@ index 1197975..4d29f6b 100644
  
    return 0;
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 4530afc725782bbb92d4681fc338acebc4604b45 Mon Sep 17 00:00:00 2001
+From 4a70fed815c12090c772ed911363520d0f02cf36 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:48:57 +0100
-Subject: [PATCH 062/152] 	* grub-core/loader/i386/multiboot_mbi.c
+Subject: [PATCH 061/506] 	* grub-core/loader/i386/multiboot_mbi.c
  (grub_multiboot_make_mbi): Limit 	location to 640K.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 062/152] 	* grub-core/loader/i386/multiboot_mbi.c
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 4f6f6d6..bbaed26 100644
+index c2983f2..feea178 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From e85cc7078e669509d3a22c4e76f94cdd53335fff Mon Sep 17 00:00:00 2001
+From dfc5ccfa97e15c8c83c98594570e4e07b3630877 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:50:47 +0100
-Subject: [PATCH 063/152] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
+Subject: [PATCH 062/506] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  [COREBOOT]: Ignore low 	tables for low memory calculations.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 063/152] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index bbaed26..6ed6cf4 100644
+index feea178..5edbf67 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -43,5 +43,5 @@ index bd8b429..a6be989 100644
  }
  
 -- 
-1.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 37e3b5e42930e8cd4e801e4203dc2fde335b4b10 Mon Sep 17 00:00:00 2001
+From bec35dad2a86b2412e9ce11d09f47f1d01ccc616 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:07:11 +0100
-Subject: [PATCH 064/152] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
+Subject: [PATCH 063/506] 	* 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 064/152] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
  2 files changed, 26 insertions(+), 19 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 6ed6cf4..97cf57e 100644
+index 5edbf67..2e98f39 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.9.3
+2.4.3
 

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

@@ -1,7 +1,7 @@
-From 1cdf2c717c0f4a2efac0e5dc8b5c564f930c537a Mon Sep 17 00:00:00 2001
+From 86402b4e0fec7d0e5637f70a3103a4d9c3f62839 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:50:05 +0100
-Subject: [PATCH 065/152] 	* include/grub/i386/openbsd_bootarg.h: Add
+Subject: [PATCH 064/506] 	* 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 97cf57e..f571f66 100644
+index 2e98f39..770269c 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
@@ -66,5 +66,5 @@ index 01ca486..9ebe6b4 100644
  
  struct grub_openbsd_bootarg_pcibios
 -- 
-1.9.3
+2.4.3
 

0065-ieee1275-check-for-IBM-pseries-emulated-machine.patch

@@ -1,7 +1,7 @@
-From 2a20b05871d51635060ab58c1b63ac2ee9f8a359 Mon Sep 17 00:00:00 2001
+From e4a1fe391906bfcd1a778c5ec4e242c4b07d429d Mon Sep 17 00:00:00 2001
 From: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 Date: Thu, 20 Mar 2014 16:57:12 +0530
-Subject: [PATCH 066/152] ieee1275: check for IBM pseries emulated machine
+Subject: [PATCH 065/506] ieee1275: check for IBM pseries emulated machine
 
 is_qemu is not being set lead to disabling of feature like
 GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
@@ -29,5 +29,5 @@ index d92ae14..3e12e6b 100644
    if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
 -- 
-1.9.3
+2.4.3
 

0066-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch

@@ -1,7 +1,7 @@
-From 530b22a1c04a08fbdb4dcbc3d34bc610af17cc68 Mon Sep 17 00:00:00 2001
+From 68f17b2b300e4eaf9852c23d0b652d6e210ac180 Mon Sep 17 00:00:00 2001
 From: Fu Wei <fu.wei@linaro.org>
 Date: Wed, 26 Mar 2014 08:13:07 +0100
-Subject: [PATCH 067/152] 	* grub-core/loader/arm64/linux.c: Remove
+Subject: [PATCH 066/506] 	* grub-core/loader/arm64/linux.c: Remove
  redundant "0x".
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 067/152] 	* grub-core/loader/arm64/linux.c: Remove
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f571f66..091535b 100644
+index 770269c..44ce649 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index 65129c2..f1d10a1 100644
        }
  
 -- 
-1.9.3
+2.4.3
 

0067-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch

@@ -1,7 +1,7 @@
-From 5d1749ea5730be5c9c32228461b784317a500f4b Mon Sep 17 00:00:00 2001
+From 46b74dd3cbb3a97a7abeb7f0464de548006e0e3d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 26 Mar 2014 08:48:30 +0100
-Subject: [PATCH 068/152] 	* grub-core/lib/relocator.c: Fix the case when
+Subject: [PATCH 067/506] 	* grub-core/lib/relocator.c: Fix the case when
  end of leftover is used.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 068/152] 	* grub-core/lib/relocator.c: Fix the case when
  2 files changed, 6 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 091535b..9404eda 100644
+index 44ce649..b3f077a 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index 9f9770b..cb11ea5 100644
  			&= ((1 << (8 - (start % 8))) - 1);
  		      grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
 -- 
-1.9.3
+2.4.3
 

0068-Fix-grub-probe-0-option.patch

@@ -1,7 +1,7 @@
-From fdf24f98bc9e4632bfe7f280872cbbf40942ae7b Mon Sep 17 00:00:00 2001
+From 9b35fe819f642f9277534d97f73024eb6734057d Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 31 Mar 2014 13:51:17 +0100
-Subject: [PATCH 069/152] Fix grub-probe -0 option
+Subject: [PATCH 068/506] Fix grub-probe -0 option
 
 * util/grub-probe,c (options): Make -0 work again (broken by
 conversion to argp).
@@ -12,7 +12,7 @@ conversion to argp).
  2 files changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9404eda..efbed8c 100644
+index b3f077a..46a6561 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,9 @@
@@ -51,5 +51,5 @@ index 1f3b59f..80509be 100644
  
    /* Free resources.  */
 -- 
-1.9.3
+2.4.3
 

0069-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch

@@ -1,7 +1,7 @@
-From 0a65563c2b355c0eb7412b46f015556691f1b5d1 Mon Sep 17 00:00:00 2001
+From 24024dac7f51d3c0df8e1bec63c02d52828de534 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 31 Mar 2014 14:48:33 +0100
-Subject: [PATCH 070/152] Fix partmap, cryptodisk, and abstraction handling in
+Subject: [PATCH 069/506] Fix partmap, cryptodisk, and abstraction handling in
  grub-mkconfig.
 
 Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig
@@ -35,7 +35,7 @@ probe_abstraction): Use configured delimiter.  Update callers.
  7 files changed, 74 insertions(+), 41 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index efbed8c..1cb3b68 100644
+index 46a6561..d613bf6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,30 @@
@@ -362,5 +362,5 @@ index 80509be..ecb7b6b 100644
  	  continue;
  	}
 -- 
-1.9.3
+2.4.3
 

0070-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch

@@ -1,7 +1,7 @@
-From bd2125649cbeae60a5caff05d5a39c88a4e6eff6 Mon Sep 17 00:00:00 2001
+From 4afd0107efa6a2d9cbe6fc71c529264dc2b9fb8a Mon Sep 17 00:00:00 2001
 From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 Date: Mon, 31 Mar 2014 15:32:30 +0100
-Subject: [PATCH 071/152] btrfs: fix get_root key comparison failures due to
+Subject: [PATCH 070/506] btrfs: fix get_root key comparison failures due to
  endianness
 
 * grub-core/fs/btrfs.c (get_root): Convert
@@ -12,7 +12,7 @@ GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian.
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1cb3b68..accffad 100644
+index d613bf6..6eca73e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
@@ -40,5 +40,5 @@ index 89666b6..f7b6c15 100644
    key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM;
    err = lower_bound (data, &key_in, &key_out,
 -- 
-1.9.3
+2.4.3
 

0071-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch

@@ -1,7 +1,7 @@
-From c3d9e64a61d17e57ef941a6a46e5a148c51c8519 Mon Sep 17 00:00:00 2001
+From 9706066791b994a55fb2d3d532a86aa1fde2a457 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Thu, 3 Apr 2014 21:31:12 +0200
-Subject: [PATCH 072/152] * grub-core/osdep/linux/getroot.c
+Subject: [PATCH 071/506] * grub-core/osdep/linux/getroot.c
  (grub_util_part_to_disk): Support NVMe device names.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 072/152] * grub-core/osdep/linux/getroot.c
  2 files changed, 22 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index accffad..4a48409 100644
+index 6eca73e..20a3661 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -51,5 +51,5 @@ index 19581d3..7007193 100644
  
    return path;
 -- 
-1.9.3
+2.4.3
 

0072-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch

@@ -1,7 +1,7 @@
-From cb2cfc87fad111a539e9645f6a96d0a89a28c8ab Mon Sep 17 00:00:00 2001
+From 8063ce197f3196da077c667ba7a6a82173608fbb Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 4 Apr 2014 07:58:42 +0200
-Subject: [PATCH 073/152] Replace few instances of memcmp/memcpy in the code
+Subject: [PATCH 072/506] Replace few instances of memcmp/memcpy in the code
  that should be grub_memcmp/grub_memcpy.
 
 ---
@@ -13,7 +13,7 @@ Subject: [PATCH 073/152] Replace few instances of memcmp/memcpy in the code
  5 files changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 4a48409..f18cdba 100644
+index 20a3661..f633fae 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -98,5 +98,5 @@ index 19985f0..41ef910 100644
      else
        {
 -- 
-1.9.3
+2.4.3
 

0073-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch

@@ -1,7 +1,7 @@
-From 91152c6e2944e9ad3583482140f8991b972fec08 Mon Sep 17 00:00:00 2001
+From 6f6d4aa02cbc522fadbc8dc42a43dedfca40da0d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 4 Apr 2014 08:02:38 +0200
-Subject: [PATCH 074/152] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
+Subject: [PATCH 073/506] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
  They're no longer pulled from libgcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 074/152] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
  2 files changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f18cdba..90e41bd 100644
+index f633fae..094fbca 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -43,5 +43,5 @@ index fdc6611..97233d7 100644
  #ifdef HAVE__RESTGPR_14_X
  void EXPORT_FUNC (_restgpr_14_x) (void);
 -- 
-1.9.3
+2.4.3
 

0074-Add-missing-endif.patch

@@ -1,7 +1,7 @@
-From fb1b02802aa368f43c8d0a871e017c14cb39b180 Mon Sep 17 00:00:00 2001
+From 2009da62f2fa19634c4485edaccf9c88ab98b276 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 4 Apr 2014 08:11:15 +0200
-Subject: [PATCH 075/152] Add missing #endif
+Subject: [PATCH 074/506] Add missing #endif
 
 ---
  include/grub/libgcc.h | 1 +
@@ -20,5 +20,5 @@ index 97233d7..8e93b67 100644
  #ifdef HAVE__RESTGPR_14_X
  void EXPORT_FUNC (_restgpr_14_x) (void);
 -- 
-1.9.3
+2.4.3
 

0075-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch

@@ -1,7 +1,7 @@
-From fb62186fefaca6b302eb61081bb6281042ff7283 Mon Sep 17 00:00:00 2001
+From a72fc329ebd81c03d7a2e6ad422e573e5a4d3213 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 6 Apr 2014 00:44:44 +0200
-Subject: [PATCH 076/152] 	* grub-core/lib/syslinux_parse.c: Fix timeout
+Subject: [PATCH 075/506] 	* grub-core/lib/syslinux_parse.c: Fix timeout
  quoting.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 076/152] 	* grub-core/lib/syslinux_parse.c: Fix timeout
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 90e41bd..50d9291 100644
+index 094fbca..11de908 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -35,5 +35,5 @@ index 21fa175..6bc504b 100644
        if (err)
  	return err;
 -- 
-1.9.3
+2.4.3
 

0076-Improve-LVM-logical_volumes-string-matching.patch

@@ -1,7 +1,7 @@
-From d576e05a7bfe25413f70b54f671f305397bacf5e Mon Sep 17 00:00:00 2001
+From c4badfe8363cc41dbedfabaa238b6c8a884e03c8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 10 Apr 2014 14:42:41 +0100
-Subject: [PATCH 077/152] Improve LVM "logical_volumes" string matching
+Subject: [PATCH 076/506] Improve LVM "logical_volumes" string matching
 
 * grub-core/disk/lvm.c (grub_lvm_detect): Search for
 "logical_volumes" block a little more accurately.
@@ -11,7 +11,7 @@ Subject: [PATCH 077/152] Improve LVM "logical_volumes" string matching
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 50d9291..7f0c57d 100644
+index 11de908..c98e0df 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -41,5 +41,5 @@ index 483c17e..862a966 100644
  	  /* And add all the lvs to the volume group. */
  	  while (1)
 -- 
-1.9.3
+2.4.3
 

0077-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch

@@ -1,7 +1,7 @@
-From 0942ce33c5b88d85a6b81f4b3dd75c32fdf21978 Mon Sep 17 00:00:00 2001
+From 3a310e842fb7a9818c2e7cf0f4118f13660871d2 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 10 Apr 2014 16:54:33 +0100
-Subject: [PATCH 078/152] Tolerate devices with no filesystem UUID returned by
+Subject: [PATCH 077/506] Tolerate devices with no filesystem UUID returned by
  os-prober
 
 * util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
@@ -16,7 +16,7 @@ Fixes Ubuntu bug #1287436.
  2 files changed, 22 insertions(+), 10 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 7f0c57d..3556468 100644
+index c98e0df..30d0cac 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,14 @@
@@ -79,5 +79,5 @@ index 7cf8487..6f38c82 100644
      hurd)
        onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
 -- 
-1.9.3
+2.4.3
 

0078-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch

@@ -1,7 +1,7 @@
-From 42c1756fd0ff7d94dcc8e9be2e429a2a976f6d41 Mon Sep 17 00:00:00 2001
+From 5a6db38d62235094a903882b71ef2749b4c19cbb Mon Sep 17 00:00:00 2001
 From: Piotr Krysiuk <piotras@gmail.com>
 Date: Sun, 20 Apr 2014 15:58:45 +0200
-Subject: [PATCH 079/152] Allow loading old kernels by placing GDT in
+Subject: [PATCH 078/506] Allow loading old kernels by placing GDT in
  conventional memory.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 079/152] Allow loading old kernels by placing GDT in
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3556468..73a8928 100644
+index 30d0cac..1be8e5e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -45,5 +45,5 @@ index d2a1b27..ffaf25f 100644
    if (err)
      return err;
 -- 
-1.9.3
+2.4.3
 

0079-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch

@@ -1,7 +1,7 @@
-From ec4609b70a7deebf6381297aae95dd4bf05bd008 Mon Sep 17 00:00:00 2001
+From 4b8b9135f1676924a8458da528d264bbc7bbb301 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 20 Apr 2014 16:12:41 +0200
-Subject: [PATCH 080/152] 	* grub-core/kern/misc.c (__bzero): Don't
+Subject: [PATCH 079/506] 	* grub-core/kern/misc.c (__bzero): Don't
  compile in GRUB_UTIL.
 
 	Reported by: Yves Blusseau <blusseau@zetam.org>.
@@ -11,7 +11,7 @@ Subject: [PATCH 080/152] 	* grub-core/kern/misc.c (__bzero): Don't
  2 files changed, 9 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 73a8928..3b61c0a 100644
+index 1be8e5e..ba5e205 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,9 @@
@@ -39,5 +39,5 @@ index 54db2e1..c5c815d 100644
  __bzero (void *s, grub_size_t n)
  {
 -- 
-1.9.3
+2.4.3
 

0080-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch

@@ -1,7 +1,7 @@
-From 4a307e8fe1298f88641a40c8a8008363aa4b9c17 Mon Sep 17 00:00:00 2001
+From 480c89858e58a2360d62fdafbeda3e7080133e9e Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 12 May 2014 10:01:48 +0200
-Subject: [PATCH 081/152] 	* grub-core/commands/verify.c
+Subject: [PATCH 080/506] 	* grub-core/commands/verify.c
  (grub_pubkey_open): Fix memdisk 	check.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 081/152] 	* grub-core/commands/verify.c
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3b61c0a..d0896d8 100644
+index ba5e205..c32d4c6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -36,5 +36,5 @@ index a9dfd88..6349ccf 100644
    fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
    if (!fsuf)
 -- 
-1.9.3
+2.4.3
 

0081-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch

@@ -1,7 +1,7 @@
-From 61fdf8bebdeaed4b601f0eca847282780380191f Mon Sep 17 00:00:00 2001
+From 2c2c5c720d79c54af39a5a4423f2d6a48d21bfda Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Thu, 15 May 2014 14:36:48 +0200
-Subject: [PATCH 082/152] 	* grub-core/commands/verify.c
+Subject: [PATCH 081/506] 	* grub-core/commands/verify.c
  (grub_pubkey_open): Trust procfs.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 082/152] 	* grub-core/commands/verify.c
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index d0896d8..2a94ad9 100644
+index c32d4c6..6d2f8c6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
@@ -39,5 +39,5 @@ index 6349ccf..525bdd1 100644
    fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
    if (!fsuf)
 -- 
-1.9.3
+2.4.3
 

0082-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch

@@ -1,7 +1,7 @@
-From 473348e663de53939fc077a1e1ef262405712dd8 Mon Sep 17 00:00:00 2001
+From 87de66d9d83446ecddb29cfbdf7369102c8e209e Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <trevor.woerner@linaro.org>
 Date: Sat, 21 Jun 2014 20:26:47 +0200
-Subject: [PATCH 083/152] 	* util/grub-gen-asciih.c (add_glyph): Fix
+Subject: [PATCH 082/506] 	* util/grub-gen-asciih.c (add_glyph): Fix
  uninitialised variable.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 083/152] 	* util/grub-gen-asciih.c (add_glyph): Fix
  2 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 2a94ad9..b552113 100644
+index 6d2f8c6..8929dbb 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -69,5 +69,5 @@ index e01447a..e35dcb7 100644
  
        if (glyph.width == 8 && glyph.height == 16
 -- 
-1.9.3
+2.4.3
 

0083-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch

@@ -1,7 +1,7 @@
-From 9de53cc99ce4c8e404e645443d07324bd9cfc157 Mon Sep 17 00:00:00 2001
+From 3f3ec8ef44f484ef581d030b0d8500c8906b673f Mon Sep 17 00:00:00 2001
 From: Stephane Rochoy <sheda>
 Date: Sun, 22 Jun 2014 01:34:57 +0200
-Subject: [PATCH 084/152] 	* grub-core/commands/efi/lsefisystab.c
+Subject: [PATCH 083/506] 	* grub-core/commands/efi/lsefisystab.c
  (grub_cmd_lsefisystab): Show 	EFI system table physical address.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 084/152] 	* grub-core/commands/efi/lsefisystab.c
  2 files changed, 6 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index b552113..abf8f4b 100644
+index 8929dbb..1dba603 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -35,5 +35,5 @@ index eda8c5f..8717db9 100644
  	       st->hdr.signature, st->hdr.revision);
    {
 -- 
-1.9.3
+2.4.3
 

0084-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch

@@ -1,7 +1,7 @@
-From 3be166827cecb977ad47ac4d3d89ec92688307a4 Mon Sep 17 00:00:00 2001
+From 15bd333e10b236fd24d17b2b23065f14d70ce478 Mon Sep 17 00:00:00 2001
 From: Stephane Rochoy <sheda>
 Date: Sun, 22 Jun 2014 01:35:52 +0200
-Subject: [PATCH 085/152] 	* grub-core/loader/i386/bsd.c
+Subject: [PATCH 084/506] 	* grub-core/loader/i386/bsd.c
  (grub_netbsd_boot): Pass pointer to 	EFI system table.
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 085/152] 	* grub-core/loader/i386/bsd.c
  3 files changed, 20 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index abf8f4b..0cdd095 100644
+index 1dba603..ee46a4d 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
@@ -68,5 +68,5 @@ index e48c19b..9b4f460 100644
 +
  #endif
 -- 
-1.9.3
+2.4.3
 

0085-util-grub-install.c-Fix-handling-of-disk-module.patch

@@ -1,7 +1,7 @@
-From d45ed8a6bf7c0c0abacb268da1f6d569743f16a0 Mon Sep 17 00:00:00 2001
+From fa33530870839e303354ff2660baeff5356ea736 Mon Sep 17 00:00:00 2001
 From: Glenn Washburn <development@efficientek.com>
 Date: Sun, 22 Jun 2014 01:45:11 +0200
-Subject: [PATCH 086/152] 	* util/grub-install.c: Fix handling of
+Subject: [PATCH 085/506] 	* util/grub-install.c: Fix handling of
  --disk-module.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 086/152] 	* util/grub-install.c: Fix handling of
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0cdd095..4ce6643 100644
+index ee46a4d..03eedb3 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -43,5 +43,5 @@ index e9c6a46..7d61c32 100644
        "This option is only available on BIOS target."), 2},
    {"no-nvram", OPTION_NO_NVRAM, 0, 0,
 -- 
-1.9.3
+2.4.3
 

0086-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch

@@ -1,8 +1,8 @@
-From a9c472a7eeec6816868dbccce6decaef3b3c62bb Mon Sep 17 00:00:00 2001
+From 1f6af2a9f8b02a71f213b4717d8e62c8a6b14fc5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9F=D0=B5=D1=85=D0=BE?=
  =?UTF-8?q?=D0=B2?= <roman_pekhov>
 Date: Sun, 22 Jun 2014 03:51:50 +0400
-Subject: [PATCH 087/152] 	* grub-core/commands/loadenv.c
+Subject: [PATCH 086/506] 	* grub-core/commands/loadenv.c
  (check_blocklists): Fix overlap check.
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 087/152] 	* grub-core/commands/loadenv.c
  2 files changed, 6 insertions(+), 11 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 4ce6643..a2da974 100644
+index 03eedb3..be322d4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
@@ -54,5 +54,5 @@ index 6af8112..acd93d1 100644
                /* This might be actually valid, but it is unbelievable that
                   any filesystem makes such a silly allocation.  */
 -- 
-1.9.3
+2.4.3
 

0087-docs-grub-dev.texi-Finding-your-way-around-The-build.patch

@@ -0,0 +1,47 @@
+From 4250f552a6c78f5547d45c77b46ea11c5e8e394d Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Thu, 26 Jun 2014 14:20:17 +0100
+Subject: [PATCH 087/506] * docs/grub-dev.texi (Finding your way around): The
+ build system no longer uses AutoGen directly.
+
+---
+ ChangeLog          | 5 +++++
+ docs/grub-dev.texi | 6 +++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index be322d4..5109c5a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-06-26  Colin Watson  <cjwatson@ubuntu.com>
++
++	* docs/grub-dev.texi (Finding your way around): The build system no
++	longer uses AutoGen directly.
++
+ 2014-06-21  Роман Пехов <roman_pekhov>
+ 
+ 	* grub-core/commands/loadenv.c (check_blocklists): Fix overlap check.
+diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
+index 7c6244c..a9f4de6 100644
+--- a/docs/grub-dev.texi
++++ b/docs/grub-dev.texi
+@@ -228,12 +228,12 @@ The opening @samp{/*} and closing @samp{*/} should be placed together on a line
+ Here is a brief map of the GRUB code base.
+ 
+ GRUB uses Autoconf and Automake, with most of the Automake input generated
+-by AutoGen.  The top-level build rules are in @file{configure.ac},
++by a Python script.  The top-level build rules are in @file{configure.ac},
+ @file{grub-core/Makefile.core.def}, and @file{Makefile.util.def}.  Each
+ block in a @file{*.def} file represents a build target, and specifies the
+ source files used to build it on various platforms.  The @file{*.def} files
+-are processed into AutoGen input by @file{gentpl.py} (which you only need to
+-look at if you are extending the build system).  If you are adding a new
++are processed into Automake input by @file{gentpl.py} (which you only need
++to look at if you are extending the build system).  If you are adding a new
+ module which follows an existing pattern, such as a new command or a new
+ filesystem implementation, it is usually easiest to grep
+ @file{grub-core/Makefile.core.def} and @file{Makefile.util.def} for an
+-- 
+2.4.3
+

0088-Fix-an-infinite-loop-in-grub-mkconfig.patch

@@ -0,0 +1,99 @@
+From 0901e7855f922e770cbfeb58262cb8fded518190 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Tue, 8 Jul 2014 23:54:30 +0100
+Subject: [PATCH 088/506] Fix an infinite loop in grub-mkconfig
+
+* util/grub.d/10_hurd.in: Make kernel list progression not fail on
+kernels whose paths contain regex metacharacters.
+* util/grub.d/10_kfreebsd.in: Likewise.
+* util/grub.d/10_linux.in: Likewise.
+* util/grub.d/20_linux_xen.in: Likewise.
+
+Reported by: Heimo Stranner.
+---
+ ChangeLog                   | 10 ++++++++++
+ util/grub.d/10_hurd.in      |  2 +-
+ util/grub.d/10_kfreebsd.in  |  2 +-
+ util/grub.d/10_linux.in     |  2 +-
+ util/grub.d/20_linux_xen.in |  4 ++--
+ 5 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 5109c5a..ccd8ac1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,13 @@
++2014-07-08  Colin Watson  <cjwatson@ubuntu.com>
++
++	* util/grub.d/10_hurd.in: Make kernel list progression not fail on
++	kernels whose paths contain regex metacharacters.
++	* util/grub.d/10_kfreebsd.in: Likewise.
++	* util/grub.d/10_linux.in: Likewise.
++	* util/grub.d/20_linux_xen.in: Likewise.
++
++	Reported by: Heimo Stranner.
++
+ 2014-06-26  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* docs/grub-dev.texi (Finding your way around): The build system no
+diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
+index 82dfe19..29b4554 100644
+--- a/util/grub.d/10_hurd.in
++++ b/util/grub.d/10_hurd.in
+@@ -168,7 +168,7 @@ while [ "x$kernels" != "x" ] ; do
+   hurd_entry "$kernel" advanced
+   hurd_entry "$kernel" recovery
+ 
+-  kernels=`echo $kernels | tr ' ' '\n' | grep -vx $kernel | tr '\n' ' '`
++  kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
+index a524762..ba7175b 100644
+--- a/util/grub.d/10_kfreebsd.in
++++ b/util/grub.d/10_kfreebsd.in
+@@ -228,7 +228,7 @@ while [ "x$list" != "x" ] ; do
+     kfreebsd_entry "${OS}" "${version}" recovery "-s"
+   fi
+ 
+-  list=`echo $list | tr ' ' '\n' | grep -vx $kfreebsd | tr '\n' ' '`
++  list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 00d1931..d2e2a8f 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -241,7 +241,7 @@ while [ "x$list" != "x" ] ; do
+                 "single ${GRUB_CMDLINE_LINUX}"
+   fi
+ 
+-  list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
++  list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index a608435..2e77758 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -255,12 +255,12 @@ while [ "x${xen_list}" != "x" ] ; do
+ 		"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
+ 	fi
+ 
+-	list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
++	list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
+     done
+     if [ x"$is_top_level" != xtrue ]; then
+ 	echo '	}'
+     fi
+-    xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '`
++    xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+-- 
+2.4.3
+

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

@@ -1,26 +0,0 @@
-From e4ecf3a1f8eef683feae27ed84c85eb8aeb79e11 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@ubuntu.com>
-Date: Sat, 28 Dec 2013 02:20:27 +0000
-Subject: [PATCH 088/152] * NEWS: The cmosclean command in fact dates back to
- 1.99.  Remove mention of it from 2.02.
-
----
- NEWS | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/NEWS b/NEWS
-index a61df94..f621c65 100644
---- a/NEWS
-+++ b/NEWS
-@@ -63,6 +63,8 @@ New in 2.02:
-   * New `efifwsetup' and `lsefi' commands on EFI platforms.
-   * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
-   * New command `pcidump' for PCI platforms.
-+  * New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
-+    coreboot.
-   * Improve opcode parsing in ACPI halt implementation.
-   * Use the TSC as a possible time source on i386-ieee1275.
-   * Merge PowerPC grub-mkrescue implementation with the common one.
--- 
-1.9.3
-

0089-grub-core-fs-cbfs.c-Don-t-probe-disks-of-unknow-size.patch

@@ -0,0 +1,41 @@
+From 33f6ce671f984465e0f8f9c96927c087b6d0c1a1 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Sun, 10 Aug 2014 09:50:36 +0200
+Subject: [PATCH 089/506] 	* grub-core/fs/cbfs.c: Don't probe disks of
+ unknow size.
+
+	Fixes hang on virtualbox.
+---
+ ChangeLog           | 4 ++++
+ grub-core/fs/cbfs.c | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index ccd8ac1..47ff355 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/fs/cbfs.c: Don't probe disks of unknow size.
++
+ 2014-07-08  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub.d/10_hurd.in: Make kernel list progression not fail on
+diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c
+index 7ad1483..35750a0 100644
+--- a/grub-core/fs/cbfs.c
++++ b/grub-core/fs/cbfs.c
+@@ -149,6 +149,9 @@ grub_cbfs_mount (grub_disk_t disk)
+   grub_off_t header_off;
+   struct cbfs_header head;
+ 
++  if (grub_disk_get_size (disk) == GRUB_DISK_SIZE_UNKNOWN)
++    goto fail;
++
+   if (grub_disk_read (disk, grub_disk_get_size (disk) - 1,
+ 		      GRUB_DISK_SECTOR_SIZE - sizeof (ptr),
+ 		      sizeof (ptr), &ptr))
+-- 
+2.4.3
+

0090-Fix-Changelog.patch

@@ -0,0 +1,25 @@
+From 79c80b06b80c680e584038537098b9e433415465 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Sun, 10 Aug 2014 10:04:04 +0200
+Subject: [PATCH 090/506] Fix Changelog
+
+---
+ ChangeLog | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 47ff355..cab1427 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -2,6 +2,8 @@
+ 
+ 	* grub-core/fs/cbfs.c: Don't probe disks of unknow size.
+ 
++	Fixes hang on virtualbox.
++
+ 2014-07-08  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub.d/10_hurd.in: Make kernel list progression not fail on
+-- 
+2.4.3
+

0091-grub-core-disk-i386-pc-biosdisk.c-grub_biosdisk_rw-A.patch

@@ -0,0 +1,48 @@
+From 0af3ae2d8b31e31c991eb7dd1d4b79e698907c8d Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Sun, 10 Aug 2014 11:27:13 +0200
+Subject: [PATCH 091/506] 	* grub-core/disk/i386/pc/biosdisk.c
+ (grub_biosdisk_rw): Add 	safety to avoid triggerring VirtualBox bug.
+
+---
+ ChangeLog                         | 5 +++++
+ grub-core/disk/i386/pc/biosdisk.c | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index cab1427..9e159a8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,10 @@
+ 2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
++	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw): Add
++	safety to avoid triggerring VirtualBox bug.
++
++2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
++
+ 	* grub-core/fs/cbfs.c: Don't probe disks of unknow size.
+ 
+ 	Fixes hang on virtualbox.
+diff --git a/grub-core/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
+index 1689539..6b21525 100644
+--- a/grub-core/disk/i386/pc/biosdisk.c
++++ b/grub-core/disk/i386/pc/biosdisk.c
+@@ -455,6 +455,14 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
+ {
+   struct grub_biosdisk_data *data = disk->data;
+ 
++  /* VirtualBox fails with sectors above 2T on CDs.
++     Since even BD-ROMS are never that big anyway, return error.  */
++  if ((data->flags & GRUB_BIOSDISK_FLAG_CDROM)
++      && (sector >> 32))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE,
++		       N_("attempt to read or write outside of disk `%s'"),
++		       disk->name);
++
+   if (data->flags & GRUB_BIOSDISK_FLAG_LBA)
+     {
+       struct grub_biosdisk_dap *dap;
+-- 
+2.4.3
+

0092-grub-core-kern-disk_common.c-Clump-disk-size-to-1EiB.patch

@@ -0,0 +1,68 @@
+From d1224d209be3fcfa5cea7b3e637cfc429f7d2345 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Sun, 10 Aug 2014 11:27:36 +0200
+Subject: [PATCH 092/506] 	* grub-core/kern/disk_common.c: Clump disk
+ size to 1EiB.
+
+---
+ ChangeLog                    |  4 ++++
+ grub-core/kern/disk_common.c | 22 ++++++++++++++++------
+ 2 files changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 9e159a8..6c389b0 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,9 @@
+ 2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
++	* grub-core/kern/disk_common.c: Clump disk size to 1EiB.
++
++2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
++
+ 	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw): Add
+ 	safety to avoid triggerring VirtualBox bug.
+ 
+diff --git a/grub-core/kern/disk_common.c b/grub-core/kern/disk_common.c
+index fb19778..2ca12b5 100644
+--- a/grub-core/kern/disk_common.c
++++ b/grub-core/kern/disk_common.c
+@@ -7,6 +7,8 @@ grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,
+ 			grub_off_t *offset, grub_size_t size)
+ {
+   grub_partition_t part;
++  grub_disk_addr_t total_sectors;
++
+   *sector += *offset >> GRUB_DISK_SECTOR_BITS;
+   *offset &= GRUB_DISK_SECTOR_SIZE - 1;
+ 
+@@ -27,12 +29,20 @@ grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,
+       *sector += start;
+     }
+ 
+-  if (disk->total_sectors != GRUB_DISK_SIZE_UNKNOWN
+-      && ((disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)) <= *sector
+-	  || ((*offset + size + GRUB_DISK_SECTOR_SIZE - 1)
+-	  >> GRUB_DISK_SECTOR_BITS) > (disk->total_sectors
+-				       << (disk->log_sector_size
+-					   - GRUB_DISK_SECTOR_BITS)) - *sector))
++  /* Transform total_sectors to number of 512B blocks.  */
++  total_sectors = disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS);
++
++  /* Some drivers have problems with disks above reasonable.
++     Treat unknown as 1EiB disk. While on it, clamp the size to 1EiB.
++     Just one condition is enough since GRUB_DISK_UNKNOWN_SIZE << ls is always
++     above 9EiB.
++  */
++  if (total_sectors > (1ULL << 51))
++    total_sectors = (1ULL << 51);
++
++  if ((total_sectors <= *sector
++       || ((*offset + size + GRUB_DISK_SECTOR_SIZE - 1)
++	   >> GRUB_DISK_SECTOR_BITS) > total_sectors - *sector))
+     return grub_error (GRUB_ERR_OUT_OF_RANGE,
+ 		       N_("attempt to read or write outside of disk `%s'"), disk->name);
+ 
+-- 
+2.4.3
+

0093-grub-core-term-at_keyboard.c-Retry-probing-keyboard-.patch

@@ -0,0 +1,84 @@
+From 3c058332499f6c0185c167a7faf37afa808136b7 Mon Sep 17 00:00:00 2001
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Date: Wed, 13 Aug 2014 23:04:01 +0200
+Subject: [PATCH 093/506] 	* grub-core/term/at_keyboard.c: Retry probing
+ keyboard if 	scancode setup failed.
+
+---
+ ChangeLog                    |  5 +++++
+ grub-core/term/at_keyboard.c | 11 +++++------
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 6c389b0..22030fd 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-08-13  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/term/at_keyboard.c: Retry probing keyboard if
++	scancode setup failed.
++
+ 2014-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/kern/disk_common.c: Clump disk size to 1EiB.
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index b4257e8..c234e92 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -226,7 +226,7 @@ static const struct
+     {0x7d, GRUB_KEYBOARD_KEY_PPAGE},
+   };
+ 
+-static int alive = 0, ping_sent;
++static int ping_sent;
+ 
+ static void
+ keyboard_controller_wait_until_ready (void)
+@@ -373,7 +373,7 @@ set_scancodes (void)
+   grub_dprintf ("atkeyb", "returned set %d\n", current_set);
+   if (current_set == 1)
+     return;
+-  grub_printf ("No supported scancode set found\n");
++  grub_dprintf ("atkeyb", "no supported scancode set found\n");
+ #endif
+ }
+ 
+@@ -543,7 +543,7 @@ grub_keyboard_getkey (void)
+ int
+ grub_at_keyboard_is_alive (void)
+ {
+-  if (alive)
++  if (current_set != 0)
+     return 1;
+   if (ping_sent
+       && KEYBOARD_COMMAND_ISREADY (grub_inb (KEYBOARD_REG_STATUS))
+@@ -611,7 +611,6 @@ static void
+ grub_keyboard_controller_init (void)
+ {
+   at_keyboard_status = 0;
+-  alive = 1;
+   /* Drain input buffer. */
+   while (1)
+     {
+@@ -639,7 +638,7 @@ grub_keyboard_controller_init (void)
+ static grub_err_t
+ grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused)))
+ {
+-  if (!alive)
++  if (current_set == 0)
+     return GRUB_ERR_NONE;
+   if (grub_keyboard_orig_set)
+     write_mode (grub_keyboard_orig_set);
+@@ -656,7 +655,7 @@ grub_at_fini_hw (int noreturn __attribute__ ((unused)))
+ static grub_err_t
+ grub_at_restore_hw (void)
+ {
+-  if (!alive)
++  if (current_set == 0)
+     return GRUB_ERR_NONE;
+ 
+   /* Drain input buffer. */
+-- 
+2.4.3
+

0094-Fix-typo-gettext_print-instead-of-gettext_printf.patch

@@ -0,0 +1,39 @@
+From c291f47b2c003ef6daeafaedd458db838bad6fb8 Mon Sep 17 00:00:00 2001
+From: Andrey Borzenkov <arvidjaar@gmail.com>
+Date: Thu, 14 Aug 2014 21:02:31 +0400
+Subject: [PATCH 094/506] Fix typo (gettext_print instead of gettext_printf)
+
+---
+ ChangeLog             | 5 +++++
+ util/grub-mkconfig.in | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 22030fd..a8f379b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-08-14  Andrey Borzenkov <arvidjaar@gmail.com>
++
++	* util/grub-mkconfig.in: Fix typo (gettext_print instead of
++	gettext_printf).
++
+ 2014-08-13  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/term/at_keyboard.c: Retry probing keyboard if
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index ca040dd..d1fae49 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -124,7 +124,7 @@ set $grub_probe dummy
+ if test -f "$1"; then
+     :
+ else
+-    gettext_print "%s: Not found.\n" "$1" 1>&2
++    gettext_printf "%s: Not found.\n" "$1" 1>&2
+     exit 1
+ fi
+ 
+-- 
+2.4.3
+

0095-grub-core-kern-mips-arc-init.c-grub_machine_get_boot.patch

@@ -0,0 +1,40 @@
+From 1de3a48098053aaebd35232bd73e3ce3f3fdf51c Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Mon, 25 Aug 2014 15:19:48 -0700
+Subject: [PATCH 095/506] * grub-core/kern/mips/arc/init.c
+ (grub_machine_get_bootlocation): Initialise pend to pacify GCC.
+
+---
+ ChangeLog                      | 5 +++++
+ grub-core/kern/mips/arc/init.c | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a8f379b..6a99e2a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-08-25  Colin Watson  <cjwatson@ubuntu.com>
++
++	* grub-core/kern/mips/arc/init.c (grub_machine_get_bootlocation):
++	Initialise pend to pacify GCC.
++
+ 2014-08-14  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+ 	* util/grub-mkconfig.in: Fix typo (gettext_print instead of
+diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
+index b4f50e4..3834a14 100644
+--- a/grub-core/kern/mips/arc/init.c
++++ b/grub-core/kern/mips/arc/init.c
+@@ -360,7 +360,7 @@ grub_machine_get_bootlocation (char **device, char **path)
+   char *loaddev = boot_location;
+   char *pptr, *partptr;
+   char *dname;
+-  grub_disk_addr_t poff = -1, pend;
++  grub_disk_addr_t poff = -1, pend = -1;
+   struct get_device_name_ctx ctx;
+   grub_disk_t parent = 0;
+   unsigned i;
+-- 
+2.4.3
+

0096-configure.ac-Remove-several-unnecessary-semicolons.patch

@@ -0,0 +1,139 @@
+From 4d94b2db58e5d6e3d6e451ab294cd9def33f7aef Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Sun, 7 Sep 2014 20:47:43 +0100
+Subject: [PATCH 096/506] * configure.ac: Remove several unnecessary
+ semicolons.
+
+---
+ ChangeLog    |  4 ++++
+ configure.ac | 36 ++++++++++++++++++------------------
+ 2 files changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 6a99e2a..4e422b8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-09-07  Colin Watson  <cjwatson@ubuntu.com>
++
++	* configure.ac: Remove several unnecessary semicolons.
++
+ 2014-08-25  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* grub-core/kern/mips/arc/init.c (grub_machine_get_bootlocation):
+diff --git a/configure.ac b/configure.ac
+index 8888c2f..a3610e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -90,18 +90,18 @@ case "$target_cpu" in
+   amd64)	target_cpu=x86_64 ;;
+   sparc)	target_cpu=sparc64 ;;
+   mipsel|mips64el)
+-                target_cpu=mipsel;
+-		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
++                target_cpu=mipsel
++		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPSEL=1"
+ 		;;
+   mips|mips64)
+-                target_cpu=mips;
+-		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPS=1";
++                target_cpu=mips
++		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPS=1"
+ 		;;
+   arm*)
+-		target_cpu=arm;
++		target_cpu=arm
+ 		;;
+   aarch64*)
+-		target_cpu=arm64;
++		target_cpu=arm64
+ 		;;
+ esac
+ 
+@@ -178,7 +178,7 @@ if test x$platform != xemu ; then
+ fi
+ 
+ if test x"$target_cpu-$platform" = xsparc64-emu ; then
+-   target_m64=1 ;
++   target_m64=1
+ fi
+ 
+ case "$target_os" in
+@@ -742,7 +742,7 @@ if test x"$efiemu_excuse" = x ; then
+       ]], [[]])], [flag=1], [flag=0])
+       if test x"$flag" = x1; then
+         grub_cv_target_cc_efiemu64_link_format="$format"
+-	break;
++	break
+       fi
+     done])
+   if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
+@@ -775,12 +775,12 @@ if test x"$platform" = xemu ; then
+         ;;
+     *windows* | *cygwin* | *mingw*)
+       if test x${target_cpu} = xi386 ; then
+-        grub_cv_target_cc_link_format=-mi386pe;
+-	TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)';
++        grub_cv_target_cc_link_format=-mi386pe
++	TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)'
+       fi
+       if test x${target_cpu} = xx86_64 ; then
+-        grub_cv_target_cc_link_format=-mi386pep;
+-	TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)';
++        grub_cv_target_cc_link_format=-mi386pep
++	TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)'
+       fi
+       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
+       ;;
+@@ -806,7 +806,7 @@ elif test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
+       ]], [[]])], [flag=1], [flag=0])
+       if test x"$flag" = x1; then
+         grub_cv_target_cc_link_format="$format"
+-	break;
++	break
+       fi
+     done])
+   if test x"$grub_cv_target_cc_link_format" = xunknown; then
+@@ -814,10 +814,10 @@ elif test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
+   fi
+   TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
+   if test x"$grub_cv_target_cc_link_format" = x-mi386pe ; then
+-    TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)';
++    TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)'
+   fi
+   if test x"$grub_cv_target_cc_link_format" = x-mi386pep ; then
+-    TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)';
++    TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)'
+   fi
+ fi
+ 
+@@ -995,7 +995,7 @@ if test "$target_cpu" = arm; then
+       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [flag=1], [flag=0])
+       if test x"$flag" = x1; then
+         grub_cv_target_cc_strict_align="$arg"
+-	break;
++	break
+       fi
+     done])
+ 
+@@ -1416,7 +1416,7 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+       md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
+       # PCF and BDF from version 6.3 isn't hanled properly by libfreetype.
+       if test "$md5" = 0a54834d2788c83886a3e1785a6a1e61 || test "$md5" = 28f2565c7a41d8d407e2551159385edb || test "$md5" = dae5e588461b3b92b87b6ffee734f936 || test "$md5" = 4a3d687aa5bb329ed05f4263a1016791 ; then
+-        continue;
++        continue
+       fi
+       FONT_SOURCE="$dir/unifont.$ext"
+       break 2
+@@ -1501,7 +1501,7 @@ if test x"$device_mapper_excuse" = x ; then
+ fi
+ 
+ if test x"$device_mapper_excuse" = x ; then
+-   LIBDEVMAPPER="-ldevmapper";
++   LIBDEVMAPPER="-ldevmapper"
+    AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+              [Define to 1 if you have the devmapper library.])
+ fi
+-- 
+2.4.3
+

0097-Support-grub-emu-on-x32-ILP32-but-with-x86-64-instru.patch

@@ -0,0 +1,111 @@
+From 2a5a532c0047d4eff90175936b220b638cce1013 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@ubuntu.com>
+Date: Sun, 7 Sep 2014 23:04:35 +0100
+Subject: [PATCH 097/506] Support grub-emu on x32 (ILP32 but with x86-64
+ instruction set)
+
+* configure.ac: Remove -m64 from checks for -mcmodel=large and
+-mno-red-zone.  These are always either unnecessary (x86_64-emu) or
+already in TARGET_CFLAGS at this point, and they produce incorrect
+results when building for x32.
+* grub-core/kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Cast
+pointers to Elf64_Xword via grub_addr_t, in order to work on x32.
+* include/grub/x86_64/types.h (GRUB_TARGET_SIZEOF_VOID_P,
+GRUB_TARGET_SIZEOF_LONG): Define to 4 on x32.
+---
+ ChangeLog                   | 13 +++++++++++++
+ configure.ac                |  4 ++--
+ grub-core/kern/x86_64/dl.c  |  4 ++--
+ include/grub/x86_64/types.h |  6 +++++-
+ 4 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4e422b8..572ee50 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,18 @@
+ 2014-09-07  Colin Watson  <cjwatson@ubuntu.com>
+ 
++	Support grub-emu on x32 (ILP32 but with x86-64 instruction set)
++
++	* configure.ac: Remove -m64 from checks for -mcmodel=large and
++	-mno-red-zone.  These are always either unnecessary (x86_64-emu) or
++	already in TARGET_CFLAGS at this point, and they produce incorrect
++	results when building for x32.
++	* grub-core/kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Cast
++	pointers to Elf64_Xword via grub_addr_t, in order to work on x32.
++	* include/grub/x86_64/types.h (GRUB_TARGET_SIZEOF_VOID_P,
++	GRUB_TARGET_SIZEOF_LONG): Define to 4 on x32.
++
++2014-09-07  Colin Watson  <cjwatson@ubuntu.com>
++
+ 	* configure.ac: Remove several unnecessary semicolons.
+ 
+ 2014-08-25  Colin Watson  <cjwatson@ubuntu.com>
+diff --git a/configure.ac b/configure.ac
+index a3610e1..8662bac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -862,7 +862,7 @@ LDFLAGS="$TARGET_LDFLAGS"
+ if test "$target_cpu" = x86_64 || test "$target_cpu-$platform" = sparc64-emu ; then
+   # Use large model to support 4G memory
+   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+-    CFLAGS="$TARGET_CFLAGS -m64 -mcmodel=large"
++    CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ 		      [grub_cv_cc_mcmodel=yes],
+ 		      [grub_cv_cc_mcmodel=no])
+@@ -877,7 +877,7 @@ fi
+ if test "$target_cpu"-"$platform" = x86_64-efi; then
+   # EFI writes to stack below %rsp, we must not use the red zone
+   AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
+-    CFLAGS="$TARGET_CFLAGS -m64 -mno-red-zone"
++    CFLAGS="$TARGET_CFLAGS -mno-red-zone"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+ 		      [grub_cv_cc_no_red_zone=yes],
+ 		      [grub_cv_cc_no_red_zone=no])
+diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
+index 6cb88bf..4406906 100644
+--- a/grub-core/kern/x86_64/dl.c
++++ b/grub-core/kern/x86_64/dl.c
+@@ -73,7 +73,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
+ 	  {
+ 	    grub_int64_t value;
+ 	    value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
+-	      (Elf64_Xword) seg->addr - rel->r_offset;
++	      (Elf64_Xword) (grub_addr_t) seg->addr - rel->r_offset;
+ 	    if (value != (grub_int32_t) value)
+ 	      return grub_error (GRUB_ERR_BAD_MODULE, "relocation out of range");
+ 	    *addr32 = value;
+@@ -83,7 +83,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
+ 	case R_X86_64_PC64:
+ 	  {
+ 	    *addr64 += rel->r_addend + sym->st_value -
+-	      (Elf64_Xword) seg->addr - rel->r_offset;
++	      (Elf64_Xword) (grub_addr_t) seg->addr - rel->r_offset;
+ 	  }
+ 	  break;
+ 
+diff --git a/include/grub/x86_64/types.h b/include/grub/x86_64/types.h
+index fec9109..0bbdc6d 100644
+--- a/include/grub/x86_64/types.h
++++ b/include/grub/x86_64/types.h
+@@ -20,10 +20,14 @@
+ #define GRUB_TYPES_CPU_HEADER	1
+ 
+ /* The size of void *.  */
++#ifdef __ILP32__
++#define GRUB_TARGET_SIZEOF_VOID_P	4
++#else
+ #define GRUB_TARGET_SIZEOF_VOID_P	8
++#endif
+ 
+ /* The size of long.  */
+-#ifdef __MINGW32__
++#if defined(__MINGW32__) || defined(__ILP32__)
+ #define GRUB_TARGET_SIZEOF_LONG		4
+ #else
+ #define GRUB_TARGET_SIZEOF_LONG		8
+-- 
+2.4.3
+

0098-Fix-incorrect-address-reference-in-btrfs.patch

@@ -0,0 +1,50 @@
+From 54bd9a061083b916d3563101d147a01e002486aa Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Thu, 14 Aug 2014 18:17:45 +0800
+Subject: [PATCH 098/506] Fix incorrect address reference in btrfs
+
+We encountered a weird random kernel initrd unpacking error on btrfs
+and finally found it was caused by incorrect address reference in range
+check for type GRUB_BTRFS_EXTENT_REGULAR and the entire result is
+unpredictable.
+
+This is a quick fix to make the address reference to the
+grub_btrfs_extent_data structure correctly, not the pointer variable
+to it.
+
+Any suggestions to this patch is welcome.
+---
+ ChangeLog            | 6 ++++++
+ grub-core/fs/btrfs.c | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 572ee50..0676065 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2014-09-08  Michael Chang  <mchang@suse.com>
++
++	* grub-core/fs/btrfs.c (grub_btrfs_extent_read): Fix extent size
++	check; comparing &data->extent against addresses in the region it
++	points to is unpredictable.
++
+ 2014-09-07  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Support grub-emu on x32 (ILP32 but with x86-64 instruction set)
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index f7b6c15..95a8fa6 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -1051,7 +1051,7 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
+ 
+ 	  data->extend = data->extstart + grub_le_to_cpu64 (data->extent->size);
+ 	  if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR
+-	      && (char *) &data->extent + elemsize
++	      && (char *) data->extent + elemsize
+ 	      >= (char *) &data->extent->filled + sizeof (data->extent->filled))
+ 	    data->extend =
+ 	      data->extstart + grub_le_to_cpu64 (data->extent->filled);
+-- 
+2.4.3
+