svn commit: r362983 - in head/sysutils/grub2-efi: . files
Kris Moore
kmoore at FreeBSD.org
Sat Jul 26 19:22:48 UTC 2014
Author: kmoore
Date: Sat Jul 26 19:22:46 2014
New Revision: 362983
URL: http://svnweb.freebsd.org/changeset/ports/362983
QAT: https://qat.redports.org/buildarchive/r362983/
Log:
Update grub2-efi to 2.02 prerelease version from PC-BSD repo
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-grub_src_types.h (contents, props changed)
Deleted:
head/sysutils/grub2-efi/files/patch-Makefile.util.am
head/sysutils/grub2-efi/files/patch-Makefile.util.def
head/sysutils/grub2-efi/files/patch-build-aux_test-driver
head/sysutils/grub2-efi/files/patch-configure.ac
head/sysutils/grub2-efi/files/patch-grub-2.00-zfs-feature-flag-support
head/sysutils/grub2-efi/files/patch-grub-core-Makefile.core.am
head/sysutils/grub2-efi/files/patch-grub-core-gnulib-Makefile.am
head/sysutils/grub2-efi/files/patch-grub-core-gnulib-argp-fmtstream.c
head/sysutils/grub2-efi/files/patch-grub-core-loader-i386-bsd.c
head/sysutils/grub2-efi/files/patch-include-grub-util-libzfs.h
Modified:
head/sysutils/grub2-efi/Makefile
head/sysutils/grub2-efi/distinfo
head/sysutils/grub2-efi/pkg-plist
Modified: head/sysutils/grub2-efi/Makefile
==============================================================================
--- head/sysutils/grub2-efi/Makefile Sat Jul 26 19:08:08 2014 (r362982)
+++ head/sysutils/grub2-efi/Makefile Sat Jul 26 19:22:46 2014 (r362983)
@@ -2,11 +2,13 @@
# $FreeBSD$
PORTNAME= grub2-efi
-PORTVERSION= 2.00
-PORTREVISION= 3
+PORTVERSION= 2.02
+PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= GNU/grub
-DISTNAME= grub-${PORTVERSION}
+MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
+ ftp://ftp.pcbsd.org/pub/software/
+DISTNAME= grub-${PORTVERSION}_1
+WRKSRC= ${WRKDIR}/grub-${PORTVERSION}
MAINTAINER= kmoore at FreeBSD.org
COMMENT= Multiboot EFI boot loader
@@ -14,12 +16,14 @@ COMMENT= Multiboot EFI boot loader
LICENSE= GPLv3
RUN_DEPENDS= ${LOCALBASE}/bin/mformat:${PORTSDIR}/emulators/mtools \
- ${LOCALBASE}/bin/grub-mkrescue:${PORTSDIR}/sysutils/grub2
+ ${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
SSP_UNSAFE= yes
USE_GCC= yes
+USE_PYTHON= yes
USE_AUTOTOOLS= automake aclocal autoconf
ACLOCAL_ARGS= -Im4
GNU_CONFIGURE= yes
@@ -37,6 +41,10 @@ post-patch:
@${LN} -s ${LOCALBASE}/lib/X11/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
@@ -44,3 +52,5 @@ do-install:
@cd ${WRKSRC}/grub-core && gmake install DESTDIR=${STAGEDIR}
.include <bsd.port.post.mk>
+
+RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*}
Modified: head/sysutils/grub2-efi/distinfo
==============================================================================
--- head/sysutils/grub2-efi/distinfo Sat Jul 26 19:08:08 2014 (r362982)
+++ head/sysutils/grub2-efi/distinfo Sat Jul 26 19:22:46 2014 (r362983)
@@ -1,2 +1,2 @@
-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-SIZE (grub-2.00.tar.xz) = 5136412
+SHA256 (grub-2.02_1.tar.xz) = d88d7c7533250df2939acb7a33f92d41fac02fc2bc729d95d89b571604d438b5
+SIZE (grub-2.02_1.tar.xz) = 4466312
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 Sat Jul 26 19:22:46 2014 (r362983)
@@ -0,0 +1,20 @@
+--- 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 @@
+
+ /* 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)
+ {
+ grub_dprintf ("geli", "wrong magic %02x\n", header.magic[0]);
Added: head/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_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-grub_src_types.h Sat Jul 26 19:22:46 2014 (r362983)
@@ -0,0 +1,11 @@
+--- grub-core/lib/libgcrypt/src/types.h.o 2014-03-03 17:14:46.722210112 -0500
++++ grub-core/lib/libgcrypt/src/types.h 2014-03-03 17:05:54.572824164 -0500
+@@ -113,6 +113,8 @@
+ #endif
+ #endif
+
++typedef uint64_t u64;
++
+ typedef union {
+ int a;
+ short b;
Modified: head/sysutils/grub2-efi/pkg-plist
==============================================================================
--- head/sysutils/grub2-efi/pkg-plist Sat Jul 26 19:08:08 2014 (r362982)
+++ head/sysutils/grub2-efi/pkg-plist Sat Jul 26 19:22:46 2014 (r362983)
@@ -415,5 +415,97 @@ lib/grub/x86_64-efi/gzio.mod
lib/grub/x86_64-efi/cmp.mod
lib/grub/x86_64-efi/read.module
lib/grub/x86_64-efi/ufs1.mod
+lib/grub/x86_64-efi/archelp.mod
+lib/grub/x86_64-efi/archelp.module
+lib/grub/x86_64-efi/cbfs.mod
+lib/grub/x86_64-efi/cbfs.module
+lib/grub/x86_64-efi/cbls.mod
+lib/grub/x86_64-efi/cbls.module
+lib/grub/x86_64-efi/cbmemc.mod
+lib/grub/x86_64-efi/cbmemc.module
+lib/grub/x86_64-efi/cbtable.mod
+lib/grub/x86_64-efi/cbtable.module
+lib/grub/x86_64-efi/cbtime.mod
+lib/grub/x86_64-efi/cbtime.module
+lib/grub/x86_64-efi/cmdline_cat_test.mod
+lib/grub/x86_64-efi/cmdline_cat_test.module
+lib/grub/x86_64-efi/disk.mod
+lib/grub/x86_64-efi/disk.module
+lib/grub/x86_64-efi/div_test.mod
+lib/grub/x86_64-efi/div_test.module
+lib/grub/x86_64-efi/efifwsetup.mod
+lib/grub/x86_64-efi/efifwsetup.module
+lib/grub/x86_64-efi/eval.mod
+lib/grub/x86_64-efi/eval.module
+lib/grub/x86_64-efi/file.mod
+lib/grub/x86_64-efi/file.module
+lib/grub/x86_64-efi/gcry_dsa.mod
+lib/grub/x86_64-efi/gcry_dsa.module
+lib/grub/x86_64-efi/gcry_idea.mod
+lib/grub/x86_64-efi/gcry_idea.module
+lib/grub/x86_64-efi/gcry_rsa.mod
+lib/grub/x86_64-efi/gcry_rsa.module
+lib/grub/x86_64-efi/gfxterm_background.mod
+lib/grub/x86_64-efi/gfxterm_background.module
+lib/grub/x86_64-efi/gfxterm_menu.mod
+lib/grub/x86_64-efi/gfxterm_menu.module
+lib/grub/x86_64-efi/hfspluscomp.mod
+lib/grub/x86_64-efi/hfspluscomp.module
+lib/grub/x86_64-efi/legacy_password_test.mod
+lib/grub/x86_64-efi/legacy_password_test.module
+lib/grub/x86_64-efi/legacycfg.mod
+lib/grub/x86_64-efi/legacycfg.module
+lib/grub/x86_64-efi/linux16.mod
+lib/grub/x86_64-efi/linux16.module
+lib/grub/x86_64-efi/lsefi.mod
+lib/grub/x86_64-efi/lsefi.module
+lib/grub/x86_64-efi/macbless.mod
+lib/grub/x86_64-efi/macbless.module
+lib/grub/x86_64-efi/macho.mod
+lib/grub/x86_64-efi/macho.module
+lib/grub/x86_64-efi/morse.mod
+lib/grub/x86_64-efi/morse.module
+lib/grub/x86_64-efi/mpi.mod
+lib/grub/x86_64-efi/mpi.module
+lib/grub/x86_64-efi/nativedisk.mod
+lib/grub/x86_64-efi/nativedisk.module
+lib/grub/x86_64-efi/offsetio.mod
+lib/grub/x86_64-efi/offsetio.module
+lib/grub/x86_64-efi/part_dfly.mod
+lib/grub/x86_64-efi/part_dfly.module
+lib/grub/x86_64-efi/pbkdf2_test.mod
+lib/grub/x86_64-efi/pbkdf2_test.module
+lib/grub/x86_64-efi/pcidump.mod
+lib/grub/x86_64-efi/pcidump.module
+lib/grub/x86_64-efi/procfs.mod
+lib/grub/x86_64-efi/procfs.module
+lib/grub/x86_64-efi/progress.mod
+lib/grub/x86_64-efi/progress.module
+lib/grub/x86_64-efi/setjmp_test.mod
+lib/grub/x86_64-efi/setjmp_test.module
+lib/grub/x86_64-efi/signature_test.mod
+lib/grub/x86_64-efi/signature_test.module
+lib/grub/x86_64-efi/sleep_test.mod
+lib/grub/x86_64-efi/sleep_test.module
+lib/grub/x86_64-efi/spkmodem.mod
+lib/grub/x86_64-efi/spkmodem.module
+lib/grub/x86_64-efi/syslinuxcfg.mod
+lib/grub/x86_64-efi/syslinuxcfg.module
+lib/grub/x86_64-efi/testspeed.mod
+lib/grub/x86_64-efi/testspeed.module
+lib/grub/x86_64-efi/tr.mod
+lib/grub/x86_64-efi/tr.module
+lib/grub/x86_64-efi/ufs1_be.mod
+lib/grub/x86_64-efi/ufs1_be.module
+lib/grub/x86_64-efi/usbserial_usbdebug.mod
+lib/grub/x86_64-efi/usbserial_usbdebug.module
+lib/grub/x86_64-efi/verify.mod
+lib/grub/x86_64-efi/verify.module
+lib/grub/x86_64-efi/video_colors.mod
+lib/grub/x86_64-efi/video_colors.module
+lib/grub/x86_64-efi/videotest_checksum.mod
+lib/grub/x86_64-efi/videotest_checksum.module
+lib/grub/x86_64-efi/xnu_uuid_test.mod
+lib/grub/x86_64-efi/xnu_uuid_test.module
@dirrm lib/grub/x86_64-efi
@dirrmtry lib/grub
More information about the svn-ports-head
mailing list