From nobody Fri Oct 20 15:19:03 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 4SBpCC739Cz4xtSM; Fri, 20 Oct 2023 15:19:03 +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 4SBpCC6VzQz4tHF; Fri, 20 Oct 2023 15:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697815143; 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=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=Y/+eAchsDt7koXNq8hgbydD6Rhfy9uVRdCzi/cgdUcPf7R61Mi09MEMXcwKgqIl61xijRZ UiKX+1j7BjPZBCZyhnEsxQcWnfcSX+aUpjGJOVwhofRu4iyQw27goCARSK/myE5Il4P1J7 NbzzaMgoRF3PXbtPE4huuK/sCzVjQ67b1XYROjDdgCHkGbqrDk+O8Txknl+hmbdw9/n5/P eBxPRSyf23etKWKGjeC19z2TiPolH15UctTLPMmEvdf3s3njo8TmFYSHcWrTr2uIV8QUQF jGv3ZiVos0YxretacKVp1mpaONL8+yzE4DFZyH5Fux5rQWTzkDEXp5QyF+aj7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697815143; a=rsa-sha256; cv=none; b=JY+H2wN3av/2hFQLHGunqLZuSU1CeFTIEw55Bb8WKZacC3qHHeRvTAKEuBhtyfd2jKRwdj xDEh/umfXaVmJsJfpbSL3DyoNg85tFypuTJDUXTgqSXQcdpyNWXEQCaamTVmplXpPLjoRW y/OeHtV5fLa7UeVwMfq4MxHtmOQdVOeUz6hHID+fEtQrB5ZkAXVpFEb4SmBCX4QyAc+drA 4P11cNglSKggwFI0ilgPuJODHuiNehFCmpxQuSUWAftXAIYFhOtUENKj6IT8ZrUTf5Ci1m iafn35GWZTzGV6ADzLMnk8vLcFQnNIHOewm9EEBgQkQ7BYA+a98Ef6yZDaI5eg== 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=1697815143; 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=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=eymf0bmp98V+gUZ1nu4ibupEnnSzCMVQkYysQdtdRmFFIPOPRghvOGER1m8b5wKrvwPShw pIwEoY/+SqX89f4wWzFdfSnb/ZCNHdPNyuP+06afDxBWwciX6qc2l4Ng9FtuGWJg11o+qq iHoHSXmsBZQxC52zoox+lgTHbMW4GI2oDHHoAzeHdY21QRPWqWyg+iqJ3jMxSK/jlI1Kwp qlaeVSYipXgM95y5Q++p2I6Bv4UXhxa9Hs1s0+fPGqi/PDHARAfS/PjPjiKwaDtTfo+njz qT1X8W+LBVl+7/8hqlN7W889S5T56rxqtv4EKP41qLN8Jhw54gmUB+8jux5l3Q== 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 4SBpCC5c1Fzd39; Fri, 20 Oct 2023 15:19:03 +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 39KFJ3hL055689; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFJ3VP055686; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:19:03 GMT Message-Id: <202310201519.39KFJ3VP055686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: eb875881553b - main - Tweaks to libarchive's upgrade instructions 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=eb875881553b5aa0a53ccfb02131ea254f4ee3b1 commit eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Author: Mitchell Horne AuthorDate: 2023-10-20 15:11:21 +0000 Commit: Mitchell Horne CommitDate: 2023-10-20 15:12:02 +0000 Tweaks to libarchive's upgrade instructions I would like to use this file as an example of the FREEBSD-upgrade convention, see D42302. libarchive is picked somewhat arbitrarily as a longstanding piece of contrib software in FreeBSD. - Remove SVN references (HEAD/trunk) - Mention the vendor/libarchive git branch - Update link to import instructions - Remove $FreeBSD$ Reviewed by: mm, imp, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42308 --- contrib/libarchive/FREEBSD-upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/libarchive/FREEBSD-upgrade b/contrib/libarchive/FREEBSD-upgrade index 0689acff2599..0b5d4e921f49 100644 --- a/contrib/libarchive/FREEBSD-upgrade +++ b/contrib/libarchive/FREEBSD-upgrade @@ -1,25 +1,25 @@ -$FreeBSD$ - libarchive The source code is pulled with git: git clone git://github.com/libarchive/libarchive.git +The git branch for imports is named vendor/libarchive. + For the contrib directory files and directories were pruned by: - + sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' You may check if there are any new files that we don't need and add them to FREEBSD-Xlist. -The instructions for importing new release and merging to HEAD can be found -at FreeBSD wiki: +The instructions for importing new release and merging to main can be found +in the Committers' Guide: - http://wiki.freebsd.org/SubversionPrimer/VendorImports + https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git -To make local changes to libarchive, simply patch and commit to the trunk -branch (aka HEAD). Never make local changes on the vendor branch. +To make local changes to libarchive, simply patch and commit to the main +branch. Never make local changes on the vendor branch. mm@FreeBSD.org -27-July-2012 +19-October-2023