svn commit: r372133 - in head/sysutils/grub2-efi: . files

[Kris Moore]

Author: kmoore
Date: Tue Nov  4 04:59:45 2014
New Revision: 372133
URL: https://svnweb.freebsd.org/changeset/ports/372133
QAT: https://qat.redports.org/buildarchive/r372133/

Log:
  - Add support for GELI passphrase passthrough to EFI booting
  - Bump PORTREV

Modified:
  head/sysutils/grub2-efi/Makefile
  head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c

Modified: head/sysutils/grub2-efi/Makefile
==============================================================================
--- head/sysutils/grub2-efi/Makefile	Tue Nov  4 02:02:03 2014	(r372132)
+++ head/sysutils/grub2-efi/Makefile	Tue Nov  4 04:59:45 2014	(r372133)
@@ -3,7 +3,7 @@
 
 PORTNAME=	grub2-efi
 PORTVERSION=	2.02
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/

Modified: head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
==============================================================================
--- head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c	Tue Nov  4 02:02:03 2014	(r372132)
+++ head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c	Tue Nov  4 04:59:45 2014	(r372133)
@@ -1,20 +1,12 @@
 --- grub-core/disk/geli.c.orig	2014-05-15 14:00:10.000000000 -0400
-+++ grub-core/disk/geli.c	2014-05-20 14:46:07.604565349 -0400
-@@ -225,7 +225,7 @@
++++ grub-core/disk/geli.c	2014-09-26 10:18:53.325111693 -0400
+@@ -430,6 +430,9 @@
+   if (!grub_password_get (passphrase, MAX_PASSPHRASE))
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied");
  
-   /* Look for GELI magic sequence.  */
-   if (grub_memcmp (header->magic, GELI_MAGIC, sizeof (GELI_MAGIC))
--      || grub_le_to_cpu32 (header->version) > 5
-+      || grub_le_to_cpu32 (header->version) > 7
-       || grub_le_to_cpu32 (header->version) < 1)
-     grub_util_error ("%s", _("wrong ELI magic or version"));
- 
-@@ -265,7 +265,7 @@
- 
-   /* Look for GELI magic sequence.  */
-   if (grub_memcmp (header.magic, GELI_MAGIC, sizeof (GELI_MAGIC))
--      || grub_le_to_cpu32 (header.version) > 5
-+      || grub_le_to_cpu32 (header.version) > 7
-       || grub_le_to_cpu32 (header.version) < 1)
++  /* Set the GELI passphrase to GRUB env, for passing to FreeBSD kernel */
++  grub_env_set ("gelipassphrase", passphrase);
++
+   /* Calculate the PBKDF2 of the user supplied passphrase.  */
+   if (grub_le_to_cpu32 (header.niter) != 0)
      {
-       grub_dprintf ("geli", "wrong magic %02x\n", header.magic[0]);