upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-18 21:20:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkg: retire backwards compatibility bootstrap support

Browse source 
pkg.pkg has been available for years and is the default in all supported
releases.  Retire fallback support for pkg.txz.

Reviewed by:	bapt
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46990
This commit is contained in:
Ed Maste 2024-10-07 13:10:58 -04:00
parent 49f4e3d297
commit 0cd9513a5b
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
usr.sbin/pkg/pkg.c
View file

@ -91,11 +91,7 @@ struct fingerprint {
STAILQ_ENTRY(fingerprint) next;
};
static const char *bootstrap_names [] = {
"pkg.pkg",
"pkg.txz",
NULL
};
static const char *bootstrap_name = "pkg.pkg";
STAILQ_HEAD(fingerprint_list, fingerprint);
@ -851,7 +847,6 @@ bootstrap_pkg(bool force, const char *fetchOpts, struct repository *repo)
char tmpsig[MAXPATHLEN];
const char *packagesite;
char pkgstatic[MAXPATHLEN];
const char *bootstrap_name;
fd_sig = -1;
ret = -1;
@ -865,18 +860,12 @@ bootstrap_pkg(bool force, const char *fetchOpts, struct repository *repo)
if (strncmp(URL_SCHEME_PREFIX, packagesite,
strlen(URL_SCHEME_PREFIX)) == 0)
packagesite += strlen(URL_SCHEME_PREFIX);
for (int j = 0; bootstrap_names[j] != NULL; j++) {
bootstrap_name = bootstrap_names[j];
snprintf(url, MAXPATHLEN, "%s/Latest/%s", packagesite, bootstrap_name);
snprintf(tmppkg, MAXPATHLEN, "%s/%s.XXXXXX",
getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP,
bootstrap_name);
if ((fd_pkg = fetch_to_fd(repo, url, tmppkg, fetchOpts)) != -1)
break;
bootstrap_name = NULL;
}
if (bootstrap_name == NULL)
snprintf(url, MAXPATHLEN, "%s/Latest/%s", packagesite, bootstrap_name);
snprintf(tmppkg, MAXPATHLEN, "%s/%s.XXXXXX",
getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP,
bootstrap_name);
if ((fd_pkg = fetch_to_fd(repo, url, tmppkg, fetchOpts)) == -1)
goto fetchfail;
if (repo->signature_type == SIGNATURE_FINGERPRINT) {
@ -918,11 +907,7 @@ bootstrap_pkg(bool force, const char *fetchOpts, struct repository *repo)
goto cleanup;
fetchfail:
for (int j = 0; bootstrap_names[j] != NULL; j++) {
warnx("Attempted to fetch %s/Latest/%s", repo->url,
bootstrap_names[j]);
}
warnx("Error: %s", fetchLastErrString);
warnx("Error fetching %s: %s", url, fetchLastErrString);
if (fetchLastErrCode == FETCH_RESOLV) {
fprintf(stderr, "Address resolution failed for %s.\n", packagesite);
} else {