From nobody Fri Jan 30 01:19:02 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 4f2J7W2Xh9z6QRb6 for ; Fri, 30 Jan 2026 01:19:03 +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 4f2J7V6sn7z3PdL for ; Fri, 30 Jan 2026 01:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769735943; 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=CiMH6XWe9zdOe/CX9hjMav5BA5XeTzyOOxE4+hE4asc=; b=sKhTSb4e08Lbeddn1XwXXmIWpxOJJ0LPad0ubvD5KkSqEi7IQKYzbkPIfjuS9RIG9RMrVr qrfNXZeLZvfyDR0cv+S7wXn6Hh6024tk2VV9Ll0c+bQTYHdBq9q3hmgXSxyIZHPP3sRMxA HvMaLv7lXlWngxM1TTfPZ4JHF/3UkfA58DvX+20ULl9KGqpX9mLOWEMI3lsmcrMnzgwTK+ YRTNxy1bKp3H8TDLy/bFhjv1lwN7jqArs5J4QmPVyXZp5oOrfE5y/Hymtb4nGdWIf6cPhg mDolr+OcjY5sBhp7Fu8ovXjRyPaxLyLaKnWQPLGO+7jlik8DgJz7peB1ksh2uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769735943; a=rsa-sha256; cv=none; b=ZpQM4ncSGeHREstUGlDpfPKA/4SeokdkAIoixe63MCoVyj62Lk5NgpHGp62u9BG9kfz78J KKPIeHYAl3eg8tl+sMd4UGvPprHrzDzN68rqVWo+yuww+g/USCvjiNJ8NIg9HclmUtIOx6 KeXPyx79+rwoDL/8aLAKdlaJh0+0f6ON7XNG6lKKpau/z2c0YdwB9FaROq8eRbnH5FnfNe eZ25Ka7jRftz7lpeHS7AC75cgpRjrth++2dCK5wRkMSIe2k5+8Jok4g+CuY+740UmGDQ+j ViRkQoKeCo6GtRIs+GVJcY6ljlstiB+C29qGIzvYJLR8pSYhV9eSeGQjNAGYLA== 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=1769735943; 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=CiMH6XWe9zdOe/CX9hjMav5BA5XeTzyOOxE4+hE4asc=; b=lNf6MgnRcvefDuBBvy6OF4vEki5DI09kJRUBfWRcSyxGfuUgNgVjuwoOh7fF2oqTR+MsSO /pbetsuqQqE09b9sn9oHiKtFxkXJjfKoi/jhFE27YtSslGD4IN+ndnTExYGgrVXeuKw84W 6P27jQ2lJ4G9901uffsUnoMTcURJ0SPrCaXF7EalgzenuEUDxG57OomdjpxPySuyf+z8M9 rd+61yxi4bCrfw2rUyu0Qr/zVpcsInnVU/8fcIl3vdmDI0g/hVvg/K/1r1sKd6yopyRZNM uLkfdIRup9Q3dsNuiJIaNxtJuKBiy/iMoceKE14EJtsoJwouuqG30hRMcsWMjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2J7V5Lrcz12b3 for ; Fri, 30 Jan 2026 01:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 01:19:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 10f4191e2f85 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 10f4191e2f85857045f5f971cc5720b977457068 Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 01:19:02 +0000 Message-Id: <697c0706.22e16.525a6823@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=10f4191e2f85857045f5f971cc5720b977457068 commit 10f4191e2f85857045f5f971cc5720b977457068 Author: Jessica Clarke AuthorDate: 2025-12-31 17:14:55 +0000 Commit: Jessica Clarke CommitDate: 2026-01-30 01:17:53 +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); }