From nobody Thu May 09 06:53:55 2024 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 4VZjR74HW9z5KjD0; Thu, 09 May 2024 06:53:55 +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 4VZjR73sVWz4PN5; Thu, 9 May 2024 06:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715237635; 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=vYb9ecHmm2AQmvYc8A8+2gYSXheRozyEOr9yYFq2h3M=; b=ixxXf122jogMf4pjKOHqKArDSL1FEYiWACgGMebPGHY0M37wLMTjWzMOXcCbvGAyCdSuTL hnUzNZVlST/DRMKJHp/2jRFWtUD4HvMnbOzbAJvi1f4oSLFiMs1Ifs7cOBxCVY/RM+iPZN L5qvY4TeX/0gFcX17gvV8BI/DS/yYqrvgvX5UnhiLSS9bIOVDzgwBhvRwnThczx/yMqj7R u2p8J8sWZ9o32+r49s91qmyPSFVmPpYLBIIyK4T27BMbiHglvoe9QWYyRfED3bsbGY3ydh PCwOQGZfc7b0Il9Qu18oQM8Uy2SCWscTC335Z3B/QDx5PMWUHnS2kQ/COFgxCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715237635; a=rsa-sha256; cv=none; b=JDVnFCp1kkDKAoVMm7GplXA/I/L8CdneJ5aSyMYIDqURwanTrbo1qT3pNJGESTFzTdf3qg oP0S/zv4kEPUF066eHVOOBP07zZvwhziqc7SL/rlR3CS8DAS1y27BFm+AZsAyTiwZEf/Pw 34SumiWX8C/P1DAyMMItMtyVRfICrLHQX3mQIqLk8C8CjeLE4SZrbH8YtYHRInHGLaaonG OCKmUvHbtgB/qnMYx1DVlYDGyDZyTA2oIWWO/Ns6NoLFyPpAb5LXis5wjS2AZbcMwexbVM fYy6XY9Kthl0969DM0MwFxx5sVcFeWOGl4qmm71dGX0wEX9F+GSned7qQLclkA== 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=1715237635; 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=vYb9ecHmm2AQmvYc8A8+2gYSXheRozyEOr9yYFq2h3M=; b=J9q/RCZje5vda7Za4iA0VhZzrecEpRunvyhy3qIOssXsaeiogbMMNoKHfIV2i1gSQ8FnIF OqBSrHMJiY1qLdy4p18KLOGiCfACt7cHMLD1u2nLAGuwsqSMvasSM4GL0SfRy0poPyFrrA sFXTmf4OT3o7TphUOScRd5v7UQKK8KZXrKiUfMcvO4O65bGfvxJMkv7e11p4+lusdSNduy rWhYeC3Sv1QH4Ix8rbQ+l12jdj3DvHkwsjSenSaEnTK9TV34bb0KyqDD5fkrO5DXUV7fPf /vFici4pUCQ7uEeOWaw/SFR/Mm88CDsX06ntEsSSierzdnWVHvg3lrjRKQ4YfA== 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 4VZjR73T9czyGs; Thu, 9 May 2024 06:53:55 +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 4496rt67089377; Thu, 9 May 2024 06:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4496rtPl089374; Thu, 9 May 2024 06:53:55 GMT (envelope-from git) Date: Thu, 9 May 2024 06:53:55 GMT Message-Id: <202405090653.4496rtPl089374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9f06e6c9907a - stable/14 - Remove remnants of portsnap(8) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f06e6c9907ae13dd1153958e0bc923097590d10 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9f06e6c9907ae13dd1153958e0bc923097590d10 commit 9f06e6c9907ae13dd1153958e0bc923097590d10 Author: Olivier Certner AuthorDate: 2024-04-22 13:02:46 +0000 Commit: Olivier Certner CommitDate: 2024-05-09 06:52:53 +0000 Remove remnants of portsnap(8) This was prompted by noticing that '/var/db/portsnap' still exists on newly-installed machines. With this change, all mentions of portsnap(8) in the tree are gone, except for the historical note in the AUTHORS section of manpage phttpget(8). locate(1) will thus start indexing again '/var/db/portsnap' on machines where this directory still exists, which may be a good way to push administrators to delete it. Reviewed by: cperciva Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45023 (cherry picked from commit 9b30b96c1fa4ee0dfc540878fbb3247bf92d19eb) ObsoleteFiles.inc: Remove /var/db/portsnap This is a followup to commit "Remove remnants of portsnap(8)" (9b30b96c1fa4). I wasn't aware of OLD_DIRS. Approved by: markj (mentor) MFC after: 1 day MFC with: 9b30b96c1fa4 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45023 (cherry picked from commit 54bbcc09a72b5d7a581f51416c9e635a33c2f884) Approved by: markj (mentor) --- ObsoleteFiles.inc | 3 +++ etc/mtree/BSD.var.dist | 2 -- libexec/phttpget/phttpget.8 | 11 ++++------- tools/regression/iscsi/initiator-instructions.txt | 6 +++--- usr.bin/locate/locate/locate.rc | 2 +- usr.bin/locate/locate/updatedb.sh | 2 +- usr.sbin/freebsd-update/freebsd-update.sh | 8 ++++---- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b5253c28d42c..b99bd4f890e5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240509: Remove remnants of portsnap(8) +OLD_DIRS+=var/db/portsnap + # 20240419: new clang import which bumps version from 17 to 18 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_cmath.h diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index 6f2327b59f0c..0845d8a59f65 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -53,8 +53,6 @@ .. ports .. - portsnap - .. zfsd tags=package=zfs cases .. diff --git a/libexec/phttpget/phttpget.8 b/libexec/phttpget/phttpget.8 index b82c788c53c6..16e0be65cd4c 100644 --- a/libexec/phttpget/phttpget.8 +++ b/libexec/phttpget/phttpget.8 @@ -49,9 +49,7 @@ small files need to be downloaded. .Pp The .Xr freebsd-update 8 -and -.Xr portsnap 8 -tools use +tool uses .Nm to download binary patch files. .Sh ENVIRONMENT @@ -69,17 +67,16 @@ Timeout for HTTP request in seconds. .El .Sh SEE ALSO .Xr fetch 1 , -.Xr freebsd-update 8 , -.Xr portsnap 8 +.Xr freebsd-update 8 .Sh AUTHORS .An -nosplit The .Nm utility was written by .An Colin Percival Aq Mt cperciva@FreeBSD.org -for use with +initially for use with .Xr portsnap 8 -and later with +(now removed) and has been used by .Xr freebsd-update 8 . This manual page was written by .An Xin LI Aq Mt delphij@FreeBSD.org . diff --git a/tools/regression/iscsi/initiator-instructions.txt b/tools/regression/iscsi/initiator-instructions.txt index 11c3311cddb2..e99ff87fe379 100644 --- a/tools/regression/iscsi/initiator-instructions.txt +++ b/tools/regression/iscsi/initiator-instructions.txt @@ -3,9 +3,9 @@ How to prepare initiator virtual machines for iSCSI target testing 1. Install operating systems. - - FreeBSD: Use default settings for everything. Don't install - ports from the system installer, use "portsnap fetch extract" - after installation instead. + - FreeBSD: Use default settings for everything. Don't install ports + from the system installer, fetch a new ports tree after + installation instead. - Fedora: Change the environment to "Minimal install". diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc index 404af4cc4a64..f004dea19508 100644 --- a/usr.bin/locate/locate/locate.rc +++ b/usr.bin/locate/locate/locate.rc @@ -15,7 +15,7 @@ #SEARCHPATHS="/" # paths unwanted in output -#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update" +#PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/freebsd-update" # directories unwanted in output #PRUNEDIRS=".zfs" diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index e874700afdb8..ff7ec7f6c18e 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -52,7 +52,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH : ${mklocatedb:=locate.mklocatedb} # make locate database program : ${FCODES:=/var/db/locate.database} # the database : ${SEARCHPATHS="/"} # directories to be put in the database -: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/portsnap /var/db/freebsd-update"} # unwanted directories +: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /var/db/freebsd-update"} # unwanted directories : ${PRUNEDIRS=".zfs"} # unwanted directories, in any parent : ${FILESYSTEMS="$(lsvfs | tail -n +3 | \ egrep -vw "loopback|network|synthetic|read-only|0" | \ diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4a6a8d78330b..77b12a3756c2 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1052,10 +1052,10 @@ IDS_check_params () { # a useful answer, use the server name specified by the user. # Put another way... look up _http._tcp.${SERVERNAME} and pick a server # from that; or if no servers are returned, use ${SERVERNAME}. -# This allows a user to specify "portsnap.freebsd.org" (in which case -# portsnap will select one of the mirrors) or "portsnap5.tld.freebsd.org" -# (in which case portsnap will use that particular server, since there -# won't be an SRV entry for that name). +# This allows a user to specify "update.FreeBSD.org" (in which case +# freebsd-update will select one of the mirrors) or "update1.freebsd.org" +# (in which case freebsd-update will use that particular server, since +# there won't be an SRV entry for that name). # # We ignore the Port field, since we are always going to use port 80.