From nobody Mon Nov 17 14:42:57 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 4d99TG0Vr0z6HLXn; Mon, 17 Nov 2025 14:42:58 +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 4d99TF6wpnz4Psl; Mon, 17 Nov 2025 14:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390578; 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=jEf5jI+octS8F5xdRlv7t9jifPQlFeBq7Q/U7dT6ovM=; b=befhb3xRJ49216/QGJyAkWqZfZHHg5Q5o6boLQVtx/HacTeuHnNob1wFxOaO45spGKpuEU g2YSl5Rvt/yGOnXzwEVZtGvQxr3Z0G0YgevcT91TDTHmBpFBWxzf+r9aKw7iPevGNN6KPQ 2oVuqyQckahDED3ujPZ8CPx5k2Sob2js3sW9UGhUWZC3R1vPQ8g4ro6JRdZWVMiz/ai/zI s+BUAFDG6b0iH8YIFk6ukstV14isTqtuudTiNl5Jni26MLYhhFKyHE99hO+CzivqGdgH3y 1Gosk1byLVNg1ndXobFpu+rEawLtC434ogQGaPCrI+cuQG2hMrohmleKmEryHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390578; 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=jEf5jI+octS8F5xdRlv7t9jifPQlFeBq7Q/U7dT6ovM=; b=gqbjlkgQHYaqOB4K9sHTFHZBDsNoLkBtYDmJQdXCWXq9HygOsitimxHZMePwGd7Z5ajvO/ Lt6fwfC527WQVZFR2B+M3aVUgR0onL/kA+XspDBSeZCA8DQZ2MbfOFr7SS+F99xtmvJbS3 RQxHFyCUgTx9UjGH5lJwF0YvmD34mTb+Xjy6zNqZ3/ygm5mqW460MhQYCLXpEgL2x/1a+6 s/TNsdJ3KiGSQPmn53WzNYAUW+ffxrlVhr7GyucS3d8DP3S7sfyhMt1DAKoz2bXKVGpJxR iqrH0t03yrazJgTTqitHJqVw00ZnyiaksrkmPjw+VZ2ArANXnIP/mJymv3ybow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390578; a=rsa-sha256; cv=none; b=qE77QL3qyqVpFCowJIyX1zqQ8ThoUEy4NeNiHEourAXuPrN16NxA/9t5ZL16eyHSrGqTup fxuMgLgQ3EARo88DRf+K5AYR28TXXtMqyrtLkgPVJknS8D1HsFvYgjiDgh2AzxaqHAo7ek DGhhfoyvxVSZWbDazHPW/34kAWxuubcvg27qRbO6XXCgQlGABiPgQscE6bk6z2A7SfTwM3 PNrrTUp+qUuZ8qOpJ3tgLuKq8qQxHT4nf5HSLNEEwNH2whJ6tdpKfMJGTDR1LmMD+lNVa2 GOPAWtl1y1hKhszgmxD4jbZvOupR1bTOH9qxekTQQde1cCw4O3iEbY4R0Uiv9A== 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 4d99TF6RQyz1RPL; Mon, 17 Nov 2025 14:42:57 +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 5AHEgvTo097982; Mon, 17 Nov 2025 14:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEgvPJ097980; Mon, 17 Nov 2025 14:42:57 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:42:57 GMT Message-Id: <202511171442.5AHEgvPJ097980@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: af4ba95daf75 - main - freebsd-update: Add some diagnositic information for a failure case 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: af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 commit af4ba95daf75cf1b1624dd57038cfaa3ed2753e7 Author: Ed Maste AuthorDate: 2025-08-28 16:04:06 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:42:17 +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 --- 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 2a07bc1fb7bc..b6e42e94f4bf 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