diff -Nru grub2-2.02+dfsg1/debian/changelog grub2-2.02+dfsg1/debian/changelog --- grub2-2.02+dfsg1/debian/changelog 2018-10-12 15:10:10.000000000 +0000 +++ grub2-2.02+dfsg1/debian/changelog 2018-10-17 18:44:49.000000000 +0000 @@ -1,3 +1,11 @@ +grub2 (2.02+dfsg1-5ubuntu8) cosmic; urgency=medium + + * debian/patches/grub-install-extra-removable.patch: install mmx64.efi to + the EFI removable path to avoid boot failures after install when certs + need to be enrolled and the system's firmware is confused. (LP: #1798171) + + -- Mathieu Trudel-Lapierre Wed, 17 Oct 2018 14:44:49 -0400 + grub2 (2.02+dfsg1-5ubuntu7) cosmic; urgency=medium [ Steve Langasek ] diff -Nru grub2-2.02+dfsg1/debian/.git-dpm grub2-2.02+dfsg1/debian/.git-dpm --- grub2-2.02+dfsg1/debian/.git-dpm 2018-09-25 19:59:50.000000000 +0000 +++ grub2-2.02+dfsg1/debian/.git-dpm 2018-10-17 18:42:02.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -364c9c5f1f6d8a7f1ae49b9323cbd733664c0bff -364c9c5f1f6d8a7f1ae49b9323cbd733664c0bff +e1499616f7c6206a539cee4aae0d81ea13a38a7e +e1499616f7c6206a539cee4aae0d81ea13a38a7e 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe grub2_2.02+dfsg1.orig.tar.xz diff -Nru grub2-2.02+dfsg1/debian/patches/add-an-auto-nvram-option-to-grub-install.patch grub2-2.02+dfsg1/debian/patches/add-an-auto-nvram-option-to-grub-install.patch --- grub2-2.02+dfsg1/debian/patches/add-an-auto-nvram-option-to-grub-install.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/add-an-auto-nvram-option-to-grub-install.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From e501ac3fa71513f33d20e9b3d6ffbb8262274ea8 Mon Sep 17 00:00:00 2001 +From db1c321096805c96c98f3cbdd5463fb419d685c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 20 Apr 2018 19:27:37 +0200 @@ -138,7 +138,7 @@ void grub_install_sgi_setup (const char *install_device, diff --git a/util/grub-install.c b/util/grub-install.c -index 1c77ae79e..0d680cb09 100644 +index 3b0a326ec..c1ba14c3e 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -59,6 +59,7 @@ static int removable = 0; @@ -180,7 +180,7 @@ {"skip-fs-probe",'s',0, 0, N_("do not probe for filesystems in DEVICE"), 0}, {"no-bootsector", OPTION_NO_BOOTSECTOR, 0, 0, -@@ -1925,7 +1934,7 @@ main (int argc, char *argv[]) +@@ -1935,7 +1944,7 @@ main (int argc, char *argv[]) ? ins_dev->disk->partition->number + 1 : 0; dev = grub_util_get_os_disk (install_device); grub_install_register_ieee1275 (0, dev, partno, @@ -189,7 +189,7 @@ } grub_device_close (ins_dev); free (grub_elf); -@@ -1957,7 +1966,7 @@ main (int argc, char *argv[]) +@@ -1967,7 +1976,7 @@ main (int argc, char *argv[]) grub_device_close (ins_dev); if (update_nvram) grub_install_register_ieee1275 (1, grub_util_get_os_disk (install_device), @@ -198,7 +198,7 @@ break; } /* fallthrough. */ -@@ -1972,7 +1981,7 @@ main (int argc, char *argv[]) +@@ -1982,7 +1991,7 @@ main (int argc, char *argv[]) ? grub_dev->disk->partition->number + 1 : 0; dev = grub_util_get_os_disk (grub_devices[0]); grub_install_register_ieee1275 (0, dev, @@ -207,7 +207,7 @@ } break; case GRUB_INSTALL_PLATFORM_MIPS_ARC: -@@ -2021,7 +2030,7 @@ main (int argc, char *argv[]) +@@ -2031,7 +2040,7 @@ main (int argc, char *argv[]) int error = 0; error = grub_install_register_efi (efidir_grub_dev, "\\System\\Library\\CoreServices", @@ -216,7 +216,7 @@ if (error) grub_util_error (_("efibootmgr failed to register the boot entry: %s"), strerror (error)); -@@ -2136,7 +2145,7 @@ main (int argc, char *argv[]) +@@ -2146,7 +2155,7 @@ main (int argc, char *argv[]) (part ? ",": ""), (part ? : "")); grub_free (part); error = grub_install_register_efi (efidir_grub_dev, diff -Nru grub2-2.02+dfsg1/debian/patches/add_ext_lfb_base_support.patch grub2-2.02+dfsg1/debian/patches/add_ext_lfb_base_support.patch --- grub2-2.02+dfsg1/debian/patches/add_ext_lfb_base_support.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/add_ext_lfb_base_support.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 428fdd45fc0cc05820d4f62b77ca5acd4b6db99d Mon Sep 17 00:00:00 2001 +From e8526c4908060e1f101a20bb85691c4646ded46b Mon Sep 17 00:00:00 2001 From: Arindam Nath Date: Thu, 12 Jul 2018 19:02:49 +0530 Subject: i386/linux: Add support for ext_lfb_base diff -Nru grub2-2.02+dfsg1/debian/patches/add-initrd-less-boot-fallback.patch grub2-2.02+dfsg1/debian/patches/add-initrd-less-boot-fallback.patch --- grub2-2.02+dfsg1/debian/patches/add-initrd-less-boot-fallback.patch 2018-09-25 19:59:50.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/add-initrd-less-boot-fallback.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 364c9c5f1f6d8a7f1ae49b9323cbd733664c0bff Mon Sep 17 00:00:00 2001 +From e1499616f7c6206a539cee4aae0d81ea13a38a7e Mon Sep 17 00:00:00 2001 From: Chris Glass Date: Fri, 9 Mar 2018 13:47:07 +0100 Subject: Added initrd-less boot capabilities. diff -Nru grub2-2.02+dfsg1/debian/patches/bootp_new_net_bootp6_command.patch grub2-2.02+dfsg1/debian/patches/bootp_new_net_bootp6_command.patch --- grub2-2.02+dfsg1/debian/patches/bootp_new_net_bootp6_command.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/bootp_new_net_bootp6_command.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From dae5252d3764d0a49a5bc07f6a56abd56b939650 Mon Sep 17 00:00:00 2001 +From 910370a11c6487a304674ff02a82876a7c618fda Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 27 Oct 2016 17:41:04 -0400 Subject: bootp: New net_bootp6 command diff -Nru grub2-2.02+dfsg1/debian/patches/bootp_process_dhcpack_http_boot.patch grub2-2.02+dfsg1/debian/patches/bootp_process_dhcpack_http_boot.patch --- grub2-2.02+dfsg1/debian/patches/bootp_process_dhcpack_http_boot.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/bootp_process_dhcpack_http_boot.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From fcb0534a2f4cae214ae4e6c7b9d0c9ab586cea4e Mon Sep 17 00:00:00 2001 +From e44e8d477a47d7a230363ac70efb30a0b45cd7a8 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 27 Oct 2016 17:42:19 -0400 Subject: bootp: Add processing DHCPACK packet from HTTP Boot diff -Nru grub2-2.02+dfsg1/debian/patches/bufio_sensible_block_sizes.patch grub2-2.02+dfsg1/debian/patches/bufio_sensible_block_sizes.patch --- grub2-2.02+dfsg1/debian/patches/bufio_sensible_block_sizes.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/bufio_sensible_block_sizes.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 214021bebc8ee0f3c4afd4b32e5386d6b4b09578 Mon Sep 17 00:00:00 2001 +From d2933d7af34a71ef0344dfaf0328181b9a6d5009 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 2 Feb 2018 10:26:34 -0500 Subject: Don't use arbitrary file sizes as block sizes in bufio diff -Nru grub2-2.02+dfsg1/debian/patches/dont-fail-efi-warnings.patch grub2-2.02+dfsg1/debian/patches/dont-fail-efi-warnings.patch --- grub2-2.02+dfsg1/debian/patches/dont-fail-efi-warnings.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/dont-fail-efi-warnings.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From b8374a1c092ab324e8afdc6d74af9f59afbff24f Mon Sep 17 00:00:00 2001 +From de5b82b6c58e32d4e679335afccad7881e150f34 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 1 Nov 2017 17:03:36 -0400 Subject: Don't fail build on some warnings we know might show up building diff -Nru grub2-2.02+dfsg1/debian/patches/efinet_set_dns_from_uefi_proto.patch grub2-2.02+dfsg1/debian/patches/efinet_set_dns_from_uefi_proto.patch --- grub2-2.02+dfsg1/debian/patches/efinet_set_dns_from_uefi_proto.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/efinet_set_dns_from_uefi_proto.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From dc3e0412f70f34e4934e9f4d202b33c92ddcf0f9 Mon Sep 17 00:00:00 2001 +From 70c8631632cbcc37c8ff9e4c7a67bb4d25a3df65 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 27 Oct 2016 17:43:21 -0400 Subject: efinet: Setting DNS server from UEFI protocol diff -Nru grub2-2.02+dfsg1/debian/patches/efinet_set_network_from_uefi_devpath.patch grub2-2.02+dfsg1/debian/patches/efinet_set_network_from_uefi_devpath.patch --- grub2-2.02+dfsg1/debian/patches/efinet_set_network_from_uefi_devpath.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/efinet_set_network_from_uefi_devpath.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From f55510f7605a73154f34c73797f96fcd70b1dcd9 Mon Sep 17 00:00:00 2001 +From 2810e1cb451c28c9659743b05115e7cffb5907b0 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 27 Oct 2016 17:43:05 -0400 Subject: efinet: Setting network from UEFI device path diff -Nru grub2-2.02+dfsg1/debian/patches/efinet_uefi_ipv6_pxe_support.patch grub2-2.02+dfsg1/debian/patches/efinet_uefi_ipv6_pxe_support.patch --- grub2-2.02+dfsg1/debian/patches/efinet_uefi_ipv6_pxe_support.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/efinet_uefi_ipv6_pxe_support.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 3ffe88be848efdcfbca14b90063c0f74e8d14177 Mon Sep 17 00:00:00 2001 +From f5a2b0d65c0dc47ca8dba4a9a9b0c6c2cdbdab2c Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 27 Oct 2016 17:41:21 -0400 Subject: efinet: UEFI IPv6 PXE support diff -Nru grub2-2.02+dfsg1/debian/patches/ext4_feature_encrypt.patch grub2-2.02+dfsg1/debian/patches/ext4_feature_encrypt.patch --- grub2-2.02+dfsg1/debian/patches/ext4_feature_encrypt.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/ext4_feature_encrypt.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 485570196e2ac091b7a119366dc3b39225734518 Mon Sep 17 00:00:00 2001 +From 1e2a8f25f2a87545d44972792402b69b2985b9d3 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 29 Jun 2017 13:27:49 +0000 Subject: Allow GRUB to mount ext2/3/4 filesystems that have the encryption diff -Nru grub2-2.02+dfsg1/debian/patches/fix-yylex-build.patch grub2-2.02+dfsg1/debian/patches/fix-yylex-build.patch --- grub2-2.02+dfsg1/debian/patches/fix-yylex-build.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/fix-yylex-build.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From d02e01d40161e7786f59217c035aaac0e9c72174 Mon Sep 17 00:00:00 2001 +From 079d96633ead9e9ba2fefda2fa3e0e7e7eb5e8e6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 14 Aug 2017 14:11:43 +0200 Subject: yylex: Explicilty cast fprintf to void. diff -Nru grub2-2.02+dfsg1/debian/patches/freetype-capitalise-variables.patch grub2-2.02+dfsg1/debian/patches/freetype-capitalise-variables.patch --- grub2-2.02+dfsg1/debian/patches/freetype-capitalise-variables.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/freetype-capitalise-variables.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From ea4584e4c871a6ae0da531c3086bcd6dc85ce13f Mon Sep 17 00:00:00 2001 +From 95d385935b93ef5d0ac10d9b6475a654947b0780 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 30 Jan 2018 14:08:26 +0000 Subject: build: Capitalise *freetype_* variables diff -Nru grub2-2.02+dfsg1/debian/patches/freetype-pkg-config.patch grub2-2.02+dfsg1/debian/patches/freetype-pkg-config.patch --- grub2-2.02+dfsg1/debian/patches/freetype-pkg-config.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/freetype-pkg-config.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 330f445b647a2dab2442dfba5b40cb7070276b82 Mon Sep 17 00:00:00 2001 +From 465fcb2201dbbee1e0022af5717c00f5564d1528 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 30 Jan 2018 21:54:17 +0000 Subject: build: Use pkg-config to find FreeType diff -Nru grub2-2.02+dfsg1/debian/patches/grub-install-efibootmgr-check.patch grub2-2.02+dfsg1/debian/patches/grub-install-efibootmgr-check.patch --- grub2-2.02+dfsg1/debian/patches/grub-install-efibootmgr-check.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/grub-install-efibootmgr-check.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From f1fa325b9028b4e9a31da9a706d7b81c61797fa0 Mon Sep 17 00:00:00 2001 +From 19c27bee0b5896ce1314728d70fa173e2be432d6 Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Mon, 30 Jan 2017 19:04:51 +0000 Subject: Make grub-install check for errors from efibootmgr @@ -136,10 +136,10 @@ const char *efifile_path, const char *efi_distributor); diff --git a/util/grub-install.c b/util/grub-install.c -index 333d55e07..2214e4549 100644 +index 1ef30ef4b..14a8c9e3c 100644 --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -2017,9 +2017,13 @@ main (int argc, char *argv[]) +@@ -2027,9 +2027,13 @@ main (int argc, char *argv[]) if (!removable && update_nvram) { /* Try to make this image bootable using the EFI Boot Manager, if available. */ @@ -154,7 +154,7 @@ } grub_device_close (ins_dev); -@@ -2113,6 +2117,7 @@ main (int argc, char *argv[]) +@@ -2123,6 +2127,7 @@ main (int argc, char *argv[]) { char * efifile_path; char * part; @@ -162,7 +162,7 @@ /* Try to make this image bootable using the EFI Boot Manager, if available. */ if (!efi_distributor || efi_distributor[0] == '\0') -@@ -2129,8 +2134,11 @@ main (int argc, char *argv[]) +@@ -2139,8 +2144,11 @@ main (int argc, char *argv[]) efidir_grub_dev->disk->name, (part ? ",": ""), (part ? : "")); grub_free (part); diff -Nru grub2-2.02+dfsg1/debian/patches/grub-install-extra-removable.patch grub2-2.02+dfsg1/debian/patches/grub-install-extra-removable.patch --- grub2-2.02+dfsg1/debian/patches/grub-install-extra-removable.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/grub-install-extra-removable.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 7ea274e7ef5d2bc84678e548f0c2cab25662cc30 Mon Sep 17 00:00:00 2001 +From aa007802974b071420fbc8c8c6536405cacad82f Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Wed, 3 Dec 2014 01:25:12 +0000 Subject: Add support for forcing EFI installation to the removable media path @@ -18,11 +18,11 @@ Patch-Name: grub-install-extra-removable.patch --- - util/grub-install.c | 125 +++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 123 insertions(+), 2 deletions(-) + util/grub-install.c | 135 +++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 1e5642d65..333d55e07 100644 +index 1e5642d65..1ef30ef4b 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -56,6 +56,7 @@ @@ -64,7 +64,7 @@ {0, 0, 0, 0, 0, 0} }; -@@ -835,6 +844,106 @@ fill_core_services (const char *core_services) +@@ -835,6 +844,116 @@ fill_core_services (const char *core_services) free (sysv_plist); } @@ -111,6 +111,7 @@ + char *cur = NULL; + char *found = NULL; + char *fb_file = NULL; ++ char *mm_file = NULL; + char *generic_efidir = NULL; + + if (!efi_suffix) @@ -120,6 +121,7 @@ + + efi_file = xasprintf ("BOOT%s.EFI", efi_suffix_upper); + fb_file = xasprintf ("fb%s.efi", efi_suffix); ++ mm_file = xasprintf ("mm%s.efi", efi_suffix); + + /* We need to install in $base_efidir/EFI/BOOT/$efi_file, but we + * need to cope with case-insensitive stuff here. Build the path one @@ -160,18 +162,26 @@ + /* Now try to also install fallback */ + efi_file = grub_util_path_concat (2, "/usr/lib/shim/", fb_file); + dst = grub_util_path_concat (2, generic_efidir, fb_file); -+ free (generic_efidir); + grub_install_copy_file (efi_file, dst, 0); + free (efi_file); + free (dst); + ++ /* Also install MokManager to the removable path */ ++ efi_file = grub_util_path_concat (2, "/usr/lib/shim/", mm_file); ++ dst = grub_util_path_concat (2, generic_efidir, mm_file); ++ grub_install_copy_file (efi_file, dst, 0); ++ free (efi_file); ++ free (dst); ++ ++ free (generic_efidir); + free (fb_file); ++ free (mm_file); +} + int main (int argc, char *argv[]) { -@@ -852,6 +961,7 @@ main (int argc, char *argv[]) +@@ -852,6 +971,7 @@ main (int argc, char *argv[]) char *relative_grubdir; char **efidir_device_names = NULL; grub_device_t efidir_grub_dev = NULL; @@ -179,7 +189,7 @@ char *efidir_grub_devname; int efidir_is_mac = 0; int is_prep = 0; -@@ -884,6 +994,9 @@ main (int argc, char *argv[]) +@@ -884,6 +1004,9 @@ main (int argc, char *argv[]) bootloader_id = xstrdup ("grub"); } @@ -189,7 +199,7 @@ if (!grub_install_source_directory) { if (!target) -@@ -1093,6 +1206,8 @@ main (int argc, char *argv[]) +@@ -1093,6 +1216,8 @@ main (int argc, char *argv[]) if (!efidir_is_mac && grub_strcmp (fs->name, "fat") != 0) grub_util_error (_("%s doesn't look like an EFI partition"), efidir); @@ -198,7 +208,7 @@ /* The EFI specification requires that an EFI System Partition must contain an "EFI" subdirectory, and that OS loaders are stored in subdirectories below EFI. Vendors are expected to pick names that do -@@ -1983,9 +2098,15 @@ main (int argc, char *argv[]) +@@ -1983,9 +2108,15 @@ main (int argc, char *argv[]) fprintf (config_dst_f, "configfile $prefix/grub.cfg\n"); fclose (config_dst_f); free (config_dst); diff -Nru grub2-2.02+dfsg1/debian/patches/grub-reboot-warn.patch grub2-2.02+dfsg1/debian/patches/grub-reboot-warn.patch --- grub2-2.02+dfsg1/debian/patches/grub-reboot-warn.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/grub-reboot-warn.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 8a775a3d2b4302d05eb1736203f35a41e4a5db0a Mon Sep 17 00:00:00 2001 +From 0a323e99ce0873c2a7c368dd732f57bc36e51733 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Fri, 17 Aug 2018 17:33:44 -0600 Subject: grub-reboot: Warn when "for the next boot only" promise cannot be diff -Nru grub2-2.02+dfsg1/debian/patches/linuxefi_disable_sb_fallback.patch grub2-2.02+dfsg1/debian/patches/linuxefi_disable_sb_fallback.patch --- grub2-2.02+dfsg1/debian/patches/linuxefi_disable_sb_fallback.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/linuxefi_disable_sb_fallback.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From c2038fae526dcc719eccf3361119b79cdf201b8b Mon Sep 17 00:00:00 2001 +From 10a7a5a6402467899a4b733d948eb94b643a5e4e Mon Sep 17 00:00:00 2001 From: Linn Crosetto Date: Tue, 5 Apr 2016 11:49:05 -0600 Subject: Disallow unsigned kernels if UEFI Secure Boot is enabled diff -Nru grub2-2.02+dfsg1/debian/patches/linuxefi_fix_relocate_coff.patch grub2-2.02+dfsg1/debian/patches/linuxefi_fix_relocate_coff.patch --- grub2-2.02+dfsg1/debian/patches/linuxefi_fix_relocate_coff.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/linuxefi_fix_relocate_coff.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From bfe7c890db05f79d34752498991b5e40bc11e263 Mon Sep 17 00:00:00 2001 +From 7d368913de3eb39f514a4278327c993aa96385ee Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 Subject: efi/chainloader: fix wrong sanity check in relocate_coff() diff -Nru grub2-2.02+dfsg1/debian/patches/linuxefi_truncate_overlong_relocs.patch grub2-2.02+dfsg1/debian/patches/linuxefi_truncate_overlong_relocs.patch --- grub2-2.02+dfsg1/debian/patches/linuxefi_truncate_overlong_relocs.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/linuxefi_truncate_overlong_relocs.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 0785df0598ba00c074a087299cad1848396f7650 Mon Sep 17 00:00:00 2001 +From aa62f5717069c327a801c5250c9125f2a1b7ecba Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 Subject: efi/chainloader: truncate overlong relocation section diff -Nru grub2-2.02+dfsg1/debian/patches/misc-fix-invalid-char-strtol.patch grub2-2.02+dfsg1/debian/patches/misc-fix-invalid-char-strtol.patch --- grub2-2.02+dfsg1/debian/patches/misc-fix-invalid-char-strtol.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/misc-fix-invalid-char-strtol.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 0c924047dbc6e9662f2ff3b91e4a260a7a59b5db Mon Sep 17 00:00:00 2001 +From a958268b5fd50f1e29de590a3d75eec2f891397c Mon Sep 17 00:00:00 2001 From: Aaron Miller Date: Thu, 27 Oct 2016 17:33:07 -0400 Subject: misc: fix invalid character recongition in strto*l diff -Nru grub2-2.02+dfsg1/debian/patches/mkconfig_other_inits.patch grub2-2.02+dfsg1/debian/patches/mkconfig_other_inits.patch --- grub2-2.02+dfsg1/debian/patches/mkconfig_other_inits.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/mkconfig_other_inits.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 323b761b682d986fa591c503a856785dc3f52eb9 Mon Sep 17 00:00:00 2001 +From 8c92615d411a0eb2bf4211d226609bd69520a0cd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 3 Jan 2015 12:04:59 +0000 Subject: Generate alternative init entries in advanced menu diff -Nru grub2-2.02+dfsg1/debian/patches/net_read_bracketed_ipv6_addr.patch grub2-2.02+dfsg1/debian/patches/net_read_bracketed_ipv6_addr.patch --- grub2-2.02+dfsg1/debian/patches/net_read_bracketed_ipv6_addr.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/net_read_bracketed_ipv6_addr.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 534753873477a96571c152ea5cbb92f8e0540353 Mon Sep 17 00:00:00 2001 +From 2ddfc97d07e3514963e71b8cdc810e27ae7a6068 Mon Sep 17 00:00:00 2001 From: Aaron Miller Date: Thu, 27 Oct 2016 17:39:49 -0400 Subject: net: read bracketed ipv6 addrs and port numbers diff -Nru grub2-2.02+dfsg1/debian/patches/ofnet-init-structs-in-bootpath-parser.patch grub2-2.02+dfsg1/debian/patches/ofnet-init-structs-in-bootpath-parser.patch --- grub2-2.02+dfsg1/debian/patches/ofnet-init-structs-in-bootpath-parser.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/ofnet-init-structs-in-bootpath-parser.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From b7fd5ca68d1fe386b47960ea0f60df134c96fd8f Mon Sep 17 00:00:00 2001 +From 5b574e33a83f154ebbca269a070593e0c7cb0a4a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 23 Aug 2018 13:25:30 +0200 Subject: ofnet: Initialize structs in bootpath parser diff -Nru grub2-2.02+dfsg1/debian/patches/printf-unit-test-gcc7.patch grub2-2.02+dfsg1/debian/patches/printf-unit-test-gcc7.patch --- grub2-2.02+dfsg1/debian/patches/printf-unit-test-gcc7.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/printf-unit-test-gcc7.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 6035fc1ca444b6e64ad4b5fd689a46f05a89f08b Mon Sep 17 00:00:00 2001 +From 05cdc4542f110841437153b905d8dc11646e57fa Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 30 Aug 2017 16:59:25 +0200 Subject: printf_unit_test: Disable Wformat-truncation on GCC >= 7 diff -Nru grub2-2.02+dfsg1/debian/patches/R_X86_64_PLT32.patch grub2-2.02+dfsg1/debian/patches/R_X86_64_PLT32.patch --- grub2-2.02+dfsg1/debian/patches/R_X86_64_PLT32.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/R_X86_64_PLT32.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 348ef1a45bf8461edd6280727ddb276f3d2b7889 Mon Sep 17 00:00:00 2001 +From 88194e2ce8c184d2ccb7e68b08ceb9a188bd16d5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 17 Feb 2018 06:47:28 -0800 Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32 diff -Nru grub2-2.02+dfsg1/debian/patches/shorter_version_info.patch grub2-2.02+dfsg1/debian/patches/shorter_version_info.patch --- grub2-2.02+dfsg1/debian/patches/shorter_version_info.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/shorter_version_info.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From e019e36acf4fcda8d2678bfaeae1e5cc56f23fac Mon Sep 17 00:00:00 2001 +From 2fcb806c659fab467710109f02bdd0526534cd6c Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 8 Feb 2018 10:48:37 +0100 Subject: Show only upstream version, hide rest in package_version variable diff -Nru grub2-2.02+dfsg1/debian/patches/skip_text_gfxpayload_where_not_supported.patch grub2-2.02+dfsg1/debian/patches/skip_text_gfxpayload_where_not_supported.patch --- grub2-2.02+dfsg1/debian/patches/skip_text_gfxpayload_where_not_supported.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/skip_text_gfxpayload_where_not_supported.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 349170e1aa0ef56196d98020aefc26fcf900b04a Mon Sep 17 00:00:00 2001 +From 8731ee00fc6b0ccad01ecfdb807b4f7f6fda7954 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 9 Feb 2018 11:14:35 -0500 Subject: video: skip 'text' gfxpayload if not supported, to fallback to diff -Nru grub2-2.02+dfsg1/debian/patches/sparc64-support.patch grub2-2.02+dfsg1/debian/patches/sparc64-support.patch --- grub2-2.02+dfsg1/debian/patches/sparc64-support.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/sparc64-support.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 5ac62f5ac97a07658ce9427ea0e4571ea1f0683f Mon Sep 17 00:00:00 2001 +From 2407900d27186b3bd7b520a2b4e7998b5eba977f Mon Sep 17 00:00:00 2001 From: Eric Snowberg Date: Thu, 22 Feb 2018 10:03:46 +0000 Subject: Add support for modern sparc64 hardware @@ -2094,10 +2094,10 @@ extern grub_addr_t EXPORT_VAR (grub_ieee1275_original_stack); diff --git a/util/grub-install.c b/util/grub-install.c -index 2214e4549..1c77ae79e 100644 +index 14a8c9e3c..3b0a326ec 100644 --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1631,6 +1631,7 @@ main (int argc, char *argv[]) +@@ -1641,6 +1641,7 @@ main (int argc, char *argv[]) { grub_util_fprint_full_disk_name (load_cfg_f, g, dev); fprintf (load_cfg_f, " "); diff -Nru grub2-2.02+dfsg1/debian/patches/support_initrd-less_boot.patch grub2-2.02+dfsg1/debian/patches/support_initrd-less_boot.patch --- grub2-2.02+dfsg1/debian/patches/support_initrd-less_boot.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/support_initrd-less_boot.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 80e560e651ff4fcb8bcbd99df25320b7c207e8d7 Mon Sep 17 00:00:00 2001 +From a2ee65a30b374a6cb3cca8d49a71aeeccecfce0d Mon Sep 17 00:00:00 2001 From: Chris Glass Date: Thu, 10 Nov 2016 13:44:25 -0500 Subject: Added knobs to allow non-initrd boot config diff -Nru grub2-2.02+dfsg1/debian/patches/syslinux-test-out-of-tree.patch grub2-2.02+dfsg1/debian/patches/syslinux-test-out-of-tree.patch --- grub2-2.02+dfsg1/debian/patches/syslinux-test-out-of-tree.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/syslinux-test-out-of-tree.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 5023ddb36869b39f54f6136093db52061f8dc79f Mon Sep 17 00:00:00 2001 +From 1620ff7f2f549e4d052bca496e89eae0b7485cd4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 18 Sep 2016 17:26:00 +0100 Subject: syslinux_test: Fix out-of-tree build handling diff -Nru grub2-2.02+dfsg1/debian/patches/tests-disable-sercon-in-seabios.patch grub2-2.02+dfsg1/debian/patches/tests-disable-sercon-in-seabios.patch --- grub2-2.02+dfsg1/debian/patches/tests-disable-sercon-in-seabios.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/tests-disable-sercon-in-seabios.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From f64fa70204df6b75e80150bb03cc5437fabd30af Mon Sep 17 00:00:00 2001 +From cc88c8d7262855a4e5c23c790e9ccfc265e4d478 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Jul 2018 12:27:39 +0100 Subject: tests: Disable sercon in SeaBIOS diff -Nru grub2-2.02+dfsg1/debian/patches/tests-fix-uhci-qemu-options.patch grub2-2.02+dfsg1/debian/patches/tests-fix-uhci-qemu-options.patch --- grub2-2.02+dfsg1/debian/patches/tests-fix-uhci-qemu-options.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/tests-fix-uhci-qemu-options.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 3c65b1db08eec39bf4ef3439f85ecd3fc8040fb9 Mon Sep 17 00:00:00 2001 +From 63550d1f906f62decd018aa18bb49568a76abb0c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 30 Jul 2018 12:29:44 +0100 Subject: tests: Fix qemu options for UHCI test diff -Nru grub2-2.02+dfsg1/debian/patches/tsc_efi_default_to_pmtimer.patch grub2-2.02+dfsg1/debian/patches/tsc_efi_default_to_pmtimer.patch --- grub2-2.02+dfsg1/debian/patches/tsc_efi_default_to_pmtimer.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/tsc_efi_default_to_pmtimer.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From a615de64cf5bc85c35f5c34cf8ebdbbb3fdda45d Mon Sep 17 00:00:00 2001 +From 9f4382d58a9785cc3aae82bc8f78d3b10549311a Mon Sep 17 00:00:00 2001 From: "David E. Box" Date: Fri, 15 Sep 2017 15:37:05 -0700 Subject: tsc: Change default tsc calibration method to pmtimer on EFI systems diff -Nru grub2-2.02+dfsg1/debian/patches/xen-multiboot2.patch grub2-2.02+dfsg1/debian/patches/xen-multiboot2.patch --- grub2-2.02+dfsg1/debian/patches/xen-multiboot2.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/xen-multiboot2.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From abb7f68db054eb11c43ab564e6397a45c0b05f32 Mon Sep 17 00:00:00 2001 +From 31c0f835e1a0e44b3c7696903f46cfa5126f7c4a Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 29 Aug 2017 16:40:53 -0400 Subject: Use grub-file to figure out whether multiboot2 should be used for diff -Nru grub2-2.02+dfsg1/debian/patches/zpool_full_device_name.patch grub2-2.02+dfsg1/debian/patches/zpool_full_device_name.patch --- grub2-2.02+dfsg1/debian/patches/zpool_full_device_name.patch 2018-09-25 19:59:48.000000000 +0000 +++ grub2-2.02+dfsg1/debian/patches/zpool_full_device_name.patch 2018-10-17 18:42:02.000000000 +0000 @@ -1,4 +1,4 @@ -From 9af3396a402a0f4ce83165c4f8c339856c8c0407 Mon Sep 17 00:00:00 2001 +From 0257f6e8e6d2817364640ed2c1d11ab38634ab38 Mon Sep 17 00:00:00 2001 From: Chad MILLER Date: Thu, 27 Oct 2016 17:15:07 -0400 Subject: Tell zpool to emit full device names