From owner-svn-ports-all@freebsd.org Sun Jun 10 10:02:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66BF7100E821; Sun, 10 Jun 2018 10:02:57 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9CD5793B7; Sun, 10 Jun 2018 10:02:56 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 923B0328D; Sun, 10 Jun 2018 10:02:56 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5AA2ura017816; Sun, 10 Jun 2018 10:02:56 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5AA2uCb017815; Sun, 10 Jun 2018 10:02:56 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201806101002.w5AA2uCb017815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 10 Jun 2018 10:02:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472124 - head/net/ipxe X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/net/ipxe X-SVN-Commit-Revision: 472124 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2018 10:02:57 -0000 Author: tobik Date: Sun Jun 10 10:02:55 2018 New Revision: 472124 URL: https://svnweb.freebsd.org/changeset/ports/472124 Log: net/ipxe: Update to latest commit Pull in gcsplit from sysutils/coreutils when users try to embed certificates via CERT= in MAKE_ARGS. This currently fails because iPXE expects csplit to behave like GNU csplit and uses constructs that our csplit does not support. PR: 228835 Submitted by: Chad Jacob Milios (based on) Modified: head/net/ipxe/Makefile head/net/ipxe/distinfo Modified: head/net/ipxe/Makefile ============================================================================== --- head/net/ipxe/Makefile Sun Jun 10 09:34:29 2018 (r472123) +++ head/net/ipxe/Makefile Sun Jun 10 10:02:55 2018 (r472124) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ipxe -PORTVERSION= 20180220 -PORTREVISION= 2 +PORTVERSION= 20180514 CATEGORIES= net MAINTAINER= tobik@FreeBSD.org @@ -26,7 +25,7 @@ USE_GITHUB= yes # 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= 47849be3a900c546cf92066849be0806f4e611d9 +GH_TAGNAME= e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2 USE_PERL5= build ALL_TARGET= bin/ipxe.dsk bin/ipxe.lkrn bin/ipxe.pxe bin/ipxe.usb bin/undionly.kpxe @@ -64,8 +63,8 @@ _IPXE_BUILDCFG= branding:PRODUCT_NAME="${PKGNAME} (${O general:PING_CMD \ general:POWEROFF_CMD -OPTIONS_DEFAULT= ISO EFI -OPTIONS_DEFINE= ISO EFI +OPTIONS_DEFAULT= ISO EFI +OPTIONS_DEFINE= ISO EFI EFI_DESC= Create EFI image ISO_DESC= Create bootable CD image @@ -87,6 +86,14 @@ ISO_MAKE_ARGS= ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \ # Add user supplied build configuration after port options etc have # been processed as they might want to overwrite some settings. _IPXE_BUILDCFG+= ${IPXE_BUILDCFG} + +# XXX: iPXE uses csplit when embedding certificates and assumes +# it's GNU csplit, so give it what it wants as a workaround if +# CERT=... is in {IPXE_,}MAKE_ARGS. +.if ${MAKE_ARGS:MCERT=*} +BUILD_DEPENDS+= gcsplit:sysutils/coreutils +MAKE_ARGS+= CSPLIT=gcsplit +.endif do-configure: .for _cat _opt in ${_IPXE_BUILDCFG:C/\:/ /} Modified: head/net/ipxe/distinfo ============================================================================== --- head/net/ipxe/distinfo Sun Jun 10 09:34:29 2018 (r472123) +++ head/net/ipxe/distinfo Sun Jun 10 10:02:55 2018 (r472124) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519713504 -SHA256 (ipxe-ipxe-20180220-47849be3a900c546cf92066849be0806f4e611d9_GH0.tar.gz) = 00c5e40965af555009fc29d7b640e3cecddd25ca2e930a2dcaa0e2bd366a36c1 -SIZE (ipxe-ipxe-20180220-47849be3a900c546cf92066849be0806f4e611d9_GH0.tar.gz) = 3769882 +TIMESTAMP = 1528487574 +SHA256 (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 35cf8a645a151bb346a4d43df2b44e7aad4e28a5f76556800d657813c5960145 +SIZE (ipxe-ipxe-20180514-e7f67d5a4c6e9f06aa7a9db1b4245f5e16f00bb2_GH0.tar.gz) = 3782601