From nobody Tue Jan 14 13:43:00 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 4YXVgn0rM0z5kjJl; Tue, 14 Jan 2025 13:43:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXVgn01nKz3bnq; Tue, 14 Jan 2025 13:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736862181; 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=ZG5RydRD/QvY0rOWlfoUc/Z4rYUhYx9z/AkGyQqifsQ=; b=BOxx5fEsJ2lS+3CK/aWv6kewahGNb2/879wNwDGFUCDPDgtqRF9cvRLQWHJSxUbbDnGNfh m0pIv6hZSJp87CO9epO8htYuCkNYfr/+Duc6eSSTQnoWjlNNwBmfRtCUTvBUN/9NiNe6sN nCGtDrG/SQ6/ZsPjylFMLEJmGfy1PTTiDQwRhCIrnyJdCcp9r3R+Qvt/O3TSlV6GamZPB3 J+BS2imvP42mAvOWExKikSqgTSB61nbMa+StFNcLTBRFdo3o+F6jdBhJLO3laJTJlMf/4n 8Wv5gyHaeP9x6IbYKTae17TkFMgFap0Wwb0HqGxoRtDz7mH0NoR3PPoEKlzZqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736862181; 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=ZG5RydRD/QvY0rOWlfoUc/Z4rYUhYx9z/AkGyQqifsQ=; b=y41n2eda2lZGBsuAOgwxIEvgwDnKPw7xrJmvhg6lDbUdF8foiPAcyFW0FVIikmmAT1GNSk dCk7MEUba5uCt4rPLW36aFsaHDwnxdAhlDNC6z2kSkG/m89Yoh2dX9T0axU+LHHIveidlP VWG6R+IUht2KVTnDReXMRCQlLQci8jLZIrc/P1iX6zGaP/dRto/roPBLJ5NfdXlSslXJFX 4hJNh2N1rCXf2llWm+/KAkcqyU6HL9cHCkBfjKzfoC3CXKIeDT5KmfZDXqknRxjMyYaAnx id4BNdl8tNPT18YHxbLNum9opzbTK15rJDA3cRnCnbyhXd27baoOTcMAah5EhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736862181; a=rsa-sha256; cv=none; b=XihfFBoK+sgtkCD//aP8KIx2I3B2CQu9ydacAKQGUsRbgbSGaUw+emKamcyiDdc18HvsQw hg5ltps+bfdpzsM7708neVdmPsyzPgoj9HoYpqDm14WXhtnWePNRXWuJfrRcHpkxSiXYrI UB2WwMINzLXilov/hCTSi+OqP/FND1VJhCeaAX119k2oyyr4+Jl8JDt93CMV09mdZmci7n UdNpSSHK5Ts3Zns7InW5AfwloLDDYtOlrWfbMmH2nhkxeVyS49GroIOuURSskkgLnM1Dho gnY0t+cc1drGc+83eHnkrfcd7DdRRYyf3dee/SOWtI63GTzCNPwVzEdAsrC4PA== 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 4YXVgm65DNz1J95; Tue, 14 Jan 2025 13:43:00 +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 50EDh0u1002137; Tue, 14 Jan 2025 13:43:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50EDh0G9002134; Tue, 14 Jan 2025 13:43:00 GMT (envelope-from git) Date: Tue, 14 Jan 2025 13:43:00 GMT Message-Id: <202501141343.50EDh0G9002134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0cd9513a5ba5 - main - pkg: retire backwards compatibility bootstrap support 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cd9513a5ba5bcc5918d783f31279f91edbba2ee Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd9513a5ba5bcc5918d783f31279f91edbba2ee commit 0cd9513a5ba5bcc5918d783f31279f91edbba2ee Author: Ed Maste AuthorDate: 2024-10-07 17:10:58 +0000 Commit: Ed Maste CommitDate: 2025-01-14 13:42:36 +0000 pkg: retire backwards compatibility bootstrap support 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 --- usr.sbin/pkg/pkg.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 0b46d2831e9e..21ee1cd4bd30 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -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 {