From nobody Thu Nov 20 02:48:38 2025 X-Original-To: dev-commits-src-branches@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 4dBjTf4N3nz6Gm0P for ; Thu, 20 Nov 2025 02:48:38 +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 4dBjTf3Hfrz3sPm for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; 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=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=JrDXZJmaPxUS8TDCOSXoOq900MDSZOv9PVHINa1fIMY8iJSGED//dB5TFG3SDj2U0UO7S6 2dsEhZEfs48EjS9gZILGFzJ4pY0QK4k4BU7vIIJF/JAv/jYwyNhrZ3MUY+oghlKL6AkOi0 EFQFV226xNAP+D6aH+n/qSU5P5mLntcAOpjSoZFdmKSG8fbDAmOgnDLufgEVZx91+57LrW wbg/cGjLq0Atnnz+Drhe3NK3WXFHgJB+kXIQLxoYHh4ACHOW9VcgcdxhPSV0jUcjKlckyC EspQv/a3x3l1zJmcFDwMpDLdulantLJp29QTEMqvUv2QKZk+rmpnd2HDOgkl4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763606918; 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=sq28osGepoy80fwYNl3/IlITO/gtnPvpCHogEAY1A40=; b=Mk7+2F79QbODuhNNJd+X2mWHST0HsgQgresbQc+2erymCa2c148mlkmFr8mY/tscW/Em5U i+oLFKSWLBr0ryYZ4lmjUfbffs4taXD0DO28N9qglqvlQ4KRPEoq7v0BZ2t9IxRNZRiXce hQmS7qEJqU+z6+b1iawarNQBn89PmC05IbXPjB1k+YdJCWKtcmi0W172Vpry+LhVYyJxFk xNKRo1GjSK8L4aMSOFQ5GoPBY3MMFjmfyFVncDUuECAw+mOuOjhnSVzmgECfL2PF9sK6BI kf8k5MwUgCtJeeeAJg8qhgbVwuUeWB0wrkrLlHik4LMDfaFoAXxIL6j/64gO7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763606918; a=rsa-sha256; cv=none; b=lI5XBLPJwLi2vHeSnMvQdnHYrTNZUMzoOITKLkld2FqE80wnLctTPBISH5iGGZ0RS3UQzK 95dL1YXw75gK4iRgkb6xW/JpH22waTFueEqc7PBtKUl1ArWUrf1uVyhHt4cogzPEHYHJVN 1BRQ0yMwGWoUwyaKAtfk40MQIFipi6VW3lNj9cl9yLkeCeU0vTpbtcrYxCdp537RRBfLgT 6w0ztGynJ+Wvwm7NWQrmpEhaijFSyjrhd2iItf9zIO8rmxxitEBYlTybz6MihHFSnqxE3+ VWZaEmmqp6x8a1uBZm+J2vPOaKN9WbrhPXU0jWGsEx+l0xz126hYffEjSIqjlw== 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 4dBjTf2nkHz16G0 for ; Thu, 20 Nov 2025 02:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 02:48:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d653eca0ef88 - stable/15 - freebsd-update: Add some diagnositic information for a failure case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 02:48:38 +0000 Message-Id: <691e8186.330a1.3d50439a@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 commit d653eca0ef889a8e3fa1e370d2b3ce7b031441a2 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-20 02:48:04 +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) --- 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 23f1106e3bde..2f2afa38f553 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1402,7 +1402,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 } @@ -1413,7 +1413,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 @@ -1436,7 +1436,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 } @@ -1453,7 +1453,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 @@ -1464,28 +1464,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