Index: head/sysutils/grub2-efi/Makefile =================================================================== --- head/sysutils/grub2-efi/Makefile (revision 388837) +++ head/sysutils/grub2-efi/Makefile (revision 388838) @@ -1,57 +1,57 @@ # Created by: kmoore@FreeBSD.org # $FreeBSD$ 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/ DISTNAME= grub-${PORTVERSION}_7 MAINTAINER= kmoore@FreeBSD.org COMMENT= Multiboot EFI boot loader LICENSE= GPLv3 RUN_DEPENDS= ${LOCALBASE}/bin/mformat:${PORTSDIR}/emulators/mtools \ ${LOCALBASE}/bin/grub-mkrescue:${PORTSDIR}/sysutils/grub2-pcbsd BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ help2man:${PORTSDIR}/misc/help2man WRKSRC= ${WRKDIR}/grub-${PORTVERSION} SSP_UNSAFE= yes USE_GCC= yes ACLOCAL_ARGS= -Im4 GNU_CONFIGURE= yes USES= autoreconf bison cpe gettext gmake python tar:xz ONLY_FOR_ARCHS= amd64 MAKE_JOBS_UNSAFE= yes CPE_PRODUCT= grub CPE_VENDOR= gnu CONFIGURE_ARGS= --with-platform=efi --disable-werror --localedir=${PREFIX}/share/locale CONFIGURE_ENV= CPP="${CC} -E" \ LEX=${LOCALBASE}/bin/flex .include post-patch: @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC} @${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def pre-configure: @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/autogen.sh cd ${WRKSRC} && ./autogen.sh post-configure: @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core do-install: @cd ${WRKSRC}/grub-core && ${GMAKE} install DESTDIR=${STAGEDIR} RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} .include Index: head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c =================================================================== --- head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c (nonexistent) +++ head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c (revision 388838) @@ -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) + { Property changes on: head/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h =================================================================== --- head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h (nonexistent) +++ head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h (revision 388838) @@ -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; Property changes on: head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt_src_types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/grub2-pcbsd/Makefile =================================================================== --- head/sysutils/grub2-pcbsd/Makefile (revision 388837) +++ head/sysutils/grub2-pcbsd/Makefile (revision 388838) @@ -1,97 +1,98 @@ # Created by: kmoore@FreeBSD.org # $FreeBSD$ PORTNAME= grub2-pcbsd PORTVERSION= 2.02q +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ DISTNAME= grub-2.02_7 MAINTAINER= kmoore@FreeBSD.org COMMENT= Multiboot boot loader LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ help2man:${PORTSDIR}/misc/help2man WRKSRC= ${WRKDIR}/grub-2.02 CONFLICTS= grub-0* grub2-2* SSP_UNSAFE= yes USE_GCC= yes ACLOCAL_ARGS= -Im4 GNU_CONFIGURE= yes USES= autoreconf bison cpe gettext gmake makeinfo python tar:xz ONLY_FOR_ARCHS= i386 amd64 INFO= grub grub-dev MAKE_JOBS_UNSAFE= yes CPE_PRODUCT= grub CPE_VENDOR= gnu CONFIGURE_ARGS= --disable-werror --localedir=${PREFIX}/share/locale CONFIGURE_ENV= CPP="${CC} -E" \ LEX=${LOCALBASE}/bin/flex SUB_FILES= 00_header 10_kfreebsd 10_ktrueos 30_os-prober 50_otherbe OPTIONS_DEFINE= MKFONT FUSE OPTIONS_DEFAULT=MKFONT MKFONT_DESC= Build grub-mkfont (require freetype2) FUSE_DESC= Build grub-mount (require FUSE) .include .if ${ARCH} != "amd64" EFIEMU= "@comment " .endif PLIST_SUB+= EFIEMU=${EFIEMU} .if ${PORT_OPTIONS:MMKFONT} LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont MAN1+= grub-mkfont.1 CONFIGURE_ARGS+= --enable-grub-mkfont .else CONFIGURE_ARGS+= --disable-grub-mkfont MKFONT= "@comment " .endif PLIST_SUB+= MKFONT=${MKFONT} .if ${PORT_OPTIONS:MFUSE} LIB_DEPENDS+= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs CONFIGURE_ARGS+= --enable-grub-mount .else CONFIGURE_ARGS+= --disable-grub-mount FUSE= "@comment " .endif PLIST_SUB+= FUSE=${FUSE} post-patch: @${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def pre-configure: @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' ${WRKSRC}/autogen.sh cd ${WRKSRC} && ./autogen.sh post-configure: @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core post-install: ${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias ${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/ ${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/ ${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/ ${INSTALL_SCRIPT} ${WRKDIR}/30_os-prober ${STAGEDIR}${PREFIX}/etc/grub.d/ ${INSTALL_SCRIPT} ${WRKDIR}/50_otherbe ${STAGEDIR}${PREFIX}/etc/grub.d/ ${MV} ${STAGEDIR}${PREFIX}/etc/grub.d/40_custom ${STAGEDIR}/${PREFIX}/etc/grub.d/40_custom.dist RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} .include Index: head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c =================================================================== --- head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c (nonexistent) +++ head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c (revision 388838) @@ -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) + { Property changes on: head/sysutils/grub2-pcbsd/files/patch-grub-core_disk_geli.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property