Date: Mon, 8 Jun 2015 12:20:04 +0000 (UTC) From: Kris Moore <kmoore@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388838 - in head/sysutils: grub2-efi grub2-efi/files grub2-pcbsd grub2-pcbsd/files Message-ID: <201506081220.t58CK42o080163@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmoore Date: Mon Jun 8 12:20:04 2015 New Revision: 388838 URL: https://svnweb.freebsd.org/changeset/ports/388838 Log: - Add back patches to handle GELI key passthrough - Bump PORTREV Added: head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c (contents, props changed) head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h (contents, props changed) head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c (contents, props changed) Modified: head/sysutils/grub2-efi/Makefile head/sysutils/grub2-pcbsd/Makefile Modified: head/sysutils/grub2-efi/Makefile ============================================================================== --- head/sysutils/grub2-efi/Makefile Mon Jun 8 12:15:45 2015 (r388837) +++ head/sysutils/grub2-efi/Makefile Mon Jun 8 12:20:04 2015 (r388838) @@ -3,7 +3,7 @@ PORTNAME= grub2-efi PORTVERSION= 2.02 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ Added: head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c Mon Jun 8 12:20:04 2015 (r388838) @@ -0,0 +1,12 @@ +--- grub-core/disk/geli.c.orig 2015-01-30 16:34:55 UTC ++++ grub-core/disk/geli.c +@@ -445,6 +445,9 @@ recover_key (grub_disk_t source, grub_cr + if (!grub_password_get (passphrase, MAX_PASSPHRASE)) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied"); + ++ /* 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) + { Added: head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h Mon Jun 8 12:20:04 2015 (r388838) @@ -0,0 +1,11 @@ +--- grub-core/lib/libgcrypt/src/types.h.orig 2014-03-03 16:00:26 UTC ++++ grub-core/lib/libgcrypt/src/types.h +@@ -113,6 +113,8 @@ + #endif + #endif + ++typedef uint64_t u64; ++ + typedef union { + int a; + short b; Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Mon Jun 8 12:15:45 2015 (r388837) +++ head/sysutils/grub2-pcbsd/Makefile Mon Jun 8 12:20:04 2015 (r388838) @@ -3,6 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02q +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ Added: head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c Mon Jun 8 12:20:04 2015 (r388838) @@ -0,0 +1,12 @@ +--- grub-core/disk/geli.c.orig 2015-01-30 16:34:55 UTC ++++ grub-core/disk/geli.c +@@ -445,6 +445,9 @@ recover_key (grub_disk_t source, grub_cr + if (!grub_password_get (passphrase, MAX_PASSPHRASE)) + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied"); + ++ /* 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) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506081220.t58CK42o080163>