From nobody Wed Jun 08 22:42:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 24CAB83EA6D; Wed, 8 Jun 2022 22:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJMgX6vtSz4YRg; Wed, 8 Jun 2022 22:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654728169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hyN0d/buRzD5QeMS5k4FbN1duzdw39iz1s87udltUow=; b=Liy8PnfV2L6fPRFbjyqfw5rXsebipgHPXq//G6/XjgiF3s5bu2temsygzK6xQD/d6pr44e kwivR9B7SAc9JUlxlW+pRL6VYBnIWTf5hdQ3hpL//+YboXM6qoK/N9K/G9WVy3+ERO85Xw r9WI9EFxK249BpVEAqPcXVnJYRyoqiDtq9CFLDg1PXGWjXSkAZEeScwFs/6fVjmFheOJ29 mLYWcrU8njtVWi9Vy5gesjulLd8+8B+XJuMaqshWFpxWFs5UqWs0eyAVhlQGJWsErnFSZF /fHh1PU9fZNWpCYrccMQDTLapUFzdPjjdtWbBOTOizR8or59xpFUsM+/YfDQNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA2E218646; Wed, 8 Jun 2022 22:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 258Mgmxo049971; Wed, 8 Jun 2022 22:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258MgmkD049970; Wed, 8 Jun 2022 22:42:48 GMT (envelope-from git) Date: Wed, 8 Jun 2022 22:42:48 GMT Message-Id: <202206082242.258MgmkD049970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Colin Percival Subject: git: 6851087b4dc0 - main - sysutils/ec2-scripts: Update to 1.11 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6851087b4dc0eca92c148a86099f709748b97da9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654728169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hyN0d/buRzD5QeMS5k4FbN1duzdw39iz1s87udltUow=; b=DDSSszq16HDsc4w1IwS2q7BNlllOt9TTcu+HBsujgZaPwUGriCWbwFMILcu9feeFlMatvx 8uoSTxxBLWlqyG9C9ZpRxhBx5Hqyo/yT3Yt0uREb58rdM2Nl4BKJacTk35DfqLj0VKTkYL 2sNuoVmGl5AJ/+n0836USTRJw2QLSKNoIUpfiKhE1LZ5JZl/8gRFiNN6QWFqvfNe1vuS8n ANh+Hz857Zi5vM+P4ypmVNTgohnGc+ASJQy1ueySpnOOkvXoWnOnvE3NpqHE4qHv/3W2OL 5vvoOECxxClw298vkgmAcQnPAq7lo4Sf8xhDTZOovuiMwRKuIG/KVhQ3P7DwLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654728169; a=rsa-sha256; cv=none; b=okvJh8ymQweE29jBwbFwMdSfkOZbVAeA+20T3voo0XnLT+y8VHC+cKGHB8JROPIB8zxSzi ggQwMI9Tqb7GLcx1L8SBxGUtcywFKAXGsLMq9yd4R0VQaauFIehxhLFNyZGnDQWAfifNS0 +jV8At0r+JgRbD83knpkFJapF3RjfIiARlJf0AiFzQEMfvBu1RtziaV0n+/0eWjQc89/JM BKM6C1YGVtun81VydtEbBmdtPCghuS3Gy1NJ+P47g5WKUP7+8XcIE8+5hjXJaFWukDJj+2 BAbDsJxKkl+xI67YBmBxnpFMAribIlgXHbdbBsiYIemsnslhkHvWzasUX5wfHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/ports/commit/?id=6851087b4dc0eca92c148a86099f709748b97da9 commit 6851087b4dc0eca92c148a86099f709748b97da9 Author: Colin Percival AuthorDate: 2022-06-07 20:59:47 +0000 Commit: Colin Percival CommitDate: 2022-06-08 22:39:48 +0000 sysutils/ec2-scripts: Update to 1.11 While I'm here: * Fetch distfile directly from github, * Remove the NOFIRSTBOOT option, which was only useful on FreeBSD releases prior to FreeBSD 11.0, all of which have long since ceased to be supported. * Add a dependency on sysutils/ebsnvme-id, which is used by the new version of these scripts. --- sysutils/ec2-scripts/Makefile | 31 ++++++++++++------------------- sysutils/ec2-scripts/distinfo | 7 +++---- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/sysutils/ec2-scripts/Makefile b/sysutils/ec2-scripts/Makefile index 0c42a077e290..c9f66051a1f6 100644 --- a/sysutils/ec2-scripts/Makefile +++ b/sysutils/ec2-scripts/Makefile @@ -1,43 +1,36 @@ # Created by: Colin Percival PORTNAME= ec2-scripts -PORTVERSION= 1.10 +PORTVERSION= 1.11 CATEGORIES= sysutils -MASTER_SITES= http://freebsd-ec2-dist.s3.amazonaws.com/ -EXTRACT_SUFX= .tgz MAINTAINER= cperciva@FreeBSD.org COMMENT= Startup scripts for FreeBSD/EC2 environment LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYRIGHT -OPTIONS_DEFINE= NOFIRSTBOOT -NOFIRSTBOOT_DESC= Use old (pre-firstboot support) version of scripts +RUN_DEPENDS= ${LOCALBASE}/sbin/ebsnvme-id:sysutils/ebsnvme-id -NO_BUILD= YES - -RC_SCRIPTS= ec2_bootmail ec2_ephemeralswap ec2_fetchkey ec2_loghostkey +USE_GITHUB= YES +GH_ACCOUNT= cperciva -.include +NO_BUILD= YES -.if ${PORT_OPTIONS:MNOFIRSTBOOT} -PORTVERSION= 1.5 -PORTREVISION= 1 -NO_INSTALL= YES -RC_SCRIPTS+= ec2_firstboot panicmail -.else -RC_SCRIPTS+= ec2_configinit +RC_SCRIPTS= ec2_bootmail \ + ec2_configinit \ + ec2_ephemeral_diskseen \ + ec2_ephemeral_swap \ + ec2_fetchkey \ + ec2_loghostkey PLIST_FILES= sbin/configinit -.endif .for i in ${RC_SCRIPTS} PLIST_FILES+= etc/rc.d/$i .endfor -.if ! ${PORT_OPTIONS:MNOFIRSTBOOT} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/configinit.sh ${STAGEDIR}${PREFIX}/sbin/configinit -.endif post-install: .for i in ${RC_SCRIPTS} diff --git a/sysutils/ec2-scripts/distinfo b/sysutils/ec2-scripts/distinfo index a14eba37d8ec..a96421f7bbd5 100644 --- a/sysutils/ec2-scripts/distinfo +++ b/sysutils/ec2-scripts/distinfo @@ -1,4 +1,3 @@ -SHA256 (ec2-scripts-1.5.tgz) = b1c95ecf56d3bcd1e903714cd453666b3fba842ee9ad9a82da519f2b01f00934 -SIZE (ec2-scripts-1.5.tgz) = 4383 -SHA256 (ec2-scripts-1.10.tgz) = 4f8e2386b0eb5eac25e869da82d2c71af42894b0de37cf2f79684b7204c64069 -SIZE (ec2-scripts-1.10.tgz) = 4779 +TIMESTAMP = 1654664226 +SHA256 (cperciva-ec2-scripts-1.11_GH0.tar.gz) = cb4fae570ab9841fd5ace57ec38de677a8a8521f2237e76e8296ae632b9d5df2 +SIZE (cperciva-ec2-scripts-1.11_GH0.tar.gz) = 5952