From nobody Wed Aug 5 18:50:47 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 4hFfcl6dkrz6n0M7 for ; Wed, 05 Aug 2026 18:50:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFfcl3hJcz3sMc for ; Wed, 05 Aug 2026 18:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785955847; 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=187HFhT40xe9tfGaNcrwGUTHfouhEiEqc7zC9Kjz3Nc=; b=rDOZOXJhywJ/qPDRNnsZhfACVIXd5M8Rzglx37Xnj5sL8rhr7Yz2VycLKc0dQEJTUAEKOg 9uMcHXsfUDBzn1WwgD0EpU/piNxduvQGZ971D3/IuYZlzVkQrGzoor9NjmApPIbd3kl2KY h0ipcpNDLTZlDjNWa4405y0CM1+X6wfJq5d833SCQMi/x2trP84xNprMkKo3qQjVH5TSvj xclVK5zZNQy5ZKJDy87rnzzggrZ0U0fH0nsgUBpB802gIoW8C+3gYbfTB2IdiWOpNbhpwy Ji7HY1akB9uTy/HTWtVK2rOvMU0wa1kPKeEbpxJfFVuyucTxsl7mZmELyhg55Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785955847; a=rsa-sha256; cv=none; b=FhuWTH9LL0sCWMu+PBUm5d5K9X2HB1rgm8P3IZCA7JhKeyMr7NtUixgvcb1iGAf5QfQuAy YWjcOH9iPb+GCJAkgWtQfO3cDCfQ5UaVJZd/0XzrQKgdAx8M8LdDFVthH5KsVr4xOBOnut 69EVIO2l+Ex7/ZAbvlmwZPEMooLk6y/sfAzzMu/8R/aBXgqGeVybGKgMZ1QXs9CDkzlf1e E0Wj8MlSls2xPLfCDyD8KodLzkKQgjCkWDUT220Ob0+5HuQP6CMWejqBW8KAS2e4S13m/h RiEXhoo8MotwFM0VbGEGRYW+s8Paf0c132YUvF2Ibtk94QIVMOf9j6//W5rE7g== 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=1785955847; 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=187HFhT40xe9tfGaNcrwGUTHfouhEiEqc7zC9Kjz3Nc=; b=ZiTwqcpgcg6Pm2VlBVbXBt8zHuJr7Lig00I7LWmCCdKd6HiM+0Gdx2PTS4G6vCyNyMEgWH tp3hiq7rwAgtbL6RGyfW2e8stdnKlPDkmZPDgBF8CdiZFlI/DD3T1VukW2wM3NeIRnuotY CC5mcxf/6tDeznzlB1gj5gOhJo9DkEGOiwC3ngFKdJcLMpgReznH4uQXN783jMlB2k7Hj7 AEUIR0FCEWWTOv7B+fngh5MSIO5tWOMdvtWAswGa6BD/+wuQorre+9E5Ruf5xfo3t5ytth GoJdS1R1ldsR09J3VsbFwM881AQQu0SwIKYeo+992I09Gg8OKpqj8IpiAXRZYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFfcl2GF7zmmb for ; Wed, 05 Aug 2026 18:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 18:50:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Wolfram Schneider From: Alexander Ziaee Subject: git: 2b0f4a74e2a1 - stable/14 - ctfmerge.1: Import ENVIRONMENT from NetBSD 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 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2b0f4a74e2a1f4eea062d651fe6759c807646ffc Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 18:50:47 +0000 Message-Id: <6a738607.36e0f.6c52c5e7@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2b0f4a74e2a1f4eea062d651fe6759c807646ffc commit 2b0f4a74e2a1f4eea062d651fe6759c807646ffc Author: Wolfram Schneider AuthorDate: 2026-06-30 13:20:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-08-05 18:50:27 +0000 ctfmerge.1: Import ENVIRONMENT from NetBSD Import the ENVIRONMENT section from NetBSD, minus the variable that our ctfmerge does not have. Alphabetize them, polish grammar and alignment, and add the variables to the man database. While here, remove whitespace from the end of some lines to quiet linter. MFC after: 3 days PR: 291186 Co-authored-by: Alexander Ziaee Obtained from: NetBSD (christos , 8a0c0d8) Differential Revision: https://reviews.freebsd.org/D54054 (cherry picked from commit 32cf24b725fdf899fb642c47004b69fcfae9b9db) --- cddl/usr.bin/ctfmerge/ctfmerge.1 | 74 ++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1 index 2bc70db82dc9..1e371e62c9c5 100644 --- a/cddl/usr.bin/ctfmerge/ctfmerge.1 +++ b/cddl/usr.bin/ctfmerge/ctfmerge.1 @@ -1,32 +1,32 @@ .\" -.\" Copyright (c) 2010 The FreeBSD Foundation -.\" All rights reserved. -.\" +.\" Copyright (c) 2010 The FreeBSD Foundation +.\" All rights reserved. +.\" .\" This software was developed by Rui Paulo under sponsorship from the -.\" FreeBSD Foundation. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. .\" -.Dd April 21, 2022 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd June 30, 2026 .Dt CTFMERGE 1 .Os .Sh NAME @@ -104,6 +104,28 @@ Copy CTF data from into .Ar destfile . .El +.Sh ENVIRONMENT +The following environment variables are used by +.Nm : +.Bl -tag -width "CTFMERGE_TERMINATE_NO_UNLINK" +.It Ev CTFMERGE_DEBUG_LEVEL +Increase debugging verbosity +.Pq maximum 3 . +.It Ev CTFMERGE_INPUT_THROTTLE +Max queue size to queue +.Pq default 10 . +.It Ev CTFMERGE_PHASE1_BATCH_SIZE +Number of files in a slot that are needed before processing starts +.Pq default 8 . +.It Ev CTFMERGE_MAX_SLOTS +Number of round-robin slots in the input queue that is processed by +worker threads. +Each slot represents a file batch +.Pq default 5 . +.It Ev CTFMERGE_TERMINATE_NO_UNLINK +Do not remove temporary files on exit, +so that they can be examined for debugging. +.El .Sh EXIT STATUS .Ex -std .Sh SEE ALSO