From nobody Sun Nov 16 02:04:30 2025 X-Original-To: dev-commits-src-branches@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 4d8DhZ612Lz6GjYh; Sun, 16 Nov 2025 02:04:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8DhZ3MYXz3cQW; Sun, 16 Nov 2025 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258670; 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=8Cbgv4PvDV2puBDAun0QE3mBF0Xc0fnjualhY/zO91I=; b=EK9APgtVqOmuyAt5Ux28kywXCsg0PfK8DVd9ROAczyYdXNag7AHS3CK0j4Pg8b86gqBJWN GzsXTxnBqrSWwWM9GI/KHyEqxrIZSTu30XeWO82CpV+RnTSf9Y/69TCCbRiW5fB6brwvUu N4LinSeHT9w0y2OYMEim/ZTE6hQxd2klVwuiaGY9PlvF0QFpBuh1Ylf8CbWDa+hg6EmkBq v17QttR6dvjUsEjCvsC+2b7NrkdmIVo4mSwte/7PBx3lVbVEV4VR61Tq+xkyN40NUm1i0V TV5o7006hgtXywlLQobwr0hzUDmYwe4aECS+lMPIjHnKSaggva31MuaHNwqeAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258670; 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=8Cbgv4PvDV2puBDAun0QE3mBF0Xc0fnjualhY/zO91I=; b=Oskw6b8bhhrJFM58I66gIR8Y89VxkRvgK1fzvsiNUnh8ldqpm1rXqFQfkOn8icgLgPtZOn CbnYZvkTq0zVKKRdzG8IWtF8bEI8QFB5LAa2YVWic2gDYnQtNyqUnBLv2UvfiINGgoNaA1 PLphY8xCJoNAOoZP7ETTWy9XLCwPGX4XME5qY9PtIvLC0qL6kWOEsjP5XetJX9/wR/fCIs 1Gqoa1dSJmvxA3wFyPQ+aTkTHruxTTDUGZbgJ0yhsrYtv4iNFcAh5LsxpgIaB6XODk+2A+ MUhZYBC8zH5RyeXiXuOR3nLs/bbP161OjRSAx5LJTTvB+aKLWFgIlJt7fFyDfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258670; a=rsa-sha256; cv=none; b=Zxh4LTIkC6SGUOcuuIaSQQqs/rVbYS9e4UNHJnoM0+eJEjqrhqqBp8qrxqEmpoFQKeuAef 6fRwVVfIIBTCgaI2Cds16yRlqJgZk/SGpg27Q/SqLhdyzZ0+poa1ifs8PvKVgM7n+59s/p 5vfDssmfcqvFj5sWlnApqv/dyxM6Y+PHEmWqQMFwNcnoeOto4//HVNQLYsbrKIBumRroj/ outYOBm4EWD/7TiAYxhSOWJc46fd0eV18y6rOGxiaLymNNK/wexoXDrSO0KBzQRvCg2mGL mTFSk2Ftk15fU03WOKefxi86pnC0mEamn0NHsm2LLqYKx+wjnvOmfxsHZZ4L6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d8DhZ2wb7z2kC; Sun, 16 Nov 2025 02:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG24UaI060870; Sun, 16 Nov 2025 02:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24ULb060867; Sun, 16 Nov 2025 02:04:30 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:30 GMT Message-Id: <202511160204.5AG24ULb060867@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: 91e1c18012dc - stable/15 - pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 91e1c18012dc839f400f971f02bc08798c6b9ce9 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=91e1c18012dc839f400f971f02bc08798c6b9ce9 commit 91e1c18012dc839f400f971f02bc08798c6b9ce9 Author: Colin Percival AuthorDate: 2025-11-15 03:26:07 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +0000 pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf On -CURRENT and -STABLE this gets bits from pkg.freebsd.org; but we get base system bits from pkgbase.freebsd.org for BETA/RC/RELEASE. Note that this repository is disabled by default, but can still be used by explicitly specifying it, e.g. "pkg upgrade -r FreeBSD-base". With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 8e0b1a1c03a35a5db13e370cb3e62585d3db68e3) --- usr.sbin/pkg/FreeBSD.conf.latest | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 9 +++++++++ usr.sbin/pkg/FreeBSD.conf.quarterly-release | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index ac1636386942..f4b80c02cffa 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/latest", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 4e26582c6981..117bbd49aeae 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/base_latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: no +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release index b4a78009f7d2..035d0ae976b9 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly-release +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release @@ -6,6 +6,8 @@ # echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # +# Note that the FreeBSD-base repository is disabled by default. +# FreeBSD-ports: { url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly", @@ -21,3 +23,10 @@ FreeBSD-ports-kmods: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-base: { + url: "pkg+https://pkgbase.FreeBSD.org/${ABI}/base_release_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}", + enabled: no +}