From owner-svn-ports-head@FreeBSD.ORG Tue Nov 4 04:59:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9491B95; Tue, 4 Nov 2014 04:59:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA844DC4; Tue, 4 Nov 2014 04:59:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA44xkkn046292; Tue, 4 Nov 2014 04:59:46 GMT (envelope-from kmoore@FreeBSD.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA44xkVa046288; Tue, 4 Nov 2014 04:59:46 GMT (envelope-from kmoore@FreeBSD.org) Message-Id: <201411040459.sA44xkVa046288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kmoore set sender to kmoore@FreeBSD.org using -f From: Kris Moore Date: Tue, 4 Nov 2014 04:59:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372133 - in head/sysutils/grub2-efi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Nov 2014 04:59:47 -0000 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]);