From nobody Sun Nov 23 21:02:07 2025 X-Original-To: dev-commits-src-all@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 4dF1bz1j4kz6HQPs for ; Sun, 23 Nov 2025 21:02:07 +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 4dF1bz0bM9z3lcQ for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; 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=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=unR7uKjKcy8+8w9uRaGxDrhpBZCl4sBcGZVaQjTL4DZuyywCUvhGzB1g0eUxsmG+Ri+E7O Dw/BCo3FG7XrLMBc/0jZ0yYrFp6y1rr200lQWdBAv6W80jG50Mn2t9ZgCCNvmznsLztO4N 40nDMHxF3TeQc6HwjXbTuEKaNNFwfDmDghVE8Ragp0OkOk5v1J3sjjimPKpplpdeCMFVuo KO7DE+qvrOLF0yCSCCf+emIIpBNJLYpcA4FXCcZEGOM+gmRW2DnbtGHg/wSWyYxAzz5fhV NWQAREbfjaxgpHutB31TyKhLAeOYcfW7Egb2QtFiv0Bv+wGwQRZTTw/Hyun6Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763931727; 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=bjMwYbE3ni3Jpeg93LR/ThR8N0dK/ovZAOCAErN1hdo=; b=MrOHCQ+EE9IO6G90YyfYqz62gEeXtvuNLmMpzzX8SqqFjsYgGN8s6unfqDVbUDsgpCQ+lb PlZHNOIsDcj0HwlzrwlzDUbjdbC/tgrgj4o4buYbeWNY1xLLmite2WH3vhfWTQL80AHrWU CEguKLn9cAxuTRi/QgqWDJfhk5TklIGb1HYDkXZ3u6ObV2nK8jMMd8ttg2XrPyOM6GHFv6 BZJx3Qg6BsjB53CRt/FB2WtMugtoT+EPkKpw9OME2IvHR5u13MreaOH+JMDFYNl5OXIzov KXHQ17GLI9eKGjFIpGvG0rRVXqohagIZD/m1vbmhxjEraf5adM0TZGuQfXLVqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763931727; a=rsa-sha256; cv=none; b=APsyUbnBRpz4ZD3WKxdQ31mk7OlFUkDB1a1/i6PclU0pC53p8bFCxfdeOIGDMwpFk9pnAQ ugdb2kyxQCoHRq0qij+Xpd1uytbU3MnO9X9hEu1ptK1/jhBB3hK5ChElJdMRdLu6g1/RVF aUtz19A72xYtJUnbkYWq1IC/KlpTao1AvO8OPXnFXS0rdOcPyQC4fsfnY2lSXQuuZdLA+G S0qCwcxZpKG9ip7dwVBKILhz0VRqGg9RUpDx3/xroIlkx9VIroAoh24G2Tmigjp8tFvABU Jt5prchDFXkFQL9CL6PToH2n6gGM4JTdp2vjFPOstp2X1gi5cqAn8pdwa/RhyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dF1bz04m2zlSs for ; Sun, 23 Nov 2025 21:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 21:02:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b409b786b8a4 - stable/14 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 21:02:07 +0000 Message-Id: <6923764f.325b5.21616ba5@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b409b786b8a42b05f006dfe7c0ac70923d5fbc70 commit b409b786b8a42b05f006dfe7c0ac70923d5fbc70 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-23 21:01:48 +0000 freebsd-update: Add some diagnositic information for a failure case Users report freebsd-update failing with "The update metadata index is correctly signed, but failed an integrity check." Add a hint at which of the cases is failing to help track down the issue. PR: 264205 Reviewed by: dch Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52222 (cherry picked from commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7) (cherry picked from commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2) --- usr.sbin/freebsd-update/freebsd-update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a9bda574713c..cf5f6373a75c 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1349,7 +1349,7 @@ fetch_metadata_index () { fetch_metadata_bogus () { echo echo "The update metadata$1 is correctly signed, but" - echo "failed an integrity check." + echo "failed an integrity check ($2)." echo "Cowardly refusing to proceed any further." return 1 } @@ -1360,7 +1360,7 @@ fetch_metadata_index_merge () { for METAFILE in $@; do if [ `grep -E "^${METAFILE}\|" ${TINDEXHASH} | wc -l` \ -ne 1 ]; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "${METAFILE} count not 1" return 1 fi @@ -1383,7 +1383,7 @@ fetch_metadata_index_merge () { # specifically grepped out of ${TINDEXHASH}. fetch_metadata_index_sanity () { if grep -qvE '^[0-9A-Z.-]+\|[0-9a-f]{64}$' tINDEX.new; then - fetch_metadata_bogus " index" + fetch_metadata_bogus " index" "unexpected entry in tINDEX.new" return 1 fi } @@ -1400,7 +1400,7 @@ fetch_metadata_sanity () { # Check that the first four fields make sense. if gunzip -c < files/$1.gz | grep -qvE "^[a-z]+\|[0-9a-z-]+\|${P}+\|[fdL-]\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid initial fields" return 1 fi @@ -1411,28 +1411,28 @@ fetch_metadata_sanity () { # Sanity check entries with type 'f' if grep -E '^f' sanitycheck.tmp | grep -qvE "^f\|${M}\|${H}\|${P}*\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type f entry" return 1 fi # Sanity check entries with type 'd' if grep -E '^d' sanitycheck.tmp | grep -qvE "^d\|${M}\|\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type d entry" return 1 fi # Sanity check entries with type 'L' if grep -E '^L' sanitycheck.tmp | grep -qvE "^L\|${M}\|${P}*\|\$"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type L entry" return 1 fi # Sanity check entries with type '-' if grep -E '^-' sanitycheck.tmp | grep -qvE "^-\|\|\|\|\|\|"; then - fetch_metadata_bogus "" + fetch_metadata_bogus "" "invalid type - entry" return 1 fi