Fix format-overflow warning with GCC 7

The overflow was in fact impossible in practice because the int
parameter is only ever 0, 1, or 2, but GCC couldn't prove that.

debian/.git-dpm

@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-7e6fab33dda2b8d510c477cd4159a360be7e3c0b
-7e6fab33dda2b8d510c477cd4159a360be7e3c0b
+8bb113820827608a4d12fbafe12bfb3adcf3babf
+8bb113820827608a4d12fbafe12bfb3adcf3babf
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 59aeb1cfaa3d5bfd7bbeeee0f0d37f6d9eed51fe
 grub2_2.02+dfsg1.orig.tar.xz

debian/changelog

@@ -1,3 +1,11 @@
+grub2 (2.02+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Adjust restore_mkdevicemap.patch to fix format-overflow warning with GCC
+    7 (the overflow was in fact impossible in practice, but GCC couldn't
+    prove that).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 16 Mar 2018 10:56:50 +0000
+
 grub2 (2.02+dfsg1-3) unstable; urgency=medium
 
   * sparc64: Don't use devspec to determine the OBP path (closes: #854568).

debian/patches/blacklist_1440x900x32.patch

@@ -1,4 +1,4 @@
-From fb50636c27b967a0d22af9e60224d865168c91e0 Mon Sep 17 00:00:00 2001
+From 6c496f2a48b653c659bc54bab1a6548282750d1e Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:11 +0000
 Subject: Blacklist 1440x900x32 from VBE preferred mode handling

debian/patches/bootp_new_net_bootp6_command.patch

@@ -1,4 +1,4 @@
-From 4635a734fabaa6fc1d6aa1cdf8f299e02f7a8b66 Mon Sep 17 00:00:00 2001
+From 7c754fff55f261e39d25da72413213600b2577c3 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 27 Oct 2016 17:41:04 -0400
 Subject: bootp: New net_bootp6 command

debian/patches/bootp_process_dhcpack_http_boot.patch

@@ -1,4 +1,4 @@
-From acf6772f2bff8f2baa4189d8be7a60e3deb0d4e4 Mon Sep 17 00:00:00 2001
+From 74c824f2b0d39b6fb5645fd55f9726d5aabc81f1 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 27 Oct 2016 17:42:19 -0400
 Subject: bootp: Add processing DHCPACK packet from HTTP Boot

debian/patches/default_grub_d.patch

@@ -1,4 +1,4 @@
-From 079c3ff41eb797890269f2eb74158fb70c833ed2 Mon Sep 17 00:00:00 2001
+From 0c9b39ffe82f8946dce58ff0e45fcf122ed64fe3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:10 +0000
 Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub

debian/patches/efinet_set_dns_from_uefi_proto.patch

@@ -1,4 +1,4 @@
-From 74d25712004c9e2b7a9a4d92240a9c384d4c8644 Mon Sep 17 00:00:00 2001
+From ca0032fc42ff1ee941a77b5b6fdca866c3b94b5b Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 27 Oct 2016 17:43:21 -0400
 Subject: efinet: Setting DNS server from UEFI protocol

debian/patches/efinet_set_network_from_uefi_devpath.patch

@@ -1,4 +1,4 @@
-From 7e748f0656af1b60725fe73cc9af2139d98c09cc Mon Sep 17 00:00:00 2001
+From e03383171dce3d640bf78109f633274f5936f1df Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 27 Oct 2016 17:43:05 -0400
 Subject: efinet: Setting network from UEFI device path

debian/patches/efinet_uefi_ipv6_pxe_support.patch

@@ -1,4 +1,4 @@
-From c575e5e9272860f5d080a55d6b08e7404ce92014 Mon Sep 17 00:00:00 2001
+From d948a72a7c909b18c424ea732aec2788705646b5 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Thu, 27 Oct 2016 17:41:21 -0400
 Subject: efinet: UEFI IPv6 PXE support

debian/patches/ext4_feature_encrypt.patch

@@ -1,4 +1,4 @@
-From 2126f99bc9a8b577702dbeecb7a77a32ddfc6698 Mon Sep 17 00:00:00 2001
+From af7ca56feae2e2c7b804ce43ff75421ec0f8a551 Mon Sep 17 00:00:00 2001
 From: Eric Biggers <ebiggers@google.com>
 Date: Thu, 29 Jun 2017 13:27:49 +0000
 Subject: Allow GRUB to mount ext2/3/4 filesystems that have the encryption

debian/patches/fix-yylex-build.patch

@@ -1,4 +1,4 @@
-From 14c4f88437b35b5d0cdeff0300a98c1b78e44987 Mon Sep 17 00:00:00 2001
+From 09953790985d9b8b76db7645c3f4f131a66abaff Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Mon, 14 Aug 2017 14:11:43 +0200
 Subject: yylex: Explicilty cast fprintf to void.

debian/patches/freetype-capitalise-variables.patch

@@ -1,4 +1,4 @@
-From 1ec0f1afd93a8278a0df9ce6058c8e54710ccde4 Mon Sep 17 00:00:00 2001
+From ba84c8d1b4830e9fcb14d9f0e4a36e03ac40a09d Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 30 Jan 2018 14:08:26 +0000
 Subject: build: Capitalise *freetype_* variables

debian/patches/freetype-pkg-config.patch

@@ -1,4 +1,4 @@
-From b2605b329bdcf705cbbaa97c6155f4fdfa6c9295 Mon Sep 17 00:00:00 2001
+From 3eec911197081a63d9dae28f1784ad01a06fb60a Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 30 Jan 2018 21:54:17 +0000
 Subject: build: Use pkg-config to find FreeType

debian/patches/gettext_quiet.patch

@@ -1,4 +1,4 @@
-From d7e9e417be57bfa26696ae6791805298cbe7f73d Mon Sep 17 00:00:00 2001
+From d6b00c624ad11c65fa670be90fa10ab391a1122b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:02 +0000
 Subject: Silence error messages when translations are unavailable

debian/patches/gfxpayload_dynamic.patch

@@ -1,4 +1,4 @@
-From 5adf03aa9d624c4f371501361873a51dcf09aab5 Mon Sep 17 00:00:00 2001
+From 9cccd7167b2bd4e6198903674a186cf657ef13bd Mon Sep 17 00:00:00 2001
 From: Evan Broder <evan@ebroder.net>
 Date: Mon, 13 Jan 2014 12:13:29 +0000
 Subject: Add configure option to enable gfxpayload=keep dynamically

debian/patches/grub-install-efibootmgr-check.patch

@@ -1,4 +1,4 @@
-From c8e0383e989d043ca3b9c5070ba2599b4f5b5b30 Mon Sep 17 00:00:00 2001
+From af3887505e8ae435eda3a431bd401494001cfceb 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

debian/patches/grub-install-extra-removable.patch

@@ -1,4 +1,4 @@
-From de07575c56142f8d826014ac557352f24e30cf1f Mon Sep 17 00:00:00 2001
+From c009126d6256205355a392dc7002ed1dac2dc59f 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

debian/patches/grub-install-pvxen-paths.patch

@@ -1,4 +1,4 @@
-From 25e2360a540ddc288035ce017c75cd52f00965db Mon Sep 17 00:00:00 2001
+From a4b1e6234ba49999e4964462c948f163e97fcff0 Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@hellion.org.uk>
 Date: Sat, 6 Sep 2014 12:20:12 +0100
 Subject: grub-install: Install PV Xen binaries into the upstream specified

debian/patches/ieee1275-clear-reset.patch

@@ -1,4 +1,4 @@
-From eb4b469c5939da9a277c9f126df0855dd3c84b57 Mon Sep 17 00:00:00 2001
+From e31237aea5ee424d14fb8514692d12482ebd78f9 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Thu, 25 Sep 2014 18:41:29 -0300
 Subject: Include a text attribute reset in the clear command for ppc

debian/patches/ignore_grub_func_test_failures.patch

@@ -1,4 +1,4 @@
-From dea8bb2dfb61af03b885c9d1536384d268a260a7 Mon Sep 17 00:00:00 2001
+From 3f8dc0a537d2052585561f6fd4708a095edbc4c4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 13 Jan 2014 12:13:32 +0000
 Subject: Ignore functional test failures for now as they are broken

debian/patches/insmod-xzio-and-lzopio-on-xen.patch

@@ -1,4 +1,4 @@
-From db9220ca946b41e91f600782d72b1a9e4117f548 Mon Sep 17 00:00:00 2001
+From 02d10b47f2e7625712397f03f25bdcd0d04dda39 Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@debian.org>
 Date: Sun, 30 Nov 2014 12:12:52 +0000
 Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen

debian/patches/install_efi_fallback.patch

@@ -1,4 +1,4 @@
-From 6adb5d9c36756bf65e8f0d8c95749c427c79d8e1 Mon Sep 17 00:00:00 2001
+From bf7aea0b065eb3ef2833bc4cf955505804d2c563 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:05 +0000
 Subject: Fall back to i386-pc if booted using EFI but -efi is missing

debian/patches/install_efi_ubuntu_flavours.patch

@@ -1,4 +1,4 @@
-From 9da46d6b60cb04a68e258c7497af8e925b2a61d6 Mon Sep 17 00:00:00 2001
+From f3a7735a3d1aa451203a4698f5137ee7565f82ff Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:27 +0000
 Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR

debian/patches/install_locale_langpack.patch

@@ -1,4 +1,4 @@
-From 4cd41d77b0e3b208523bc2cac4765cf7ac64bfd1 Mon Sep 17 00:00:00 2001
+From 03ca727beff305cee6e925af0ec9d37f8f5046f8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:07 +0000
 Subject: Prefer translations from Ubuntu language packs if available

debian/patches/install_powerpc_machtypes.patch

@@ -1,4 +1,4 @@
-From 6e5881153e0dd951a7ea961983c20e7e2bb636c8 Mon Sep 17 00:00:00 2001
+From 4ee18c4a571e455f1a14762006f91d6f0ae76f41 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 28 Jan 2014 14:40:02 +0000
 Subject: Port yaboot logic for various powerpc machine types

debian/patches/install_signed.patch

@@ -1,4 +1,4 @@
-From 6e95e348f8c0c6e751404a988b34f76f52d33862 Mon Sep 17 00:00:00 2001
+From 1917ef9042066380b9839501f7ccc598617847ae Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:22 +0000
 Subject: Install signed images if UEFI Secure Boot is enabled

debian/patches/linuxefi.patch

@@ -1,4 +1,4 @@
-From 5c926a43c12f057ad58db5e0312a1240548b6be4 Mon Sep 17 00:00:00 2001
+From 72da0de7449b8eada6a23f9a5e4b48f07955a368 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Mon, 13 Jan 2014 12:13:15 +0000
 Subject: Add "linuxefi" loader which avoids ExitBootServices

debian/patches/linuxefi_debug.patch

@@ -1,4 +1,4 @@
-From c498a75512894d3006c256c21035c1de9f94ec68 Mon Sep 17 00:00:00 2001
+From a2958c004fe653de6a5defba0a7efd799810b5ae Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:18 +0000
 Subject: Add more debugging to linuxefi

debian/patches/linuxefi_non_sb_fallback.patch

@@ -1,4 +1,4 @@
-From b9d6b15bf1f2f1d842a17a005bb8af94ac03a3c5 Mon Sep 17 00:00:00 2001
+From 6da8e840ec0878e1bbdf549ac09afe016409fcb8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:20 +0000
 Subject: If running under UEFI secure boot, attempt to use linuxefi loader

debian/patches/linuxefi_require_shim.patch

@@ -1,4 +1,4 @@
-From 20df4d793336859f781fe5f3636214eb2dcdcf64 Mon Sep 17 00:00:00 2001
+From 90b80a94103bece12cd80e99e71ff7ab75a66e0b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:19 +0000
 Subject: Make linuxefi refuse to boot without shim

debian/patches/maybe_quiet.patch

@@ -1,4 +1,4 @@
-From d2b60054a3fcd730fa802ec82c1fd4a64f653e93 Mon Sep 17 00:00:00 2001
+From aa30b8a134b8cf10901fd133363f021c50c47631 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:26 +0000
 Subject: Add configure option to reduce visual clutter at boot time

debian/patches/misc-fix-invalid-char-strtol.patch

@@ -1,4 +1,4 @@
-From 69681de986277c05a54a6c512dd952658935ab7b Mon Sep 17 00:00:00 2001
+From d1029b7aa12849339d1f23dfecb17afeb4fa292b Mon Sep 17 00:00:00 2001
 From: Aaron Miller <aaronmiller@fb.com>
 Date: Thu, 27 Oct 2016 17:33:07 -0400
 Subject: misc: fix invalid character recongition in strto*l

debian/patches/mkconfig_mid_upgrade.patch

@@ -1,4 +1,4 @@
-From c4092a1d354f4ff35bb38018ee1a3514c34037e2 Mon Sep 17 00:00:00 2001
+From bc5248a3a6a60361c925393aa6e3de064d374bf1 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:03 +0000
 Subject: Bail out if trying to run grub-mkconfig during upgrade to 2.00

debian/patches/mkconfig_nonexistent_loopback.patch

@@ -1,4 +1,4 @@
-From 00ec601e51016bede7f1fed5ce02cc95ee58fce6 Mon Sep 17 00:00:00 2001
+From 7ef88db58a928e4abc6588b8812bce044e2af7a6 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:08 +0000
 Subject: Avoid getting confused by inaccessible loop device backing paths

debian/patches/mkconfig_other_inits.patch

@@ -1,4 +1,4 @@
-From ae153b39d7f210f2255f6d09e65950d7fd182b91 Mon Sep 17 00:00:00 2001
+From 63c966da63808b2251b7110b1b4b753b8a21576b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sat, 3 Jan 2015 12:04:59 +0000
 Subject: Generate alternative init entries in advanced menu

debian/patches/mkconfig_recovery_title.patch

@@ -1,4 +1,4 @@
-From 1d867aa13673b70c11440fa1eb4db5a4a0114a3e Mon Sep 17 00:00:00 2001
+From 0adc9d7db3b4291b6f533ede619ec28cc8fa4226 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:33 +0000
 Subject: Add GRUB_RECOVERY_TITLE option

debian/patches/mkconfig_signed_kernel.patch

@@ -1,4 +1,4 @@
-From 91965fde7e4b0ad61c1c802fa2b2fcff065f637a Mon Sep 17 00:00:00 2001
+From 0874e7cf1520ce34cf51e5e3aad7d2707db5c6d3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:21 +0000
 Subject: Generate configuration for signed UEFI kernels if available

debian/patches/mkconfig_ubuntu_distributor.patch

@@ -1,4 +1,4 @@
-From f1bb3c14f7cccb77beb639dbef5eca26c1a8dfa9 Mon Sep 17 00:00:00 2001
+From 00e15161a27958f7f0728c3fb36c0604a5b0aeb9 Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <Mario_Limonciello@dell.com>
 Date: Mon, 13 Jan 2014 12:13:14 +0000
 Subject: Remove GNU/Linux from default distributor string for Ubuntu

debian/patches/mkconfig_ubuntu_recovery.patch

@@ -1,4 +1,4 @@
-From 52451827f71afce9c0249f94ef6403bd3920fcbd Mon Sep 17 00:00:00 2001
+From c8164bdd843b7f1c002f0c0419decadec8c74a94 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:06 +0000
 Subject: "single" -> "recovery" when friendly-recovery is installed

debian/patches/net_read_bracketed_ipv6_addr.patch

@@ -1,4 +1,4 @@
-From 6e00817ab6f8a277adcfd2aac25f0d37f79846b4 Mon Sep 17 00:00:00 2001
+From 8fef2df852f48b22897dd016186cc2d9f996c0da Mon Sep 17 00:00:00 2001
 From: Aaron Miller <aaronmiller@fb.com>
 Date: Thu, 27 Oct 2016 17:39:49 -0400
 Subject: net: read bracketed ipv6 addrs and port numbers

debian/patches/no_insmod_on_sb.patch

@@ -1,4 +1,4 @@
-From af776e6bccb7fed6c421112627ab6091bcd56442 Mon Sep 17 00:00:00 2001
+From 62f86bcd111ed41ffa53d948147f4098033a5e71 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Mon, 13 Jan 2014 12:13:09 +0000
 Subject: Don't permit loading modules on UEFI secure boot

debian/patches/ppc64el-disable-vsx.patch

@@ -1,4 +1,4 @@
-From a4d8622229e8af195fe8b6aa11e642d53b995535 Mon Sep 17 00:00:00 2001
+From 670711393c4f958b9bd0669b4118376fccd56446 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Thu, 25 Sep 2014 19:33:39 -0300
 Subject: Disable VSX instruction

debian/patches/probe_fusionio.patch

@@ -1,4 +1,4 @@
-From 044b52774e9177cef6cae2b104867ff964d22ab4 Mon Sep 17 00:00:00 2001
+From 5b9981361cc915381282119b22a982ca59256588 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:31 +0000
 Subject: Probe FusionIO devices
@@ -38,7 +38,7 @@ index 90d92d3ad..7adc0f30e 100644
  
    return path;
 diff --git a/util/deviceiter.c b/util/deviceiter.c
-index 23d49aecd..bc68b2549 100644
+index a4971ef42..dddc50da7 100644
 --- a/util/deviceiter.c
 +++ b/util/deviceiter.c
 @@ -383,6 +383,12 @@ get_nvme_disk_name (char *name, int controller, int namespace)

debian/patches/quick_boot.patch

@@ -1,4 +1,4 @@
-From 1c8b307a7f7b568b3d59419663c6eca836b7b396 Mon Sep 17 00:00:00 2001
+From 82480176b8b1404acb7aec08d108cb7517d4fb23 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:28 +0000
 Subject: Add configure option to bypass boot menu if possible

debian/patches/restore_mkdevicemap.patch

@@ -1,4 +1,4 @@
-From 8aeda5b858c0334e1b35d17a34295289621fb7fc Mon Sep 17 00:00:00 2001
+From de91fba78b8d8bcc8dff5a5d15d763bd883bbda6 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 13 Jan 2014 12:13:01 +0000
 Subject: Restore grub-mkdevicemap
@@ -10,7 +10,7 @@ would be very complicated.
 
 Author: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
 Forwarded: no
-Last-Update: 2016-09-18
+Last-Update: 2018-03-16
 
 Patch-Name: restore_mkdevicemap.patch
 ---
@@ -87,7 +87,7 @@ index 000000000..85374978c
 +#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */
 diff --git a/util/deviceiter.c b/util/deviceiter.c
 new file mode 100644
-index 000000000..23d49aecd
+index 000000000..a4971ef42
 --- /dev/null
 +++ b/util/deviceiter.c
 @@ -0,0 +1,1021 @@
@@ -641,7 +641,7 @@ index 000000000..23d49aecd
 +  /* Floppies.  */
 +  for (i = 0; i < floppy_disks; i++)
 +    {
-+      char name[16];
++      char name[32];
 +      struct stat st;
 +
 +      get_floppy_disk_name (name, i);

debian/patches/skip_gettext_strings_test.patch

@@ -1,4 +1,4 @@
-From 9e85ec7cd9e0cfa262ef3094c3dc35ff96f10f66 Mon Sep 17 00:00:00 2001
+From e3ef14b4a42ee06514e281f7ab136cd0c1c938e8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:34 +0000
 Subject: Don't run gettext_strings_test

debian/patches/sleep_shift.patch

@@ -1,4 +1,4 @@
-From 2501abf76ee470085ad1dd18387d0e629bf8305b Mon Sep 17 00:00:00 2001
+From 4b5de05feb2b89ba5d3acd13826b1465c5111587 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:23 +0000
 Subject: Allow Shift to interrupt 'sleep --interruptible'

debian/patches/sparc64-support.patch

@@ -1,4 +1,4 @@
-From 7e6fab33dda2b8d510c477cd4159a360be7e3c0b Mon Sep 17 00:00:00 2001
+From 8bb113820827608a4d12fbafe12bfb3adcf3babf Mon Sep 17 00:00:00 2001
 From: Eric Snowberg <eric.snowberg@oracle.com>
 Date: Thu, 22 Feb 2018 10:03:46 +0000
 Subject: Add support for modern sparc64 hardware

debian/patches/syslinux-test-out-of-tree.patch

@@ -1,4 +1,4 @@
-From 51856050ba9d29e40fa44c051bd28aa89989ceb3 Mon Sep 17 00:00:00 2001
+From 3773848cf605c69e54ad802ebf05e3de596eb5aa Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Sun, 18 Sep 2016 17:26:00 +0100
 Subject: syslinux_test: Fix out-of-tree build handling

debian/patches/tsc_efi_default_to_pmtimer.patch

@@ -1,4 +1,4 @@
-From 3bf96a30d25b72f03529e62f3ea59df9607cf3a1 Mon Sep 17 00:00:00 2001
+From 8b643f33f749ba56ba06a745a571bb6b76dbf3dd Mon Sep 17 00:00:00 2001
 From: "David E. Box" <david.e.box@linux.intel.com>
 Date: Fri, 15 Sep 2017 15:37:05 -0700
 Subject: tsc: Change default tsc calibration method to pmtimer on EFI systems

debian/patches/uefi_firmware_setup.patch

@@ -1,4 +1,4 @@
-From a33e24943261b65cc2e38738bd4afbf68c0061a1 Mon Sep 17 00:00:00 2001
+From 78b220997f3f16b5d3bd351e5573fc2779cc2cfd Mon Sep 17 00:00:00 2001
 From: Steve Langasek <steve.langasek@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:12 +0000
 Subject: Output a menu entry for firmware setup on UEFI FastBoot systems

debian/patches/vt_handoff.patch

@@ -1,4 +1,4 @@
-From 4bb0d5e8119471ca57342e99ac4b41a691039b28 Mon Sep 17 00:00:00 2001
+From 94c17f6606a35ed6e4e5ffe900ef4044e97547d4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:30 +0000
 Subject: Add configure option to use vt.handoff=7

debian/patches/wubi_no_windows.patch

@@ -1,4 +1,4 @@
-From b1ff1336667cb0ab0abe679d9e38f3e3b5b48e2f Mon Sep 17 00:00:00 2001
+From 55ed7346aeaa113b1378e3ac060ca66913d1161d Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:24 +0000
 Subject: Skip Windows os-prober entries on Wubi systems

debian/patches/zpool_full_device_name.patch

@@ -1,4 +1,4 @@
-From 06fd6cde689d6f753fece3c1e562a212c3a4b143 Mon Sep 17 00:00:00 2001
+From 821844713b075e5e27b49db307896a3ccb010c51 Mon Sep 17 00:00:00 2001
 From: Chad MILLER <chad.miller@canonical.com>
 Date: Thu, 27 Oct 2016 17:15:07 -0400
 Subject: Tell zpool to emit full device names

util/deviceiter.c

@@ -554,7 +554,7 @@ grub_util_iterate_devices (int (*hook) (const char *, int, void *), void *hook_d
   /* Floppies.  */
   for (i = 0; i < floppy_disks; i++)
     {
-      char name[16];
+      char name[32];
       struct stat st;
 
       get_floppy_disk_name (name, i);