From nobody Thu Oct 05 15:54:31 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 4S1bj33KtTz4vryf; Thu, 5 Oct 2023 15:54:31 +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 4S1bj32tNsz3LKJ; Thu, 5 Oct 2023 15:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521271; 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=jY8yNmz2CejtlLAqLY7ivPxQcTnAqCODzKNSqbvZn9g=; b=qdSHOqykG+UWNLmg9tT4NQEq38HXDpaAzJTNPELdYOoIKu+ci7o7uYMDZds06XUW0UFnL+ bGERAlTjcoJ+s0HP/7SSR8KA5Wp4QYa9TT1+I3IzddEmuNOuk8K21gD2MvF/aIaIigF/Gb fhQ3wtX2Ct6lQxC1XNIS9Xsq8TKaHIDjNIR63e73PEPajqhUF/hpsWgs8QJ08GOussz4xP ctvs8BhsZfCz+daMVw/aCpikKFVHyeIKnVeOjLNs1LATqoKx0p4WwCFJIjWhLXiPd+T4Hj EmaeeTSbJrQFjIIllZ14zx45BqlPM0ytVK5urfiGRNX0OTUGgM6pYMrKQiWg4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696521271; a=rsa-sha256; cv=none; b=w/3e4p9fT9nSs4TkoGu2h5zhy2Rj50AHqd0eLWDymt8lRr0BEMeDrCnSaU3tcSUJvaokyd 7PZQCwzjaql6p2VVs3HvGS29XDK7lJmOKUbo7ty937wqpj/vagQhI4Anz+R4rrJdPrd3Qe Aqz/sYM9dnxTHf+yuZzB0EzNJ5vRa9uhVUKH1MPur8ZA0iLrPUbV944rUgxUhW7dNSsop+ 6yYku0IM7pkjC43je0I5F/MrH1fY7N0CFJfofq9Yc9DujbD2td7feSBTrPLLvL43nOvkgA YbsD0FIXSny+sNgfuWkBYe3jZXr8CoehQGk1EoNaM4dPwURNhZFVprx0NqOKNg== 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=1696521271; 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=jY8yNmz2CejtlLAqLY7ivPxQcTnAqCODzKNSqbvZn9g=; b=kLS/JUx1+di0udygpnBQoyqzDI+5Lnmg1CUwxkLT1Q6kE3dv0zPsDrQZZMqh7Yj7HLWDd1 AnbVOmoQ2YE/nIviltdkNgW0fvjDjNawbdXYEP78FBI/K3p7yPPgCsKgnORjvL9nFty1pA eYwkKZIOueZGBuL1Q4IWw3cPpvA1apxhXWBFXx8TuDso8eIdCC/J4hgiUjWes4b69d0Rke 0ptQx6r4M1dmgY4EMW7pCqK8FEENOdHbKURf5RNpnnR7cfcnN1xPQaLLLtFDUpg3h4HtVl mGiYNnzgL+KUmOGVya9ejd7RY79kSGFd0r9PfEFxXyE0PcoXDJudgI1gasqqXA== 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 4S1bj31pZRz1Prl; Thu, 5 Oct 2023 15:54:31 +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 395FsVar046568; Thu, 5 Oct 2023 15:54:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FsViO046565; Thu, 5 Oct 2023 15:54:31 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:54:31 GMT Message-Id: <202310051554.395FsViO046565@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: e76b9cc26d68 - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e76b9cc26d68fa0d398571c0142acc1a54bcb1a8 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e76b9cc26d68fa0d398571c0142acc1a54bcb1a8 commit e76b9cc26d68fa0d398571c0142acc1a54bcb1a8 Author: Mark Johnston AuthorDate: 2023-09-27 22:02:36 +0000 Commit: Colin Percival CommitDate: 2023-10-05 15:54:02 +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 Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D42003 (cherry picked from commit 63aa2e91342ead0495eada5667f413f0cf8eb56a) (cherry picked from commit 1cc968931bef915dd700b5eaefc8e6bd13fdb8a0) --- 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/' \