grub2: update to 2.04

upstream changes:
-----------------
* GCC 8 and 9 support.
* Gnulib integration overhaul.
* RISC-V support.
* Xen PVH support.
* Native UEFI secure boot support.
* UEFI TPM driver.
* New IEEE 1275 obdisk driver.
* Btrfs RAID 5 and RIAD 6 support.
* PARTUUID support.
* VLAN support.
* Native DHCP support.
* Many ARM and ARM64 fixes.
* Many SPARC fixes.
* Many IEEE 1275 fixes.
* ...and tons of other fixes and cleanups...

5 files changed, 61 insertions, 19 deletions

diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index f195961fdfd..7e1447a3d59 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/01/18 23:35:17 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2020/05/02 16:53:54 triaxx Exp $
 
-DISTNAME=		grub-2.02
+DISTNAME=		grub-2.04
 PKGNAME=		${DISTNAME:S/grub/grub2/}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/grub/
@@ -31,6 +31,8 @@ FORTIFY_SUPPORTED=	no
 
 .include "../../mk/bsd.prefs.mk"
 
+CFLAGS+=		-Wno-unused-value
+
 #
 # Build requirements, taken from the INSTALL file in GRUB's distribution:
 #
diff --git a/sysutils/grub2/PLIST b/sysutils/grub2/PLIST
index 6b272b209c9..44fd495cb6e 100644
--- a/sysutils/grub2/PLIST
+++ b/sysutils/grub2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/09/16 13:18:54 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/02 16:53:54 triaxx Exp $
 bin/grub-editenv
 bin/grub-file
 bin/grub-fstest
@@ -19,7 +19,6 @@ bin/grub-script-check
 bin/grub-syslinux2cfg
 info/grub-dev.info
 info/grub.info
-lib/charset.alias
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/acpi.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/acpi.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/adler32.mod
@@ -151,8 +150,11 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ext2.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ext2.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/extcmd.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/extcmd.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/f2fs.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/f2fs.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fat.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fat.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fdt.lst
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/file.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/file.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/font.mod
@@ -404,6 +406,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pci.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pci.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pcidump.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pcidump.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pgp.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pgp.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/plan9.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/plan9.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/play.mod
@@ -430,6 +434,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid6rec.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid6rec.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/random.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/random.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/rdmsr.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/rdmsr.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/read.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/read.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/reboot.mod
@@ -476,6 +482,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/spkmodem.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/spkmodem.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/squash4.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/squash4.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/strtoull_test.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/strtoull_test.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/syslinuxcfg.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/syslinuxcfg.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tar.mod
@@ -535,8 +543,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbtest.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbtest.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vbe.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vbe.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/verify.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/verify.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/verifiers.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/verifiers.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga_text.mod
@@ -558,6 +566,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest_checksum.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest_checksum.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/wrmsr.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/wrmsr.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xfs.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xfs.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xnu.mod
@@ -574,6 +584,8 @@ lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfscrypt.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfscrypt.module
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfsinfo.mod
 lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfsinfo.module
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zstd.mod
+lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zstd.module
 man/man1/grub-editenv.1
 man/man1/grub-file.1
 man/man1/grub-fstest.1
@@ -691,7 +703,9 @@ share/locale/nb/LC_MESSAGES/grub.mo
 share/locale/nl/LC_MESSAGES/grub.mo
 share/locale/pa/LC_MESSAGES/grub.mo
 share/locale/pl/LC_MESSAGES/grub.mo
+share/locale/pt/LC_MESSAGES/grub.mo
 share/locale/pt_BR/LC_MESSAGES/grub.mo
+share/locale/ro/LC_MESSAGES/grub.mo
 share/locale/ru/LC_MESSAGES/grub.mo
 share/locale/sl/LC_MESSAGES/grub.mo
 share/locale/sr/LC_MESSAGES/grub.mo
diff --git a/sysutils/grub2/distinfo b/sysutils/grub2/distinfo
index 4bc31d08484..f77f188d6df 100644
--- a/sysutils/grub2/distinfo
+++ b/sysutils/grub2/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.8 2018/11/25 15:51:01 maya Exp $
+$NetBSD: distinfo,v 1.9 2020/05/02 16:53:54 triaxx Exp $
 
-SHA1 (grub-2.02.tar.gz) = 2f778cf62a3126bae71ce428b512bffc964cf7d0
-RMD160 (grub-2.02.tar.gz) = 8428eba6ddd26cd36a852c99d343b2b7650e90ac
-SHA512 (grub-2.02.tar.gz) = 061d6332a2e44ad43aada1df4dfd25575685aa3612bb2b7cb75d5e2a0b4edecd965de74f0b4ee6176d00cfa7ee1db19f0a53f3e2466395b3a31a7769bb0fcf72
-Size (grub-2.02.tar.gz) = 10568950 bytes
+SHA1 (grub-2.04.tar.gz) = de58e12e02c4d60ef0f24057bde6abde8474c3e1
+RMD160 (grub-2.04.tar.gz) = f990ff7dc3e4fa6f1048b87b192a0ae7cf3b3c63
+SHA512 (grub-2.04.tar.gz) = 3ba14fe8fdd15322ef89dd2f90e7f4a9e1e9a2ea19b795e0677c1f504b3fb93329109a83ddf5230f7173068e3f043dd5c9a92f6f2bb9257e13e236f62df10453
+Size (grub-2.04.tar.gz) = 11130271 bytes
 SHA1 (unifont-5.1.20080820.pcf.gz) = 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a
 RMD160 (unifont-5.1.20080820.pcf.gz) = ddc87231a7c1e18e81a6f4578a4f0279bcd0c292
 SHA512 (unifont-5.1.20080820.pcf.gz) = 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649
 Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
-SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 4cd60bf75811c3f72ed47ccc6dd2dec7bc77f991
+SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 2c7251081082d671d21343b5e95300a6779b4b21
+SHA1 (patch-grub-core_osdep_generic_blocklist.c) = e1bf4511edfea1754204ffb5fb2a6a5a777b8b94
 SHA1 (patch-util_getroot.c) = 7c2f148ffa778872de4f59b6fcf365bd1a497acf
diff --git a/sysutils/grub2/patches/patch-grub-core_osdep_bsd_hostdisk.c b/sysutils/grub2/patches/patch-grub-core_osdep_bsd_hostdisk.c
index 2c92cbc8cee..3be5a7a6b40 100644
--- a/sysutils/grub2/patches/patch-grub-core_osdep_bsd_hostdisk.c
+++ b/sysutils/grub2/patches/patch-grub-core_osdep_bsd_hostdisk.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-grub-core_osdep_bsd_hostdisk.c,v 1.1 2018/05/23 07:56:53 triaxx Exp $
+$NetBSD: patch-grub-core_osdep_bsd_hostdisk.c,v 1.2 2020/05/02 16:53:54 triaxx Exp $
 
 Fix build error for NetBSD:
  * undefined RAW_FLOPPY_MAJOR macro
  * undefined fd variable
 
---- grub-core/osdep/bsd/hostdisk.c.orig    2015-05-21 15:50:29.000000000 +0000
+--- grub-core/osdep/bsd/hostdisk.c.orig	2018-11-24 17:13:02.000000000 +0000
 +++ grub-core/osdep/bsd/hostdisk.c
 @@ -50,6 +50,9 @@
  # endif /* HAVE_GETRAWPARTITION */
@@ -24,20 +24,20 @@ Fix build error for NetBSD:
 +grub_hostdisk_configure_device_driver (grub_util_fd_t fd)
  {
    struct stat st;
-
-@@ -81,7 +84,7 @@ configure_device_driver (grub_util_fd_t
+ 
+@@ -81,7 +84,7 @@ configure_device_driver (grub_util_fd_t 
  grub_util_fd_t
  grub_util_fd_open (const char *os_dev, int flags)
  {
 -  grub_util_fd_t ret;
 +  grub_util_fd_t fd;
-
+ 
  #ifdef O_LARGEFILE
    flags |= O_LARGEFILE;
 @@ -90,10 +93,10 @@ grub_util_fd_open (const char *os_dev, i
    flags |= O_BINARY;
  #endif
-
+ 
 -  ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
 -  if (ret >= 0)
 -    configure_device_driver (fd);
@@ -47,5 +47,5 @@ Fix build error for NetBSD:
 +    grub_hostdisk_configure_device_driver (fd);
 +  return fd;
  }
-
+ 
  #endif
diff --git a/sysutils/grub2/patches/patch-grub-core_osdep_generic_blocklist.c b/sysutils/grub2/patches/patch-grub-core_osdep_generic_blocklist.c
new file mode 100644
index 00000000000..eddd600f1ce
--- /dev/null
+++ b/sysutils/grub2/patches/patch-grub-core_osdep_generic_blocklist.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-grub-core_osdep_generic_blocklist.c,v 1.1 2020/05/02 16:53:54 triaxx Exp $
+
+* Fix implicit declaration of function grub_file_filter_disable_compression()
+  (http://git.savannah.gnu.org/cgit/grub.git/commit/?id=dabdfa1)
+
+--- grub-core/osdep/generic/blocklist.c.orig	2018-11-24 17:13:02.000000000 +0000
++++ grub-core/osdep/generic/blocklist.c
+@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_
+ 
+       grub_disk_cache_invalidate_all ();
+ 
+-      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
++      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
+       if (file)
+ 	{
+ 	  if (grub_file_size (file) != core_size)
+@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_
+ 
+   grub_file_t file;
+   /* Now read the core image to determine where the sectors are.  */
+-  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
++  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
+   if (! file)
+     grub_util_error ("%s", grub_errmsg);
+