From nobody Tue Oct 3 17:28:37 2023 X-Original-To: dev-commits-src-all@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 4S0PtZ0QS6z4vm82; Tue, 3 Oct 2023 17:28:38 +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 4S0PtY71lNz4KKJ; Tue, 3 Oct 2023 17:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354118; 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=sKhdgEAswwuVSPRMl0DXAdzHVJ36RhXQFTVhXJrbIAM=; b=Hf3tn4BwU169UmDhsLfEmROAaZ74m5nwTJh0My0WwzSwGqzFfD9MCtX0QiLf6Qf+Vb4Jzh m7Vy9YZBxosJDMRrDgcozsGchiMhTzhxNAORrzMKSKTiST76Tbuxlqsi5LKqdJn5V42OGn hBrmKxsh/8PlQfcaikdH9SJbxJ7s+9hGsd62ZCyYmU8FORqBkBGlq0aZjK7zSczXDfjQ24 pkRpm5W6e3vomjK7lgLcRT9WFfiJ2qmcF96UOJFwuA2M4HJrQxjthzeg6KDNgltiiYlH5T z2ISJGfRwopioSdqu6CL613vy+HyR677NcdSnsneOi6BLiVejM6QhllEugFTrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696354118; a=rsa-sha256; cv=none; b=iByDoYFHX2AYV6A+ZaoWaQ5+KlSiyAZteNX5hXvk1yAvkaudEInBiQWfI8WXzWtq/Kd5P4 fMBaNt6xyap5k9naGrx1Am7F8ceLOQJLqCX/wVnjk4QSxD7D2bbnBqik1Qs2XEi3vWllJ4 9/ugSHag88AkZzbdyJHcHO/6vCjQJz4HcLvTyneJzo3rx+SZTGY+jDbDOS1Bs016hQRhQu liLaw8uPoO5U/5ULvZd2gdDmJ2ODQ/x95nahCv/fYHemfBttQnapc8LiOIehCPdZzDaEJx GlKmq3UAvJiFkiEio/7pIMLSISHZ9n012ZJrIHM+2jIHGnE+MJhAtD4vXsn+5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354118; 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=sKhdgEAswwuVSPRMl0DXAdzHVJ36RhXQFTVhXJrbIAM=; b=cOScnEdRSob26dA4pcIl2covNozciKGpDhuJJUrMPDO0UKWwBeVvOf6o7PCWKN46+VdHEm GNboMxDa8Afx6PRLn0+TCTfc91D8SkujIYjViWMHDpXr+Ba0La/8Xqn+eazywPMWbjC/3/ sJ1RdhBCpQ6buTGMbeYTxc7MS1E5IkrOUdSYEsjMJRYPmIsAulWFadVVQfadDCjsquaB0L EjhfW0K8K3LSAw+w7pQkw0sQ0yBZWb4KucYDfq2cH6sGrzAqa6b0Nvn7/iPsS6TsYEw9S+ QEpD95SS1Ya8Un3mXsecnj2kO9dUZTUsSRpl9Dp4V8sBryeAtDv1R1Sz6IDyYA== 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 4S0PtY644Jz141X; Tue, 3 Oct 2023 17:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393HSb9d085443; Tue, 3 Oct 2023 17:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393HSb0I085440; Tue, 3 Oct 2023 17:28:37 GMT (envelope-from git) Date: Tue, 3 Oct 2023 17:28:37 GMT Message-Id: <202310031728.393HSb0I085440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1cc968931bef - stable/14 - release/ec2: Remove references to portsnap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1cc968931bef915dd700b5eaefc8e6bd13fdb8a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc968931bef915dd700b5eaefc8e6bd13fdb8a0 commit 1cc968931bef915dd700b5eaefc8e6bd13fdb8a0 Author: Mark Johnston AuthorDate: 2023-09-27 22:02:36 +0000 Commit: Colin Percival CommitDate: 2023-10-03 17:28:17 +0000 release/ec2: Remove references to portsnap We no longer install a default portsnap.conf, so the sed invocation just generates an error. Reviewed by: cperciva MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42003 (cherry picked from commit 63aa2e91342ead0495eada5667f413f0cf8eb56a) --- release/tools/ec2.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 71f9f5c330cb..d033739adc26 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -126,11 +126,9 @@ EOF 's/^#KbdInteractiveAuthentication yes/KbdInteractiveAuthentication no/' \ ${DESTDIR}/etc/ssh/sshd_config - # Use FreeBSD Update and Portsnap mirrors hosted in AWS + # Use FreeBSD Update mirrors hosted in AWS sed -i '' -e 's/update.FreeBSD.org/aws.update.FreeBSD.org/' \ ${DESTDIR}/etc/freebsd-update.conf - sed -i '' -e 's/portsnap.FreeBSD.org/aws.portsnap.FreeBSD.org/' \ - ${DESTDIR}/etc/portsnap.conf # Use the NTP service provided by Amazon sed -i '' -e 's/^pool/#pool/' \