From owner-svn-ports-head@FreeBSD.ORG  Fri Jan 23 10:35:09 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CB4AB7A6;
 Fri, 23 Jan 2015 10:35:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7559EE0;
 Fri, 23 Jan 2015 10:35:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0NAZ9Bf095051;
 Fri, 23 Jan 2015 10:35:09 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0NAZ9ZQ095050;
 Fri, 23 Jan 2015 10:35:09 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201501231035.t0NAZ9ZQ095050@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 23 Jan 2015 10:35:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377720 - head/sysutils/shim
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2015 10:35:09 -0000

Author: trasz
Date: Fri Jan 23 10:35:08 2015
New Revision: 377720
URL: https://svnweb.freebsd.org/changeset/ports/377720
QAT: https://qat.redports.org/buildarchive/r377720/

Log:
  Install certificate and key matching what's embedded in the shim itself.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sysutils/shim/Makefile

Modified: head/sysutils/shim/Makefile
==============================================================================
--- head/sysutils/shim/Makefile	Fri Jan 23 10:20:17 2015	(r377719)
+++ head/sysutils/shim/Makefile	Fri Jan 23 10:35:08 2015	(r377720)
@@ -3,6 +3,7 @@
 
 PORTNAME=	shim
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	trasz@FreeBSD.org
@@ -23,14 +24,19 @@ USE_GITHUB=	yes
 MAKE_JOBS_UNSAFE=	yes
 ONLY_FOR_ARCHS=	amd64
 
-PLIST_FILES=	lib/shim/MokManager.efi lib/shim/fallback.efi lib/shim/shim.efi
+PLIST_FILES=	lib/shim/shim.pem lib/shim/shim.key \
+		lib/shim/MokManager.efi lib/shim/fallback.efi lib/shim/shim.efi
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/make-certs
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Makefile
 
 do-install:
+	# Note that before this step, the shim.pem contains the _private_ key.
+	openssl x509 -inform der -in ${WRKSRC}/shim.cer -outform pem -out ${WRKSRC}/shim.pem
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} -m 600 ${WRKSRC}/shim.key ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/shim.pem ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
 	${INSTALL_DATA} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim