From nobody Thu Sep 10 02:24:24 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 4hgM211M8Nz6rrND for ; Thu, 10 Sep 2026 02:24:25 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgM2070PXz3HjQ for ; Thu, 10 Sep 2026 02:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007065; 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=tEo4/ZtwGSJLJemzclJVSEke7pK1pgiZkWmEaJY/7D0=; b=p3gLBiJGlcB8t5uw8qCPEuXSotkoPImOC4P5UvopkrlW1f8I120xKVOzB1ixsIQFVSdD6I /A/1Ep+EwR/lLYXJRfpvTqc9x7d4FSUsbF95XoHoaMLqF7Y2V1wWAkkQhe6YRPqt28qTBc lLM7E/bCsZZMhqXUV7pL6NhQhYgFvSYq86BmgvfquDZ1d7p28XddeDVzY3azodECrcm5yt xteSUH4eptk0tdEhaQ+nbdGb9WB+6Oi4eO61x1Oej2bU5RHy+74gF7jYnmez/2iWH5H3D6 MASM87ctlWYGHwOtiBXK/rHcrCZ9IPZ1MUl/1SbtUE/2miIYfDSZfcsfeEg2TQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789007065; b=jq1syF1wf7AMBuPdTI+MVBDRlfy2IBK899Og6bE+buEBtXIDP7MVZx4pwobEWkuqfNmtOR OlCY2OY1WHiXWEpGYDJNbEN7va2opEtY3K0lkeq8FJ/V66AfphdDKlgssILWABBrds2gNm U4uNjVyCta76jFcnNaHlHNvh6/UbcwIwTQFv2QZobuUD2aS0onOWGKgrkrCxENN1uH394O RuRhqcikqKkojGiMVhJMKXBkkqtZdlCSPvtzzVT8GawFVTK2kt5mTj4svOpE6Lftz5lPKb Y1esaFtSFcfpEknC40AW5Z0s5Sk4MAB0i8YD0TvBACoEo5eeCTMxLvfZrxW5Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789007065; 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=tEo4/ZtwGSJLJemzclJVSEke7pK1pgiZkWmEaJY/7D0=; b=FmLbeGdFhMpVUXDuXHauArCZh59Y31di3z1oRM1ZsBBk5uBWvO3yAX8JD9oRIvNv2dZiWZ w9vtbr2PhXIYFj6DouiBsVq2eAGh3mIYW52UYL/UqeOEYNBbTd3OE6S1nI3gAIWdj5Sg+d 93obTVgeOlicwjCTRbEtS90lBR/GYggaLy+JmlnWq5ioNUcLb4uw7e671Han8x4S/+T0bi gWL7QSNbJhOUrP51QZkPUa/mWJP3HRa38cLvm5RVMxt0Jw/KpFFDFaSJ0UiWhrpSL6TvZp gAfM6ZJkoyBwPghV36a3ORETu7D1mrXX3Il6d6bXy7ux92BPtEKUQcvDwfQM0A== 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 4hgM205B4Bz1Mmh for ; Thu, 10 Sep 2026 02:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fca5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 02:24:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 1922ceffcf10 - stable/15 - MFC: libmagic: Add swap.c and magic.h to SRCS. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1922ceffcf10a6a8c21498a5e4c02e291415cc6b Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 02:24:24 +0000 Message-Id: <6aa214d8.1fca5.39ba0e02@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=1922ceffcf10a6a8c21498a5e4c02e291415cc6b commit 1922ceffcf10a6a8c21498a5e4c02e291415cc6b Author: Xin LI AuthorDate: 2026-09-05 01:03:17 +0000 Commit: Xin LI CommitDate: 2026-09-10 02:22:04 +0000 MFC: libmagic: Add swap.c and magic.h to SRCS. (cherry picked from commit 8929675e11c0c64ff96a2441082794980c9c6b2e) --- lib/libmagic/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index fe04f5ea68c8..bbb02eb7e7bf 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -19,7 +19,9 @@ SRCS= apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \ compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \ is_csv.c \ is_simh.c \ - is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c + is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c \ + swap.c +SRCS+= magic.h INCS= magic.h MAGICPATH?= /usr/share/misc @@ -62,7 +64,7 @@ CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic # For the non-dirdeps build, HOST_CC is CC by default -mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} +mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c swap.c ${INCS} ${BUILD_TOOLS_META} ${HOST_CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD}