From nobody Wed Sep 27 23:03:36 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 4Rwsbs0qZnz4v6rK; Wed, 27 Sep 2023 23:03:37 +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 4Rwsbs0Kp0z4Z7m; Wed, 27 Sep 2023 23:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695855817; 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=HqBJg9JOfpM9mGCRefJQVOmOSCBzxBIKe3m0U0X0h/Q=; b=vv4lQSrAm1cHWGrPbxWcUdwoMg3kik9UWBN+RzrA6c3wYqTM2z7laBhmwmFBI0m5bU1ZsN i6MdEWkLx4ge3ShO1J1IAnNN3ovb+fAdXltvMZ71+xAvZDZw9mv9WIQT1fnoMtW7BxgsjY x2Xb3mtqJGudAT4dm8omAdsV7jBj+FJkLJrltxwHnz9Dmhxok9/R/bFdbl/3T3MDB5DKbE 1ZdGrzbF12kYsmTqkosVCFgyLJBpMs3RjtTzc7zHHm9r+PzEJ7AJ5EbiGTawtwauhKH/9+ iMuMXtlRTlhomKoaz78UuLIvqFgzpg+odZAMVw90cFiK+lghXGBhhQTadm872g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695855817; a=rsa-sha256; cv=none; b=Ob7S8fJUgGQ1iP3Q0apPKqTXhLP+NnpsFL6bWoYVsf9xu3Xsvb/uJ7xVUJl3FRO5z+ybut d/j12NGEIs1ChEGnmnW0EhftDlJFR6p8nei7Wuk8QxTYpfB96qsnMZBy4+6XpsgM3a/Z3T X1nii+ST3uMeuL+JV+l7yf8eZEARaSZyemJ/PZUJNhSvQCiZu7uuMBtkdZNJV4RRXEBlNl pcCBS9NIMdo7TDWXjTVUGWBfeS7P9vS29ajAQ91/v8uc4awMWYSLda10cFSvtRhDMkOnPF dnPsGi6ojHgXWrewTo4lenL22lVOy1xERUtRTtbWsj/5/f7fSJcnXqL+PKX71Q== 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=1695855817; 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=HqBJg9JOfpM9mGCRefJQVOmOSCBzxBIKe3m0U0X0h/Q=; b=INYtza+7ilK2Mu/GwclbGW44LHSNhWxDhbDGZYg98D8agS+pz1hEGjP1EnB2qPYG8PPZ4v ciRienLkuf8XGOn7Ti3h6mr2LRr80NLkeBeoj+jxIjd1bleonymKODlktoi+Yxvbwb7jx2 6sothrs5Ml4qjctdZDE8ABAckoQfFUvu5Pg8/aBTFNwcUa2x3lFl3yI2go3oDIr5cuNlfD 31E+ms9zrFQf+GTPWxYwSqY94IV12B4mR2onTE65JZcFWvbZteN1mrj5+vOPEEPMNrykoB StdqMM/af6fEpyOJqUT805c+UgIywF+q7VlOFGYevWLxxwISIDw6pFjcDDmJEw== 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 4Rwsbr6VGzzy59; Wed, 27 Sep 2023 23:03:36 +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 38RN3aUG040887; Wed, 27 Sep 2023 23:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RN3a7m040885; Wed, 27 Sep 2023 23:03:36 GMT (envelope-from git) Date: Wed, 27 Sep 2023 23:03:36 GMT Message-Id: <202309272303.38RN3a7m040885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 63aa2e91342e - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63aa2e91342ead0495eada5667f413f0cf8eb56a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=63aa2e91342ead0495eada5667f413f0cf8eb56a commit 63aa2e91342ead0495eada5667f413f0cf8eb56a Author: Mark Johnston AuthorDate: 2023-09-27 22:02:36 +0000 Commit: Mark Johnston CommitDate: 2023-09-27 23:03:25 +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 --- 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/' \