From nobody Wed Dec 31 17:16:53 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 4dhGpY2DS2z6LyHW for ; Wed, 31 Dec 2025 17:16: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 4dhGpY19FZz45sb for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; 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=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=Pit4+mUH9Wvr+nfPVhWNrOwt11KldulFRF9flWqqC1tyV+AYmZXHtACGz9UafD3Dp06BNF uo4ZYEZRFCmDFMInXqenJiKJetumlwUp0fkMt/2z0PBcXULd1eOpsYRJVe0eYUAVsJS6X2 bOT5vYSpDtSb6LRn/bEcT5f3f4nCbfYmO+bVxhLYPX8ADeuFGOKnUUMdlqksTs/o/UpG5y MDKdz4zZVgxOG5l7POUkEqLvItrw9ZLTvBBM6hINOSzMIui6Qw/Upbh7MSTez5tJz/U3wB JXkhP9Eeyy5MlNKkEgttN+29LQ9hxXIrpw1Ii8AwetGSUVfI7PwsB6mOVce6Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767201413; 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=GU2Q20BzztMFYcYa/OuF+mti6uapzVnRNyEhaadixvw=; b=XzvCFP62SZyT7hTFSpHzR/itOPHz3dxfb0K+JIS5d7QWcASb+LsEh8VfdiaqFSJe5SZ9xq Wnr6xF1wynyRrUKIzWd2NQEtVSAojqtOfhKJGc50TgXMYrZed90FWOF1KPpqDS3KyboWML prxf0ow28opRoEMkZD/MHQV7+H/3j+ay7QXJ7zcpBRfSTduBwJYQ3CoO24qCVKFTd0a0cK s+ddPqCF5N3JYiOUQujT6Ma4EWhl5l4X+q+opAJBH7h42FtUvjztY3OUJUz9RD0p+5Xk+V NG1vyI0g4BkQusSX1a2LwEyo6+na7x22RE9hCR1u/AoJQhgcgoo0ASE5WFp0Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767201413; a=rsa-sha256; cv=none; b=teUFnoO1TBmHjSm2XWujIQyTpd2RB9mmp9fHcDMwcy0ge+98qrmGECT48TpToG+/0Vjx2h +pmEBAMpBLscczPE2A4Gk7Ondz1BQzFEbinF2dlMLhzszybzphpHM4MUsvfehSEVytAwCg tluqm9EVO/3PNiE5pk5lkPsljQoaxmkkjx8Z2+Wu2ulE9kyVRBSJzaUtJ34qELDUuoB3rs ad+qH6ODzNGPWC9BWXQ6mpXGInYsvQFGzrM2rzP+Rz/nk6Ce0kh4iIX7Jt+/nA2zEbJTOJ 8AcXh5uZd6/A3mHLamryzxERXiYsS5gmeWLEzxyhlFQeU/3Dmpt8cgQJV0gJ6A== 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 4dhGpY0jtgzvnD for ; Wed, 31 Dec 2025 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22037 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 31 Dec 2025 17:16:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 39047538cf5d - main - 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39047538cf5d8f26112f7b08b3c56967f70f7f94 Auto-Submitted: auto-generated Date: Wed, 31 Dec 2025 17:16:53 +0000 Message-Id: <69555a85.22037.62b46f04@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=39047538cf5d8f26112f7b08b3c56967f70f7f94 commit 39047538cf5d8f26112f7b08b3c56967f70f7f94 Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Jessica Clarke CommitDate: 2025-12-31 17:14:55 +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 --- 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); }