From nobody Sun Jan 11 19:22:59 2026 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 4dq54z5httz6NPGD for ; Sun, 11 Jan 2026 19:22:59 +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 4dq54z57fFz3hTb for ; Sun, 11 Jan 2026 19:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768159379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8xT44sCxZ5rCatenu+WA5T8VlbdRsqK7VAhIWq3ZvY=; b=rjge6G22ykgYXqTwelQ2WALjJlXVIKbvdMQMTvMtLCQ+cciyIfH0tnq/tMOAfLbuGydsRm BLE6LCPXtywkyuR2eJPdj9B0bm9i3WOCzmRGMyV12SXLKzWT1jAMZG2t2XGmYJnAvAZq6o gua4R6gOOhki8dXg9v0S72o/YAN1ipT90Ycs8sRXia1TQeu4nDeGU4G5AatQPwoRv0rLXi c6zBJQ8We42NJkoMLGDjbphYlVnmqzTVOGcOz0oJ2cxDbp+P1f10C/0udpy85DHc9jvKuE sooGdJV8ylEu7/xg/xe+W6P834c9DiAqS+fsm2+AbqhcXaGG+diNB/0VXHh7aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768159379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8xT44sCxZ5rCatenu+WA5T8VlbdRsqK7VAhIWq3ZvY=; b=iGYXpiw+liOoZSxYxXn1T/P/2ZTOlc4F+atab4sxE5RpMWbRkH6klp+xm7dK5YuM0/wf1N NMbRTmvkhLYYrKONEDULRI36kpfpFA4FVhWrHsIDjXEmQgIzUV8rb4JMkfHSuqrU72TcV8 /BKAJ2mgdmO0pnpBt3kCR9Sbye+Pz1sA14z/AziT+pimcAH++fJvO1GTnlaHgUc39hHFjv qFqlBmSEDkNA8P6WTJYNQiq636jYLDoAcMX+s6JINDU5Rna56XKZtPSaEqx2hOGpygo9Oj zdj2Q6NJLIoDOaMv7vOefsEOsF7D9fBwAZQWnIYIfxb7t4inlVEYyzjoHUThug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768159379; a=rsa-sha256; cv=none; b=VK3XNPPSghQluZKECTwHWX7S6n9SE8KL+MgP+gA6nU1poorlKO+HJasG23+okcxpsov5md drsv+tPonaYTiaZZD2nhIqjKaVpM+n4LDHgS29Dpn+5i77Okz1A+Qjp6XzNvDoK0NzLGCA x16bBCbfri65osYqG0/F+g9Pzvn4Rpce6Agha06dqUiaM2VME1z5HwdA1qxQP6/4XGxNlg OsQvkkAu2kcHuxuNFs/eGmqVOFNl3aBPu34JmSfYXQITRxwpEKL9JQPZVOkjgewU7ib+4c KQatx6DbjtYorOHX4Fp+k9GmAH81GaQRj0IjTepIRbUeHJzaXMojz57fW1B5IQ== 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 4dq54z4gYVztbh for ; Sun, 11 Jan 2026 19:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e43e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Jan 2026 19:22:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Adrian Chadd Subject: git: e5861dc2ea52 - stable/15 - Merge commit faa5141b9be4 from file git (by Christos Zoulas): 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e5861dc2ea529527894b9be2df99f359c0d5b6ef Auto-Submitted: auto-generated Date: Sun, 11 Jan 2026 19:22:59 +0000 Message-Id: <6963f893.3e43e.563516a7@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e5861dc2ea529527894b9be2df99f359c0d5b6ef commit e5861dc2ea529527894b9be2df99f359c0d5b6ef Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Adrian Chadd CommitDate: 2026-01-11 19:21:47 +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); }