Index: head/net/ipxe/Makefile =================================================================== --- head/net/ipxe/Makefile (revision 433913) +++ head/net/ipxe/Makefile (revision 433914) @@ -1,93 +1,92 @@ # Created by: Guerkan Karaman # $FreeBSD$ # With helpful hints from net/gpxe PORTNAME= ipxe -PORTVERSION= 20160213 -PORTREVISION= 2 +PORTVERSION= 20161208 CATEGORIES= net MAINTAINER= t@tobik.me COMMENT= Open source network boot firmware LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \ bash:shells/bash \ mkisofs:sysutils/cdrtools USE_GITHUB= yes GH_PROJECT= ipxe # iPXE hasn't had a release since 2010. # See iPXE's FAQ at http://ipxe.org/faq # # Q: Which version of iPXE should I use? # # A: iPXE uses a rolling release model, in which every commit is intended # to be production-ready. You should always use the latest code. # -GH_TAGNAME= 7ecfe7159f94193a666200a17057d4cd5981b850 +GH_TAGNAME= 26050fd4c87c50503d5bd573b2ec91703676e211 USES= gmake perl5 shebangfix USE_BINUTILS= yes USE_GCC= yes MAKE_ARGS= PERL=${PERL} \ CC=${CC} \ HOST_CC=${CC} \ NO_WERROR=1 \ V=1 \ OBJCOPY="${LOCALBASE}/bin/objcopy" \ ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \ LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32" WRKSRC_SUBDIR= src SHEBANG_FILES= util/geniso util/gensdsk PLIST_FILES= %%DATADIR%%/ipxe.dsk \ %%DATADIR%%/ipxe.usb \ %%DATADIR%%/ipxe.iso \ %%DATADIR%%/ipxe.pxe \ %%DATADIR%%/ipxe.lkrn SUB_FILES= pkg-message .include ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64/i386 .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=i386 .endif IPXE_EMBED?= # Allows embedding of iPXE start scripts .if ${IPXE_EMBED} != "" MAKE_ARGS+= EMBED="${IPXE_EMBED}" .endif IPXE_TRUST?= # Path to the root certificates iPXE trusts .if ${IPXE_TRUST} != "" MAKE_ARGS+= TRUST="${IPXE_TRUST}" .endif pre-everything:: @${ECHO_MSG} "To build iPXE with an embedded script (path must be absolute):" @${ECHO_MSG} "make IPXE_EMBED=/path/to/ipxe/script install clean" @${ECHO_MSG} @${ECHO_MSG} "To build iPXE with new trusted root certificates" @${ECHO_MSG} "(see http://ipxe.org/crypto for more information):" @${ECHO_MSG} "make IPXE_TRUST=/path/to/ca1.crt,/path/to/ca2.crt" pre-build: # ISO creation fails if isolinux.bin is read only ${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/bin/ipxe.dsk ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/bin/ipxe.usb ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/bin/ipxe.iso ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/bin/ipxe.pxe ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/bin/ipxe.lkrn ${STAGEDIR}${DATADIR} .include Index: head/net/ipxe/distinfo =================================================================== --- head/net/ipxe/distinfo (revision 433913) +++ head/net/ipxe/distinfo (revision 433914) @@ -1,2 +1,3 @@ -SHA256 (ipxe-ipxe-20160213-7ecfe7159f94193a666200a17057d4cd5981b850_GH0.tar.gz) = 81e5a199c179ea993368beca55b40f810dddf789c6da48bace72aae3d94a6aba -SIZE (ipxe-ipxe-20160213-7ecfe7159f94193a666200a17057d4cd5981b850_GH0.tar.gz) = 3490722 +TIMESTAMP = 1484933375 +SHA256 (ipxe-ipxe-20161208-26050fd4c87c50503d5bd573b2ec91703676e211_GH0.tar.gz) = 2bc78183aa863bf4491e9d948f4321bc951413a2faca1654ef0d276dae1e365e +SIZE (ipxe-ipxe-20161208-26050fd4c87c50503d5bd573b2ec91703676e211_GH0.tar.gz) = 3674693 Index: head/net/ipxe/files/patch-util_parserom.pl =================================================================== --- head/net/ipxe/files/patch-util_parserom.pl (revision 433913) +++ head/net/ipxe/files/patch-util_parserom.pl (nonexistent) @@ -1,11 +0,0 @@ ---- util/parserom.pl.orig 2016-11-03 13:22:25 UTC -+++ util/parserom.pl -@@ -157,7 +157,7 @@ sub process_isa_rom { - - # Output Makefile rules for the specified ROM declarations - sub print_make_rules { -- my ( $state, my $image, my $desc, my $vendor, my $device, my $dup ) = @_; -+ my ( $state, $image, $desc, $vendor, $device, $dup ) = @_; - unless ( $state->{'is_header_printed'} ) { - print "# NIC\t\n"; - print "# NIC\tfamily\t$state->{family}\n"; Property changes on: head/net/ipxe/files/patch-util_parserom.pl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ipxe/files/patch-config_general.h =================================================================== --- head/net/ipxe/files/patch-config_general.h (revision 433913) +++ head/net/ipxe/files/patch-config_general.h (revision 433914) @@ -1,33 +1,33 @@ ---- config/general.h.orig 2016-02-12 14:04:51 UTC +--- config/general.h.orig 2016-12-08 09:35:52 UTC +++ config/general.h @@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ #define NET_PROTO_IPV4 /* IPv4 protocol */ -#undef NET_PROTO_IPV6 /* IPv6 protocol */ +#define NET_PROTO_IPV6 /* IPv6 protocol */ #undef NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */ #define NET_PROTO_STP /* Spanning Tree protocol */ + #define NET_PROTO_LACP /* Link Aggregation control protocol */ +@@ -54,10 +54,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -@@ -53,10 +53,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); - #define DOWNLOAD_PROTO_TFTP /* Trivial File Transfer Protocol */ #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ -#undef DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ +#define DOWNLOAD_PROTO_HTTPS /* Secure Hypertext Transfer Protocol */ #undef DOWNLOAD_PROTO_FTP /* File Transfer Protocol */ #undef DOWNLOAD_PROTO_SLAM /* Scalable Local Area Multicast */ -#undef DOWNLOAD_PROTO_NFS /* Network File System Protocol */ +#define DOWNLOAD_PROTO_NFS /* Network File System Protocol */ + //#undef DOWNLOAD_PROTO_FILE /* Local filesystem access */ /* - * SAN boot protocols -@@ -136,7 +136,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); +@@ -141,7 +141,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define PXE_CMD /* PXE commands */ //#define REBOOT_CMD /* Reboot command */ //#define POWEROFF_CMD /* Power off command */ -//#define IMAGE_TRUST_CMD /* Image trust management commands */ +#define IMAGE_TRUST_CMD /* Image trust management commands */ //#define PCI_CMD /* PCI commands */ //#define PARAM_CMD /* Form parameter commands */ //#define NEIGHBOUR_CMD /* Neighbour management commands */