diff --git a/debian/.git-dpm b/debian/.git-dpm index 1b5ff0c1e..31356abad 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -f6e6d59bfa40b7bacfb99446f8b432dca83b7692 -f6e6d59bfa40b7bacfb99446f8b432dca83b7692 +747496a6d37d07538649a8045325a448dd77a3c4 +747496a6d37d07538649a8045325a448dd77a3c4 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 grub2_2.02~beta2.orig.tar.xz diff --git a/debian/patches/blacklist_1440x900x32.patch b/debian/patches/blacklist_1440x900x32.patch index 37434dd17..60533a73c 100644 --- a/debian/patches/blacklist_1440x900x32.patch +++ b/debian/patches/blacklist_1440x900x32.patch @@ -1,4 +1,4 @@ -From 8b1331cfab8c2c88ff2ecb83d082767006048ea4 Mon Sep 17 00:00:00 2001 +From 4b0f317bcce4f33447c75c97bf5b5c26abfb1525 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:11 +0000 Subject: Blacklist 1440x900x32 from VBE preferred mode handling diff --git a/debian/patches/default_grub_d.patch b/debian/patches/default_grub_d.patch index 4e846decf..f4d7b2b0c 100644 --- a/debian/patches/default_grub_d.patch +++ b/debian/patches/default_grub_d.patch @@ -1,4 +1,4 @@ -From 456b43187661cb81c2e7022f7ed8b010d85064d5 Mon Sep 17 00:00:00 2001 +From b7b657b655fb49c41eaa51293aa54097a5dbdfa5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:10 +0000 Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub @@ -9,12 +9,12 @@ Last-Update: 2014-01-28 Patch-Name: default_grub_d.patch --- - grub-core/osdep/unix/config.c | 112 ++++++++++++++++++++++++++++++++++-------- + grub-core/osdep/unix/config.c | 114 ++++++++++++++++++++++++++++++++++-------- util/grub-mkconfig.in | 5 ++ - 2 files changed, 97 insertions(+), 20 deletions(-) + 2 files changed, 98 insertions(+), 21 deletions(-) diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index f4b0bb4..7b7fdc6 100644 +index f4b0bb4..95eabc8 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -24,6 +24,8 @@ @@ -26,7 +26,7 @@ index f4b0bb4..7b7fdc6 100644 #include #include #include -@@ -61,6 +63,13 @@ grub_util_get_localedir (void) +@@ -61,13 +63,27 @@ grub_util_get_localedir (void) return LOCALEDIR; } @@ -40,9 +40,10 @@ index f4b0bb4..7b7fdc6 100644 void grub_util_load_config (struct grub_util_config *cfg) { -@@ -68,6 +77,13 @@ grub_util_load_config (struct grub_util_config *cfg) + pid_t pid; const char *argv[4]; - char *script, *ptr; +- char *script, *ptr; ++ char *script = NULL, *ptr; const char *cfgfile, *iptr; + char *cfgdir; + grub_util_fd_dir_t d; diff --git a/debian/patches/elf_bi_endian.patch b/debian/patches/elf_bi_endian.patch index 85ca3accb..5ab409176 100644 --- a/debian/patches/elf_bi_endian.patch +++ b/debian/patches/elf_bi_endian.patch @@ -1,4 +1,4 @@ -From 8f735bcf5acd775e7a35a072dd8e6049eb62a8c5 Mon Sep 17 00:00:00 2001 +From 4a42ac8d567ce0a74687f2da6afb9e88f6d4099d Mon Sep 17 00:00:00 2001 From: Tomohiro B Berry Date: Tue, 14 Jan 2014 17:43:25 +0000 Subject: Add bi-endian support to ELF parser diff --git a/debian/patches/freebsd_debugflags_eperm.patch b/debian/patches/freebsd_debugflags_eperm.patch index 818dcabe6..5eb9560ae 100644 --- a/debian/patches/freebsd_debugflags_eperm.patch +++ b/debian/patches/freebsd_debugflags_eperm.patch @@ -1,4 +1,4 @@ -From deb30ba6d7b01de7a6ac898596f47505eab40720 Mon Sep 17 00:00:00 2001 +From d745c136fb0d268d843236c810a8c5b5b0dd4048 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jan 2014 02:55:58 +0000 Subject: Ignore EPERM when modifying kern.geom.debugflags diff --git a/debian/patches/gfxpayload_dynamic.patch b/debian/patches/gfxpayload_dynamic.patch index 78e3a15a2..c4ff3b1d2 100644 --- a/debian/patches/gfxpayload_dynamic.patch +++ b/debian/patches/gfxpayload_dynamic.patch @@ -1,4 +1,4 @@ -From 8575a84fe17f8278b9206015af1f66c15c2cba74 Mon Sep 17 00:00:00 2001 +From bda2afd2546d6fb505afdd6406a668e6fc9a735e Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 13 Jan 2014 12:13:29 +0000 Subject: Add configure option to enable gfxpayload=keep dynamically diff --git a/debian/patches/grub-shell-no-pad.patch b/debian/patches/grub-shell-no-pad.patch index 7d917a93a..c71dcefcc 100644 --- a/debian/patches/grub-shell-no-pad.patch +++ b/debian/patches/grub-shell-no-pad.patch @@ -1,4 +1,4 @@ -From 7354e71090201e34d682530f858e3972fe7d3099 Mon Sep 17 00:00:00 2001 +From fc98be5f4e09d5960d55ebd2b6e22f301cd83987 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 16 Jan 2014 12:51:23 +0000 Subject: grub-shell: Pass -no-pad to xorriso when building floppy images diff --git a/debian/patches/ignore_grub_func_test_failures.patch b/debian/patches/ignore_grub_func_test_failures.patch index cae969af7..b0d18f59f 100644 --- a/debian/patches/ignore_grub_func_test_failures.patch +++ b/debian/patches/ignore_grub_func_test_failures.patch @@ -1,4 +1,4 @@ -From e9db6823d7a5de73fe80f742e9813ca33a286dfd Mon Sep 17 00:00:00 2001 +From 42364ad963f4b1ea010c5cf05b1bb8b9bdcc546e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:32 +0000 Subject: Ignore functional test failures for now as they are broken diff --git a/debian/patches/install_efi_ubuntu_flavours.patch b/debian/patches/install_efi_ubuntu_flavours.patch index 34134b334..d36c03352 100644 --- a/debian/patches/install_efi_ubuntu_flavours.patch +++ b/debian/patches/install_efi_ubuntu_flavours.patch @@ -1,4 +1,4 @@ -From cf637cd4ebc2d1da31eda10de73bbd2c4cee68ae Mon Sep 17 00:00:00 2001 +From 4d7a5b913e148b9086ab89d62c98e50ca66d6c9b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:27 +0000 Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR diff --git a/debian/patches/install_powerpc_machtypes.patch b/debian/patches/install_powerpc_machtypes.patch index 717ca646f..89da6a8f7 100644 --- a/debian/patches/install_powerpc_machtypes.patch +++ b/debian/patches/install_powerpc_machtypes.patch @@ -1,4 +1,4 @@ -From f6e6d59bfa40b7bacfb99446f8b432dca83b7692 Mon Sep 17 00:00:00 2001 +From 747496a6d37d07538649a8045325a448dd77a3c4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 28 Jan 2014 14:40:02 +0000 Subject: Port yaboot logic for various powerpc machine types diff --git a/debian/patches/install_signed.patch b/debian/patches/install_signed.patch index affd4acb5..938cb3dc5 100644 --- a/debian/patches/install_signed.patch +++ b/debian/patches/install_signed.patch @@ -1,4 +1,4 @@ -From b7e82b5eaaada3f85430ea5832f23a9c0f58a19f Mon Sep 17 00:00:00 2001 +From af2df8281cbf3bcc7db1246551008bb0bbae007b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:22 +0000 Subject: Install signed images if UEFI Secure Boot is enabled diff --git a/debian/patches/linuxefi.patch b/debian/patches/linuxefi.patch index 4f6ef5ffd..3dd1f1fe5 100644 --- a/debian/patches/linuxefi.patch +++ b/debian/patches/linuxefi.patch @@ -1,4 +1,4 @@ -From d39f1a7e3dd33a2f3ce596350591075a71a9425e Mon Sep 17 00:00:00 2001 +From 2359f527c5091fb6633eec1b165db05c07eb83cf Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 13 Jan 2014 12:13:15 +0000 Subject: Add "linuxefi" loader which avoids ExitBootServices diff --git a/debian/patches/linuxefi_amd64_only.patch b/debian/patches/linuxefi_amd64_only.patch index 6228a1dab..50583ccc2 100644 --- a/debian/patches/linuxefi_amd64_only.patch +++ b/debian/patches/linuxefi_amd64_only.patch @@ -1,4 +1,4 @@ -From a16e48a24310eac5fadb2183deda89a1b00ff32e Mon Sep 17 00:00:00 2001 +From d17d82d5217170e5f3124ed1c5aa77a7b8f253d7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:16 +0000 Subject: Only build linuxefi on amd64 diff --git a/debian/patches/linuxefi_debug.patch b/debian/patches/linuxefi_debug.patch index 35376a252..e3198de01 100644 --- a/debian/patches/linuxefi_debug.patch +++ b/debian/patches/linuxefi_debug.patch @@ -1,4 +1,4 @@ -From efd9ff3eff1d48c498592bf61bc90b47d8c490f5 Mon Sep 17 00:00:00 2001 +From 935cb0d861b3e0a0ab9340f7f1527fa1d0d388af Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:18 +0000 Subject: Add more debugging to linuxefi diff --git a/debian/patches/linuxefi_non_sb_fallback.patch b/debian/patches/linuxefi_non_sb_fallback.patch index ec95b5444..3a8cad2f3 100644 --- a/debian/patches/linuxefi_non_sb_fallback.patch +++ b/debian/patches/linuxefi_non_sb_fallback.patch @@ -1,4 +1,4 @@ -From 1e58c5e035f2324f273664720458de48f2014a5f Mon Sep 17 00:00:00 2001 +From 34d4893c33d118806ebde0a0efbc6c2cd1687dcc Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:20 +0000 Subject: If running under UEFI secure boot, attempt to use linuxefi loader diff --git a/debian/patches/linuxefi_require_shim.patch b/debian/patches/linuxefi_require_shim.patch index c0dcc3ad4..1ebdc1728 100644 --- a/debian/patches/linuxefi_require_shim.patch +++ b/debian/patches/linuxefi_require_shim.patch @@ -1,4 +1,4 @@ -From ceea76bad9989e0ba4629e9e0d05a918066993de Mon Sep 17 00:00:00 2001 +From 22fb5cb563a439aab34fd9b4ce33e10ee54c03e1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:19 +0000 Subject: Make linuxefi refuse to boot without shim diff --git a/debian/patches/macbless_mansection.patch b/debian/patches/macbless_mansection.patch index 0bc3bc66f..a2f3db7fb 100644 --- a/debian/patches/macbless_mansection.patch +++ b/debian/patches/macbless_mansection.patch @@ -1,4 +1,4 @@ -From 018d839eb3b3710d022713c422fdb34a3578f0d8 Mon Sep 17 00:00:00 2001 +From 4c565aaad13c96c1b3525cbdc836892a2b3eabc1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 8 Jan 2014 11:05:20 +0000 Subject: * Makefile.util.def (grub-macbless): Change mansection to 8. diff --git a/debian/patches/maybe_quiet.patch b/debian/patches/maybe_quiet.patch index d5da45f7e..347a5faf7 100644 --- a/debian/patches/maybe_quiet.patch +++ b/debian/patches/maybe_quiet.patch @@ -1,4 +1,4 @@ -From 3f5c6ce2b682a5e104fca25efcd5dc8e31b864bf Mon Sep 17 00:00:00 2001 +From a22ef2bbf3232bc9b1982fc9fee92a7f56b5cd7c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:26 +0000 Subject: Add configure option to reduce visual clutter at boot time diff --git a/debian/patches/mkconfig_recovery_title.patch b/debian/patches/mkconfig_recovery_title.patch index 12812b9fb..d6cec862c 100644 --- a/debian/patches/mkconfig_recovery_title.patch +++ b/debian/patches/mkconfig_recovery_title.patch @@ -1,4 +1,4 @@ -From b57e48a75c3142efe9b7ec47e0f0a71f606fa2d9 Mon Sep 17 00:00:00 2001 +From c3c70fbb049ae45de7d72800d41c97fabbba09ae Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:33 +0000 Subject: Add GRUB_RECOVERY_TITLE option diff --git a/debian/patches/mkconfig_signed_kernel.patch b/debian/patches/mkconfig_signed_kernel.patch index 6ae3d9246..afda7e578 100644 --- a/debian/patches/mkconfig_signed_kernel.patch +++ b/debian/patches/mkconfig_signed_kernel.patch @@ -1,4 +1,4 @@ -From ae10dec295676230fbc886a5e260afb616433939 Mon Sep 17 00:00:00 2001 +From d17e028ba932b3583e36074e62fa1a1bf1b24bd1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:21 +0000 Subject: Generate configuration for signed UEFI kernels if available diff --git a/debian/patches/mkconfig_ubuntu_distributor.patch b/debian/patches/mkconfig_ubuntu_distributor.patch index 8b0bc96fc..e48008a5c 100644 --- a/debian/patches/mkconfig_ubuntu_distributor.patch +++ b/debian/patches/mkconfig_ubuntu_distributor.patch @@ -1,4 +1,4 @@ -From a5f2eff241350d805dd5e0085690b475bb66455b Mon Sep 17 00:00:00 2001 +From 9b945075b6407e9cd862cee51eb244cb5f6ead80 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 13 Jan 2014 12:13:14 +0000 Subject: Remove GNU/Linux from default distributor string for Ubuntu diff --git a/debian/patches/probe_fusionio.patch b/debian/patches/probe_fusionio.patch index 2d65cf6cd..9ab9bd55e 100644 --- a/debian/patches/probe_fusionio.patch +++ b/debian/patches/probe_fusionio.patch @@ -1,4 +1,4 @@ -From ffd4a6e24200858ed49b92b650493e8c59b47a21 Mon Sep 17 00:00:00 2001 +From 9301628f624589fcac74f61c0711ce950a362528 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:31 +0000 Subject: Probe FusionIO devices diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch index df15d758b..b2856f6f1 100644 --- a/debian/patches/quick_boot.patch +++ b/debian/patches/quick_boot.patch @@ -1,4 +1,4 @@ -From d7b9e7f5dfbeba56b7c515850e816a1f5d2af192 Mon Sep 17 00:00:00 2001 +From 1470162d206cd88869bc29bb4b88e449447ef347 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:28 +0000 Subject: Add configure option to bypass boot menu if possible diff --git a/debian/patches/skip_gettext_strings_test.patch b/debian/patches/skip_gettext_strings_test.patch index b54790166..eaa53caf3 100644 --- a/debian/patches/skip_gettext_strings_test.patch +++ b/debian/patches/skip_gettext_strings_test.patch @@ -1,4 +1,4 @@ -From 9c99482624633e4bc8a49cc83222a9652e5176ac Mon Sep 17 00:00:00 2001 +From 970690081f88e5b0c99ba3be43441c470abb08c1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:34 +0000 Subject: Don't run gettext_strings_test diff --git a/debian/patches/sleep_shift.patch b/debian/patches/sleep_shift.patch index bf53a419b..4891bd751 100644 --- a/debian/patches/sleep_shift.patch +++ b/debian/patches/sleep_shift.patch @@ -1,4 +1,4 @@ -From 7da1b970bf91a16642f1fa48481c9da5d480859b Mon Sep 17 00:00:00 2001 +From 9eea9d9c11448edd7d234c31196fdcece1737541 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:23 +0000 Subject: Allow Shift to interrupt 'sleep --interruptible' diff --git a/debian/patches/uefi_firmware_setup.patch b/debian/patches/uefi_firmware_setup.patch index 61fc0aee2..df040792f 100644 --- a/debian/patches/uefi_firmware_setup.patch +++ b/debian/patches/uefi_firmware_setup.patch @@ -1,4 +1,4 @@ -From 6edbc585519e8643ad7cb810b5cbad643345da0f Mon Sep 17 00:00:00 2001 +From 1f7a967fdb2402b74258d7675f92ba5f99a05e7c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 13 Jan 2014 12:13:12 +0000 Subject: Output a menu entry for firmware setup on UEFI FastBoot systems diff --git a/debian/patches/vt_handoff.patch b/debian/patches/vt_handoff.patch index ae937119d..ed57d4944 100644 --- a/debian/patches/vt_handoff.patch +++ b/debian/patches/vt_handoff.patch @@ -1,4 +1,4 @@ -From 868ae32e5e817fcc5b2a75fc12e66ff40ca71475 Mon Sep 17 00:00:00 2001 +From a8442bb12d61e5439ce33dc487a6700bf3380139 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:30 +0000 Subject: Add configure option to use vt.handoff=7 diff --git a/debian/patches/wubi_no_windows.patch b/debian/patches/wubi_no_windows.patch index 2cd6c9a54..bf286bab6 100644 --- a/debian/patches/wubi_no_windows.patch +++ b/debian/patches/wubi_no_windows.patch @@ -1,4 +1,4 @@ -From e08f779f2ef39466cc259def8bd19c910e785d4c Mon Sep 17 00:00:00 2001 +From 20c2d356f5176ae7b7f74a546e8742d89289d76c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:24 +0000 Subject: Skip Windows os-prober entries on Wubi systems diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c index 7b7fdc667..95eabc81b 100644 --- a/grub-core/osdep/unix/config.c +++ b/grub-core/osdep/unix/config.c @@ -75,7 +75,7 @@ grub_util_load_config (struct grub_util_config *cfg) { pid_t pid; const char *argv[4]; - char *script, *ptr; + char *script = NULL, *ptr; const char *cfgfile, *iptr; char *cfgdir; grub_util_fd_dir_t d;