cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add back patches to handle GELI key passthrough

Browse Source 
- Bump PORTREV
This commit is contained in:
Kris Moore 2015-06-08 12:20:04 +00:00
parent f7e351f8df
commit c0a0311653
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=388838
5 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/grub2-efi/Makefile
View File

@ -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/

12
sysutils/grub2-efi/files/patch-grub-core_disk_geli.c Normal file
View File

@ -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)
{

11
sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h Normal file
View File

@ -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;

1
sysutils/grub2-pcbsd/Makefile
View File

@ -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/

12
sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c Normal file
View File

@ -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)
{