From nobody Fri Jan 30 01:19:53 2026 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 4f2J8T3nX7z6QRXf for ; Fri, 30 Jan 2026 01:19:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f2J8T31h1z3Pxn for ; Fri, 30 Jan 2026 01:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769735993; 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=USKGZS7FhaGQGgjIVMIB56yEPB+j/XsR9XzG2Tz/WrU=; b=B4IsjUFPiZmRA5pnEcCUz8n/Yk+xMp8qPtwpUTD3bVRHtF6UMi3ZLNFDxX2scM2hg9gNbb a/DFHpnRSXEem+pFRt12fA8Z3rBnfCoGF9xkviq0ktWxgo4CEbnQc1g/7CwtZLRA+80V8e 3TGfhLiKl9NKOhC06SPAXMG4MW/aGnd6EDctctEKDyCixkxFFaJX3W7p7aP8LFEgC5MBql cWHIcr2yTh0H+eT5MhUSnrwK02T/MRTTkJJZDZ4Yon5RjAzkqNyWuiri/1o840GXK9Wwj5 7Py1EYnFj9bfmgOp4vwX84X+oPO2/6YeDW1AAnaWJid/ofXkCNoifY6TxJ5p9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769735993; a=rsa-sha256; cv=none; b=BMBl9f2+Lqm+N5Jp8AI1YhTFkOwoGp9D71jwyhNMcC363klE+ondWrRFP+h/UOQFGrpY2H SSRHDiOeWFBXFeU9LVHkXE/Q8EQIjpcyu6pM30b8JrrZV+BdcRrriKVxTdEU4tly5x7xtA axvCHLnixCrJMaf3ucqpWw4N7ouOcUkPRwuDBp1D+RYs5RQPRoqOXuAd2BazZWmjCfoDoC OVVuo98kg8yTFfX0ATbTFLYHJjH7BSAfofxNMloiY2k1+hTxPNYk45dwiRHvsfBV4rBVM3 Qvd3o9piurAubiZbVFpNP3Cr4zhnO/3Q+7FIRKcxxsiPuewkTRNWGXIinlCNWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769735993; 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=USKGZS7FhaGQGgjIVMIB56yEPB+j/XsR9XzG2Tz/WrU=; b=Hpg3LC0O7+2amL8eL0rmNnoswyzjJQ6fnn5FuLUSuJVTKlXn3EI09xogtwXpJ8PSv3TlFy TDV4OBLVUH1sdWEpE1szMljk51l603YCoNNOkD53eAebInT1xkqMiAG8HKI0xj2jRZ8NGs JizKPk4dI1R5Kiej95+wGGEBm17VDwqYuEt9C1VHP6rkbr0BweMvv02sys97zZdl8aVr6U xnfvHWLeq05asM2PkIiDJpBjJ/bywt21t9BqkPoWOhzafpf/0cmU+R2SuMHyA3wz86hIrV U1q/+Fq39W63xuyGhZ1Ratmgqj/Qd6+BxXXHk7X4pLnmo18bljawSjsHcyKf1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2J8T2b59z12pr for ; Fri, 30 Jan 2026 01:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22623 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 01:19:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: afedf568e111 - stable/14 - Merge commit faa5141b9be4 from file git (by Christos Zoulas): 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: afedf568e111b5b6093e8465c1e22ab3895c6162 Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 01:19:53 +0000 Message-Id: <697c0739.22623.111c8e72@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=afedf568e111b5b6093e8465c1e22ab3895c6162 commit afedf568e111b5b6093e8465c1e22ab3895c6162 Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Jessica Clarke CommitDate: 2026-01-30 01:19:18 +0000 Merge commit faa5141b9be4 from file git (by Christos Zoulas): PR/656: harry.sintonen: Fix bug in byte swapping that was caused by the change to make flags uint16_t and cont_level uint8_t. This fixes using a magic.mgc built with a different endianness than file(1) itself, e.g. when building powerpc64 on amd64. PR: 292079 Fixes: ae316d1d1cff ("MFV: file 5.46.") MFC after: 3 days (cherry picked from commit 39047538cf5d8f26112f7b08b3c56967f70f7f94) --- contrib/file/src/apprentice.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/src/apprentice.c b/contrib/file/src/apprentice.c index 5289f8e87267..dde2dd1e0c2d 100644 --- a/contrib/file/src/apprentice.c +++ b/contrib/file/src/apprentice.c @@ -3646,15 +3646,14 @@ file_varint2uintmax_t(const unsigned char *us, int t, size_t *l) file_private void bs1(struct magic *m) { - m->cont_level = swap2(m->cont_level); + m->flag = swap2(m->flag); m->offset = swap4(CAST(uint32_t, m->offset)); m->in_offset = swap4(CAST(uint32_t, m->in_offset)); m->lineno = swap4(CAST(uint32_t, m->lineno)); if (IS_STRING(m->type)) { m->str_range = swap4(m->str_range); m->str_flags = swap4(m->str_flags); - } - else { + } else { m->value.q = swap8(m->value.q); m->num_mask = swap8(m->num_mask); }