From nobody Sat Nov 15 07:58:59 2025 X-Original-To: dev-commits-src-main@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 4d7mc352N5z6HKg0; Sat, 15 Nov 2025 07:58:59 +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 4d7mc33g11z3Nxv; Sat, 15 Nov 2025 07:58:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193539; 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=/tjVXDeVvcj9AtqApvkptiEj4JJ+Bw+2lBfkBuLTMBQ=; b=wErh/i98UNrXr80eJ8bLrUmoLpQoXvLdn2agxhO1a8p4sVcdGarcUF87kSZybgx95IIdFj 1RYebDQAskGAxRPqJem5jyRK/LlJjIQVau/kwn6AgBB1IGgI4BfOYT0MsdeK8W5FrC/ZcQ iu190hgOVwxM1smJAl4OKm8oFihnLpSVWqyGe5HoRQgUhXeMD8tdOSxt6YWTI69+USrAPA arH8Ohgc9IYtK07u8zHMxQFDBh2QIbsc+TPAMQOubkRf5N4ZTslQ2wnmcHLnyb13bBy+SQ SoW89kVUrhG+Dn8gJEs9WTtg99wdSUzeuiBAI9vz17bj4lfrbdZXM2l8i/VsIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193539; 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=/tjVXDeVvcj9AtqApvkptiEj4JJ+Bw+2lBfkBuLTMBQ=; b=xJapNnWvYF8CemgmxVxx173LzGaokOBWGCdQMsTcMIQLO3sMSWgp0ZTj1Y4e895JH/RDAE DU6z5yYk9is7PNTEBWgT0KAKCC0BfKgfxHJGwZmTsnjbLYx8Ic0R5uTiI48dc3vPBD0G8G 7s/QwPyYidx70tldgl4JdmUqQUE3WhKK6A7l8ketPGjo3kBvNIxIEsqWi8JgdT4lkxvQtN 8KwXCKK+SmJSpY5xZb5kRSp8li0DxX2S/U6UoH03AJcjsaWu/KQx5q4eo01UpkzYG/Ni+S DJ5iv4CFBAsRuUgAYQnM503lnvgzPSVhsguAg2fiG9HAGN9QTkMpHVETbxQuoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763193539; a=rsa-sha256; cv=none; b=iRpXR1KkVsQtCy1UNeD7jLZpid9qXNIIBU8HJVF2ZHRQuCTKz6WRKfpeYjjzOEpfvujQLO 49fRla1m3GypS/r5hbsQnVCblurQsWem/9Vi6uCEcb1gs49kU8fTcEE4zxYB/pjh78oGNq qGujUpTePl9jV2gZpGoC6CDoA/gtiMtG5SgsIBPEmA9en0Ta7Sv4+bFIUv2RvcorNVe4/d ECVDSLfpd5nM1BaSfDcAn3MBkpzOUZgNZhQ14rltwq2EFa2pI5yta0iA182RjcpBCYIuST 1ObDMfGnXz6EOjjeniCbmOAyGGIMo0ebrbaozAQ6uZAzMlNuSF10ynpj30uKIw== 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 4d7mc332cgzkPx; Sat, 15 Nov 2025 07:58:59 +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 5AF7wxbG013536; Sat, 15 Nov 2025 07:58:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7wxcq013533; Sat, 15 Nov 2025 07:58:59 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:58:59 GMT Message-Id: <202511150758.5AF7wxcq013533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 8e0b1a1c03a3 - main - pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8e0b1a1c03a35a5db13e370cb3e62585d3db68e3 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8e0b1a1c03a35a5db13e370cb3e62585d3db68e3 commit 8e0b1a1c03a35a5db13e370cb3e62585d3db68e3 Author: Colin Percival AuthorDate: 2025-11-15 03:26:07 +0000 Commit: Colin Percival CommitDate: 2025-11-15 07:58:41 +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) --- 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 +}