src/usr.sbin/pkg, branch main

Revert "pkg: Add -j and -r options"

2026-07-13T22:08:58Z

This reverts commit d94e034d504682be56fc2e9d20ac2c0fe15b70ec at the request of des@, as it seems to have broken the pass-through case.

pkg: Add -j and -r options

2026-07-13T15:32:41Z

This allows pkg(7) to be used to bootstrap a jail or chroot, and to recognize the -j and -r options and pass them through to pkg(8) if already bootstrapped. Note that this does not address the issue of repository keys. If using a signed package repository, you will still need to copy /usr/share/keys into the target environment before or after bootstrapping, or pkg will be unable to verify package signatures. MFC after: 1 week Reviewed by: imp, bapt Differential Revision: https://reviews.freebsd.org/D58165

pkg: Fix mirror type parsing and service discovery

2026-02-05T03:59:21Z

Signed-off-by: Pavel Knoblokh Reviewed by: emaste, imp, kevans Fixes: dc4581589a3 ("pkg: clean support for repositories") Closes: https://github.com/freebsd/freebsd-src/pull/1989

Comments: FreeBSD.conf should not be overwritten

2026-01-10T02:41:13Z

The files /usr/sbin/pkg/FreeBSD.conf.* currently set base repo to {enable: no}. We don't want to overwrite /local/etc/pkg/repos/FreeBSD.conf that already exists when users choose tech preview in the installation. Signed-off-by: Guilherme Augusto de Souza Candinho Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1925

pkg: Move FreeBSD-base to pkg.freebsd.org

2025-11-27T22:13:52Z

Rather than fetching packages directly from the CDN which currently backs pkgbase.freebsd.org, requests will go to pkg.freebsd.org mirrors and be 302ed to the correct servers. This adds ~70 seconds to the process of installing or upgrading a pkgbase system; it also orphans systems with 15.0-{PRERELEASE,ALPHA*,BETA*} installed since they are expecting to see pkgbase files signed with the pkg keys, not the new pkgbase signing keys. Reviewed by: dch, philip MFC after: immediately (for 15.0-RELEASE) With hat: re Requested by: clusteradm, core Differential Revision: https://reviews.freebsd.org/D53964

pkg: Add FreeBSD-base to /etc/pkg/FreeBSD.conf

2025-11-15T07:58:41Z

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)

pkg: Die if make -V BRANCH fails

2025-10-30T20:50:45Z

If build logic breaks such that we can't figure out which branch we're on, we should error out rather than shipping a default (and probably wrong) /etc/pkg/FreeBSD.conf Reviewed by: ivy MFC after: 5 minutes Suggested by: ivy Differential Revision: https://reviews.freebsd.org/D53487

pkg(7): Add support for pkg+ prefix to bootstrap pubkey

2025-09-11T07:03:48Z

MFC After: 1 day Sponsored by: Amn Afzar Hoopad Inc Differencial Revision: https://reviews.freebsd.org/D52418

Update comments to match pkg repo renaming

2025-08-27T22:48:46Z

Reported by: Ceri Davies Fixes: c83705a5756e ("Rename FreeBSD* pkg repos to FreeBSD-ports*")

Rename FreeBSD* pkg repos to FreeBSD-ports*

2025-08-27T16:46:36Z

With pkgbase being the New Way Of Doing Things in FreeBSD 15.0, it is unnecessarily confusing to have a repository called "FreeBSD" which contains packages built from the FreeBSD ports tree but not from the FreeBSD src tree. Bite the bullet and change it now rather than having an even more painful transition later. With hat: re@ Bikeshed on: freebsd-current, freebsd-ports Relnotes: The "FreeBSD" and "FreeBSD-kmods" repositories defined in /etc/pkg/FreeBSD.conf have been renamed to FreeBSD-ports and FreeBSD-ports-kmods respectively. Users who override these in /usr/local/etc/pkg/repos will need to adjust their configuration to match the new names.