From 011fe811ba630b24a763136374ad50d8e394f74c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 24 Jun 2014 11:18:06 -0400
Subject: [PATCH] Update to newest upstream.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 0001-fix-EFI-detection-on-Windows.patch       |   2 +-
 ...rm-cache_armv6.S-Remove-.arch-direct.patch |   2 +-
 ...mpiling-the-GRUB-Fix-some-spelling-m.patch |  10 +-
 0004-NEWS-First-draft-of-2.02-entry.patch     |   4 +-
 ...aster-of-git.sv.gnu.org-srv-git-grub.patch |  43 ++
 ...an-command-in-fact-dates-back-to-1.9.patch |  10 +-
 ...-unused-error.h-from-kern-emu-misc.c.patch |   6 +-
 ...navailable-coreboot-tables-if-not-ru.patch |   6 +-
 ...ssing-entries.-Correct-existing-ones.patch |   6 +-
 ..._frame-section-from-arm64-efi-kernel.patch |   6 +-
 ...-aa64.efi-for-boot-images-on-AArch64.patch |   4 +-
 ...-fix-32-bit-compilation-on-MinGW-w64.patch |   6 +-
 ...rub-mkrescue-to-use-bootaa64.efi-too.patch |   6 +-
 ...rect-length-of-device-path-end-entry.patch |   6 +-
 ...f-grub-macbless-Change-mansection-to.patch |   6 +-
 ...o-EFI-rescue-image-to-fix-missing-pr.patch |   4 +-
 ...k.c-is-only-ever-compiled-on-FreeBSD.patch |   6 +-
 ...efer-more-portable-test-1-constructs.patch |   6 +-
 ...=> 0019-NEWS-Add-few-missing-entries.patch |   6 +-
 ...fi-efi.c-Ensure-that-the-result-star.patch |   6 +-
 ...c-Extend-GCC-warning-workaround-to-g.patch |   6 +-
 ...D_LDFLAGS-for-the-cross-compile-case.patch |   6 +-
 ...erm-terminfo.c-Recognize-keys-F1-F12.patch |   6 +-
 ...ate.patch => 0024-Fix-ChangeLog-date.patch |   6 +-
 ...ct-MinGW-W64-32-instead-of-_FILE_OFF.patch |   6 +-
 ...-support-to-fix-make-clean-on-Window.patch |   6 +-
 ...-on-MinGW-due-to-libintl.h-pulling-s.patch |   6 +-
 ...ds-macbless.c-Rename-FILE-and-DIR-to.patch |   6 +-
 ...f-Link-grub-ofpathname-with-zfs-libs.patch |   6 +-
 ...e.am-default_payload.elf-Add-modules.patch |   6 +-
 ...l-of-cpu-machine-links-on-mingw-msys.patch |   6 +-
 ...-main.c-read_config_file-Buffer-conf.patch |   6 +-
 ... 0033-util-grub-install.c-Fix-a-typo.patch |   6 +-
 ...-for-genemuinit-instead-of-MOD_FILES.patch |   6 +-
 ...-when-modifying-kern.geom.debugflags.patch |   6 +-
 ...op-condition-to-avoid-infinite-loops.patch |   6 +-
 ...rease-network-try-interval-gradually.patch |   6 +-
 ...aVu-also-in-usr-share-fonts-truetype.patch |   6 +-
 ...th-to-DejaVuSans-in-configure-summar.patch |   6 +-
 ..._EXTRA_DIST-to-allow-shipping-runtim.patch |   6 +-
 ...l.c-write_to_disk-Add-an-info-messag.patch |   6 +-
 ...rub-install.c-List-available-targets.patch |   6 +-
 ...043-Fix-several-translatable-strings.patch |   6 +-
 ...t-set-default-prefix-in-grub-mkimage.patch |   6 +-
 ...-cross-compile-failure-due-to-printf.patch |   6 +-
 ...erial.c-grub_serial_register-Fix-inv.patch |   6 +-
 ...port-for-partitioned-partx-loop-devi.patch |   6 +-
 ...t_keyboard.c-Tolerate-missing-keyboa.patch |   6 +-
 ...-add-missing-files-and-.exe-variants.patch |   6 +-
 ....c-Downgrade-warnings-about-unhandle.patch |  16 +-
 ...hci.c-Do-not-enable-I-O-decoding-and.patch |   6 +-
 ...hci.c-Allocate-and-clean-space-for-a.patch |   6 +-
 ...core-disk-ahci.c-Add-safety-cleanups.patch |   6 +-
 ...hci.c-Properly-handle-transactions-w.patch |   6 +-
 ...hci.c-Increase-timeout.-Some-SSDs-ta.patch |   6 +-
 ....c-Build-fix-for-argp.h-with-older-g.patch |   6 +-
 ...ue.c-Build-fix-for-argp.h-with-older.patch |   6 +-
 ...d-grub_env_set_net_property-function.patch |   6 +-
 ...dd-bootpath-parser-for-open-firmware.patch |   6 +-
 ...hci.c-Ignore-NPORTS-field-and-rely-o.patch |   6 +-
 ...386-coreboot-mmap.c-Filter-out-0xa00.patch |   6 +-
 ...-i386-multiboot_mbi.c-grub_multiboot.patch |   6 +-
 ...386-uppermem.c-lower_hook-COREBOOT-I.patch |   6 +-
 ...386-pc-mmap.c-Fallback-to-EISA-memor.patch |   6 +-
 ...6-openbsd_bootarg.h-Add-addr-and-fre.patch |   6 +-
 ...eck-for-IBM-pseries-emulated-machine.patch |  33 ++
 ...er-arm64-linux.c-Remove-redundant-0x.patch |  39 ++
 ...locator.c-Fix-the-case-when-end-of-l.patch |  39 ++
 0069-Fix-grub-probe-0-option.patch            |  55 +++
 ...todisk-and-abstraction-handling-in-g.patch | 366 ++++++++++++++++++
 ...ot-key-comparison-failures-due-to-en.patch |  44 +++
 ...linux-getroot.c-grub_util_part_to_di.patch |  55 +++
 ...ances-of-memcmp-memcpy-in-the-code-t.patch | 102 +++++
 ...gcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch |  47 +++
 0075-Add-missing-endif.patch                  |  24 ++
 ...syslinux_parse.c-Fix-timeout-quoting.patch |  39 ++
 ...-LVM-logical_volumes-string-matching.patch |  45 +++
 ...-with-no-filesystem-UUID-returned-by.patch |  83 ++++
 ...d-kernels-by-placing-GDT-in-conventi.patch |  49 +++
 ...isc.c-__bzero-Don-t-compile-in-GRUB_.patch |  43 ++
 ...ds-verify.c-grub_pubkey_open-Fix-mem.patch |  40 ++
 ...ds-verify.c-grub_pubkey_open-Trust-p.patch |  43 ++
 0083-Don-t-add-to-highlighted-row.patch       |  26 --
 ...ciih.c-add_glyph-Fix-uninitialised-v.patch |  73 ++++
 ...ds-efi-lsefisystab.c-grub_cmd_lsefis.patch |  39 ++
 ...-i386-bsd.c-grub_netbsd_boot-Pass-po.patch |  72 ++++
 ...nstall.c-Fix-handling-of-disk-module.patch |  47 +++
 ...ds-loadenv.c-check_blocklists-Fix-ov.patch |  58 +++
 ...an-command-in-fact-dates-back-to-1.9.patch |  26 ++
 ...089-Migrate-PPC-from-Yaboot-to-Grub2.patch |   4 +-
 ...=> 0090-Add-fw_path-variable-revised.patch |   4 +-
 ...tch => 0091-Add-support-for-linuxefi.patch |   4 +-
 ...xefi-and-initrdefi-where-appropriate.patch |   4 +-
 ...w-insmod-when-secure-boot-is-enabled.patch |   4 +-
 ...-hex-hex-straight-through-unmolested.patch |   4 +-
 ...http.patch => 0095-Fix-crash-on-http.patch |   4 +-
 ...ient-architecture-CAS-reboot-support.patch |   4 +-
 ...t.patch => 0097-Add-vlan-tag-support.patch |   4 +-
 ...098-Add-X-option-to-printf-functions.patch |  16 +-
 ...HCP-client-ID-and-UUID-options-added.patch |   4 +-
 ...for-specific-config-file-for-netboot.patch |   4 +-
 ...rect-length-of-device-path-end-entry.patch |  30 --
 ...g-module-to-parse-Boot-Loader-Specif.patch |   4 +-
 ...2-Move-bash-completion-script-922997.patch |   4 +-
 ...nsole-display-attr-when-clear-screen.patch |   4 +-
 ...4-Don-t-write-messages-to-the-screen.patch |   4 +-
 ... => 0105-Don-t-print-GNU-GRUB-header.patch |   4 +-
 ...=> 0106-Don-t-add-to-highlighted-row.patch |   8 +-
 ...atch => 0107-Message-string-cleanups.patch |   4 +-
 ...ing-now-that-we-aren-t-displaying-it.patch |   4 +-
 ...t-indentation-for-the-term-help-text.patch |   4 +-
 ...es.patch => 0110-Indent-menu-entries.patch |   4 +-
 ...ix-margins.patch => 0111-Fix-margins.patch |   4 +-
 ...UEFI-operating-systems-returned-by-o.patch |   8 +-
 ...video-support-for-IBM-power-machines.patch |  10 +-
 ...-1-for-our-right-hand-margin-so-line.patch |   4 +-
 ...-Use-linux16-when-appropriate-880840.patch |   4 +-
 ...0116-Enable-pager-by-default.-985860.patch |   4 +-
 ...-on-serial-so-don-t-tell-the-user-to.patch |   4 +-
 ...n-t-say-GNU-Linux-in-generated-menus.patch |   4 +-
 ...-Don-t-draw-a-border-around-the-menu.patch |   4 +-
 ...andard-margin-for-the-timeout-string.patch |   4 +-
 ...ript_execute_sourcecode-usage-on-ppc.patch |   4 +-
 ...rame-to-list-of-relocations-stripped.patch |   4 +-
 ...rk-with-our-changes-for-linux16-and-.patch |   4 +-
 ...on-t-print-during-fdt-loading-method.patch |   4 +-
 ...when-generating-configuration-by-gru.patch |   4 +-
 grub2.spec                                    | 225 ++++++-----
 128 files changed, 1911 insertions(+), 436 deletions(-)
 create mode 100644 0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
 rename 0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch => 0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch (78%)
 rename 0006-remove-unused-error.h-from-kern-emu-misc.c.patch => 0007-remove-unused-error.h-from-kern-emu-misc.c.patch (85%)
 rename 0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch => 0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch (92%)
 rename 0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch => 0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch (96%)
 rename 0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch => 0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch (89%)
 rename 0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch => 0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch (89%)
 rename 0011-fix-32-bit-compilation-on-MinGW-w64.patch => 0012-fix-32-bit-compilation-on-MinGW-w64.patch (89%)
 rename 0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch => 0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch (89%)
 rename 0013-arm64-set-correct-length-of-device-path-end-entry.patch => 0014-arm64-set-correct-length-of-device-path-end-entry.patch (89%)
 rename 0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch => 0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch (85%)
 rename 0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch => 0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch (93%)
 rename 0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch => 0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch (89%)
 rename 0017-Prefer-more-portable-test-1-constructs.patch => 0018-Prefer-more-portable-test-1-constructs.patch (96%)
 rename 0018-NEWS-Add-few-missing-entries.patch => 0019-NEWS-Add-few-missing-entries.patch (95%)
 rename 0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch => 0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch (93%)
 rename 0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch => 0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch (87%)
 rename 0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch => 0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch (98%)
 rename 0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch => 0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch (95%)
 rename 0023-Fix-ChangeLog-date.patch => 0024-Fix-ChangeLog-date.patch (79%)
 rename 0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch => 0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch (90%)
 rename 0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch => 0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch (98%)
 rename 0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch => 0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch (98%)
 rename 0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch => 0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch (91%)
 rename 0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch => 0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch (85%)
 rename 0029-Makefile.am-default_payload.elf-Add-modules.patch => 0030-Makefile.am-default_payload.elf-Add-modules.patch (92%)
 rename 0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch => 0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch (91%)
 rename 0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch => 0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch (91%)
 rename 0032-util-grub-install.c-Fix-a-typo.patch => 0033-util-grub-install.c-Fix-a-typo.patch (87%)
 rename 0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch => 0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch (95%)
 rename 0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch => 0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch (93%)
 rename 0035-change-stop-condition-to-avoid-infinite-loops.patch => 0036-change-stop-condition-to-avoid-infinite-loops.patch (91%)
 rename 0036-increase-network-try-interval-gradually.patch => 0037-increase-network-try-interval-gradually.patch (96%)
 rename 0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch => 0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch (88%)
 rename 0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch => 0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch (84%)
 rename 0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch => 0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch (91%)
 rename 0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch => 0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch (85%)
 rename 0041-util-grub-install.c-List-available-targets.patch => 0042-util-grub-install.c-List-available-targets.patch (95%)
 rename 0042-Fix-several-translatable-strings.patch => 0043-Fix-several-translatable-strings.patch (95%)
 rename 0043-do-not-set-default-prefix-in-grub-mkimage.patch => 0044-do-not-set-default-prefix-in-grub-mkimage.patch (94%)
 rename 0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch => 0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch (96%)
 rename 0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch => 0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch (91%)
 rename 0046-grub-install-support-for-partitioned-partx-loop-devi.patch => 0047-grub-install-support-for-partitioned-partx-loop-devi.patch (90%)
 rename 0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch => 0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch (86%)
 rename 0048-.gitignore-add-missing-files-and-.exe-variants.patch => 0049-.gitignore-add-missing-files-and-.exe-variants.patch (84%)
 rename 0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch => 0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch (85%)
 rename 0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch => 0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch (91%)
 rename 0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch => 0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch (91%)
 rename 0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch => 0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch (93%)
 rename 0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch => 0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch (91%)
 rename 0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch => 0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch (88%)
 rename 0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch => 0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch (86%)
 rename 0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch => 0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch (87%)
 rename 0057-add-grub_env_set_net_property-function.patch => 0058-add-grub_env_set_net_property-function.patch (97%)
 rename 0058-add-bootpath-parser-for-open-firmware.patch => 0059-add-bootpath-parser-for-open-firmware.patch (97%)
 rename 0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch => 0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch (86%)
 rename 0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch => 0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch (94%)
 rename 0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch => 0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch (88%)
 rename 0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch => 0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch (88%)
 rename 0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch => 0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch (93%)
 rename 0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch => 0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch (93%)
 create mode 100644 0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
 create mode 100644 0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
 create mode 100644 0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
 create mode 100644 0069-Fix-grub-probe-0-option.patch
 create mode 100644 0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
 create mode 100644 0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
 create mode 100644 0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
 create mode 100644 0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
 create mode 100644 0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
 create mode 100644 0075-Add-missing-endif.patch
 create mode 100644 0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
 create mode 100644 0077-Improve-LVM-logical_volumes-string-matching.patch
 create mode 100644 0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
 create mode 100644 0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
 create mode 100644 0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
 create mode 100644 0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
 create mode 100644 0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
 delete mode 100644 0083-Don-t-add-to-highlighted-row.patch
 create mode 100644 0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
 create mode 100644 0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
 create mode 100644 0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
 create mode 100644 0086-util-grub-install.c-Fix-handling-of-disk-module.patch
 create mode 100644 0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
 create mode 100644 0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
 rename 0065-Migrate-PPC-from-Yaboot-to-Grub2.patch => 0089-Migrate-PPC-from-Yaboot-to-Grub2.patch (96%)
 rename 0066-Add-fw_path-variable-revised.patch => 0090-Add-fw_path-variable-revised.patch (94%)
 rename 0067-Add-support-for-linuxefi.patch => 0091-Add-support-for-linuxefi.patch (99%)
 rename 0068-Use-linuxefi-and-initrdefi-where-appropriate.patch => 0092-Use-linuxefi-and-initrdefi-where-appropriate.patch (92%)
 rename 0069-Don-t-allow-insmod-when-secure-boot-is-enabled.patch => 0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch (96%)
 rename 0070-Pass-x-hex-hex-straight-through-unmolested.patch => 0094-Pass-x-hex-hex-straight-through-unmolested.patch (97%)
 rename 0071-Fix-crash-on-http.patch => 0095-Fix-crash-on-http.patch (88%)
 rename 0072-IBM-client-architecture-CAS-reboot-support.patch => 0096-IBM-client-architecture-CAS-reboot-support.patch (97%)
 rename 0073-Add-vlan-tag-support.patch => 0097-Add-vlan-tag-support.patch (98%)
 rename 0074-Add-X-option-to-printf-functions.patch => 0098-Add-X-option-to-printf-functions.patch (69%)
 rename 0075-DHCP-client-ID-and-UUID-options-added.patch => 0099-DHCP-client-ID-and-UUID-options-added.patch (96%)
 rename 0076-Search-for-specific-config-file-for-netboot.patch => 0100-Search-for-specific-config-file-for-netboot.patch (97%)
 delete mode 100644 0100-arm64-set-correct-length-of-device-path-end-entry.patch
 rename 0077-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch => 0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch (97%)
 rename 0078-Move-bash-completion-script-922997.patch => 0102-Move-bash-completion-script-922997.patch (86%)
 rename 0079-for-ppc-reset-console-display-attr-when-clear-screen.patch => 0103-for-ppc-reset-console-display-attr-when-clear-screen.patch (89%)
 rename 0080-Don-t-write-messages-to-the-screen.patch => 0104-Don-t-write-messages-to-the-screen.patch (97%)
 rename 0081-Don-t-print-GNU-GRUB-header.patch => 0105-Don-t-print-GNU-GRUB-header.patch (86%)
 rename 0082-Don-t-add-to-highlighted-row.patch => 0106-Don-t-add-to-highlighted-row.patch (77%)
 rename 0084-Message-string-cleanups.patch => 0107-Message-string-cleanups.patch (96%)
 rename 0085-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch => 0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch (87%)
 rename 0086-Use-the-correct-indentation-for-the-term-help-text.patch => 0109-Use-the-correct-indentation-for-the-term-help-text.patch (87%)
 rename 0087-Indent-menu-entries.patch => 0110-Indent-menu-entries.patch (86%)
 rename 0088-Fix-margins.patch => 0111-Fix-margins.patch (92%)
 rename 0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch => 0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch (86%)
 rename 0090-Disable-GRUB-video-support-for-IBM-power-machines.patch => 0113-Disable-GRUB-video-support-for-IBM-power-machines.patch (89%)
 rename 0091-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch => 0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch (85%)
 rename 0092-Use-linux16-when-appropriate-880840.patch => 0115-Use-linux16-when-appropriate-880840.patch (90%)
 rename 0093-Enable-pager-by-default.-985860.patch => 0116-Enable-pager-by-default.-985860.patch (83%)
 rename 0094-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch => 0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch (87%)
 rename 0095-Don-t-say-GNU-Linux-in-generated-menus.patch => 0118-Don-t-say-GNU-Linux-in-generated-menus.patch (91%)
 rename 0096-Don-t-draw-a-border-around-the-menu.patch => 0119-Don-t-draw-a-border-around-the-menu.patch (95%)
 rename 0097-Use-the-standard-margin-for-the-timeout-string.patch => 0120-Use-the-standard-margin-for-the-timeout-string.patch (91%)
 rename 0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch => 0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch (86%)
 rename 0099-Add-.eh_frame-to-list-of-relocations-stripped.patch => 0122-Add-.eh_frame-to-list-of-relocations-stripped.patch (89%)
 rename 0101-Make-10_linux-work-with-our-changes-for-linux16-and-.patch => 0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch (94%)
 rename 0102-Don-t-print-during-fdt-loading-method.patch => 0124-Don-t-print-during-fdt-loading-method.patch (82%)
 rename 0103-Honor-a-symlink-when-generating-configuration-by-gru.patch => 0125-Honor-a-symlink-when-generating-configuration-by-gru.patch (86%)

diff --git a/0001-fix-EFI-detection-on-Windows.patch b/0001-fix-EFI-detection-on-Windows.patch
index b201774..ec59fc7 100644
--- a/0001-fix-EFI-detection-on-Windows.patch
+++ b/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/103] fix EFI detection on Windows
+Subject: [PATCH 001/125] fix EFI detection on Windows
 
 We are on legacy BIOS if GetFirmwareEnvironmentVariable fails (returns
 zero) *and* extended error information is ERROR_INVALID_FUNCTION.
diff --git a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch b/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
index 33702e5..36e531a 100644
--- a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
+++ b/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/103] 	* grub-core/kern/arm/cache_armv6.S: Remove
+Subject: [PATCH 002/125] 	* 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
diff --git a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
index c7c62b0..5ad6d34 100644
--- a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
+++ b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
@@ -1,11 +1,9 @@
-From b3a04ee7745f9db87475ed926569ca1b3ba63994 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 6 May 2014 10:47:21 -0400
-Subject: [PATCH 003/103] * INSTALL (Cross-compiling the GRUB): Fix some
+From 8ebe593c564edc8ae62086df8a1448e898ef259b 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/125] * INSTALL (Cross-compiling the GRUB): Fix some
  spelling mistakes. * docs/grub.texi (Getting the source code): Likewise.
 
-Conflicts:
-	ChangeLog
 ---
  ChangeLog          |  5 +++++
  INSTALL            | 10 +++++-----
diff --git a/0004-NEWS-First-draft-of-2.02-entry.patch b/0004-NEWS-First-draft-of-2.02-entry.patch
index 4ef0581..70ebfc6 100644
--- a/0004-NEWS-First-draft-of-2.02-entry.patch
+++ b/0004-NEWS-First-draft-of-2.02-entry.patch
@@ -1,7 +1,7 @@
-From 4b4eebb6b2cb81455337137d75467db0e00c7d99 Mon Sep 17 00:00:00 2001
+From c0e2febef52139e0e580e52f553bf3aa521e390c 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/103] * NEWS: First draft of 2.02 entry.
+Subject: [PATCH 004/125] * NEWS: First draft of 2.02 entry.
 
 ---
  ChangeLog |   4 +++
diff --git a/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
new file mode 100644
index 0000000..36c3640
--- /dev/null
+++ b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
@@ -0,0 +1,43 @@
+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/125] 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.0
+
diff --git a/0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
similarity index 78%
rename from 0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
rename to 0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
index 99b3650..7e5dff0 100644
--- a/0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
+++ b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
@@ -1,7 +1,7 @@
-From 41a4b6d4b2fcf14e6f8dcc03dda3eb807a64c428 Mon Sep 17 00:00:00 2001
+From 94763697f5f33614b7bd6da91707a27b6872b750 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Sat, 28 Dec 2013 02:20:27 +0000
-Subject: [PATCH 005/103] * NEWS: The cmosclean command in fact dates back to
+Subject: [PATCH 006/125] * NEWS: The cmosclean command in fact dates back to
  1.99.  Remove mention of it from 2.02.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 005/103] * NEWS: The cmosclean command in fact dates back to
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 82dc61d..a606ca5 100644
+index da3c2df..c33856e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
@@ -19,9 +19,9 @@ index 82dc61d..a606ca5 100644
 +	* NEWS: The cmosclean command in fact dates back to 1.99.  Remove
 +	mention of it from 2.02.
 +
- 2013-12-27  Colin Watson  <cjwatson@ubuntu.com>
+ 2013-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
  
- 	* NEWS: First draft of 2.02 entry.
+ 	* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
 diff --git a/NEWS b/NEWS
 index 577d9fd..b74c05f 100644
 --- a/NEWS
diff --git a/0006-remove-unused-error.h-from-kern-emu-misc.c.patch b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch
similarity index 85%
rename from 0006-remove-unused-error.h-from-kern-emu-misc.c.patch
rename to 0007-remove-unused-error.h-from-kern-emu-misc.c.patch
index 4785b61..ffa8bfc 100644
--- a/0006-remove-unused-error.h-from-kern-emu-misc.c.patch
+++ b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch
@@ -1,7 +1,7 @@
-From bdabacb90e48becc55a4f84e0166c573663879d4 Mon Sep 17 00:00:00 2001
+From 904bd6b3cb12977def4f940e90aca3fe557c3bb5 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 28 Dec 2013 09:01:20 +0400
-Subject: [PATCH 006/103] remove unused error.h from kern/emu/misc.c
+Subject: [PATCH 007/125] remove unused error.h from kern/emu/misc.c
 
 Fixes compilation on mingw32, where include is apparently missing.
 ---
@@ -10,7 +10,7 @@ Fixes compilation on mingw32, where include is apparently missing.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a606ca5..17c1c31 100644
+index c33856e..0401f61 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
similarity index 92%
rename from 0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
rename to 0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
index 7f53d4e..981cf36 100644
--- a/0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
+++ b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
@@ -1,7 +1,7 @@
-From 52bc775fbd3b6e4bb68fe3f5644a23a475ff0b26 Mon Sep 17 00:00:00 2001
+From 23cd074c57ee6f35776fd5122a050bcef6c9eef5 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 28 Dec 2013 17:25:14 +0100
-Subject: [PATCH 007/103] 	Don't abort() on unavailable coreboot tables
+Subject: [PATCH 008/125] 	Don't abort() on unavailable coreboot tables
  if not running on coreboot.
 
 ---
@@ -11,7 +11,7 @@ Subject: [PATCH 007/103] 	Don't abort() on unavailable coreboot tables
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 17c1c31..140b2d8 100644
+index 0401f61..ed6d77c 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
similarity index 96%
rename from 0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
rename to 0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
index 1fe3522..465d290 100644
--- a/0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
+++ b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
@@ -1,7 +1,7 @@
-From e556fb6be8a3b3155723c26d02437a0a5bf26183 Mon Sep 17 00:00:00 2001
+From 3eff91e86e4df2cf8a5e1b26f98e96bf4731f526 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 30 Dec 2013 06:49:15 +0100
-Subject: [PATCH 008/103] 	* NEWS: Add few missing entries. Correct
+Subject: [PATCH 009/125] 	* NEWS: Add few missing entries. Correct
  existing ones.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 008/103] 	* NEWS: Add few missing entries. Correct
  2 files changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 140b2d8..447dece 100644
+index ed6d77c..db84300 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
similarity index 89%
rename from 0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch
rename to 0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
index 5426d24..f957439 100644
--- a/0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch
+++ b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
@@ -1,7 +1,7 @@
-From e5b01b454769cec291160ffdeef706d04bedb342 Mon Sep 17 00:00:00 2001
+From 9e9507d2e1eaed4fc2ebe2959c5405687485f613 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Mon, 30 Dec 2013 12:56:19 +0000
-Subject: [PATCH 009/103] strip .eh_frame section from arm64-efi kernel
+Subject: [PATCH 010/125] strip .eh_frame section from arm64-efi kernel
 
 Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
 ---
@@ -10,7 +10,7 @@ Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 447dece..d2e5193 100644
+index db84300..8c1ecec 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
similarity index 89%
rename from 0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
rename to 0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
index 360dd31..eb1ad03 100644
--- a/0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
+++ b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
@@ -1,7 +1,7 @@
-From 907365b13dc4a1fb5a17dea673ad65130ebbcf7a Mon Sep 17 00:00:00 2001
+From 7e782c6996ee433c94fb378cbc8db0fa0f663c84 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 10:38:54 +0400
-Subject: [PATCH 010/103] use {grub,boot}aa64.efi for boot images on AArch64
+Subject: [PATCH 011/125] 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
diff --git a/0011-fix-32-bit-compilation-on-MinGW-w64.patch b/0012-fix-32-bit-compilation-on-MinGW-w64.patch
similarity index 89%
rename from 0011-fix-32-bit-compilation-on-MinGW-w64.patch
rename to 0012-fix-32-bit-compilation-on-MinGW-w64.patch
index 3ea78fb..85ac044 100644
--- a/0011-fix-32-bit-compilation-on-MinGW-w64.patch
+++ b/0012-fix-32-bit-compilation-on-MinGW-w64.patch
@@ -1,7 +1,7 @@
-From 9ce80256f3246f13d083374980018e937737f101 Mon Sep 17 00:00:00 2001
+From afda7f47601f36a98074d8d21ffb640256f02267 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 18:43:02 +0400
-Subject: [PATCH 011/103] fix 32 bit compilation on MinGW-w64
+Subject: [PATCH 012/125] fix 32 bit compilation on MinGW-w64
 
 Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and
 32 bit under MinGW-64. The latter does not require fseeko/ftello
@@ -12,7 +12,7 @@ redefinition which it already does in case of _FILE_OFFSET_BITS=64.
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index d2e5193..761e8c6 100644
+index 8c1ecec..e87f0a7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
similarity index 89%
rename from 0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
rename to 0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
index d9b8b98..ac852ee 100644
--- a/0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
+++ b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
@@ -1,7 +1,7 @@
-From abb042d2a8c3787de2509eb6f7c219f9c921ab28 Mon Sep 17 00:00:00 2001
+From 9981c4e3f366b4795655368a78baa058b18711c6 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 7 Jan 2014 20:34:25 +0400
-Subject: [PATCH 012/103] Change grub-mkrescue to use bootaa64.efi too
+Subject: [PATCH 013/125] Change grub-mkrescue to use bootaa64.efi too
 
 Also add ChangeLog entry for previous change.
 ---
@@ -10,7 +10,7 @@ Also add ChangeLog entry for previous change.
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 761e8c6..735748f 100644
+index e87f0a7..0b9fa05 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
diff --git a/0013-arm64-set-correct-length-of-device-path-end-entry.patch b/0014-arm64-set-correct-length-of-device-path-end-entry.patch
similarity index 89%
rename from 0013-arm64-set-correct-length-of-device-path-end-entry.patch
rename to 0014-arm64-set-correct-length-of-device-path-end-entry.patch
index 3d71bcf..5a323d6 100644
--- a/0013-arm64-set-correct-length-of-device-path-end-entry.patch
+++ b/0014-arm64-set-correct-length-of-device-path-end-entry.patch
@@ -1,7 +1,7 @@
-From 60431c470d8ae9001d34e76f7b80d2b55007fd64 Mon Sep 17 00:00:00 2001
+From f493e0d352e1e8ff8cbafee69878d00487a04808 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 013/103] arm64: set correct length of device path end entry
+Subject: [PATCH 014/125] arm64: set correct length of device path end entry
 
 The length of the Device Path End entry in the grub_linux_boot()
 function was incorrectly set to 0. This triggers an assert failure
@@ -14,7 +14,7 @@ Set it to sizeof (grub_efi_device_path_t).
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 735748f..a1ecbe2 100644
+index 0b9fa05..4ec5517 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
similarity index 85%
rename from 0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch
rename to 0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
index 2407073..05b86e2 100644
--- a/0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch
+++ b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
@@ -1,7 +1,7 @@
-From ad0412ef8b5dcc14499d4ba318493db298ac7a79 Mon Sep 17 00:00:00 2001
+From 1c0db34a9597ecccb3ad4899892fb6ff6e22304d Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Wed, 8 Jan 2014 11:05:20 +0000
-Subject: [PATCH 014/103] * Makefile.util.def (grub-macbless): Change
+Subject: [PATCH 015/125] * Makefile.util.def (grub-macbless): Change
  mansection to 8.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 014/103] * Makefile.util.def (grub-macbless): Change
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a1ecbe2..6a382e4 100644
+index 4ec5517..b445f12 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
similarity index 93%
rename from 0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
rename to 0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
index 8560900..15e0d55 100644
--- a/0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
+++ b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
@@ -1,7 +1,7 @@
-From ae32118428c545d74dcf2d708660b490d4740ca9 Mon Sep 17 00:00:00 2001
+From 3aea6cc46177a90056ba60381e6387377fe40c99 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sun, 12 Jan 2014 15:29:21 +0400
-Subject: [PATCH 015/103] add part_apple to EFI rescue image to fix missing
+Subject: [PATCH 016/125] add part_apple to EFI rescue image to fix missing
  prefix
 
 On Mac rescue image is booted from HFS+ partition, so bootpath looks like
diff --git a/0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
similarity index 89%
rename from 0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
rename to 0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
index 8e8e67f..6a0ac81 100644
--- a/0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
+++ b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
@@ -1,7 +1,7 @@
-From 76455c52e6315685813dd1f880977d4781f3fe73 Mon Sep 17 00:00:00 2001
+From a433d177585c8355c6ede67469a521d05cf1e9d7 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:30:52 +0000
-Subject: [PATCH 016/103] freebsd/hostdisk.c is only ever compiled on FreeBSD
+Subject: [PATCH 017/125] freebsd/hostdisk.c is only ever compiled on FreeBSD
 
 * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
 redundant preprocessor conditional.
@@ -11,7 +11,7 @@ redundant preprocessor conditional.
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 6a382e4..a80f172 100644
+index b445f12..6613b4e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0017-Prefer-more-portable-test-1-constructs.patch b/0018-Prefer-more-portable-test-1-constructs.patch
similarity index 96%
rename from 0017-Prefer-more-portable-test-1-constructs.patch
rename to 0018-Prefer-more-portable-test-1-constructs.patch
index a9ea359..2502c37 100644
--- a/0017-Prefer-more-portable-test-1-constructs.patch
+++ b/0018-Prefer-more-portable-test-1-constructs.patch
@@ -1,7 +1,7 @@
-From 942d03cf562e626418a0553a6e22e5c9cb7e7de4 Mon Sep 17 00:00:00 2001
+From 4ec08b960f6de1190dea9fe7e6ab3b4b249840e5 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 15:24:50 +0000
-Subject: [PATCH 017/103] Prefer more portable test(1) constructs
+Subject: [PATCH 018/125] Prefer more portable test(1) constructs
 
 * util/grub.d/00_header.in (make_timeout): Use && rather than test
 -a.
@@ -19,7 +19,7 @@ rather than test -o.
  5 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a80f172..30084cf 100644
+index 6613b4e..c8e95a6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,4 +1,14 @@
diff --git a/0018-NEWS-Add-few-missing-entries.patch b/0019-NEWS-Add-few-missing-entries.patch
similarity index 95%
rename from 0018-NEWS-Add-few-missing-entries.patch
rename to 0019-NEWS-Add-few-missing-entries.patch
index c95ece5..54998df 100644
--- a/0018-NEWS-Add-few-missing-entries.patch
+++ b/0019-NEWS-Add-few-missing-entries.patch
@@ -1,7 +1,7 @@
-From ed742dc11fee69471c07101c814fc27a36b83768 Mon Sep 17 00:00:00 2001
+From e18da008f74a3c5f27a191e4f7be80c02a49f2fe Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:31:10 +0100
-Subject: [PATCH 018/103] 	* NEWS: Add few missing entries.
+Subject: [PATCH 019/125] 	* NEWS: Add few missing entries.
 
 ---
  ChangeLog |  4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 018/103] 	* NEWS: Add few missing entries.
  2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 30084cf..5eea8a3 100644
+index c8e95a6..6a19f85 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
similarity index 93%
rename from 0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
rename to 0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
index 8631ddf..f685e43 100644
--- a/0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
+++ b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
@@ -1,7 +1,7 @@
-From cadbf009147f14d3e7f33bf0f29cefb7a26aeb26 Mon Sep 17 00:00:00 2001
+From 29c96f00677e1dd2a9df4de645a7f5fab7b736a1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:41:47 +0100
-Subject: [PATCH 019/103] 	* grub-core/kern/efi/efi.c: Ensure that the
+Subject: [PATCH 020/125] 	* grub-core/kern/efi/efi.c: Ensure that the
  result starts with / 	and has no //.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 019/103] 	* grub-core/kern/efi/efi.c: Ensure that the
  2 files changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 5eea8a3..b42fd65 100644
+index 6a19f85..b04a4ef 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
similarity index 87%
rename from 0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
rename to 0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
index c1933ff..53ee84b 100644
--- a/0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
+++ b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
@@ -1,7 +1,7 @@
-From a97ddeedaa2d65158ea9489cb73ff187fd8ff306 Mon Sep 17 00:00:00 2001
+From fa9e3a9aa30988c2339e9d05c81b5d91534f4049 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:43:29 +0100
-Subject: [PATCH 020/103] 	* util/grub-mount.c: Extend GCC warning
+Subject: [PATCH 021/125] 	* util/grub-mount.c: Extend GCC warning
  workaround to grub-mount.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 020/103] 	* util/grub-mount.c: Extend GCC warning
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index b42fd65..7241046 100644
+index b04a4ef..8534158 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
diff --git a/0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
similarity index 98%
rename from 0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
rename to 0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
index 595a654..c920419 100644
--- a/0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
+++ b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
@@ -1,7 +1,7 @@
-From 270a7a0d557ecdedc7aaba8dfba01d45635455e9 Mon Sep 17 00:00:00 2001
+From 3bea802b45b9c98f70753370522fa6e47ba8966b Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 19:50:54 +0400
-Subject: [PATCH 021/103] reintroduce BUILD_LDFLAGS for the cross-compile case
+Subject: [PATCH 022/125] reintroduce BUILD_LDFLAGS for the cross-compile case
 
 This allows providing separate LDFLAGS for build and host environments, which
 are not necessary the same for cross-compile case. In particular, it allows
@@ -20,7 +20,7 @@ for build and host now.
  5 files changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 7241046..86053ae 100644
+index 8534158..9c3ef2e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
diff --git a/0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
similarity index 95%
rename from 0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
rename to 0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
index f195f50..ba94774 100644
--- a/0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
+++ b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
@@ -1,7 +1,7 @@
-From e5f0bfe517d7b07bcc940c16bbfe89daed17163f Mon Sep 17 00:00:00 2001
+From ac660e42875162e599f50c085cb646c633cf376d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:57:35 +0100
-Subject: [PATCH 022/103] 	* grub-core/term/terminfo.c: Recognize keys
+Subject: [PATCH 023/125] 	* grub-core/term/terminfo.c: Recognize keys
  F1-F12.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 022/103] 	* grub-core/term/terminfo.c: Recognize keys
  2 files changed, 54 insertions(+), 36 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 86053ae..1d530ce 100644
+index 9c3ef2e..bdfbf44 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0023-Fix-ChangeLog-date.patch b/0024-Fix-ChangeLog-date.patch
similarity index 79%
rename from 0023-Fix-ChangeLog-date.patch
rename to 0024-Fix-ChangeLog-date.patch
index 67908d4..f0d7981 100644
--- a/0023-Fix-ChangeLog-date.patch
+++ b/0024-Fix-ChangeLog-date.patch
@@ -1,14 +1,14 @@
-From d55d279aaf9e05f5adee41f70eeca2533fa2bc03 Mon Sep 17 00:00:00 2001
+From 6e5cf6b00fa82e5a02135ea5e21230ee44c72087 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:01:16 +0400
-Subject: [PATCH 023/103] Fix ChangeLog date
+Subject: [PATCH 024/125] Fix ChangeLog date
 
 ---
  ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1d530ce..da20112 100644
+index bdfbf44..fcbf220 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -2,7 +2,7 @@
diff --git a/0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
similarity index 90%
rename from 0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
rename to 0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
index e164d26..97ef9e7 100644
--- a/0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
+++ b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
@@ -1,7 +1,7 @@
-From 458248c36f2ec209cfdd7564c8dedf0e443ced5e Mon Sep 17 00:00:00 2001
+From bb3e1a1e8448f3ea9489b5ebfcec799196bc862f Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:04:11 +0400
-Subject: [PATCH 024/103] Use _W64 to detect MinGW W64-32 instead of
+Subject: [PATCH 025/125] Use _W64 to detect MinGW W64-32 instead of
  _FILE_OFFSET_BITS
 
 In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
@@ -15,7 +15,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00723.html
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index da20112..21fc87f 100644
+index fcbf220..5aac7c1 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
similarity index 98%
rename from 0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
rename to 0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
index 8f2aeed..54f73dc 100644
--- a/0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
+++ b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
@@ -1,7 +1,7 @@
-From 75db309b99ac486e9c6b5508722796c034cb36d6 Mon Sep 17 00:00:00 2001
+From 5ac7afd762d11b4c91d5756222c3abf5862203de Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 20:41:24 +0400
-Subject: [PATCH 025/103] add BUILD_EXEEXT support to fix make clean on Windows
+Subject: [PATCH 026/125] add BUILD_EXEEXT support to fix make clean on Windows
 
 Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where
 appropriate.
@@ -14,7 +14,7 @@ appropriate.
  5 files changed, 40 insertions(+), 20 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 21fc87f..8ae23e5 100644
+index 5aac7c1..dad2da2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
diff --git a/0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
similarity index 98%
rename from 0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
rename to 0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
index 39ea1a7..8ba4dc3 100644
--- a/0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
+++ b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
@@ -1,7 +1,7 @@
-From 925662e61e6becd12efb438d386b5aee45be4ecf Mon Sep 17 00:00:00 2001
+From 09194ac15b3c348cbf147e8ea27b982b57a7a778 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 21:22:57 +0400
-Subject: [PATCH 026/103] fix include loop on MinGW due to libintl.h pulling
+Subject: [PATCH 027/125] fix include loop on MinGW due to libintl.h pulling
  stdio.h
 
 In file included from ./include/grub/dl.h:23:0,
@@ -45,7 +45,7 @@ into separate file grub/compiler.h and include it instead.
  create mode 100644 include/grub/compiler.h
 
 diff --git a/ChangeLog b/ChangeLog
-index 8ae23e5..50ac180 100644
+index dad2da2..dad469b 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,19 @@
diff --git a/0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
similarity index 91%
rename from 0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
rename to 0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
index d5202a0..24777e9 100644
--- a/0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
+++ b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
@@ -1,7 +1,7 @@
-From 82a8398294fbb8ef767860e27d648df3e44f9b87 Mon Sep 17 00:00:00 2001
+From 9cbb9fc3d79e449affe7ed5e104aa828b72ad2cd Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:26:40 +0100
-Subject: [PATCH 027/103] 	* grub-core/commands/macbless.c: Rename FILE
+Subject: [PATCH 028/125] 	* grub-core/commands/macbless.c: Rename FILE
  and DIR to avoid 	conflicts.
 
 	Reported by: Andrey Borzenkov.
@@ -11,7 +11,7 @@ Subject: [PATCH 027/103] 	* grub-core/commands/macbless.c: Rename FILE
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 50ac180..75ecd5f 100644
+index dad469b..9d1a3f0 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
diff --git a/0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
similarity index 85%
rename from 0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
rename to 0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
index 9eda460..fa05502 100644
--- a/0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
+++ b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
@@ -1,7 +1,7 @@
-From 5fd5c957af6bce9d59324a54e94c879285bd2897 Mon Sep 17 00:00:00 2001
+From 6c3fa2da4fd22c3ebda0c6cf69f97d578c04e704 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sat, 18 Jan 2014 19:41:15 +0100
-Subject: [PATCH 028/103] 	* Makefile.util.def: Link grub-ofpathname with
+Subject: [PATCH 029/125] 	* Makefile.util.def: Link grub-ofpathname with
  zfs libs.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 028/103] 	* Makefile.util.def: Link grub-ofpathname with
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 75ecd5f..40ffd93 100644
+index 9d1a3f0..edceb66 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0029-Makefile.am-default_payload.elf-Add-modules.patch b/0030-Makefile.am-default_payload.elf-Add-modules.patch
similarity index 92%
rename from 0029-Makefile.am-default_payload.elf-Add-modules.patch
rename to 0030-Makefile.am-default_payload.elf-Add-modules.patch
index 6b42bf3..73a5e73 100644
--- a/0029-Makefile.am-default_payload.elf-Add-modules.patch
+++ b/0030-Makefile.am-default_payload.elf-Add-modules.patch
@@ -1,7 +1,7 @@
-From e7bf7f69fa55a08430efcd81472daf253fd1b7f3 Mon Sep 17 00:00:00 2001
+From 3f6bd432acbf2244e6f4b83dd3a259392b10afb6 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:43:19 +0100
-Subject: [PATCH 029/103] 	* Makefile.am (default_payload.elf): Add
+Subject: [PATCH 030/125] 	* Makefile.am (default_payload.elf): Add
  modules 	multiboot cbmemc linux16 gzio echo help.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 029/103] 	* Makefile.am (default_payload.elf): Add
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 40ffd93..23fa27e 100644
+index edceb66..cff9386 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,4 +1,9 @@
diff --git a/0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
similarity index 91%
rename from 0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
rename to 0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
index 74d976e..7714277 100644
--- a/0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
+++ b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
@@ -1,7 +1,7 @@
-From bad3b8b7be801e2213955727277f55d88325e714 Mon Sep 17 00:00:00 2001
+From d0cf0d7dcd4813a168d2bd94ec77ee0ae8ff860e Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 22:48:04 +0400
-Subject: [PATCH 030/103] fix removal of {cpu,machine} links on mingw/msys
+Subject: [PATCH 031/125] fix removal of {cpu,machine} links on mingw/msys
 
 At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
 but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
@@ -15,7 +15,7 @@ Make it more clear in message that we are checking "ln -s".
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 23fa27e..58ae4f5 100644
+index cff9386..c3bfa9f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
similarity index 91%
rename from 0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
rename to 0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
index 2c529cc..440afe6 100644
--- a/0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
+++ b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
@@ -1,7 +1,7 @@
-From 1e0b6198696c7ba23945468d81dff7a8ba28c361 Mon Sep 17 00:00:00 2001
+From 221f6e1ac22f66881276d4cb012d588ecfb17e47 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 19:54:09 +0100
-Subject: [PATCH 031/103] 	* grub-core/normal/main.c (read_config_file):
+Subject: [PATCH 032/125] 	* grub-core/normal/main.c (read_config_file):
  Buffer config file. 	Reduces boot time.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 031/103] 	* grub-core/normal/main.c (read_config_file):
  2 files changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 58ae4f5..0609420 100644
+index c3bfa9f..c84f7e7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0032-util-grub-install.c-Fix-a-typo.patch b/0033-util-grub-install.c-Fix-a-typo.patch
similarity index 87%
rename from 0032-util-grub-install.c-Fix-a-typo.patch
rename to 0033-util-grub-install.c-Fix-a-typo.patch
index 80345c2..1c25056 100644
--- a/0032-util-grub-install.c-Fix-a-typo.patch
+++ b/0033-util-grub-install.c-Fix-a-typo.patch
@@ -1,7 +1,7 @@
-From caa0ecbe148f596f021967fc4ef02cb4f6a02852 Mon Sep 17 00:00:00 2001
+From d353b169aa6b2a9cd03d0c2987da7da059aa6f99 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 20:02:51 +0100
-Subject: [PATCH 032/103] 	* util/grub-install.c: Fix a typo.
+Subject: [PATCH 033/125] 	* util/grub-install.c: Fix a typo.
 
 ---
  ChangeLog           | 4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 032/103] 	* util/grub-install.c: Fix a typo.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0609420..dc6df34 100644
+index c84f7e7..9360345 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
diff --git a/0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
similarity index 95%
rename from 0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
rename to 0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
index 8347a02..447ccbf 100644
--- a/0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
+++ b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
@@ -1,7 +1,7 @@
-From 656469fae69a5b7c6ddaaef717433b101c60e8c3 Mon Sep 17 00:00:00 2001
+From 85cc4b1abfed85fd8504da4acc391d5936de2812 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 18 Jan 2014 23:15:40 +0400
-Subject: [PATCH 033/103] use MODULE_FILES for genemuinit* instead of MOD_FILES
+Subject: [PATCH 034/125] use MODULE_FILES for genemuinit* instead of MOD_FILES
 
 MinGW native nm does not support ELF binaries.
 ---
@@ -12,7 +12,7 @@ MinGW native nm does not support ELF binaries.
  4 files changed, 16 insertions(+), 8 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index dc6df34..9073b1e 100644
+index 9360345..4688ff4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,11 @@
diff --git a/0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
similarity index 93%
rename from 0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
rename to 0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
index 988e5e0..329d654 100644
--- a/0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
+++ b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
@@ -1,7 +1,7 @@
-From aa4a525fe853594ed566b2bafa7b8bc101c78a88 Mon Sep 17 00:00:00 2001
+From 97fca4331e317b0491912c3cf3d02a9fac96c419 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Fri, 17 Jan 2014 02:28:46 +0000
-Subject: [PATCH 034/103] Ignore EPERM when modifying kern.geom.debugflags
+Subject: [PATCH 035/125] Ignore EPERM when modifying kern.geom.debugflags
 
 Many tests fail when run as a non-root user on FreeBSD.  The failures
 all amount to an inability to open files using grub_util_fd_open,
@@ -16,7 +16,7 @@ perfectly reasonable operations.
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9073b1e..a7aee43 100644
+index 4688ff4..10abfe2 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
diff --git a/0035-change-stop-condition-to-avoid-infinite-loops.patch b/0036-change-stop-condition-to-avoid-infinite-loops.patch
similarity index 91%
rename from 0035-change-stop-condition-to-avoid-infinite-loops.patch
rename to 0036-change-stop-condition-to-avoid-infinite-loops.patch
index 12d8f2c..8d5841a 100644
--- a/0035-change-stop-condition-to-avoid-infinite-loops.patch
+++ b/0036-change-stop-condition-to-avoid-infinite-loops.patch
@@ -1,7 +1,7 @@
-From fe1f47e9190113ad7318f46e0e66a4497ebb6135 Mon Sep 17 00:00:00 2001
+From 547d1e84df5d57c7600ead4556d43d5dbbe33c4b 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 035/103] change stop condition to avoid infinite loops
+Subject: [PATCH 036/125] change stop condition to avoid infinite loops
 
 In net/net.c there is a while (1) that only exits if there is a stop
 condition and more then 10 packages or if there is no package received.
@@ -15,7 +15,7 @@ this never happens.
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index a7aee43..0df6854 100644
+index 10abfe2..f69d8c7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,15 @@
diff --git a/0036-increase-network-try-interval-gradually.patch b/0037-increase-network-try-interval-gradually.patch
similarity index 96%
rename from 0036-increase-network-try-interval-gradually.patch
rename to 0037-increase-network-try-interval-gradually.patch
index d8d92bf..45ad186 100644
--- a/0036-increase-network-try-interval-gradually.patch
+++ b/0037-increase-network-try-interval-gradually.patch
@@ -1,7 +1,7 @@
-From ec46305a8533a9880dbfd157c2ba8cc1354ab504 Mon Sep 17 00:00:00 2001
+From d3652ff33623d842fc4422ffd98e4303795e9519 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 036/103] increase network try interval gradually
+Subject: [PATCH 037/125] increase network try interval gradually
 
 * grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
 interval gradually.
@@ -19,7 +19,7 @@ interval gradually.
  6 files changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0df6854..b35563e 100644
+index f69d8c7..f5618a6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,14 @@
diff --git a/0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
similarity index 88%
rename from 0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
rename to 0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
index bd41e32..9b9fa29 100644
--- a/0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
+++ b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
@@ -1,7 +1,7 @@
-From e9cbf597953d597dd15c0dc0be77a9583fa733f7 Mon Sep 17 00:00:00 2001
+From 90d83cda679fef485f7bb1a318bd682c4eb86cb4 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:29:33 +0400
-Subject: [PATCH 037/103] look for DejaVu also in /usr/share/fonts/truetype
+Subject: [PATCH 038/125] look for DejaVu also in /usr/share/fonts/truetype
 
 It is installed in this path on openSUSE.
 ---
@@ -10,7 +10,7 @@ It is installed in this path on openSUSE.
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index b35563e..b2e6d39 100644
+index f5618a6..9f5d81d 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
similarity index 84%
rename from 0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
rename to 0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
index 5c878cd..921115c 100644
--- a/0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
+++ b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
@@ -1,7 +1,7 @@
-From 8dd8e1c0e27070d2f172ddaf4e7528496dfd8b45 Mon Sep 17 00:00:00 2001
+From 3e02e2fbd2089645ac2c482dad59318394b62252 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 19:41:11 +0400
-Subject: [PATCH 038/103] Show detected path to DejaVuSans in configure summary
+Subject: [PATCH 039/125] Show detected path to DejaVuSans in configure summary
 
 ---
  ChangeLog    | 1 +
@@ -9,7 +9,7 @@ Subject: [PATCH 038/103] Show detected path to DejaVuSans in configure summary
  2 files changed, 2 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index b2e6d39..30b8e8a 100644
+index 9f5d81d..3ba57ae 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,6 +1,7 @@
diff --git a/0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
similarity index 91%
rename from 0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
rename to 0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
index ce66ea7..1f6eb9f 100644
--- a/0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
+++ b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
@@ -1,7 +1,7 @@
-From b56a7569613e59c14d09c77b428884a9acb19e7d Mon Sep 17 00:00:00 2001
+From 6e9483ee94033f4bb7b9a17bd032c4af4479abc0 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Tue, 21 Jan 2014 20:54:09 +0400
-Subject: [PATCH 039/103] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
+Subject: [PATCH 040/125] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
  files
 
 Not all toolkits provide static libraries. This patch enables creation of self
@@ -24,7 +24,7 @@ targets.
  2 files changed, 9 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 30b8e8a..f2c75dc 100644
+index 3ba57ae..1ede370 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
similarity index 85%
rename from 0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
rename to 0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
index 2d958e1..0ca62f0 100644
--- a/0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
+++ b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
@@ -1,7 +1,7 @@
-From 4a640fa8d9e9f463dfc9a1c1e9adfc758c58ed16 Mon Sep 17 00:00:00 2001
+From 100e7015f7dcf2cee0c4ddbbd7498a67bac695d0 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 23 Jan 2014 12:05:36 +0000
-Subject: [PATCH 040/103] * util/grub-install.c (write_to_disk): Add an info
+Subject: [PATCH 041/125] * util/grub-install.c (write_to_disk): Add an info
  message.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 040/103] * util/grub-install.c (write_to_disk): Add an info
  2 files changed, 5 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index f2c75dc..21417f8 100644
+index 1ede370..eee8e78 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0041-util-grub-install.c-List-available-targets.patch b/0042-util-grub-install.c-List-available-targets.patch
similarity index 95%
rename from 0041-util-grub-install.c-List-available-targets.patch
rename to 0042-util-grub-install.c-List-available-targets.patch
index 7e37557..8a12d3b 100644
--- a/0041-util-grub-install.c-List-available-targets.patch
+++ b/0042-util-grub-install.c-List-available-targets.patch
@@ -1,7 +1,7 @@
-From 9779a803f3368df23a4a90f2475d6d78672e83c0 Mon Sep 17 00:00:00 2001
+From d25ddbcafa537525f606938df0e500c50a5e93e1 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:09:25 +0100
-Subject: [PATCH 041/103] 	* util/grub-install.c: List available targets.
+Subject: [PATCH 042/125] 	* util/grub-install.c: List available targets.
 
 ---
  ChangeLog                   |  4 ++++
@@ -11,7 +11,7 @@ Subject: [PATCH 041/103] 	* util/grub-install.c: List available targets.
  4 files changed, 44 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 21417f8..f3bb077 100644
+index eee8e78..20e8baa 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0042-Fix-several-translatable-strings.patch b/0043-Fix-several-translatable-strings.patch
similarity index 95%
rename from 0042-Fix-several-translatable-strings.patch
rename to 0043-Fix-several-translatable-strings.patch
index 6408813..0795545 100644
--- a/0042-Fix-several-translatable-strings.patch
+++ b/0043-Fix-several-translatable-strings.patch
@@ -1,7 +1,7 @@
-From 3886fbac17202ede59c051ef90046b01d199ecc9 Mon Sep 17 00:00:00 2001
+From 2cd73ec6b2efeaff2bdcd40cce0cd3145d9e07d0 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 24 Jan 2014 18:20:27 +0100
-Subject: [PATCH 042/103] 	Fix several translatable strings.
+Subject: [PATCH 043/125] 	Fix several translatable strings.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
  4 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f3bb077..bc1a08a 100644
+index 20e8baa..e149d8e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,11 @@
diff --git a/0043-do-not-set-default-prefix-in-grub-mkimage.patch b/0044-do-not-set-default-prefix-in-grub-mkimage.patch
similarity index 94%
rename from 0043-do-not-set-default-prefix-in-grub-mkimage.patch
rename to 0044-do-not-set-default-prefix-in-grub-mkimage.patch
index 3b7d6c5..dbbeb1f 100644
--- a/0043-do-not-set-default-prefix-in-grub-mkimage.patch
+++ b/0044-do-not-set-default-prefix-in-grub-mkimage.patch
@@ -1,7 +1,7 @@
-From 7a7665be5063a4f2aa97fb7e8f8585d38f7821ac Mon Sep 17 00:00:00 2001
+From 2b2a550c14e70d17af4140e64d08022ed170f0c8 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 19:54:51 +0400
-Subject: [PATCH 043/103] do not set default prefix in grub-mkimage
+Subject: [PATCH 044/125] do not set default prefix in grub-mkimage
 
 Default prefix is likely wrong on Unix and completely wrong on Windows.
 Let caller set it explicitly to avoid any ambiguity.
@@ -11,7 +11,7 @@ Let caller set it explicitly to avoid any ambiguity.
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index bc1a08a..3b39980 100644
+index e149d8e..b405b7e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
similarity index 96%
rename from 0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
rename to 0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
index 6a1b24a..fef1a66 100644
--- a/0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
+++ b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
@@ -1,7 +1,7 @@
-From 67c5e4180039d4b98039620f1d109a9323e4d2fe Mon Sep 17 00:00:00 2001
+From 90efd351fa4f81df97473e1bb8c8234a801f8ebe Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Sat, 25 Jan 2014 21:49:41 +0400
-Subject: [PATCH 044/103] fix Mingw W64-32 cross compile failure due to printf
+Subject: [PATCH 045/125] fix Mingw W64-32 cross compile failure due to printf
  redefinition in libintl.h
 
 In file included from util/misc.c:36:0:
@@ -25,7 +25,7 @@ v3: modify g10lib.h during import
  5 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 3b39980..50d07c8 100644
+index b405b7e..c93f11f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,12 @@
diff --git a/0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
similarity index 91%
rename from 0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
rename to 0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
index cc8a31a..60e2354 100644
--- a/0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
+++ b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
@@ -1,7 +1,7 @@
-From 7cb3659aebdd85ceb3b582b5c342b5c2ba84e904 Mon Sep 17 00:00:00 2001
+From c18e39b667adb11624f3f4162c1342b76712d655 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 26 Jan 2014 02:36:05 +0100
-Subject: [PATCH 045/103] 	* grub-core/term/serial.c
+Subject: [PATCH 046/125] 	* grub-core/term/serial.c
  (grub_serial_register): Fix invalid free. 	Ensure that pointers are
  inited to NULL and that pointers are not 	accessed after free.
 
@@ -11,7 +11,7 @@ Subject: [PATCH 045/103] 	* grub-core/term/serial.c
  2 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 50d07c8..6727e6e 100644
+index c93f11f..67b4d5c 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0046-grub-install-support-for-partitioned-partx-loop-devi.patch b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch
similarity index 90%
rename from 0046-grub-install-support-for-partitioned-partx-loop-devi.patch
rename to 0047-grub-install-support-for-partitioned-partx-loop-devi.patch
index ea01129..913dc28 100644
--- a/0046-grub-install-support-for-partitioned-partx-loop-devi.patch
+++ b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch
@@ -1,7 +1,7 @@
-From bb87dccc37bf223ecf207660511efc93bd021a40 Mon Sep 17 00:00:00 2001
+From c889057e089d69bd187c8ba134c9669247744628 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Sun, 26 Jan 2014 02:56:04 +0100
-Subject: [PATCH 046/103] 	grub-install: support for partitioned partx
+Subject: [PATCH 047/125] 	grub-install: support for partitioned partx
  loop devices.
 
 	* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
@@ -12,7 +12,7 @@ Subject: [PATCH 046/103] 	grub-install: support for partitioned partx
  2 files changed, 20 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 6727e6e..b80896b 100644
+index 67b4d5c..bbec1e7 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,10 @@
diff --git a/0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
similarity index 86%
rename from 0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
rename to 0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
index 478eafa..036b300 100644
--- a/0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
+++ b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
@@ -1,7 +1,7 @@
-From 2919748f67c5e4cf7ec9ce67604c5a82fb09036f Mon Sep 17 00:00:00 2001
+From 379cbd6233fe227544ff3073b60b295fe841b654 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sun, 26 Jan 2014 03:31:10 +0100
-Subject: [PATCH 047/103] 	* grub-core/term/at_keyboard.c: Tolerate
+Subject: [PATCH 048/125] 	* grub-core/term/at_keyboard.c: Tolerate
  missing keyboard.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 047/103] 	* grub-core/term/at_keyboard.c: Tolerate
  2 files changed, 7 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index b80896b..44f018b 100644
+index bbec1e7..d37d4a6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0048-.gitignore-add-missing-files-and-.exe-variants.patch b/0049-.gitignore-add-missing-files-and-.exe-variants.patch
similarity index 84%
rename from 0048-.gitignore-add-missing-files-and-.exe-variants.patch
rename to 0049-.gitignore-add-missing-files-and-.exe-variants.patch
index 3c13ced..dfc08c5 100644
--- a/0048-.gitignore-add-missing-files-and-.exe-variants.patch
+++ b/0049-.gitignore-add-missing-files-and-.exe-variants.patch
@@ -1,7 +1,7 @@
-From 23537251e8447ea8a43b0ddc7c4e15fde69adfb2 Mon Sep 17 00:00:00 2001
+From 58ca3abc65a64d950d6da8b473e91f16d410f1ac Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 29 Jan 2014 13:26:00 -0200
-Subject: [PATCH 048/103] .gitignore: add missing files and .exe variants.
+Subject: [PATCH 049/125] .gitignore: add missing files and .exe variants.
 
 ---
  .gitignore | 7 +++++++
@@ -9,7 +9,7 @@ Subject: [PATCH 048/103] .gitignore: add missing files and .exe variants.
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 44f018b..f4cf40f 100644
+index d37d4a6..a49f5f1 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
similarity index 85%
rename from 0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
rename to 0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
index b127be8..3863f89 100644
--- a/0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
+++ b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
@@ -1,23 +1,27 @@
-From c3011bbece033baf950468e9c538a58822c839bc Mon Sep 17 00:00:00 2001
+From f21c40f33c95d908cee32a5063f285d22574a507 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:41:48 +0100
-Subject: [PATCH 049/103] 	* util/grub-mkfont.c: Downgrade warnings about
+Subject: [PATCH 050/125] 	* util/grub-mkfont.c: Downgrade warnings about
  unhandled features 	to debug.
 
 ---
- ChangeLog          |  5 +++++
+ ChangeLog          |  9 +++++++++
  util/grub-mkfont.c | 14 ++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
+ 2 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index f4cf40f..7aac69a 100644
+index a49f5f1..9837c7f 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,8 @@
+@@ -1,3 +1,12 @@
 +2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* util/grub-mkfont.c: Downgrade warnings about unhandled features
 +	to debug.
++
++2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
 +
  2014-01-29  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
  
diff --git a/0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
similarity index 91%
rename from 0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
rename to 0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
index 17bc496..d411536 100644
--- a/0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
+++ b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
@@ -1,7 +1,7 @@
-From 8a51c8b80452b6156148177dff95532160a88541 Mon Sep 17 00:00:00 2001
+From 5795341bb64a4e101d7c067d688b19a41dd50662 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:43:25 +0100
-Subject: [PATCH 050/103] 	* grub-core/disk/ahci.c: Do not enable I/O
+Subject: [PATCH 051/125] 	* grub-core/disk/ahci.c: Do not enable I/O
  decoding and keep 	enabling busmaster for the end.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 050/103] 	* grub-core/disk/ahci.c: Do not enable I/O
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 7aac69a..1b8aae2 100644
+index 9837c7f..51eba95 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
similarity index 91%
rename from 0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
rename to 0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
index 5203c0c..50eb17d 100644
--- a/0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
+++ b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
@@ -1,7 +1,7 @@
-From 8465dd514df3e1bbdec7e001c7d3c343cd355d42 Mon Sep 17 00:00:00 2001
+From 50cb0018044359180aa57e6aa7ec944def83bbcc Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:45:18 +0100
-Subject: [PATCH 051/103] 	* grub-core/disk/ahci.c: Allocate and clean
+Subject: [PATCH 052/125] 	* 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 051/103] 	* grub-core/disk/ahci.c: Allocate and clean
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 1b8aae2..2a8f372 100644
+index 51eba95..9bb1817 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
similarity index 93%
rename from 0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch
rename to 0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
index ca412da..56562d1 100644
--- a/0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch
+++ b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
@@ -1,7 +1,7 @@
-From 1d7a31631db690d4159e1c1415cb074c9ef25c1f Mon Sep 17 00:00:00 2001
+From 3f00de9c207fb4b3f9e45fd775650404ce087aac Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:46:17 +0100
-Subject: [PATCH 052/103] 	* grub-core/disk/ahci.c: Add safety cleanups.
+Subject: [PATCH 053/125] 	* grub-core/disk/ahci.c: Add safety cleanups.
 
 ---
  ChangeLog             |  4 ++++
@@ -9,7 +9,7 @@ Subject: [PATCH 052/103] 	* grub-core/disk/ahci.c: Add safety cleanups.
  2 files changed, 14 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 2a8f372..0385937 100644
+index 9bb1817..15300b0 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
diff --git a/0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
similarity index 91%
rename from 0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
rename to 0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
index 90fc13f..7976cd7 100644
--- a/0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
+++ b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
@@ -1,7 +1,7 @@
-From 056070c0cadb1af383d46ca6441f34d79c0298ca Mon Sep 17 00:00:00 2001
+From 5e8c619b17cdf70b30d37412738b149d80874c28 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:49:51 +0100
-Subject: [PATCH 053/103] 	* grub-core/disk/ahci.c: Properly handle
+Subject: [PATCH 054/125] 	* grub-core/disk/ahci.c: Properly handle
  transactions with no 	transferred data.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 053/103] 	* grub-core/disk/ahci.c: Properly handle
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 0385937..d84aff0 100644
+index 15300b0..bc1ab23 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
similarity index 88%
rename from 0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
rename to 0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
index f61eac4..a287d35 100644
--- a/0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
+++ b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
@@ -1,7 +1,7 @@
-From a50391c562f002d026dad5ef14ab7fd175154e07 Mon Sep 17 00:00:00 2001
+From 45dd39fb467d061a550113fd5e5431209f0db73c Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Wed, 29 Jan 2014 23:50:49 +0100
-Subject: [PATCH 054/103] 	* grub-core/disk/ahci.c: Increase timeout.
+Subject: [PATCH 055/125] 	* 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 054/103] 	* grub-core/disk/ahci.c: Increase timeout.
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index d84aff0..9d0b00b 100644
+index bc1ab23..1a822f3 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
similarity index 86%
rename from 0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
rename to 0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
index dc77541..9e4b89a 100644
--- a/0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
+++ b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
@@ -1,7 +1,7 @@
-From e4aba2a9e4a0e2f7966c8225fc4f500a65c81361 Mon Sep 17 00:00:00 2001
+From 767cf43a2e5c738df50155cc8729ad0f57d6ab47 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:34:27 +0100
-Subject: [PATCH 055/103] 	* util/grub-mkfont.c: Build fix for argp.h
+Subject: [PATCH 056/125] 	* util/grub-mkfont.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 055/103] 	* util/grub-mkfont.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index 9d0b00b..f5472af 100644
+index 1a822f3..f2bba84 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,7 @@
diff --git a/0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
similarity index 87%
rename from 0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
rename to 0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
index a267e6b..d7f3d71 100644
--- a/0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
+++ b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
@@ -1,7 +1,7 @@
-From 51490b569b3c08672685eaf85431f7015f55b86d Mon Sep 17 00:00:00 2001
+From 3365d3eb4062cee9581f3560ec3e93f8c8ababb2 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 3 Feb 2014 14:35:51 +0100
-Subject: [PATCH 056/103] 	* util/grub-mkrescue.c: Build fix for argp.h
+Subject: [PATCH 057/125] 	* util/grub-mkrescue.c: Build fix for argp.h
  with older gcc.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 056/103] 	* util/grub-mkrescue.c: Build fix for argp.h
  2 files changed, 8 insertions(+)
 
 diff --git a/ChangeLog b/ChangeLog
-index f5472af..2e0bdfc 100644
+index f2bba84..f4a4721 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,9 @@
diff --git a/0057-add-grub_env_set_net_property-function.patch b/0058-add-grub_env_set_net_property-function.patch
similarity index 97%
rename from 0057-add-grub_env_set_net_property-function.patch
rename to 0058-add-grub_env_set_net_property-function.patch
index b086708..3908353 100644
--- a/0057-add-grub_env_set_net_property-function.patch
+++ b/0058-add-grub_env_set_net_property-function.patch
@@ -1,7 +1,7 @@
-From d2f5eb3848747a696b94baf9bbc525d93dc0a81c Mon Sep 17 00:00:00 2001
+From 533058df7c164a4d3498dfaa626923904597f162 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 057/103] add grub_env_set_net_property function
+Subject: [PATCH 058/125] 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 057/103] add grub_env_set_net_property function
  4 files changed, 66 insertions(+), 47 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 2e0bdfc..f7338f4 100644
+index f4a4721..63f5aa3 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,11 @@
diff --git a/0058-add-bootpath-parser-for-open-firmware.patch b/0059-add-bootpath-parser-for-open-firmware.patch
similarity index 97%
rename from 0058-add-bootpath-parser-for-open-firmware.patch
rename to 0059-add-bootpath-parser-for-open-firmware.patch
index ed964ea..8915d7b 100644
--- a/0058-add-bootpath-parser-for-open-firmware.patch
+++ b/0059-add-bootpath-parser-for-open-firmware.patch
@@ -1,7 +1,7 @@
-From bec34a014c4bad329869b5316204cd07e53fd0ac Mon Sep 17 00:00:00 2001
+From 1a768cc5a65094e19c216caf92dd190317df25fc 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 058/103] add bootpath parser for open firmware
+Subject: [PATCH 059/125] 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 f7338f4..5e8eded 100644
+index 63f5aa3..5237631 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,18 @@
diff --git a/0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
similarity index 86%
rename from 0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
rename to 0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
index c4baef9..62e41dc 100644
--- a/0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
+++ b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
@@ -1,7 +1,7 @@
-From 009445ef577c51c6b9041f5525d8138977bc24ef Mon Sep 17 00:00:00 2001
+From 7f4e3839c9b872f0981e1ecdecfa2bd91065f99c Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Thu, 20 Feb 2014 10:11:43 +0100
-Subject: [PATCH 059/103] 	* grub-core/disk/ahci.c: Ignore NPORTS field
+Subject: [PATCH 060/125] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  and rely on PI 	exclusively.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 059/103] 	* grub-core/disk/ahci.c: Ignore NPORTS field
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 5e8eded..19e13d8 100644
+index 5237631..be41aa5 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
similarity index 94%
rename from 0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
rename to 0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
index 10cf522..2fda096 100644
--- a/0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
+++ b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
@@ -1,7 +1,7 @@
-From 77a4d6620a9a9a9ef83fc746d14b330d842b7298 Mon Sep 17 00:00:00 2001
+From c65d7e05498edecd560753768114b574f7c3543d Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:47:57 +0100
-Subject: [PATCH 060/103] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
+Subject: [PATCH 061/125] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  out 0xa0000-0x100000 	region.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 060/103] 	* grub-core/kern/i386/coreboot/mmap.c: Filter
  2 files changed, 37 insertions(+), 6 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 19e13d8..6af559a 100644
+index be41aa5..4f6f6d6 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,3 +1,8 @@
diff --git a/0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
similarity index 88%
rename from 0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
rename to 0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
index 4b3bb9d..1ea10c7 100644
--- a/0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
+++ b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
@@ -1,7 +1,7 @@
-From e1c64869c163e44957cca04844753c1dae60ebad Mon Sep 17 00:00:00 2001
+From 4530afc725782bbb92d4681fc338acebc4604b45 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:48:57 +0100
-Subject: [PATCH 061/103] 	* grub-core/loader/i386/multiboot_mbi.c
+Subject: [PATCH 062/125] 	* grub-core/loader/i386/multiboot_mbi.c
  (grub_multiboot_make_mbi): Limit 	location to 640K.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 061/103] 	* grub-core/loader/i386/multiboot_mbi.c
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 6af559a..8087595 100644
+index 4f6f6d6..bbaed26 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
similarity index 88%
rename from 0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
rename to 0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
index 2ad8c90..a6ca9dd 100644
--- a/0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
+++ b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
@@ -1,7 +1,7 @@
-From 710c688efe8b10b3e6b889158d80d11cca6655ec Mon Sep 17 00:00:00 2001
+From e85cc7078e669509d3a22c4e76f94cdd53335fff Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 09:50:47 +0100
-Subject: [PATCH 062/103] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
+Subject: [PATCH 063/125] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  [COREBOOT]: Ignore low 	tables for low memory calculations.
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 062/103] 	* grub-core/mmap/i386/uppermem.c (lower_hook)
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 8087595..76ae629 100644
+index bbaed26..6ed6cf4 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
similarity index 93%
rename from 0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
rename to 0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
index 6694c5d..4df3110 100644
--- a/0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
+++ b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
@@ -1,7 +1,7 @@
-From 2fecc871c9094c82a78d057d340fb4d83b895cdb Mon Sep 17 00:00:00 2001
+From 37e3b5e42930e8cd4e801e4203dc2fde335b4b10 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:07:11 +0100
-Subject: [PATCH 063/103] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
+Subject: [PATCH 064/125] 	* 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 063/103] 	* grub-core/kern/i386/pc/mmap.c: Fallback to
  2 files changed, 26 insertions(+), 19 deletions(-)
 
 diff --git a/ChangeLog b/ChangeLog
-index 76ae629..25ca7db 100644
+index 6ed6cf4..97cf57e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,10 @@
diff --git a/0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
similarity index 93%
rename from 0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
rename to 0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
index 4ab2528..2f67767 100644
--- a/0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
+++ b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
@@ -1,7 +1,7 @@
-From d69dfa96c2765e9759d99bc808566b46c599ede0 Mon Sep 17 00:00:00 2001
+From 1cdf2c717c0f4a2efac0e5dc8b5c564f930c537a Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 28 Feb 2014 10:50:05 +0100
-Subject: [PATCH 064/103] 	* include/grub/i386/openbsd_bootarg.h: Add
+Subject: [PATCH 065/125] 	* 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 25ca7db..1b17e1b 100644
+index 97cf57e..f571f66 100644
 --- a/ChangeLog
 +++ b/ChangeLog
 @@ -1,5 +1,12 @@
diff --git a/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
new file mode 100644
index 0000000..454dc2d
--- /dev/null
+++ b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
@@ -0,0 +1,33 @@
+From 2a20b05871d51635060ab58c1b63ac2ee9f8a359 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/125] 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
+displayed during the grub-menu edit.
+
+Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
+---
+ grub-core/kern/ieee1275/cmain.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
+index d92ae14..3e12e6b 100644
+--- a/grub-core/kern/ieee1275/cmain.c
++++ b/grub-core/kern/ieee1275/cmain.c
+@@ -84,8 +84,10 @@ grub_ieee1275_find_options (void)
+ 
+   rc = grub_ieee1275_get_property (root, "model",
+ 				   tmp,	sizeof (tmp), 0);
+-  if (rc >= 0 && !grub_strcmp (tmp, "Emulated PC"))
++  if (rc >= 0 && (!grub_strcmp (tmp, "Emulated PC")
++		  || !grub_strcmp (tmp, "IBM pSeries (emulated by qemu)"))) {
+     is_qemu = 1;
++  }
+ 
+   if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
+     grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
+-- 
+1.9.0
+
diff --git a/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
new file mode 100644
index 0000000..6bff740
--- /dev/null
+++ b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
@@ -0,0 +1,39 @@
+From 530b22a1c04a08fbdb4dcbc3d34bc610af17cc68 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/125] 	* grub-core/loader/arm64/linux.c: Remove
+ redundant "0x".
+
+---
+ ChangeLog                      | 4 ++++
+ grub-core/loader/arm64/linux.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f571f66..091535b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-03-26  Fu Wei <fu.wei@linaro.org>
++
++	* grub-core/loader/arm64/linux.c: Remove redundant "0x".
++
+ 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields.
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 65129c2..f1d10a1 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -68,7 +68,7 @@ get_firmware_fdt (void)
+     if (grub_memcmp (&tables[i].vendor_guid, &fdt_guid, sizeof (fdt_guid)) == 0)
+       {
+ 	firmware_fdt = tables[i].vendor_table;
+-	grub_dprintf ("linux", "found registered FDT @ 0x%p\n", firmware_fdt);
++	grub_dprintf ("linux", "found registered FDT @ %p\n", firmware_fdt);
+ 	break;
+       }
+ 
+-- 
+1.9.0
+
diff --git a/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
new file mode 100644
index 0000000..fc4a44f
--- /dev/null
+++ b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
@@ -0,0 +1,39 @@
+From 5d1749ea5730be5c9c32228461b784317a500f4b 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/125] 	* grub-core/lib/relocator.c: Fix the case when
+ end of leftover is used.
+
+---
+ ChangeLog                 | 4 ++++
+ grub-core/lib/relocator.c | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 091535b..9404eda 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/lib/relocator.c: Fix the case when end of leftover is used.
++
+ 2014-03-26  Fu Wei <fu.wei@linaro.org>
+ 
+ 	* grub-core/loader/arm64/linux.c: Remove redundant "0x".
+diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
+index 9f9770b..cb11ea5 100644
+--- a/grub-core/lib/relocator.c
++++ b/grub-core/lib/relocator.c
+@@ -865,6 +865,8 @@ malloc_in_range (struct grub_relocator *rel,
+ 			% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+ 		      struct grub_relocator_fw_leftover *lo
+ 			= events[last_lo].leftover;
++		      if (offend == 0 && alloc_end != alloc_start)
++			offend = GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+ 		      lo->freebytes[offstart / 8]
+ 			&= ((1 << (8 - (start % 8))) - 1);
+ 		      grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
+-- 
+1.9.0
+
diff --git a/0069-Fix-grub-probe-0-option.patch b/0069-Fix-grub-probe-0-option.patch
new file mode 100644
index 0000000..3483987
--- /dev/null
+++ b/0069-Fix-grub-probe-0-option.patch
@@ -0,0 +1,55 @@
+From fdf24f98bc9e4632bfe7f280872cbbf40942ae7b 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/125] Fix grub-probe -0 option
+
+* util/grub-probe,c (options): Make -0 work again (broken by
+conversion to argp).
+(main): Simplify logic.
+---
+ ChangeLog         | 6 ++++++
+ util/grub-probe.c | 7 ++-----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 9404eda..efbed8c 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2014-03-31  Colin Watson  <cjwatson@ubuntu.com>
++
++	* util/grub-probe,c (options): Make -0 work again (broken by
++	conversion to argp).
++	(main): Simplify logic.
++
+ 2014-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/lib/relocator.c: Fix the case when end of leftover is used.
+diff --git a/util/grub-probe.c b/util/grub-probe.c
+index 1f3b59f..80509be 100644
+--- a/util/grub-probe.c
++++ b/util/grub-probe.c
+@@ -711,6 +711,7 @@ static struct argp_option options[] = {
+    N_("use FILE as the device map [default=%s]"), 0},
+   {"target",  't', N_("TARGET"), 0, 0, 0},
+   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
++  {0, '0', 0, 0, N_("separate items in output using ASCII NUL characters"), 0},
+   { 0, 0, 0, 0, 0, 0 }
+ };
+ 
+@@ -884,11 +885,7 @@ main (int argc, char *argv[])
+   else
+     probe (arguments.devices[0], NULL, delim);
+ 
+-  if (!arguments.zero_delim && (print == PRINT_BIOS_HINT
+-				|| print == PRINT_IEEE1275_HINT
+-				|| print == PRINT_BAREMETAL_HINT
+-				|| print == PRINT_EFI_HINT
+-				|| print == PRINT_ARC_HINT))
++  if (delim == ' ')
+     putchar ('\n');
+ 
+   /* Free resources.  */
+-- 
+1.9.0
+
diff --git a/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
new file mode 100644
index 0000000..0e46c75
--- /dev/null
+++ b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
@@ -0,0 +1,366 @@
+From 0a65563c2b355c0eb7412b46f015556691f1b5d1 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/125] Fix partmap, cryptodisk, and abstraction handling in
+ grub-mkconfig.
+
+Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig
+no longer to be forgiving of trailing spaces on grub-probe output
+lines, which among other things means that util/grub.d/10_linux.in
+no longer detects LVM.  To fix this, make grub-probe's output
+delimiting more consistent.  As a bonus, this improves the coverage
+of the -0 option.
+
+Fixes Debian bug #735935.
+
+* grub-core/disk/cryptodisk.c
+(grub_util_cryptodisk_get_abstraction): Add a user-data argument.
+* grub-core/disk/diskfilter.c (grub_diskfilter_get_partmap):
+Likewise.
+* include/grub/cryptodisk.h (grub_util_cryptodisk_get_abstraction):
+Update prototype.
+* include/grub/diskfilter.h (grub_diskfilter_get_partmap): Likewise.
+* util/grub-install.c (push_partmap_module, push_cryptodisk_module,
+probe_mods): Adjust for extra user-data arguments.
+* util/grub-probe.c (do_print, probe_partmap, probe_cryptodisk_uuid,
+probe_abstraction): Use configured delimiter.  Update callers.
+---
+ ChangeLog                   | 25 ++++++++++++++++++++++++
+ grub-core/disk/cryptodisk.c | 19 ++++++++++---------
+ grub-core/disk/diskfilter.c |  5 +++--
+ include/grub/cryptodisk.h   |  3 ++-
+ include/grub/diskfilter.h   |  3 ++-
+ util/grub-install.c         | 14 ++++++++++----
+ util/grub-probe.c           | 46 ++++++++++++++++++++++-----------------------
+ 7 files changed, 74 insertions(+), 41 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index efbed8c..1cb3b68 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,30 @@
+ 2014-03-31  Colin Watson  <cjwatson@ubuntu.com>
+ 
++	Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
++
++	Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig
++	no longer to be forgiving of trailing spaces on grub-probe output
++	lines, which among other things means that util/grub.d/10_linux.in
++	no longer detects LVM.  To fix this, make grub-probe's output
++	delimiting more consistent.  As a bonus, this improves the coverage
++	of the -0 option.
++
++	Fixes Debian bug #735935.
++
++	* grub-core/disk/cryptodisk.c
++	(grub_util_cryptodisk_get_abstraction): Add a user-data argument.
++	* grub-core/disk/diskfilter.c (grub_diskfilter_get_partmap):
++	Likewise.
++	* include/grub/cryptodisk.h (grub_util_cryptodisk_get_abstraction):
++	Update prototype.
++	* include/grub/diskfilter.h (grub_diskfilter_get_partmap): Likewise.
++	* util/grub-install.c (push_partmap_module, push_cryptodisk_module,
++	probe_mods): Adjust for extra user-data arguments.
++	* util/grub-probe.c (do_print, probe_partmap, probe_cryptodisk_uuid,
++	probe_abstraction): Use configured delimiter.  Update callers.
++
++2014-03-31  Colin Watson  <cjwatson@ubuntu.com>
++
+ 	* util/grub-probe,c (options): Make -0 work again (broken by
+ 	conversion to argp).
+ 	(main): Simplify logic.
+diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
+index 75c6e1f..f0e3a90 100644
+--- a/grub-core/disk/cryptodisk.c
++++ b/grub-core/disk/cryptodisk.c
+@@ -762,25 +762,26 @@ grub_cryptodisk_cheat_insert (grub_cryptodisk_t newdev, const char *name,
+ 
+ void
+ grub_util_cryptodisk_get_abstraction (grub_disk_t disk,
+-				      void (*cb) (const char *val))
++				      void (*cb) (const char *val, void *data),
++				      void *data)
+ {
+   grub_cryptodisk_t dev = (grub_cryptodisk_t) disk->data;
+ 
+-  cb ("cryptodisk");
+-  cb (dev->modname);
++  cb ("cryptodisk", data);
++  cb (dev->modname, data);
+ 
+   if (dev->cipher)
+-    cb (dev->cipher->cipher->modname);
++    cb (dev->cipher->cipher->modname, data);
+   if (dev->secondary_cipher)
+-    cb (dev->secondary_cipher->cipher->modname);
++    cb (dev->secondary_cipher->cipher->modname, data);
+   if (dev->essiv_cipher)
+-    cb (dev->essiv_cipher->cipher->modname);
++    cb (dev->essiv_cipher->cipher->modname, data);
+   if (dev->hash)
+-    cb (dev->hash->modname);
++    cb (dev->hash->modname, data);
+   if (dev->essiv_hash)
+-    cb (dev->essiv_hash->modname);
++    cb (dev->essiv_hash->modname, data);
+   if (dev->iv_hash)
+-    cb (dev->iv_hash->modname);
++    cb (dev->iv_hash->modname, data);
+ }
+ 
+ const char *
+diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
+index 28b70c6..e8a3bcb 100644
+--- a/grub-core/disk/diskfilter.c
++++ b/grub-core/disk/diskfilter.c
+@@ -354,7 +354,8 @@ grub_diskfilter_memberlist (grub_disk_t disk)
+ 
+ void
+ grub_diskfilter_get_partmap (grub_disk_t disk,
+-			     void (*cb) (const char *pm))
++			     void (*cb) (const char *pm, void *data),
++			     void *data)
+ {
+   struct grub_diskfilter_lv *lv = disk->data;
+   struct grub_diskfilter_pv *pv;
+@@ -376,7 +377,7 @@ grub_diskfilter_get_partmap (grub_disk_t disk,
+ 	    continue;
+ 	  }
+ 	for (s = 0; pv->partmaps[s]; s++)
+-	  cb (pv->partmaps[s]);
++	  cb (pv->partmaps[s], data);
+       }
+ }
+ 
+diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h
+index 66f3e1e..f2ad2a7 100644
+--- a/include/grub/cryptodisk.h
++++ b/include/grub/cryptodisk.h
+@@ -145,7 +145,8 @@ grub_cryptodisk_cheat_insert (grub_cryptodisk_t newdev, const char *name,
+ 			      grub_disk_t source, const char *cheat);
+ void
+ grub_util_cryptodisk_get_abstraction (grub_disk_t disk,
+-				      void (*cb) (const char *val));
++				      void (*cb) (const char *val, void *data),
++				      void *data);
+ 
+ char *
+ grub_util_get_geli_uuid (const char *dev);
+diff --git a/include/grub/diskfilter.h b/include/grub/diskfilter.h
+index 042fe04..1aedcd3 100644
+--- a/include/grub/diskfilter.h
++++ b/include/grub/diskfilter.h
+@@ -202,7 +202,8 @@ grub_diskfilter_get_pv_from_disk (grub_disk_t disk,
+ 				  struct grub_diskfilter_vg **vg);
+ void
+ grub_diskfilter_get_partmap (grub_disk_t disk,
+-			     void (*cb) (const char *val));
++			     void (*cb) (const char *val, void *data),
++			     void *data);
+ #endif
+ 
+ #endif /* ! GRUB_RAID_H */
+diff --git a/util/grub-install.c b/util/grub-install.c
+index 2e6226a..e9c6a46 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -387,7 +387,7 @@ probe_raid_level (grub_disk_t disk)
+ }
+ 
+ static void
+-push_partmap_module (const char *map)
++push_partmap_module (const char *map, void *data __attribute__ ((unused)))
+ {
+   char buf[50];
+ 
+@@ -402,6 +402,12 @@ push_partmap_module (const char *map)
+ }
+ 
+ static void
++push_cryptodisk_module (const char *mod, void *data __attribute__ ((unused)))
++{
++  grub_install_push_module (mod);
++}
++
++static void
+ probe_mods (grub_disk_t disk)
+ {
+   grub_partition_t part;
+@@ -412,11 +418,11 @@ probe_mods (grub_disk_t disk)
+     grub_util_info ("no partition map found for %s", disk->name);
+ 
+   for (part = disk->partition; part; part = part->parent)
+-    push_partmap_module (part->partmap->name);
++    push_partmap_module (part->partmap->name, NULL);
+ 
+   if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID)
+     {
+-      grub_diskfilter_get_partmap (disk, push_partmap_module);
++      grub_diskfilter_get_partmap (disk, push_partmap_module, NULL);
+       have_abstractions = 1;
+     }
+ 
+@@ -432,7 +438,7 @@ probe_mods (grub_disk_t disk)
+   if (disk->dev->id == GRUB_DISK_DEVICE_CRYPTODISK_ID)
+     {
+       grub_util_cryptodisk_get_abstraction (disk,
+-					    grub_install_push_module);
++					    push_cryptodisk_module, NULL);
+       have_abstractions = 1;
+       have_cryptodisk = 1;
+     }
+diff --git a/util/grub-probe.c b/util/grub-probe.c
+index 80509be..ecb7b6b 100644
+--- a/util/grub-probe.c
++++ b/util/grub-probe.c
+@@ -130,13 +130,14 @@ get_targets_string (void)
+ }
+ 
+ static void
+-do_print (const char *x)
++do_print (const char *x, void *data)
+ {
+-  grub_printf ("%s ", x);
++  char delim = *(const char *) data;
++  grub_printf ("%s%c", x, delim);
+ }
+ 
+ static void
+-probe_partmap (grub_disk_t disk)
++probe_partmap (grub_disk_t disk, char delim)
+ {
+   grub_partition_t part;
+   grub_disk_memberlist_t list = NULL, tmp;
+@@ -147,10 +148,10 @@ probe_partmap (grub_disk_t disk)
+     }
+ 
+   for (part = disk->partition; part; part = part->parent)
+-    printf ("%s ", part->partmap->name);
++    printf ("%s%c", part->partmap->name, delim);
+ 
+   if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID)
+-    grub_diskfilter_get_partmap (disk, do_print);
++    grub_diskfilter_get_partmap (disk, do_print, &delim);
+ 
+   /* In case of LVM/RAID, check the member devices as well.  */
+   if (disk->dev->memberlist)
+@@ -159,7 +160,7 @@ probe_partmap (grub_disk_t disk)
+     }
+   while (list)
+     {
+-      probe_partmap (list->disk);
++      probe_partmap (list->disk, delim);
+       tmp = list->next;
+       free (list);
+       list = tmp;
+@@ -167,7 +168,7 @@ probe_partmap (grub_disk_t disk)
+ }
+ 
+ static void
+-probe_cryptodisk_uuid (grub_disk_t disk)
++probe_cryptodisk_uuid (grub_disk_t disk, char delim)
+ {
+   grub_disk_memberlist_t list = NULL, tmp;
+ 
+@@ -178,7 +179,7 @@ probe_cryptodisk_uuid (grub_disk_t disk)
+     }
+   while (list)
+     {
+-      probe_cryptodisk_uuid (list->disk);
++      probe_cryptodisk_uuid (list->disk, delim);
+       tmp = list->next;
+       free (list);
+       list = tmp;
+@@ -186,7 +187,7 @@ probe_cryptodisk_uuid (grub_disk_t disk)
+   if (disk->dev->id == GRUB_DISK_DEVICE_CRYPTODISK_ID)
+     {
+       const char *uu = grub_util_cryptodisk_get_uuid (disk);
+-      grub_printf ("%s ", uu);
++      grub_printf ("%s%c", uu, delim);
+     }
+ }
+ 
+@@ -210,7 +211,7 @@ probe_raid_level (grub_disk_t disk)
+ }
+ 
+ static void
+-probe_abstraction (grub_disk_t disk)
++probe_abstraction (grub_disk_t disk, char delim)
+ {
+   grub_disk_memberlist_t list = NULL, tmp;
+   int raid_level;
+@@ -219,7 +220,7 @@ probe_abstraction (grub_disk_t disk)
+     list = disk->dev->memberlist (disk);
+   while (list)
+     {
+-      probe_abstraction (list->disk);
++      probe_abstraction (list->disk, delim);
+ 
+       tmp = list->next;
+       free (list);
+@@ -229,26 +230,26 @@ probe_abstraction (grub_disk_t disk)
+   if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID
+       && (grub_memcmp (disk->name, "lvm/", sizeof ("lvm/") - 1) == 0 ||
+ 	  grub_memcmp (disk->name, "lvmid/", sizeof ("lvmid/") - 1) == 0))
+-    printf ("lvm ");
++    printf ("lvm%c", delim);
+ 
+   if (disk->dev->id == GRUB_DISK_DEVICE_DISKFILTER_ID
+       && grub_memcmp (disk->name, "ldm/", sizeof ("ldm/") - 1) == 0)
+-    printf ("ldm ");
++    printf ("ldm%c", delim);
+ 
+   if (disk->dev->id == GRUB_DISK_DEVICE_CRYPTODISK_ID)
+-    grub_util_cryptodisk_get_abstraction (disk, do_print);
++    grub_util_cryptodisk_get_abstraction (disk, do_print, &delim);
+ 
+   raid_level = probe_raid_level (disk);
+   if (raid_level >= 0)
+     {
+-      printf ("diskfilter ");
++      printf ("diskfilter%c", delim);
+       if (disk->dev->raidname)
+-	printf ("%s ", disk->dev->raidname (disk));
++	printf ("%s%c", disk->dev->raidname (disk), delim);
+     }
+   if (raid_level == 5)
+-    printf ("raid5rec ");
++    printf ("raid5rec%c", delim);
+   if (raid_level == 6)
+-    printf ("raid6rec ");
++    printf ("raid6rec%c", delim);
+ }
+ 
+ static void
+@@ -630,16 +631,14 @@ probe (const char *path, char **device_names, char delim)
+ 
+       if (print == PRINT_ABSTRACTION)
+ 	{
+-	  probe_abstraction (dev->disk);
+-	  putchar (delim);
++	  probe_abstraction (dev->disk, delim);
+ 	  grub_device_close (dev);
+ 	  continue;
+ 	}
+ 
+       if (print == PRINT_CRYPTODISK_UUID)
+ 	{
+-	  probe_cryptodisk_uuid (dev->disk);
+-	  putchar (delim);
++	  probe_cryptodisk_uuid (dev->disk, delim);
+ 	  grub_device_close (dev);
+ 	  continue;
+ 	}
+@@ -647,8 +646,7 @@ probe (const char *path, char **device_names, char delim)
+       if (print == PRINT_PARTMAP)
+ 	{
+ 	  /* Check if dev->disk itself is contained in a partmap.  */
+-	  probe_partmap (dev->disk);
+-	  putchar (delim);
++	  probe_partmap (dev->disk, delim);
+ 	  grub_device_close (dev);
+ 	  continue;
+ 	}
+-- 
+1.9.0
+
diff --git a/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
new file mode 100644
index 0000000..7d631ad
--- /dev/null
+++ b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
@@ -0,0 +1,44 @@
+From bd2125649cbeae60a5caff05d5a39c88a4e6eff6 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/125] btrfs: fix get_root key comparison failures due to
+ endianness
+
+* grub-core/fs/btrfs.c (get_root): Convert
+GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian.
+---
+ ChangeLog            | 7 +++++++
+ grub-core/fs/btrfs.c | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 1cb3b68..accffad 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2014-03-31  Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
++
++	btrfs: fix get_root key comparison failures due to endianness
++
++	* grub-core/fs/btrfs.c (get_root): Convert
++	GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian.
++
+ 2014-03-31  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 89666b6..f7b6c15 100644
+--- a/grub-core/fs/btrfs.c
++++ b/grub-core/fs/btrfs.c
+@@ -1201,7 +1201,7 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key,
+   struct grub_btrfs_key key_out, key_in;
+   struct grub_btrfs_root_item ri;
+ 
+-  key_in.object_id = GRUB_BTRFS_ROOT_VOL_OBJECTID;
++  key_in.object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_ROOT_VOL_OBJECTID);
+   key_in.offset = 0;
+   key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM;
+   err = lower_bound (data, &key_in, &key_out,
+-- 
+1.9.0
+
diff --git a/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
new file mode 100644
index 0000000..8438558
--- /dev/null
+++ b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
@@ -0,0 +1,55 @@
+From c3d9e64a61d17e57ef941a6a46e5a148c51c8519 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/125] * grub-core/osdep/linux/getroot.c
+ (grub_util_part_to_disk): Support NVMe device names.
+
+---
+ ChangeLog                       |  5 +++++
+ grub-core/osdep/linux/getroot.c | 17 +++++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index accffad..4a48409 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe
++	device names.
++
+ 2014-03-31  Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+ 
+ 	btrfs: fix get_root key comparison failures due to endianness
+diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
+index 19581d3..7007193 100644
+--- a/grub-core/osdep/linux/getroot.c
++++ b/grub-core/osdep/linux/getroot.c
+@@ -896,6 +896,23 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
+ 	  *pp = '\0';
+ 	  return path;
+ 	}
++
++      /* If this is a NVMe device */
++      if ((strncmp ("nvme", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
++	{
++	  char *pp = p + 4;
++	  while (*pp >= '0' && *pp <= '9')
++	    pp++;
++	  if (*pp == 'n')
++	    pp++;
++	  while (*pp >= '0' && *pp <= '9')
++	    pp++;
++	  if (*pp == 'p')
++	    *is_part = 1;
++	  /* /dev/nvme[0-9]+n[0-9]+p[0-9]* */
++	  *pp = '\0';
++	  return path;
++	}
+     }
+ 
+   return path;
+-- 
+1.9.0
+
diff --git a/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
new file mode 100644
index 0000000..d55bd61
--- /dev/null
+++ b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
@@ -0,0 +1,102 @@
+From cb2cfc87fad111a539e9645f6a96d0a89a28c8ab 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/125] Replace few instances of memcmp/memcpy in the code
+ that should be grub_memcmp/grub_memcpy.
+
+---
+ ChangeLog                      | 5 +++++
+ grub-core/commands/acpihalt.c  | 4 ++--
+ grub-core/commands/legacycfg.c | 4 ++--
+ grub-core/lib/relocator.c      | 2 +-
+ grub-core/loader/i386/bsd.c    | 4 ++--
+ 5 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4a48409..f18cdba 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	Replace few instances of memcmp/memcpy in the code that should be
++	grub_memcmp/grub_memcpy.
++
+ 2014-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe
+diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
+index 09421a6..83bdfe1 100644
+--- a/grub-core/commands/acpihalt.c
++++ b/grub-core/commands/acpihalt.c
+@@ -214,8 +214,8 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end,
+ 	  }
+ 	case GRUB_ACPI_OPCODE_NAME:
+ 	  ptr++;
+-	  if ((!scope || memcmp (scope, "\\", scope_len) == 0) &&
+-	      (memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0))
++	  if ((!scope || grub_memcmp (scope, "\\", scope_len) == 0) &&
++	      (grub_memcmp (ptr, "_S5_", 4) == 0 || grub_memcmp (ptr, "\\_S5_", 4) == 0))
+ 	    {
+ 	      int ll;
+ 	      grub_uint8_t *ptr2 = ptr;
+diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
+index e42a9d8..2c09fb7 100644
+--- a/grub-core/commands/legacycfg.c
++++ b/grub-core/commands/legacycfg.c
+@@ -580,7 +580,7 @@ check_password_md5_real (const char *entered,
+   GRUB_MD_MD5->write (ctx, entered, enteredlen);
+   digest = GRUB_MD_MD5->read (ctx);
+   GRUB_MD_MD5->final (ctx);
+-  memcpy (alt_result, digest, MD5_HASHLEN);
++  grub_memcpy (alt_result, digest, MD5_HASHLEN);
+   
+   GRUB_MD_MD5->init (ctx);
+   GRUB_MD_MD5->write (ctx, entered, enteredlen);
+@@ -596,7 +596,7 @@ check_password_md5_real (const char *entered,
+ 
+   for (i = 0; i < 1000; i++)
+     {
+-      memcpy (alt_result, digest, 16);
++      grub_memcpy (alt_result, digest, 16);
+ 
+       GRUB_MD_MD5->init (ctx);
+       if ((i & 1) != 0)
+diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
+index cb11ea5..f759c7f 100644
+--- a/grub-core/lib/relocator.c
++++ b/grub-core/lib/relocator.c
+@@ -652,7 +652,7 @@ malloc_in_range (struct grub_relocator *rel,
+     for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
+ 	 i++)
+       {
+-	memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0]));
++	grub_memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0]));
+ 	for (j = 0; j < N; j++)
+ 	  counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
+ 		   & DIGITSORT_MASK) + 1]++;
+diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
+index 19985f0..41ef910 100644
+--- a/grub-core/loader/i386/bsd.c
++++ b/grub-core/loader/i386/bsd.c
+@@ -1082,7 +1082,7 @@ grub_netbsd_add_boot_disk_and_wedge (void)
+ 
+     grub_crypto_hash (GRUB_MD_MD5, hash,
+ 		      buf.raw, GRUB_DISK_SECTOR_SIZE);
+-    memcpy (biw.matchhash, hash, 16);
++    grub_memcpy (biw.matchhash, hash, 16);
+ 
+     grub_bsd_add_meta (NETBSD_BTINFO_BOOTWEDGE, &biw, sizeof (biw));
+   }
+@@ -1100,7 +1100,7 @@ grub_netbsd_add_boot_disk_and_wedge (void)
+ 	bid.labelsector = partmapsector;
+ 	bid.label.type = buf.label.type;
+ 	bid.label.checksum = buf.label.checksum;
+-	memcpy (bid.label.packname, buf.label.packname, 16);
++	grub_memcpy (bid.label.packname, buf.label.packname, 16);
+       }
+     else
+       {
+-- 
+1.9.0
+
diff --git a/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
new file mode 100644
index 0000000..7a21954
--- /dev/null
+++ b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
@@ -0,0 +1,47 @@
+From 91152c6e2944e9ad3583482140f8991b972fec08 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/125] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
+ They're no longer pulled from libgcc.
+
+---
+ ChangeLog             | 5 +++++
+ include/grub/libgcc.h | 7 -------
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f18cdba..90e41bd 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,10 @@
+ 2014-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
++	* include/grub/libgcc.h: Remove ctzsi2 and ctzdi2. They're no longer
++	pulled from libgcc.
++
++2014-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
++
+ 	Replace few instances of memcmp/memcpy in the code that should be
+ 	grub_memcmp/grub_memcpy.
+ 
+diff --git a/include/grub/libgcc.h b/include/grub/libgcc.h
+index fdc6611..97233d7 100644
+--- a/include/grub/libgcc.h
++++ b/include/grub/libgcc.h
+@@ -42,13 +42,6 @@ void EXPORT_FUNC (__bswapsi2) (void);
+ # ifdef HAVE___BSWAPDI2
+ void EXPORT_FUNC (__bswapdi2) (void);
+ # endif
+-# ifdef HAVE___CTZDI2
+-void EXPORT_FUNC (__ctzdi2) (void);
+-# endif
+-# ifdef HAVE___CTZSI2
+-void EXPORT_FUNC (__ctzsi2) (void);
+-# endif
+-#endif
+ 
+ #ifdef HAVE__RESTGPR_14_X
+ void EXPORT_FUNC (_restgpr_14_x) (void);
+-- 
+1.9.0
+
diff --git a/0075-Add-missing-endif.patch b/0075-Add-missing-endif.patch
new file mode 100644
index 0000000..620dc59
--- /dev/null
+++ b/0075-Add-missing-endif.patch
@@ -0,0 +1,24 @@
+From fb1b02802aa368f43c8d0a871e017c14cb39b180 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/125] Add missing #endif
+
+---
+ include/grub/libgcc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/grub/libgcc.h b/include/grub/libgcc.h
+index 97233d7..8e93b67 100644
+--- a/include/grub/libgcc.h
++++ b/include/grub/libgcc.h
+@@ -42,6 +42,7 @@ void EXPORT_FUNC (__bswapsi2) (void);
+ # ifdef HAVE___BSWAPDI2
+ void EXPORT_FUNC (__bswapdi2) (void);
+ # endif
++#endif
+ 
+ #ifdef HAVE__RESTGPR_14_X
+ void EXPORT_FUNC (_restgpr_14_x) (void);
+-- 
+1.9.0
+
diff --git a/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
new file mode 100644
index 0000000..157678a
--- /dev/null
+++ b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
@@ -0,0 +1,39 @@
+From fb62186fefaca6b302eb61081bb6281042ff7283 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/125] 	* grub-core/lib/syslinux_parse.c: Fix timeout
+ quoting.
+
+---
+ ChangeLog                      | 4 ++++
+ grub-core/lib/syslinux_parse.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 90e41bd..50d9291 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-04-06  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/lib/syslinux_parse.c: Fix timeout quoting.
++
+ 2014-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* include/grub/libgcc.h: Remove ctzsi2 and ctzdi2. They're no longer
+diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
+index 21fa175..6bc504b 100644
+--- a/grub-core/lib/syslinux_parse.c
++++ b/grub-core/lib/syslinux_parse.c
+@@ -1432,7 +1432,7 @@ config_file (struct output_buffer *outbuf,
+       for (curentry = menu.entries; curentry->next; curentry = curentry->next);
+       lentry = curentry;
+ 
+-      print_string ("set timeout='");
++      print_string ("set timeout=");
+       err = print_num (outbuf, (menu.timeout + 9) / 10);
+       if (err)
+ 	return err;
+-- 
+1.9.0
+
diff --git a/0077-Improve-LVM-logical_volumes-string-matching.patch b/0077-Improve-LVM-logical_volumes-string-matching.patch
new file mode 100644
index 0000000..30bf96c
--- /dev/null
+++ b/0077-Improve-LVM-logical_volumes-string-matching.patch
@@ -0,0 +1,45 @@
+From d576e05a7bfe25413f70b54f671f305397bacf5e 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/125] Improve LVM "logical_volumes" string matching
+
+* grub-core/disk/lvm.c (grub_lvm_detect): Search for
+"logical_volumes" block a little more accurately.
+---
+ ChangeLog            | 5 +++++
+ grub-core/disk/lvm.c | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 50d9291..7f0c57d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-04-10  Colin Watson  <cjwatson@ubuntu.com>
++
++	* grub-core/disk/lvm.c (grub_lvm_detect): Search for
++	"logical_volumes" block a little more accurately.
++
+ 2014-04-06  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/lib/syslinux_parse.c: Fix timeout quoting.
+diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
+index 483c17e..862a966 100644
+--- a/grub-core/disk/lvm.c
++++ b/grub-core/disk/lvm.c
+@@ -333,10 +333,10 @@ grub_lvm_detect (grub_disk_t disk,
+ 	    }
+ 	}
+ 
+-      p = grub_strstr (p, "logical_volumes");
++      p = grub_strstr (p, "logical_volumes {");
+       if (p)
+ 	{
+-	  p += sizeof ("logical_volumes = ") - 1;
++	  p += sizeof ("logical_volumes {") - 1;
+ 
+ 	  /* And add all the lvs to the volume group. */
+ 	  while (1)
+-- 
+1.9.0
+
diff --git a/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
new file mode 100644
index 0000000..82792e1
--- /dev/null
+++ b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
@@ -0,0 +1,83 @@
+From 0942ce33c5b88d85a6b81f4b3dd75c32fdf21978 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/125] Tolerate devices with no filesystem UUID returned by
+ os-prober
+
+* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
+UUID.  Other parts of grub-mkconfig tolerate these, they were
+previously allowed here up to commit
+55e706c918922def17f5012c23cfe88c4c645208, and they can arise in
+practice when the system has active LVM snapshots.
+Fixes Ubuntu bug #1287436.
+---
+ ChangeLog                   |  9 +++++++++
+ util/grub.d/30_os-prober.in | 23 +++++++++++++----------
+ 2 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 7f0c57d..3556468 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,14 @@
+ 2014-04-10  Colin Watson  <cjwatson@ubuntu.com>
+ 
++	* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
++	UUID.  Other parts of grub-mkconfig tolerate these, they were
++	previously allowed here up to commit
++	55e706c918922def17f5012c23cfe88c4c645208, and they can arise in
++	practice when the system has active LVM snapshots.
++	Fixes Ubuntu bug #1287436.
++
++2014-04-10  Colin Watson  <cjwatson@ubuntu.com>
++
+ 	* grub-core/disk/lvm.c (grub_lvm_detect): Search for
+ 	"logical_volumes" block a little more accurately.
+ 
+diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
+index 7cf8487..6f38c82 100644
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -112,16 +112,17 @@ for OS in ${OSPROBED} ; do
+   LONGNAME="`echo ${OS} | cut -d ':' -f 2 | tr '^' ' '`"
+   LABEL="`echo ${OS} | cut -d ':' -f 3 | tr '^' ' '`"
+   BOOT="`echo ${OS} | cut -d ':' -f 4`"
+-  UUID="`${grub_probe} --target=fs_uuid --device ${DEVICE%@*}`"
+-  EXPUUID="$UUID"
++  if UUID="`${grub_probe} --target=fs_uuid --device ${DEVICE%@*}`"; then
++    EXPUUID="$UUID"
+ 
+-  if [ x"${DEVICE#*@}" != x ] ; then
++    if [ x"${DEVICE#*@}" != x ] ; then
+       EXPUUID="${EXPUUID}@${DEVICE#*@}"
+-  fi
++    fi
+ 
+-  if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
+-    echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
+-    continue
++    if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
++      echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
++      continue
++    fi
+   fi
+ 
+   BTRFS="`echo ${OS} | cut -d ':' -f 5`"
+@@ -277,9 +278,11 @@ EOF
+       echo "$title_correction_code"
+     ;;
+     macosx)
+-      OSXUUID="${UUID}"
+-      osx_entry xnu_kernel 32
+-      osx_entry xnu_kernel64 64
++      if [ "${UUID}" ]; then
++	OSXUUID="${UUID}"
++	osx_entry xnu_kernel 32
++	osx_entry xnu_kernel64 64
++      fi
+     ;;
+     hurd)
+       onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
+-- 
+1.9.0
+
diff --git a/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
new file mode 100644
index 0000000..33e156a
--- /dev/null
+++ b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
@@ -0,0 +1,49 @@
+From 42c1756fd0ff7d94dcc8e9be2e429a2a976f6d41 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/125] Allow loading old kernels by placing GDT in
+ conventional memory.
+
+---
+ ChangeLog                      |  5 +++++
+ grub-core/lib/i386/relocator.c | 11 +++++++----
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3556468..73a8928 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-04-20  Piotr Krysiuk  <piotras@gmail.com>
++
++	* grub-core/lib/i386/relocator.c: Allow loading old kernels by placing
++	GDT in conventional memory.
++
+ 2014-04-10  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
+diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
+index d2a1b27..ffaf25f 100644
+--- a/grub-core/lib/i386/relocator.c
++++ b/grub-core/lib/i386/relocator.c
+@@ -81,10 +81,13 @@ grub_relocator32_boot (struct grub_relocator *rel,
+   void *relst;
+   grub_relocator_chunk_t ch;
+ 
+-  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
+-					  (0xffffffff - RELOCATOR_SIZEOF (32))
+-					  + 1, RELOCATOR_SIZEOF (32), 16,
+-					  GRUB_RELOCATOR_PREFERENCE_NONE,
++  /* Specific memory range due to Global Descriptor Table for use by payload
++     that we will store in returned chunk.  The address range and preference
++     are based on "THE LINUX/x86 BOOT PROTOCOL" specification.  */
++  err = grub_relocator_alloc_chunk_align (rel, &ch, 0x1000,
++					  0x9a000 - RELOCATOR_SIZEOF (32),
++					  RELOCATOR_SIZEOF (32), 16,
++					  GRUB_RELOCATOR_PREFERENCE_LOW,
+ 					  avoid_efi_bootservices);
+   if (err)
+     return err;
+-- 
+1.9.0
+
diff --git a/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
new file mode 100644
index 0000000..964b51d
--- /dev/null
+++ b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
@@ -0,0 +1,43 @@
+From ec4609b70a7deebf6381297aae95dd4bf05bd008 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/125] 	* grub-core/kern/misc.c (__bzero): Don't
+ compile in GRUB_UTIL.
+
+	Reported by: Yves Blusseau <blusseau@zetam.org>.
+---
+ ChangeLog             | 6 ++++++
+ grub-core/kern/misc.c | 3 +++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 73a8928..3b61c0a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2014-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.
++
++	Reported by: Yves Blusseau <blusseau@zetam.org>.
++
+ 2014-04-20  Piotr Krysiuk  <piotras@gmail.com>
+ 
+ 	* grub-core/lib/i386/relocator.c: Allow loading old kernels by placing
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index 54db2e1..c5c815d 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -542,6 +542,9 @@ memset (void *s, int c, grub_size_t n)
+   return grub_memset (s, c, n);
+ }
+ 
++#endif
++
++#if !defined(GRUB_UTIL) && defined(__APPLE__)
+ void GRUB_BUILTIN_ATTR
+ __bzero (void *s, grub_size_t n)
+ {
+-- 
+1.9.0
+
diff --git a/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
new file mode 100644
index 0000000..e3454c5
--- /dev/null
+++ b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
@@ -0,0 +1,40 @@
+From 4a307e8fe1298f88641a40c8a8008363aa4b9c17 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/125] 	* grub-core/commands/verify.c
+ (grub_pubkey_open): Fix memdisk 	check.
+
+---
+ ChangeLog                   | 5 +++++
+ grub-core/commands/verify.c | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3b61c0a..d0896d8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	* grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
++	check.
++
+ 2014-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.
+diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
+index a9dfd88..6349ccf 100644
+--- a/grub-core/commands/verify.c
++++ b/grub-core/commands/verify.c
+@@ -835,7 +835,7 @@ grub_pubkey_open (grub_file_t io, const char *filename)
+ 
+   if (!sec)
+     return io;
+-  if (io->device->disk && io->device->disk->id == GRUB_DISK_DEVICE_MEMDISK_ID)
++  if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID)
+     return io;
+   fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
+   if (!fsuf)
+-- 
+1.9.0
+
diff --git a/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
new file mode 100644
index 0000000..2b92647
--- /dev/null
+++ b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
@@ -0,0 +1,43 @@
+From 61fdf8bebdeaed4b601f0eca847282780380191f 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/125] 	* grub-core/commands/verify.c
+ (grub_pubkey_open): Trust procfs.
+
+---
+ ChangeLog                   | 4 ++++
+ grub-core/commands/verify.c | 4 +++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index d0896d8..2a94ad9 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,9 @@
+ 2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
++	* grub-core/commands/verify.c (grub_pubkey_open): Trust procfs.
++
++2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
++
+ 	* grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
+ 	check.
+ 
+diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
+index 6349ccf..525bdd1 100644
+--- a/grub-core/commands/verify.c
++++ b/grub-core/commands/verify.c
+@@ -835,7 +835,9 @@ grub_pubkey_open (grub_file_t io, const char *filename)
+ 
+   if (!sec)
+     return io;
+-  if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID)
++  if (io->device->disk && 
++      (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID
++       || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID))
+     return io;
+   fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
+   if (!fsuf)
+-- 
+1.9.0
+
diff --git a/0083-Don-t-add-to-highlighted-row.patch b/0083-Don-t-add-to-highlighted-row.patch
deleted file mode 100644
index 1181345..0000000
--- a/0083-Don-t-add-to-highlighted-row.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ceaa93bab3ce4b8ed8ac4448e39bbf017749a757 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <william.jon.mccann@gmail.com>
-Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 083/103] Don't add '*' to highlighted row
-
-It is already highlighted.
----
- grub-core/normal/menu_text.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index daf92b5..2f84fcc 100644
---- a/grub-core/normal/menu_text.c
-+++ b/grub-core/normal/menu_text.c
-@@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
-       unicode_title[i] = ' ';
- 
-   if (data->geo.num_entries > 1)
--    grub_putcode (' ', term);
-+    grub_putcode (' ', data->term);
- 
-   grub_print_ucs4_menu (unicode_title,
- 			unicode_title + len,
--- 
-1.9.0
-
diff --git a/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
new file mode 100644
index 0000000..ea807fd
--- /dev/null
+++ b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
@@ -0,0 +1,73 @@
+From 473348e663de53939fc077a1e1ef262405712dd8 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/125] 	* util/grub-gen-asciih.c (add_glyph): Fix
+ uninitialised variable.
+
+---
+ ChangeLog              |  4 ++++
+ util/grub-gen-asciih.c | 15 +++++++++------
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 2a94ad9..b552113 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-06-21  Trevor Woerner <trevor.woerner@linaro.org>
++
++	* util/grub-gen-asciih.c (add_glyph): Fix uninitialised variable.
++
+ 2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* grub-core/commands/verify.c (grub_pubkey_open): Trust procfs.
+diff --git a/util/grub-gen-asciih.c b/util/grub-gen-asciih.c
+index e01447a..e35dcb7 100644
+--- a/util/grub-gen-asciih.c
++++ b/util/grub-gen-asciih.c
+@@ -81,14 +81,14 @@ add_glyph (FT_UInt glyph_idx, FT_Face face,
+   err = FT_Load_Glyph (face, glyph_idx, flag);
+   if (err)
+     {
+-      printf ("Freetype Error %d loading glyph 0x%x for U+0x%x",
++      fprintf (stderr, "Freetype Error %d loading glyph 0x%x for U+0x%x",
+ 	      err, glyph_idx, char_code);
+ 
+       if (err > 0 && err < (signed) ARRAY_SIZE (ft_errmsgs))
+-	printf (": %s\n", ft_errmsgs[err]);
++	fprintf (stderr, ": %s\n", ft_errmsgs[err]);
+       else
+-	printf ("\n");
+-      return;
++	fprintf (stderr, "\n");
++      exit (1);
+     }
+ 
+   glyph = face->glyph;
+@@ -128,7 +128,6 @@ add_glyph (FT_UInt glyph_idx, FT_Face face,
+ static void
+ write_font_ascii_bitmap (FILE *file, FT_Face face)
+ {
+-  struct grub_glyph_info glyph;
+   int char_code;
+ 
+   fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n");
+@@ -138,10 +137,14 @@ write_font_ascii_bitmap (FILE *file, FT_Face face)
+   for (char_code = 0; char_code <= 0x7f; char_code++)
+     {
+       FT_UInt glyph_idx;
+-      
++      struct grub_glyph_info glyph;
++
+       glyph_idx = FT_Get_Char_Index (face, char_code);
+       if (!glyph_idx)
+ 	return;
++
++      memset (&glyph, 0, sizeof(glyph));
++
+       add_glyph (glyph_idx, face, char_code, &glyph);
+ 
+       if (glyph.width == 8 && glyph.height == 16
+-- 
+1.9.0
+
diff --git a/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
new file mode 100644
index 0000000..02e54c7
--- /dev/null
+++ b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
@@ -0,0 +1,39 @@
+From 9de53cc99ce4c8e404e645443d07324bd9cfc157 Mon Sep 17 00:00:00 2001
+From: Stephane Rochoy <sheda>
+Date: Sun, 22 Jun 2014 01:34:57 +0200
+Subject: [PATCH 084/125] 	* grub-core/commands/efi/lsefisystab.c
+ (grub_cmd_lsefisystab): Show 	EFI system table physical address.
+
+---
+ ChangeLog                            | 5 +++++
+ grub-core/commands/efi/lsefisystab.c | 1 +
+ 2 files changed, 6 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index b552113..abf8f4b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2014-06-21  Stephane Rochoy <sheda>
++
++	* grub-core/commands/efi/lsefisystab.c (grub_cmd_lsefisystab): Show
++	EFI system table physical address.
++
+ 2014-06-21  Trevor Woerner <trevor.woerner@linaro.org>
+ 
+ 	* util/grub-gen-asciih.c (add_glyph): Fix uninitialised variable.
+diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
+index eda8c5f..8717db9 100644
+--- a/grub-core/commands/efi/lsefisystab.c
++++ b/grub-core/commands/efi/lsefisystab.c
+@@ -52,6 +52,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
+   grub_efi_configuration_table_t *t;
+   unsigned int i;
+ 
++  grub_printf ("Address: %p\n", st);
+   grub_printf ("Signature: %016" PRIxGRUB_UINT64_T " revision: %08x\n",
+ 	       st->hdr.signature, st->hdr.revision);
+   {
+-- 
+1.9.0
+
diff --git a/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
new file mode 100644
index 0000000..0ea46b8
--- /dev/null
+++ b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
@@ -0,0 +1,72 @@
+From 3be166827cecb977ad47ac4d3d89ec92688307a4 Mon Sep 17 00:00:00 2001
+From: Stephane Rochoy <sheda>
+Date: Sun, 22 Jun 2014 01:35:52 +0200
+Subject: [PATCH 085/125] 	* grub-core/loader/i386/bsd.c
+ (grub_netbsd_boot): Pass pointer to 	EFI system table.
+
+---
+ ChangeLog                           | 5 +++++
+ grub-core/loader/i386/bsd.c         | 8 ++++++++
+ include/grub/i386/netbsd_bootinfo.h | 7 +++++++
+ 3 files changed, 20 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index abf8f4b..0cdd095 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,10 @@
+ 2014-06-21  Stephane Rochoy <sheda>
+ 
++	* grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to
++	EFI system table.
++
++2014-06-21  Stephane Rochoy <sheda>
++
+ 	* grub-core/commands/efi/lsefisystab.c (grub_cmd_lsefisystab): Show
+ 	EFI system table physical address.
+ 
+diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
+index 41ef910..8f691e0 100644
+--- a/grub-core/loader/i386/bsd.c
++++ b/grub-core/loader/i386/bsd.c
+@@ -1145,6 +1145,14 @@ grub_netbsd_boot (void)
+   if (err)
+     return err;
+ 
++#ifdef GRUB_MACHINE_EFI
++  err = grub_bsd_add_meta (NETBSD_BTINFO_EFI,
++			   &grub_efi_system_table,
++			   sizeof (grub_efi_system_table));
++  if (err)
++    return err;
++#endif
++
+   {
+     struct bsd_tag *tag;
+     tag_buf_len = 0;
+diff --git a/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
+index e48c19b..9b4f460 100644
+--- a/include/grub/i386/netbsd_bootinfo.h
++++ b/include/grub/i386/netbsd_bootinfo.h
+@@ -58,6 +58,8 @@
+ #define NETBSD_BTINFO_BOOTWEDGE		10
+ #define NETBSD_BTINFO_MODULES		11
+ #define NETBSD_BTINFO_FRAMEBUF		12
++#define NETBSD_BTINFO_USERCONFCOMMANDS  13
++#define NETBSD_BTINFO_EFI	        14
+ 
+ struct grub_netbsd_bootinfo
+ {
+@@ -146,4 +148,9 @@ struct grub_netbsd_btinfo_framebuf
+ 
+ #define GRUB_NETBSD_MAX_ROOTDEVICE_LEN 16
+ 
++struct grub_netbsd_btinfo_efi
++{
++  void *pa_systbl;  /* Physical address of the EFI System Table */
++};
++
+ #endif
+-- 
+1.9.0
+
diff --git a/0086-util-grub-install.c-Fix-handling-of-disk-module.patch b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch
new file mode 100644
index 0000000..3256788
--- /dev/null
+++ b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch
@@ -0,0 +1,47 @@
+From d45ed8a6bf7c0c0abacb268da1f6d569743f16a0 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/125] 	* util/grub-install.c: Fix handling of
+ --disk-module.
+
+---
+ ChangeLog           | 4 ++++
+ util/grub-install.c | 3 +--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 0cdd095..4ce6643 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-06-21  Glenn Washburn <development@efficientek.com>
++
++	* util/grub-install.c: Fix handling of --disk-module.
++
+ 2014-06-21  Stephane Rochoy <sheda>
+ 
+ 	* grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to
+diff --git a/util/grub-install.c b/util/grub-install.c
+index e9c6a46..7d61c32 100644
+--- a/util/grub-install.c
++++ b/util/grub-install.c
+@@ -94,7 +94,6 @@ enum
+     OPTION_RECHECK, 
+     OPTION_FORCE,
+     OPTION_FORCE_FILE_ID,
+-    OPTION_MODULE, 
+     OPTION_NO_NVRAM, 
+     OPTION_REMOVABLE, 
+     OPTION_BOOTLOADER_ID, 
+@@ -273,7 +272,7 @@ static struct argp_option options[] = {
+    N_("install even if problems are detected"), 2},
+   {"force-file-id", OPTION_FORCE_FILE_ID, 0, 0,
+    N_("use identifier file even if UUID is available"), 2},
+-  {"disk-module", OPTION_MODULE, N_("MODULE"), 0,
++  {"disk-module", OPTION_DISK_MODULE, N_("MODULE"), 0,
+    N_("disk module to use (biosdisk or native). "
+       "This option is only available on BIOS target."), 2},
+   {"no-nvram", OPTION_NO_NVRAM, 0, 0,
+-- 
+1.9.0
+
diff --git a/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
new file mode 100644
index 0000000..7b41e25
--- /dev/null
+++ b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
@@ -0,0 +1,58 @@
+From a9c472a7eeec6816868dbccce6decaef3b3c62bb 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/125] 	* grub-core/commands/loadenv.c
+ (check_blocklists): Fix overlap check.
+
+---
+ ChangeLog                    |  4 ++++
+ grub-core/commands/loadenv.c | 13 ++-----------
+ 2 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 4ce6643..a2da974 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-06-21  Роман Пехов <roman_pekhov>
++
++	* grub-core/commands/loadenv.c (check_blocklists): Fix overlap check.
++
+ 2014-06-21  Glenn Washburn <development@efficientek.com>
+ 
+ 	* util/grub-install.c: Fix handling of --disk-module.
+diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
+index 6af8112..acd93d1 100644
+--- a/grub-core/commands/loadenv.c
++++ b/grub-core/commands/loadenv.c
+@@ -263,7 +263,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
+       for (q = p->next; q; q = q->next)
+         {
+ 	  grub_disk_addr_t s1, s2;
+-	  grub_disk_addr_t e1, e2, t;
++	  grub_disk_addr_t e1, e2;
+ 
+ 	  s1 = p->sector;
+ 	  e1 = s1 + ((p->length + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+@@ -271,16 +271,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
+ 	  s2 = q->sector;
+ 	  e2 = s2 + ((q->length + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+ 
+-	  if (s2 > s1)
+-	    {
+-	      t = s2;
+-	      s2 = s1;
+-	      s1 = t;
+-	      t = e2;
+-	      e2 = e1;
+-	      e1 = t;
+-	    }
+-          if (e1 > s2)
++	  if (s1 < e2 && s2 < e1)
+             {
+               /* This might be actually valid, but it is unbelievable that
+                  any filesystem makes such a silly allocation.  */
+-- 
+1.9.0
+
diff --git a/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
new file mode 100644
index 0000000..1f49561
--- /dev/null
+++ b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
@@ -0,0 +1,26 @@
+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/125] * 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.0
+
diff --git a/0065-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
similarity index 96%
rename from 0065-Migrate-PPC-from-Yaboot-to-Grub2.patch
rename to 0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
index 3f1b501..39d07c9 100644
--- a/0065-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -1,7 +1,7 @@
-From 4d75121a7fa86a60b646c96e2d75caa0d70c408e Mon Sep 17 00:00:00 2001
+From f01392a68f7f20bcc064a7d28e10805509701c4d Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 065/103] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 089/125] Migrate PPC from Yaboot to Grub2
 
 Add configuration support for serial terminal consoles.  This will set the
 maximum screen size so that text is not overwritten.
diff --git a/0066-Add-fw_path-variable-revised.patch b/0090-Add-fw_path-variable-revised.patch
similarity index 94%
rename from 0066-Add-fw_path-variable-revised.patch
rename to 0090-Add-fw_path-variable-revised.patch
index ade4f17..f20abd1 100644
--- a/0066-Add-fw_path-variable-revised.patch
+++ b/0090-Add-fw_path-variable-revised.patch
@@ -1,7 +1,7 @@
-From ae053ae71b4d7e3168f6d97398f0d137929fafd0 Mon Sep 17 00:00:00 2001
+From 5bd3e1f888eeddc2575608516220ffa7b8270c7a Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 066/103] Add fw_path variable (revised)
+Subject: [PATCH 090/125] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the
diff --git a/0067-Add-support-for-linuxefi.patch b/0091-Add-support-for-linuxefi.patch
similarity index 99%
rename from 0067-Add-support-for-linuxefi.patch
rename to 0091-Add-support-for-linuxefi.patch
index 079da3d..a998cdd 100644
--- a/0067-Add-support-for-linuxefi.patch
+++ b/0091-Add-support-for-linuxefi.patch
@@ -1,7 +1,7 @@
-From f84fdfda066a9b46598847f7af0f02c97fb8cdc5 Mon Sep 17 00:00:00 2001
+From 70e7bfb2caa9d0f52187b4f6e84762c6459c5903 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 067/103] Add support for linuxefi
+Subject: [PATCH 091/125] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +
diff --git a/0068-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
similarity index 92%
rename from 0068-Use-linuxefi-and-initrdefi-where-appropriate.patch
rename to 0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
index f378b24..762c562 100644
--- a/0068-Use-linuxefi-and-initrdefi-where-appropriate.patch
+++ b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
@@ -1,7 +1,7 @@
-From f606b7dfc35082809dd68dccf47d16db7d741085 Mon Sep 17 00:00:00 2001
+From acc83cfa76a6457be73b1e748a80deb3967e2364 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 068/103] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 092/125] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--
diff --git a/0069-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
similarity index 96%
rename from 0069-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
rename to 0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
index 6c9e02c..5e7f4c4 100644
--- a/0069-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+++ b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
@@ -1,7 +1,7 @@
-From 87edbb7d2e669de75f05d28329f72464ce5d4ee3 Mon Sep 17 00:00:00 2001
+From fe7b32ab9e58470fdf930d8efc7c9ebcd69e6ef3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 069/103] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 093/125] Don't allow insmod when secure boot is enabled.
 
 Hi,
 
diff --git a/0070-Pass-x-hex-hex-straight-through-unmolested.patch b/0094-Pass-x-hex-hex-straight-through-unmolested.patch
similarity index 97%
rename from 0070-Pass-x-hex-hex-straight-through-unmolested.patch
rename to 0094-Pass-x-hex-hex-straight-through-unmolested.patch
index 225bed3..ed4751c 100644
--- a/0070-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0094-Pass-x-hex-hex-straight-through-unmolested.patch
@@ -1,7 +1,7 @@
-From 438e7306ea31c03ee86c4cdf97b2802443e5e4dd Mon Sep 17 00:00:00 2001
+From a4f335a93d417c7f51f715d55ae59621fc9772ad Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 070/103] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 094/125] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---
diff --git a/0071-Fix-crash-on-http.patch b/0095-Fix-crash-on-http.patch
similarity index 88%
rename from 0071-Fix-crash-on-http.patch
rename to 0095-Fix-crash-on-http.patch
index 21a0c2b..7423137 100644
--- a/0071-Fix-crash-on-http.patch
+++ b/0095-Fix-crash-on-http.patch
@@ -1,7 +1,7 @@
-From 0a40f0fc38bf46df57c411b673299c20120cf9b2 Mon Sep 17 00:00:00 2001
+From e5a51c7c96d347cd6cbb7a2aa11f5dd7358c802a Mon Sep 17 00:00:00 2001
 From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
 Date: Tue, 25 Sep 2012 18:40:55 -0400
-Subject: [PATCH 071/103] Fix crash on http
+Subject: [PATCH 095/125] Fix crash on http
 
 Don't free file->data on receiving FIN flag since it is used all over without
 checking. http_close() will be called later to free that memory.
diff --git a/0072-IBM-client-architecture-CAS-reboot-support.patch b/0096-IBM-client-architecture-CAS-reboot-support.patch
similarity index 97%
rename from 0072-IBM-client-architecture-CAS-reboot-support.patch
rename to 0096-IBM-client-architecture-CAS-reboot-support.patch
index 8065777..4a80b5b 100644
--- a/0072-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0096-IBM-client-architecture-CAS-reboot-support.patch
@@ -1,7 +1,7 @@
-From 751b9439b85ba9f6a6da7b08bc261fcf68f6ea94 Mon Sep 17 00:00:00 2001
+From 9d1411ffa7290c1cbdc9ee95bb5fcc5506e63e0f Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 072/103] IBM client architecture (CAS) reboot support
+Subject: [PATCH 096/125] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
diff --git a/0073-Add-vlan-tag-support.patch b/0097-Add-vlan-tag-support.patch
similarity index 98%
rename from 0073-Add-vlan-tag-support.patch
rename to 0097-Add-vlan-tag-support.patch
index 6525097..1eeffe9 100644
--- a/0073-Add-vlan-tag-support.patch
+++ b/0097-Add-vlan-tag-support.patch
@@ -1,7 +1,7 @@
-From e6fbb3e8b50fb1e41f1466d2ef11c88868702f49 Mon Sep 17 00:00:00 2001
+From c987623113e2d03e80f0ba1e108bf0a800628f85 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 073/103] Add vlan-tag support
+Subject: [PATCH 097/125] Add vlan-tag support
 
 This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
 multiple VLANs in a bridged network to share the same physical network link but
diff --git a/0074-Add-X-option-to-printf-functions.patch b/0098-Add-X-option-to-printf-functions.patch
similarity index 69%
rename from 0074-Add-X-option-to-printf-functions.patch
rename to 0098-Add-X-option-to-printf-functions.patch
index 4e4bd86..59e0f75 100644
--- a/0074-Add-X-option-to-printf-functions.patch
+++ b/0098-Add-X-option-to-printf-functions.patch
@@ -1,17 +1,17 @@
-From 6831a99c8594a644adb7da3fe8191c01b42f1912 Mon Sep 17 00:00:00 2001
+From d7aaf1651f4b36721f73331753d017d33d7879b4 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 074/103] Add %X option to printf functions.
+Subject: [PATCH 098/125] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 54db2e1..50f7f53 100644
+index c5c815d..a56cfe7 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
-@@ -759,7 +759,7 @@ __umoddi3 (grub_uint64_t a, grub_uint64_t b)
+@@ -762,7 +762,7 @@ __umoddi3 (grub_uint64_t a, grub_uint64_t b)
  static inline char *
  grub_lltoa (char *str, int c, unsigned long long n)
  {
@@ -20,7 +20,7 @@ index 54db2e1..50f7f53 100644
    char *p;
  
    if ((long long) n < 0 && c == 'd')
-@@ -774,7 +774,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
+@@ -777,7 +777,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
      do
        {
  	unsigned d = (unsigned) (n & 0xf);
@@ -29,7 +29,7 @@ index 54db2e1..50f7f53 100644
        }
      while (n >>= 4);
    else
-@@ -847,6 +847,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
+@@ -850,6 +850,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
  	{
  	case 'p':
  	case 'x':
@@ -37,7 +37,7 @@ index 54db2e1..50f7f53 100644
  	case 'u':
  	case 'd':
  	case 'c':
-@@ -927,6 +928,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
+@@ -930,6 +931,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
        switch (c)
  	{
  	case 'x':
@@ -45,7 +45,7 @@ index 54db2e1..50f7f53 100644
  	case 'u':
  	  args->ptr[curn].type = UNSIGNED_INT + longfmt;
  	  break;
-@@ -1064,6 +1066,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
+@@ -1067,6 +1069,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0,
  	  c = 'x';
  	  /* Fall through. */
  	case 'x':
diff --git a/0075-DHCP-client-ID-and-UUID-options-added.patch b/0099-DHCP-client-ID-and-UUID-options-added.patch
similarity index 96%
rename from 0075-DHCP-client-ID-and-UUID-options-added.patch
rename to 0099-DHCP-client-ID-and-UUID-options-added.patch
index 98b17d4..4c55c1b 100644
--- a/0075-DHCP-client-ID-and-UUID-options-added.patch
+++ b/0099-DHCP-client-ID-and-UUID-options-added.patch
@@ -1,7 +1,7 @@
-From 3eb31d2652b19eb38b2a01bdc83540cbd67d96be Mon Sep 17 00:00:00 2001
+From 2f3846a557e4ddf83f44e166d959ee460bedf8e1 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 075/103] DHCP client ID and UUID options added.
+Subject: [PATCH 099/125] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
diff --git a/0076-Search-for-specific-config-file-for-netboot.patch b/0100-Search-for-specific-config-file-for-netboot.patch
similarity index 97%
rename from 0076-Search-for-specific-config-file-for-netboot.patch
rename to 0100-Search-for-specific-config-file-for-netboot.patch
index dfda2de..2c466fe 100644
--- a/0076-Search-for-specific-config-file-for-netboot.patch
+++ b/0100-Search-for-specific-config-file-for-netboot.patch
@@ -1,7 +1,7 @@
-From 430bea1ee5b48877f8ffd461b4a0c6e147a3c24e Mon Sep 17 00:00:00 2001
+From bf19a1e123fd09552165bd0d2b19ccf438c0a46c Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 076/103] Search for specific config file for netboot
+Subject: [PATCH 100/125] Search for specific config file for netboot
 
 This patch implements a search for a specific configuration when the config
 file is on a remoteserver. It uses the following order:
diff --git a/0100-arm64-set-correct-length-of-device-path-end-entry.patch b/0100-arm64-set-correct-length-of-device-path-end-entry.patch
deleted file mode 100644
index f6474e9..0000000
--- a/0100-arm64-set-correct-length-of-device-path-end-entry.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f581af0a9cac0c25468c9c0c43c103ca38b547a9 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 100/103] arm64: set correct length of device path end entry
-
-The length of the Device Path End entry in the grub_linux_boot()
-function was incorrectly set to 0. This triggers an assert failure
-in debug builds of Tianocore.
-
-Set it to sizeof (grub_efi_device_path_t).
----
- ChangeLog | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 1b17e1b..5d2bef7 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -339,6 +339,8 @@
- 	* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
- 	detection.
- 
-+=======
-+>>>>>>> arm64: set correct length of device path end entry
- 2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
- 
- 	* configure.ac: Set version to 2.02~beta2.
--- 
-1.9.0
-
diff --git a/0077-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
similarity index 97%
rename from 0077-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
rename to 0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
index 9063b61..ac9ceea 100644
--- a/0077-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@@ -1,7 +1,7 @@
-From 8721b76fad30cce6f152f119a031422acd6ae13a Mon Sep 17 00:00:00 2001
+From ddfb160353df14e9f88affe7498512a553146872 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 077/103] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 101/125] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
diff --git a/0078-Move-bash-completion-script-922997.patch b/0102-Move-bash-completion-script-922997.patch
similarity index 86%
rename from 0078-Move-bash-completion-script-922997.patch
rename to 0102-Move-bash-completion-script-922997.patch
index 70d859f..ce872c1 100644
--- a/0078-Move-bash-completion-script-922997.patch
+++ b/0102-Move-bash-completion-script-922997.patch
@@ -1,7 +1,7 @@
-From 35cc854569fc68a336072775fc7e3dc7debc99bc Mon Sep 17 00:00:00 2001
+From f60046d87e55646d36c21520c5f6391c184ec8ad Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 078/103] Move bash completion script (#922997)
+Subject: [PATCH 102/125] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---
diff --git a/0079-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
similarity index 89%
rename from 0079-for-ppc-reset-console-display-attr-when-clear-screen.patch
rename to 0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
index 94fab7a..bef0ba5 100644
--- a/0079-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -1,7 +1,7 @@
-From 9364753f4e7eaa65dceadba5652ddd2becabce0a Mon Sep 17 00:00:00 2001
+From e52a5b66e765740deea4dbd201ab802c408184b9 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 079/103] for ppc, reset console display attr when clear screen
+Subject: [PATCH 103/125] for ppc, reset console display attr when clear screen
 
 This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519
diff --git a/0080-Don-t-write-messages-to-the-screen.patch b/0104-Don-t-write-messages-to-the-screen.patch
similarity index 97%
rename from 0080-Don-t-write-messages-to-the-screen.patch
rename to 0104-Don-t-write-messages-to-the-screen.patch
index fc8c628..9f4f086 100644
--- a/0080-Don-t-write-messages-to-the-screen.patch
+++ b/0104-Don-t-write-messages-to-the-screen.patch
@@ -1,7 +1,7 @@
-From 56d9ef35cfe88fdfc82f8b16908e839d62801b38 Mon Sep 17 00:00:00 2001
+From 0ee337319fc8c21da04bca1cabb51b3445dba3fd Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH 080/103] Don't write messages to the screen
+Subject: [PATCH 104/125] Don't write messages to the screen
 
 Writing messages to the screen before the menus or boot splash
 happens so quickly it looks like something is wrong and isn't
diff --git a/0081-Don-t-print-GNU-GRUB-header.patch b/0105-Don-t-print-GNU-GRUB-header.patch
similarity index 86%
rename from 0081-Don-t-print-GNU-GRUB-header.patch
rename to 0105-Don-t-print-GNU-GRUB-header.patch
index 996a65a..2dcb13a 100644
--- a/0081-Don-t-print-GNU-GRUB-header.patch
+++ b/0105-Don-t-print-GNU-GRUB-header.patch
@@ -1,7 +1,7 @@
-From c3cb9d2a7a43ef15f361e142be2a1abaa4067655 Mon Sep 17 00:00:00 2001
+From e3cabcd95237fadbad8e6a0e36222d97d16b5365 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:53:48 -0400
-Subject: [PATCH 081/103] Don't print GNU GRUB header
+Subject: [PATCH 105/125] Don't print GNU GRUB header
 
 No one cares.
 ---
diff --git a/0082-Don-t-add-to-highlighted-row.patch b/0106-Don-t-add-to-highlighted-row.patch
similarity index 77%
rename from 0082-Don-t-add-to-highlighted-row.patch
rename to 0106-Don-t-add-to-highlighted-row.patch
index 1175260..c2b3c81 100644
--- a/0082-Don-t-add-to-highlighted-row.patch
+++ b/0106-Don-t-add-to-highlighted-row.patch
@@ -1,7 +1,7 @@
-From 6a89fe8eff74f03b19a850e260c971b9ac3129ca Mon Sep 17 00:00:00 2001
+From c89f05d148a1a1416513d22f62d23504b35dd230 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 082/103] Don't add '*' to highlighted row
+Subject: [PATCH 106/125] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -9,7 +9,7 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 2ff2941..daf92b5 100644
+index 2ff2941..2f84fcc 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
@@ -17,7 +17,7 @@ index 2ff2941..daf92b5 100644
  
    if (data->geo.num_entries > 1)
 -    grub_putcode (highlight ? '*' : ' ', data->term);
-+    grub_putcode (' ', term);
++    grub_putcode (' ', data->term);
  
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,
diff --git a/0084-Message-string-cleanups.patch b/0107-Message-string-cleanups.patch
similarity index 96%
rename from 0084-Message-string-cleanups.patch
rename to 0107-Message-string-cleanups.patch
index 99c8ea1..e1797d2 100644
--- a/0084-Message-string-cleanups.patch
+++ b/0107-Message-string-cleanups.patch
@@ -1,7 +1,7 @@
-From db36eff4717d7a05a9c17dabbf46ebf6a30d056b Mon Sep 17 00:00:00 2001
+From 6c33a9b3a96a5e8c782a8eef97f5d95a3a542921 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH 084/103] Message string cleanups
+Subject: [PATCH 107/125] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---
diff --git a/0085-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
similarity index 87%
rename from 0085-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
rename to 0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
index 9971dcd..dbb7a5f 100644
--- a/0085-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
@@ -1,7 +1,7 @@
-From 7c1b0d6c8c79bfb55fcc9f81c4db225e63ba57a9 Mon Sep 17 00:00:00 2001
+From 6227514ebbfcf1744060eb4bf1b39b669221809d Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH 085/103] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 108/125] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---
diff --git a/0086-Use-the-correct-indentation-for-the-term-help-text.patch b/0109-Use-the-correct-indentation-for-the-term-help-text.patch
similarity index 87%
rename from 0086-Use-the-correct-indentation-for-the-term-help-text.patch
rename to 0109-Use-the-correct-indentation-for-the-term-help-text.patch
index 7eab53d..3641870 100644
--- a/0086-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/0109-Use-the-correct-indentation-for-the-term-help-text.patch
@@ -1,7 +1,7 @@
-From 7188fc2fc1cc381e3ad0ca765c205bdc9ce44b1a Mon Sep 17 00:00:00 2001
+From 9cc9edb600ad1acc1598910ed95a8482ff3de6e2 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH 086/103] Use the correct indentation for the term help text
+Subject: [PATCH 109/125] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---
diff --git a/0087-Indent-menu-entries.patch b/0110-Indent-menu-entries.patch
similarity index 86%
rename from 0087-Indent-menu-entries.patch
rename to 0110-Indent-menu-entries.patch
index b41cecf..b0a8038 100644
--- a/0087-Indent-menu-entries.patch
+++ b/0110-Indent-menu-entries.patch
@@ -1,7 +1,7 @@
-From 90dbb7aaa066c84e514af72530018ec71735c9d7 Mon Sep 17 00:00:00 2001
+From e52c695e09447f6fbc51c23f1745d50c6db5c7b8 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH 087/103] Indent menu entries
+Subject: [PATCH 110/125] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-
diff --git a/0088-Fix-margins.patch b/0111-Fix-margins.patch
similarity index 92%
rename from 0088-Fix-margins.patch
rename to 0111-Fix-margins.patch
index fc6224d..7aa4eb8 100644
--- a/0088-Fix-margins.patch
+++ b/0111-Fix-margins.patch
@@ -1,7 +1,7 @@
-From 69d78859f1c3d2841a2519dddabcb656b0d61ad7 Mon Sep 17 00:00:00 2001
+From a623d490ea6a94cc7db68400d3fea5b0c25ccb9c Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH 088/103] Fix margins
+Subject: [PATCH 111/125] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----
diff --git a/0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
similarity index 86%
rename from 0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch
rename to 0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
index 9f170f9..eae6afa 100644
--- a/0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
@@ -1,7 +1,7 @@
-From 57af230410edac066aa54ee1d008ead9e0405039 Mon Sep 17 00:00:00 2001
+From 5980cac9e0320a3eb65e7fb73487a565d21361da Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 089/103] Add support for UEFI operating systems returned by
+Subject: [PATCH 112/125] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:
@@ -15,10 +15,10 @@ contrast to legacy OSes, where path is the device string. Handle this case.
  1 file changed, 18 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 7cf8487..390bb0e 100644
+index 6f38c82..9f955ab 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
-@@ -319,9 +319,23 @@ EOF
+@@ -322,9 +322,23 @@ EOF
  EOF
      ;;
      *)
diff --git a/0090-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
similarity index 89%
rename from 0090-Disable-GRUB-video-support-for-IBM-power-machines.patch
rename to 0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
index 26a4f75..7230092 100644
--- a/0090-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -1,7 +1,7 @@
-From bd0e85e1590dec600e0a46fca6f88fa32d38701f Mon Sep 17 00:00:00 2001
+From 3fd909cbba26f1f76a64aa095937b00cd1785570 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 090/103] Disable GRUB video support for IBM power machines
+Subject: [PATCH 113/125] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -12,11 +12,11 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index d92ae14..409c922 100644
+index 3e12e6b..3e14f53 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
-@@ -88,7 +88,10 @@ grub_ieee1275_find_options (void)
-     is_qemu = 1;
+@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
+   }
  
    if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
 -    grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
diff --git a/0091-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
similarity index 85%
rename from 0091-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
rename to 0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
index f05e677..7ed1420 100644
--- a/0091-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@@ -1,7 +1,7 @@
-From dc24706a6f889f3562f642ab5c6a19fe0eeb49b5 Mon Sep 17 00:00:00 2001
+From 6550cd89b1dee8c9ad866cbf10bf72dc2ff8a8bc Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 091/103] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 114/125] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
diff --git a/0092-Use-linux16-when-appropriate-880840.patch b/0115-Use-linux16-when-appropriate-880840.patch
similarity index 90%
rename from 0092-Use-linux16-when-appropriate-880840.patch
rename to 0115-Use-linux16-when-appropriate-880840.patch
index aee4441..edc8da6 100644
--- a/0092-Use-linux16-when-appropriate-880840.patch
+++ b/0115-Use-linux16-when-appropriate-880840.patch
@@ -1,7 +1,7 @@
-From e3c0c4cdf83eb8269984e3d33ce47e604247913e Mon Sep 17 00:00:00 2001
+From ba749818b7a53df63d887cb17497f82c78ca934c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 092/103] Use linux16 when appropriate (#880840)
+Subject: [PATCH 115/125] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.
diff --git a/0093-Enable-pager-by-default.-985860.patch b/0116-Enable-pager-by-default.-985860.patch
similarity index 83%
rename from 0093-Enable-pager-by-default.-985860.patch
rename to 0116-Enable-pager-by-default.-985860.patch
index e5a690a..23f9203 100644
--- a/0093-Enable-pager-by-default.-985860.patch
+++ b/0116-Enable-pager-by-default.-985860.patch
@@ -1,7 +1,7 @@
-From 281b3060d667e35b84850b8943f2dd1b7c9d5e7c Mon Sep 17 00:00:00 2001
+From 26f2fbd4fb424ad097ea99578864ae526b79f732 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 093/103] Enable pager by default. (#985860)
+Subject: [PATCH 116/125] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
diff --git a/0094-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
similarity index 87%
rename from 0094-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
rename to 0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
index a9afd10..704a0ea 100644
--- a/0094-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
@@ -1,7 +1,7 @@
-From d550d551e833d56ffbf08166e12aa6c8a97b38fc Mon Sep 17 00:00:00 2001
+From 3e8fad7dba63db810a9626d472de5270b2d1bb75 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 094/103] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 117/125] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/0095-Don-t-say-GNU-Linux-in-generated-menus.patch b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch
similarity index 91%
rename from 0095-Don-t-say-GNU-Linux-in-generated-menus.patch
rename to 0118-Don-t-say-GNU-Linux-in-generated-menus.patch
index ab9f1e3..6916ba9 100644
--- a/0095-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -1,7 +1,7 @@
-From 931f63ee792555882837c1287a361223d603d37c Mon Sep 17 00:00:00 2001
+From 03d405d9b503c435f3a975c5789a0bda9650a753 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 095/103] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 118/125] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--
diff --git a/0096-Don-t-draw-a-border-around-the-menu.patch b/0119-Don-t-draw-a-border-around-the-menu.patch
similarity index 95%
rename from 0096-Don-t-draw-a-border-around-the-menu.patch
rename to 0119-Don-t-draw-a-border-around-the-menu.patch
index 5e1a17e..8569fea 100644
--- a/0096-Don-t-draw-a-border-around-the-menu.patch
+++ b/0119-Don-t-draw-a-border-around-the-menu.patch
@@ -1,7 +1,7 @@
-From 9fd85bc9025a32e053b752c8de04e1ba48e83951 Mon Sep 17 00:00:00 2001
+From 6bf4deb61df3ecb1e2d108195efa5ac980baa961 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 096/103] Don't draw a border around the menu
+Subject: [PATCH 119/125] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---
diff --git a/0097-Use-the-standard-margin-for-the-timeout-string.patch b/0120-Use-the-standard-margin-for-the-timeout-string.patch
similarity index 91%
rename from 0097-Use-the-standard-margin-for-the-timeout-string.patch
rename to 0120-Use-the-standard-margin-for-the-timeout-string.patch
index d89d094..daccecd 100644
--- a/0097-Use-the-standard-margin-for-the-timeout-string.patch
+++ b/0120-Use-the-standard-margin-for-the-timeout-string.patch
@@ -1,7 +1,7 @@
-From 903bf51c8b9ca237e135d20a80ed7783584b3d8b Mon Sep 17 00:00:00 2001
+From a3e6964bd3242bd042489bb510e63fc0224fede4 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 097/103] Use the standard margin for the timeout string
+Subject: [PATCH 120/125] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---
diff --git a/0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
similarity index 86%
rename from 0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
rename to 0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
index 8be9b05..19ba050 100644
--- a/0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
+++ b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
@@ -1,7 +1,7 @@
-From b45d96d3c8877f1194728152e8a23c3a85245ac6 Mon Sep 17 00:00:00 2001
+From a7a033ed92a55dd44314ed20f720a3d32fa9c684 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 10 Jan 2014 09:36:24 -0500
-Subject: [PATCH 098/103] Fix grub_script_execute_sourcecode() usage on ppc.
+Subject: [PATCH 121/125] Fix grub_script_execute_sourcecode() usage on ppc.
 
 593e430c made it not take the extra argc/argv that this code still
 passes it.
diff --git a/0099-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
similarity index 89%
rename from 0099-Add-.eh_frame-to-list-of-relocations-stripped.patch
rename to 0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
index aca5b30..449d530 100644
--- a/0099-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
@@ -1,7 +1,7 @@
-From 648dcde61e116b808c81a54f312de88a8ae2a672 Mon Sep 17 00:00:00 2001
+From 9120cc5592d26a945ead586b71820fb9708f5062 Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 099/103] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 122/125] Add .eh_frame to list of relocations stripped
 
 ---
  conf/Makefile.common | 2 +-
diff --git a/0101-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
similarity index 94%
rename from 0101-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
rename to 0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
index eabf5eb..4811f03 100644
--- a/0101-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+++ b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
@@ -1,7 +1,7 @@
-From ffc319b20f2eafb1146aae42b4e88c408c59a32f Mon Sep 17 00:00:00 2001
+From 1c9518bb506f8f4fa6b388571c76797705e7b566 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 101/103] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 123/125] Make 10_linux work with our changes for linux16 and
  linuxefi on aarch64
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/0102-Don-t-print-during-fdt-loading-method.patch b/0124-Don-t-print-during-fdt-loading-method.patch
similarity index 82%
rename from 0102-Don-t-print-during-fdt-loading-method.patch
rename to 0124-Don-t-print-during-fdt-loading-method.patch
index 41ecb60..44fa894 100644
--- a/0102-Don-t-print-during-fdt-loading-method.patch
+++ b/0124-Don-t-print-during-fdt-loading-method.patch
@@ -1,7 +1,7 @@
-From d1d443a3ea5f6ba9eef4dd40e1435d567ffe8526 Mon Sep 17 00:00:00 2001
+From aa8c71086da3a28382b8bd958bac1c5d3b2b2be3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 102/103] Don't print during fdt loading method.
+Subject: [PATCH 124/125] Don't print during fdt loading method.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---
diff --git a/0103-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
similarity index 86%
rename from 0103-Honor-a-symlink-when-generating-configuration-by-gru.patch
rename to 0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
index 869c7a8..5056519 100644
--- a/0103-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
@@ -1,7 +1,7 @@
-From 3da70b20f42c2c678d54cc0f56a6d3df6432d79e Mon Sep 17 00:00:00 2001
+From 37ad82c4f11e293e30eea26302624691e80f19b8 Mon Sep 17 00:00:00 2001
 From: Marcel Kolaja <mkolaja@redhat.com>
 Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 103/103] Honor a symlink when generating configuration by
+Subject: [PATCH 125/125] Honor a symlink when generating configuration by
  grub2-mkconfig
 
 Honor a symlink when generating configuration by grub2-mkconfig, so that
diff --git a/grub2.spec b/grub2.spec
index 52db98b..f591b48 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -47,7 +47,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.02
-Release:        0.3%{?dist}
+Release:        0.4%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -64,105 +64,127 @@ Patch0001: 0001-fix-EFI-detection-on-Windows.patch
 Patch0002: 0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
 Patch0003: 0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
 Patch0004: 0004-NEWS-First-draft-of-2.02-entry.patch
-Patch0005: 0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
-Patch0006: 0006-remove-unused-error.h-from-kern-emu-misc.c.patch
-Patch0007: 0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
-Patch0008: 0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
-Patch0009: 0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch
-Patch0010: 0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
-Patch0011: 0011-fix-32-bit-compilation-on-MinGW-w64.patch
-Patch0012: 0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
-Patch0013: 0013-arm64-set-correct-length-of-device-path-end-entry.patch
-Patch0014: 0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch
-Patch0015: 0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
-Patch0016: 0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
-Patch0017: 0017-Prefer-more-portable-test-1-constructs.patch
-Patch0018: 0018-NEWS-Add-few-missing-entries.patch
-Patch0019: 0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
-Patch0020: 0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
-Patch0021: 0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
-Patch0022: 0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
-Patch0023: 0023-Fix-ChangeLog-date.patch
-Patch0024: 0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
-Patch0025: 0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
-Patch0026: 0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
-Patch0027: 0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
-Patch0028: 0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
-Patch0029: 0029-Makefile.am-default_payload.elf-Add-modules.patch
-Patch0030: 0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
-Patch0031: 0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
-Patch0032: 0032-util-grub-install.c-Fix-a-typo.patch
-Patch0033: 0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
-Patch0034: 0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
-Patch0035: 0035-change-stop-condition-to-avoid-infinite-loops.patch
-Patch0036: 0036-increase-network-try-interval-gradually.patch
-Patch0037: 0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
-Patch0038: 0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
-Patch0039: 0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
-Patch0040: 0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
-Patch0041: 0041-util-grub-install.c-List-available-targets.patch
-Patch0042: 0042-Fix-several-translatable-strings.patch
-Patch0043: 0043-do-not-set-default-prefix-in-grub-mkimage.patch
-Patch0044: 0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
-Patch0045: 0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
-Patch0046: 0046-grub-install-support-for-partitioned-partx-loop-devi.patch
-Patch0047: 0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
-Patch0048: 0048-.gitignore-add-missing-files-and-.exe-variants.patch
-Patch0049: 0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
-Patch0050: 0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
-Patch0051: 0051-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
-Patch0052: 0052-grub-core-disk-ahci.c-Add-safety-cleanups.patch
-Patch0053: 0053-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
-Patch0054: 0054-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
-Patch0055: 0055-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
-Patch0056: 0056-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
-Patch0057: 0057-add-grub_env_set_net_property-function.patch
-Patch0058: 0058-add-bootpath-parser-for-open-firmware.patch
-Patch0059: 0059-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
-Patch0060: 0060-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
-Patch0061: 0061-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
-Patch0062: 0062-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
-Patch0063: 0063-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
-Patch0064: 0064-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
-Patch0065: 0065-Migrate-PPC-from-Yaboot-to-Grub2.patch
-Patch0066: 0066-Add-fw_path-variable-revised.patch
-Patch0067: 0067-Add-support-for-linuxefi.patch
-Patch0068: 0068-Use-linuxefi-and-initrdefi-where-appropriate.patch
-Patch0069: 0069-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
-Patch0070: 0070-Pass-x-hex-hex-straight-through-unmolested.patch
-Patch0071: 0071-Fix-crash-on-http.patch
-Patch0072: 0072-IBM-client-architecture-CAS-reboot-support.patch
-Patch0073: 0073-Add-vlan-tag-support.patch
-Patch0074: 0074-Add-X-option-to-printf-functions.patch
-Patch0075: 0075-DHCP-client-ID-and-UUID-options-added.patch
-Patch0076: 0076-Search-for-specific-config-file-for-netboot.patch
-Patch0077: 0077-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
-Patch0078: 0078-Move-bash-completion-script-922997.patch
-Patch0079: 0079-for-ppc-reset-console-display-attr-when-clear-screen.patch
-Patch0080: 0080-Don-t-write-messages-to-the-screen.patch
-Patch0081: 0081-Don-t-print-GNU-GRUB-header.patch
-Patch0082: 0082-Don-t-add-to-highlighted-row.patch
-Patch0083: 0083-Don-t-add-to-highlighted-row.patch
-Patch0084: 0084-Message-string-cleanups.patch
-Patch0085: 0085-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
-Patch0086: 0086-Use-the-correct-indentation-for-the-term-help-text.patch
-Patch0087: 0087-Indent-menu-entries.patch
-Patch0088: 0088-Fix-margins.patch
-Patch0089: 0089-Add-support-for-UEFI-operating-systems-returned-by-o.patch
-Patch0090: 0090-Disable-GRUB-video-support-for-IBM-power-machines.patch
-Patch0091: 0091-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
-Patch0092: 0092-Use-linux16-when-appropriate-880840.patch
-Patch0093: 0093-Enable-pager-by-default.-985860.patch
-Patch0094: 0094-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
-Patch0095: 0095-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0096: 0096-Don-t-draw-a-border-around-the-menu.patch
-Patch0097: 0097-Use-the-standard-margin-for-the-timeout-string.patch
-Patch0098: 0098-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
-Patch0099: 0099-Add-.eh_frame-to-list-of-relocations-stripped.patch
-Patch0100: 0100-arm64-set-correct-length-of-device-path-end-entry.patch
-Patch0101: 0101-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
-Patch0102: 0102-Don-t-print-during-fdt-loading-method.patch
-Patch0103: 0103-Honor-a-symlink-when-generating-configuration-by-gru.patch
+Patch0005: 0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
+Patch0006: 0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
+Patch0007: 0007-remove-unused-error.h-from-kern-emu-misc.c.patch
+Patch0008: 0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
+Patch0009: 0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
+Patch0010: 0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
+Patch0011: 0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
+Patch0012: 0012-fix-32-bit-compilation-on-MinGW-w64.patch
+Patch0013: 0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
+Patch0014: 0014-arm64-set-correct-length-of-device-path-end-entry.patch
+Patch0015: 0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
+Patch0016: 0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
+Patch0017: 0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
+Patch0018: 0018-Prefer-more-portable-test-1-constructs.patch
+Patch0019: 0019-NEWS-Add-few-missing-entries.patch
+Patch0020: 0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
+Patch0021: 0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
+Patch0022: 0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
+Patch0023: 0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
+Patch0024: 0024-Fix-ChangeLog-date.patch
+Patch0025: 0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
+Patch0026: 0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
+Patch0027: 0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
+Patch0028: 0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
+Patch0029: 0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
+Patch0030: 0030-Makefile.am-default_payload.elf-Add-modules.patch
+Patch0031: 0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
+Patch0032: 0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
+Patch0033: 0033-util-grub-install.c-Fix-a-typo.patch
+Patch0034: 0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
+Patch0035: 0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
+Patch0036: 0036-change-stop-condition-to-avoid-infinite-loops.patch
+Patch0037: 0037-increase-network-try-interval-gradually.patch
+Patch0038: 0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
+Patch0039: 0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
+Patch0040: 0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
+Patch0041: 0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
+Patch0042: 0042-util-grub-install.c-List-available-targets.patch
+Patch0043: 0043-Fix-several-translatable-strings.patch
+Patch0044: 0044-do-not-set-default-prefix-in-grub-mkimage.patch
+Patch0045: 0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
+Patch0046: 0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
+Patch0047: 0047-grub-install-support-for-partitioned-partx-loop-devi.patch
+Patch0048: 0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
+Patch0049: 0049-.gitignore-add-missing-files-and-.exe-variants.patch
+Patch0050: 0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
+Patch0051: 0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
+Patch0052: 0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
+Patch0053: 0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
+Patch0054: 0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
+Patch0055: 0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
+Patch0056: 0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
+Patch0057: 0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
+Patch0058: 0058-add-grub_env_set_net_property-function.patch
+Patch0059: 0059-add-bootpath-parser-for-open-firmware.patch
+Patch0060: 0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
+Patch0061: 0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
+Patch0062: 0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
+Patch0063: 0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
+Patch0064: 0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
+Patch0065: 0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
+Patch0066: 0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
+Patch0067: 0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
+Patch0068: 0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
+Patch0069: 0069-Fix-grub-probe-0-option.patch
+Patch0070: 0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
+Patch0071: 0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
+Patch0072: 0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
+Patch0073: 0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
+Patch0074: 0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
+Patch0075: 0075-Add-missing-endif.patch
+Patch0076: 0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
+Patch0077: 0077-Improve-LVM-logical_volumes-string-matching.patch
+Patch0078: 0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
+Patch0079: 0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
+Patch0080: 0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
+Patch0081: 0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
+Patch0082: 0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
+Patch0083: 0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
+Patch0084: 0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
+Patch0085: 0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
+Patch0086: 0086-util-grub-install.c-Fix-handling-of-disk-module.patch
+Patch0087: 0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
+Patch0088: 0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
+Patch0089: 0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
+Patch0090: 0090-Add-fw_path-variable-revised.patch
+Patch0091: 0091-Add-support-for-linuxefi.patch
+Patch0092: 0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
+Patch0093: 0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+Patch0094: 0094-Pass-x-hex-hex-straight-through-unmolested.patch
+Patch0095: 0095-Fix-crash-on-http.patch
+Patch0096: 0096-IBM-client-architecture-CAS-reboot-support.patch
+Patch0097: 0097-Add-vlan-tag-support.patch
+Patch0098: 0098-Add-X-option-to-printf-functions.patch
+Patch0099: 0099-DHCP-client-ID-and-UUID-options-added.patch
+Patch0100: 0100-Search-for-specific-config-file-for-netboot.patch
+Patch0101: 0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+Patch0102: 0102-Move-bash-completion-script-922997.patch
+Patch0103: 0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
+Patch0104: 0104-Don-t-write-messages-to-the-screen.patch
+Patch0105: 0105-Don-t-print-GNU-GRUB-header.patch
+Patch0106: 0106-Don-t-add-to-highlighted-row.patch
+Patch0107: 0107-Message-string-cleanups.patch
+Patch0108: 0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+Patch0109: 0109-Use-the-correct-indentation-for-the-term-help-text.patch
+Patch0110: 0110-Indent-menu-entries.patch
+Patch0111: 0111-Fix-margins.patch
+Patch0112: 0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+Patch0113: 0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
+Patch0114: 0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+Patch0115: 0115-Use-linux16-when-appropriate-880840.patch
+Patch0116: 0116-Enable-pager-by-default.-985860.patch
+Patch0117: 0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+Patch0118: 0118-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0119: 0119-Don-t-draw-a-border-around-the-menu.patch
+Patch0120: 0120-Use-the-standard-margin-for-the-timeout-string.patch
+Patch0121: 0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
+Patch0122: 0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0123: 0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+Patch0124: 0124-Don-t-print-during-fdt-loading-method.patch
+Patch0125: 0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
 
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel bzip2-devel
@@ -591,6 +613,9 @@ fi
 %{_datarootdir}/grub/themes/
 
 %changelog
+* Tue Jun 24 2014 Peter Jones <pjones@redhat.com> - 2.02-0.4
+- Update to latest upstream.
+
 * Thu Mar 13 2014 Peter Jones <pjones@redhat.com> - 2.02-0.3
 - Merge in RHEL 7 changes and ARM works in progress.