From nobody Mon Jul 14 12:18:00 2025
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 4bghD90djXz61gjm;
Mon, 14 Jul 2025 12:18:01 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bghD86sDHz3mk8;
Mon, 14 Jul 2025 12:18:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752495481;
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=BYrWc36T2qIOeQfqk6xaXYO81GCXfTBIhbf4925TQj0=;
b=sVXgE+M2N+nEdS7O9WQzzzkezb1WO73GJqZnGlXwnHPRzYr0FFH0qqV3TnkO2TWiF0etrO
xXHK4oKPLNY2LXLa+PCpJHusYBW2QmRqL9oM38QaMoBxaOohwpClEldxmaVaeEML5qnGD6
Qw6PUbfjKyc4rAnF93PEl090Jj0bIkMsxhvY7nNA0MoRNqI70tSvQoTdbR0a8rOaw250Gp
7TqkQUmFkj6PIYUs7pV+k/9v2a1MI8inDX+6NY//WkoPger26CyBGyg6/wPeDIZhOcXZWC
AlH2y8qLS6owLtauVfOJwhwqY+CSjow1eTd8g8Hqw8efoGBNvdjkMIzXgTLeRg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752495481;
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=BYrWc36T2qIOeQfqk6xaXYO81GCXfTBIhbf4925TQj0=;
b=mpa0rSOJyr/1tzUqEu6mQKM+IXRZh3YnyZ4O+LVxKY8+TYiHwx9oqZWSsolswQrmf8Nc5O
a74Oc3wUGmuV7pWkmIh2qN0JWa2ESvYw/iSSuzKKNq6KdNsg8EwNdxMafRWSShVgXO1hYj
OKa3SCY6dic4treFHpUezdm8c97phbqeWoEcDPMxL2pmjPGwCVZaVSsmxES9HVEG6xM+OT
6XcAvEnY24GBOVXkJxcAQrCN+4To052jVQrTa27NOh8aF3pJRFhx8f6h169t0tL0HhLj1a
/8vJeNi8/tuUUdXzg900tuC3ECiQ3Ni8/IzsyPOKo97E/UlBQC1x5kgSTZ/IqA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752495481; a=rsa-sha256; cv=none;
b=DwLRC1U3x47EUBS9NR5LyNerLEvPmxhgumjofTshWSggCTt2qfBA0b/RfDVOMRB0y/1wUR
tpFbusZQEDzjLSSH483U9uW+U8VecpQOcy4XTO6mhXZHrfvbtxXOHLL04E76q8gVARcK2f
RTLFzHe4goIpMtS7xVdjjNT1wqu+5FKLKCLFH2dtwMp4D9ZJG/SylW9QKicuG7L5oDBXQw
mkQDg5NhPsknzFeKozbOdh+Obm+Lp3ko8TFDAYvT+qb29AY2EG/dUp+wt/j2CMgW1CfJB5
5VXNVFqvSdCl7ouuHvKnCD65DzSJ4WOuNlLx6xNucC4pN5aemQ9WNoj+ZapeKw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bghD86JZTztH0;
Mon, 14 Jul 2025 12:18:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56ECI0UT056720;
Mon, 14 Jul 2025 12:18:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ECI0Yx056717;
Mon, 14 Jul 2025 12:18:00 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 12:18:00 GMT
Message-Id: <202507141218.56ECI0Yx056717@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis
Subject: git: b5ec6cda9380 - stable/14 - fortune: Fix typo in
dmesgd.nycbug.org example
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: christos
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: b5ec6cda9380ab5ae222c91f161df9f420ab3b5e
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=b5ec6cda9380ab5ae222c91f161df9f420ab3b5e
commit b5ec6cda9380ab5ae222c91f161df9f420ab3b5e
Author: Christos Margiolis
AuthorDate: 2025-07-13 21:25:07 +0000
Commit: Christos Margiolis
CommitDate: 2025-07-14 12:17:54 +0000
fortune: Fix typo in dmesgd.nycbug.org example
No functional change, but commit for correctness nonetheless.
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D51293
(cherry picked from commit 697bf0f416e4fe0fdd974b9eacdaed140fe18061)
---
usr.bin/fortune/datfiles/freebsd-tips | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
index aed66f2295e2..a35b7cd5881f 100644
--- a/usr.bin/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
@@ -554,7 +554,7 @@ Use "sysrc name=value" to add an entry and "sysrc -x name" to delete an entry.
You can upload the dmesg of your system to help developers get an overview of commonly
used hardware and peripherals for FreeBSD. Use the curl package to upload it like this:
curl -v -d "nickname=$USER" -d "description=FreeBSD/$(uname -m) on \
-$(kenv smbios.system.maker) $(kenv smbios.system.product)" -d "do=addd" \
+$(kenv smbios.system.maker) $(kenv smbios.system.product)" -d "do=add" \
--data-urlencode 'dmesg@/var/run/dmesg.boot' http://dmesgd.nycbug.org/index.cgi
%
Want to know how much memory (in bytes) your machine has installed? Let
From nobody Mon Jul 14 12:18:58 2025
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 4bghFH1YwHz61gbk;
Mon, 14 Jul 2025 12:18: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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bghFG5B78z3nRy;
Mon, 14 Jul 2025 12:18:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752495538;
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=zUbFuGt5WU56eNK1G+TnOq9y9+I1EtocR3tsBzOTqv4=;
b=d2PFGoeRMzGxVPmhj7AJsO4mxsg7v9YQasiWcDGCKoHmqrEBZNFjanNyJLUkNnznmwfwoB
gCYbcqQ9eJ/ByjezUtY0946MqFXt+wlbOJKZd2FxbPrJHQ8NHwhxAbprVO9ra/A8kKtvIo
rBXxsP+b9h3RFwNUUT9KszAVdjCicRAX6yapppwKl7IDw6rq+WHaTjlqjCjt0ylM8YS1TN
iAhsLSr025wW40FWVzNybDva+iJiOeZ6xPDJM58kJWcP7daL/U3j2P8i9TZ4Fl7UO650xG
/gENaK6uhIHU/nTzBh9StcaepNXQNKBB+8pBUYlyn1QqODibTZCphgrIPdJZRw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752495538;
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=zUbFuGt5WU56eNK1G+TnOq9y9+I1EtocR3tsBzOTqv4=;
b=dfskWWMf8Nyy2txmdGO7K4b5cRNAZFCHem2DU7chNQVpkgtt+k6SJlwOe6Wc57XLSX7Zfg
HYBPF6R0/CiUaLIaA6TLI9/AfC/67+uR13Xnof3ckXWpsYSGW60P166mkDhNzWee/94PxH
wbe2e16Fc6cEeKpIdugs1ScX37he4NotxNms5S59bFrbnigpFYpQy5E9ZBDOT0gUxFSEHH
cY9bvZtT+Q9159VyaZwWktBr9O8DWEAUvXPPQZaAFzsOkvDKpkf5WHmENJadW2uBT4yieE
jt52CPlebPvJb3CrOENWfAQZHcDsMOHKVAZQuBOn1vb3WYr32no5Q7AtYMfrIA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752495538; a=rsa-sha256; cv=none;
b=RnsUl5Q5j5eGLnIpWktJfPx5N8YkynHwtoTdDUxsFklMfRxwh0QGsQ9shqR0gzU5o6nuYJ
5jqsRTAfcmAYYZ5dE1UjtytVtNb300izquuwcr3sHoRMzRpaF5cf88eHM1aYj4APmEoBos
9huMQBI8xh3a0/UO1keCsbHbfSwnWFlDYyVdUJrYJMqStYdsOmjXSHA1UeK8iBrlM81ikE
FT/hY+40o86LmK/l1bsdbYBCB/T08FL31WKUNjCZ/lYANBgnYr5Fyg9OlqbhDodabwDTg+
rb0fVqiifgDm+IAtXVB5fxA2lM6aA9KkXQqMrYCky/XavnwOAoZfywYz3/BeAw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bghFG4bzgzthV;
Mon, 14 Jul 2025 12:18:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56ECIw4D057229;
Mon, 14 Jul 2025 12:18:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ECIwjG057226;
Mon, 14 Jul 2025 12:18:58 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 12:18:58 GMT
Message-Id: <202507141218.56ECIwjG057226@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: c2b1623bb97e - stable/14 - truss.1: Reference
sysdecode(3)
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: c2b1623bb97e5e2df8447892d22bc64250982f0d
Auto-Submitted: auto-generated
The branch stable/14 has been updated by 0mp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c2b1623bb97e5e2df8447892d22bc64250982f0d
commit c2b1623bb97e5e2df8447892d22bc64250982f0d
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-06-18 17:40:27 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-07-14 12:18:32 +0000
truss.1: Reference sysdecode(3)
MFC after: 1 week
(cherry picked from commit fa9ac741d03342c33a0e8f85114949625ba4901f)
---
usr.bin/truss/truss.1 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/usr.bin/truss/truss.1 b/usr.bin/truss/truss.1
index a0cd90b229aa..debb3af11b5d 100644
--- a/usr.bin/truss/truss.1
+++ b/usr.bin/truss/truss.1
@@ -1,5 +1,5 @@
.\"
-.Dd July 24, 2017
+.Dd June 18, 2025
.Dt TRUSS 1
.Os
.Sh NAME
@@ -104,7 +104,8 @@ Follow an already-running process:
.Xr kdump 1 ,
.Xr ktrace 1 ,
.Xr ptrace 2 ,
-.Xr utrace 2
+.Xr utrace 2 ,
+.Xr sysdecode 3
.Sh HISTORY
The
.Nm
From nobody Mon Jul 14 16:47:14 2025
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 4bgpBq18s4z61xMZ;
Mon, 14 Jul 2025 16:47:15 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBp5Y9Wz485n;
Mon, 14 Jul 2025 16:47:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511634;
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=6HUeNo0Kob0KGQA96PNRhA0+PVOtgd93LamFE0sk6Ik=;
b=T7A2A4yfvFrAOCIc69A0RpeSdQQZvvwVtERj5ybUEAQllcyMS/Vu5cJOY1gBknoe1tBpJO
zvexxV5oA6F8ElRzKDyNWeGaeXJTSL4kx4wlxkI787doSv3Xf9YU/twUMNwpumVxrrgu6h
i5HNNCW37rmDrGhIYuDVJvtUfqbKA9CRR5CVy634a4JPrSqw9DcTESFgKrY5HNUHptFRUu
5DA3wDjm++xYz3oM6Y1efakx0e1R/1DJ1kZcaMdVgMC1bG32VyAD8UawHizy7WLAm//G3l
neCm3ixFw68oMa7NrrM5Y8HG2q1kzwWanKaZ/n6rdVgu84xE6BeGUG2ehPwwFw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511634;
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=6HUeNo0Kob0KGQA96PNRhA0+PVOtgd93LamFE0sk6Ik=;
b=rRU00Fdj2QSKQRzzTIUwFnYiKgtMwnkU1f2Tr5AM7NbAkwKMPL0FAlPXy5HOP0KWgzVqk7
MdE/mDZ4P9Wm0yQjhJAutBK/mg6bLDzYTxs5nhNcViLFLxTK7GP5zFDa4Jlz9d6zjiXHPx
YoIpyIBOYQY3jMO866vuWfMbKBq4aUGTVIeI0fgiK/E32slOEob/wcu5ICCYrNoOLdKqi8
MQuHNbK6847uUnjqLjJrscbrgG0Pth9I2ueqccmMGcDyPLeJ3QO40OYNL/TN8RgB1w673d
gwBwRLs3cZKdks0h6V0m63EwBHhwhSa+LK6nHPFgr9DjL2uTEiWiIN2/n8leZg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511634; a=rsa-sha256; cv=none;
b=w8rZzoafFM0uDswVVwM2L0e6ARhRAZBUrRYJ/PT22skbE5VCmE0c5tYQNglNuItl6trvvm
xhMI2JpOMxmdJxnvgXp6yf/i7Dxb/P0QKIml8/WSyhtyWQcuYdE9jey1/7Zwsh1xim5Lpj
oyQwApWuxD74mEPnjXZ/Tfc76pjHkE//j5D2JOeEVIVv+zusNXj2RyY1Y13SEFFyJK05+S
iy+GKVqRClnBXjf0eGS3OwN25XW2oFjmU0JTP3qBeUNkx8Aqo4KNyezVC7w7ssrP+1glA8
2oiU+BWGCsg+aO6K7jPAPfI8mo5Yg8ejUJaBZlHfCa6cJngs6JteSs6GEDEe6Q==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBp4Kjpz122L;
Mon, 14 Jul 2025 16:47:14 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlEtV065142;
Mon, 14 Jul 2025 16:47:14 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlEMB065138;
Mon, 14 Jul 2025 16:47:14 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:14 GMT
Message-Id: <202507141647.56EGlEMB065138@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: e912101db10b - stable/14 - contrib/mandoc: add
-isoC-2024 and -svid1 to mdoc(7)
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
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: e912101db10b45e8f440da44ae06e0f0383d24ad
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=e912101db10b45e8f440da44ae06e0f0383d24ad
commit e912101db10b45e8f440da44ae06e0f0383d24ad
Author: Robert Clausecker
AuthorDate: 2024-10-25 15:05:20 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:44 +0000
contrib/mandoc: add -isoC-2024 and -svid1 to mdoc(7)
C23 (ISO/IEC 9899:2024) is not out yet, but will be shortly.
SVID1 is needed for the history section of memccpy(3).
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D47284
(cherry picked from commit 7ed159c6cc00adf6f75f9a43024f23509f5b8e5e)
---
contrib/mandoc/st.c | 2 ++
lib/libc/string/memccpy.3 | 6 ++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c
index 266df0081a95..cb6bf3303126 100644
--- a/contrib/mandoc/st.c
+++ b/contrib/mandoc/st.c
@@ -56,6 +56,7 @@ LINE("-isoC-tcor1", "ISO/IEC 9899/TCOR1:1994 (\\(lqISO\\~C90, Technical Corrigen
LINE("-isoC-tcor2", "ISO/IEC 9899/TCOR2:1995 (\\(lqISO\\~C90, Technical Corrigendum 2\\(rq)")
LINE("-isoC-99", "ISO/IEC 9899:1999 (\\(lqISO\\~C99\\(rq)")
LINE("-isoC-2011", "ISO/IEC 9899:2011 (\\(lqISO\\~C11\\(rq)")
+LINE("-isoC-2024", "ISO/IEC 9899:2024 (\\(lqISO\\~C23\\(rq)")
LINE("-iso9945-1-90", "ISO/IEC 9945-1:1990 (\\(lqPOSIX.1\\(rq)")
LINE("-iso9945-1-96", "ISO/IEC 9945-1:1996 (\\(lqPOSIX.1\\(rq)")
LINE("-iso9945-2-93", "ISO/IEC 9945-2:1993 (\\(lqPOSIX.2\\(rq)")
@@ -79,6 +80,7 @@ LINE("-susv1", "Version\\~1 of the Single UNIX Specification (\\(lqSUSv1\\(rq)"
LINE("-susv2", "Version\\~2 of the Single UNIX Specification (\\(lqSUSv2\\(rq)")
LINE("-susv3", "Version\\~3 of the Single UNIX Specification (\\(lqSUSv3\\(rq)")
LINE("-susv4", "Version\\~4 of the Single UNIX Specification (\\(lqSUSv4\\(rq)")
+LINE("-svid1", "System\\~V Interface Definition, First Edition (\\(lqSVID1\\(rq)")
LINE("-svid4", "System\\~V Interface Definition, Fourth Edition (\\(lqSVID4\\(rq)")
return NULL;
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index fe543d9172d3..54498610fde7 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -82,16 +82,14 @@ The
function conforms to
.St -p1003.1-2004
and
-.\" St -isoC-2024 .
-ISO/IEC 9899:2024 (\(lqISO\~C23\(rq).
+.St -isoC-2024 .
.Sh HISTORY
The
.Fn memccpy
function first appeared in
.Bx 4.4
and was first specified in the
-.\" St -svid1 .
-System\~V Interface Definition, First Edition (\(lqSVID1\(rq).
+.St -svid1 .
The
.Ft restrict
keyword was added to the prototype in
From nobody Mon Jul 14 16:47:15 2025
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 4bgpBr38LLz61xMj;
Mon, 14 Jul 2025 16:47:16 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBq5pztz481D;
Mon, 14 Jul 2025 16:47:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511635;
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=tuSrBbkfpgp3mJx50NXTs7JCgzhI2I3vNCGrSJ0OXt8=;
b=g0fngHRZ1vo+NGMrctq3k72+GieARkoZRrrFdfC3qZDCMHsZTWGGrepId44Tr8oWPN3fcz
z/Hu2fZ/9hWs6IwGB1JZC15Fe5U+SafWCVo+r4W9e5Mb3cj41msksMKvEnotgUfrEcXLe8
62qA5RIHol52ZgL+DoQj5BGUJFYJBZBBGqyLF3ixX5HxGfgIP4tyQgHdfDXoDA+CvSe0Qb
/W6iuhdR8Lcbb0UvYzn7QzYXaGHLLTNWYPYA02Mm1zetnWi58mGCh6aUEd3t4KmhdyFE2p
xcixXi242RNs0ZJMba+BFz9vX/FjqEJxQ9TBNVi2OkcbRu/5hKdP7VcgqPPSfg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511635;
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=tuSrBbkfpgp3mJx50NXTs7JCgzhI2I3vNCGrSJ0OXt8=;
b=LXAh/YBDkhrRCM5ArxHj5qAZYpm7LpdlYk7C5bJKZwmuDObNHfcTdJTGVjX/2dJoqj1vwA
09fo4uB4laI+fvmqtwTQwDEjc6tsQcWfhC4Qn7yJMvyCO4dyFCec1SsdwabrNBEBsiJUHB
2AwGTUG6NdzUE0YazFaV1TxFP3ZcxN4Z7aSG4dYSAHWwnJ54sDkSPlQzzqlEKrKZEsYYmS
YSJLomuBfLswomoOo66Yt12AA7tIAaUIu5aGaRk1IlPK5Frh6i2uWQDaCA9CaJWLpxEPOm
67XNozNWL0fawH0SuVdMTamv49kCWvHHWW8II3i2H0/zx9s/eOPItqMdBUEd9A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511635; a=rsa-sha256; cv=none;
b=QLSTODX4TR/tKFif6kq0aptc/i5gUAeucLP+Yq1HK4yjKo1RWz29Ev60ncR0uvKGRn99L4
/+9meAMP0dGqrIbEIC0TPuOokTUSystTjfZYPw9P4DQdw2RSs8xMhrh4Dmb/DliI2V2AdL
nGYgXkAzFBeHGtaLblBK3Ug7ndx3L83JokS000fHYSMFPyCCiUfO7OM6mTt6lDBeHyL6Og
wOO7L8FVbswUk0EMvCdMXvkzIV5sDZiVf3B3PGplnAtGuPEkJBU04RCBgKvy4cpswi3nk8
10sjdck/9xjBSIujJH3FH8Oaidl31XtugUwCzXTs6Tv4d1DtCKACyqRJG0357g==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBq4zrLz12R5;
Mon, 14 Jul 2025 16:47:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlF5u065175;
Mon, 14 Jul 2025 16:47:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlFke065172;
Mon, 14 Jul 2025 16:47:15 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:15 GMT
Message-Id: <202507141647.56EGlFke065172@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: dd276946d561 - stable/14 - Merge mandoc snapshot
2024-09-22
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
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: dd276946d56197947c47fa7a37255859aea6e942
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=dd276946d56197947c47fa7a37255859aea6e942
commit dd276946d56197947c47fa7a37255859aea6e942
Author: Brooks Davis
AuthorDate: 2024-12-06 20:47:31 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:44 +0000
Merge mandoc snapshot 2024-09-22
(cherry picked from commit c1c95add8c80843ba15d784f95c361d795b1f593)
---
contrib/mandoc/LICENSE | 5 +-
contrib/mandoc/Makefile | 13 +-
contrib/mandoc/Makefile.depend | 89 ++--
contrib/mandoc/NEWS | 4 +-
contrib/mandoc/TODO | 105 +++-
contrib/mandoc/catman.c | 4 +-
contrib/mandoc/cgi.c | 121 +++--
contrib/mandoc/chars.c | 5 +-
contrib/mandoc/compat_strsep.c | 4 +-
contrib/mandoc/configure | 13 +-
contrib/mandoc/configure.local.example | 14 +-
contrib/mandoc/dba_read.c | 4 +-
contrib/mandoc/demandoc.1 | 5 +-
contrib/mandoc/demandoc.c | 13 +-
contrib/mandoc/eqn.c | 28 +-
contrib/mandoc/eqn_parse.h | 6 +-
contrib/mandoc/html.c | 17 +-
contrib/mandoc/html.h | 6 +-
contrib/mandoc/main.c | 43 +-
contrib/mandoc/makewhatis.8 | 8 +-
contrib/mandoc/man.1 | 8 +-
contrib/mandoc/man.7 | 34 +-
contrib/mandoc/man.c | 43 +-
contrib/mandoc/man.cgi.8 | 14 +-
contrib/mandoc/man_html.c | 112 +++--
contrib/mandoc/man_macro.c | 24 +-
contrib/mandoc/man_term.c | 108 +++--
contrib/mandoc/man_validate.c | 68 +--
contrib/mandoc/mandoc.1 | 206 +++++---
contrib/mandoc/mandoc.c | 394 +--------------
contrib/mandoc/mandoc.css | 51 +-
contrib/mandoc/mandoc.h | 32 +-
contrib/mandoc/mandoc_aux.c | 5 +-
contrib/mandoc/mandoc_aux.h | 8 +-
contrib/mandoc/mandoc_char.7 | 21 +-
contrib/mandoc/mandoc_dbg.c | 343 +++++++++++++
contrib/mandoc/mandoc_dbg.h | 55 +++
contrib/mandoc/mandoc_dbg_init.3 | 280 +++++++++++
contrib/mandoc/mandoc_escape.3 | 172 ++++---
contrib/mandoc/mandoc_headers.3 | 37 +-
contrib/mandoc/mandoc_html.3 | 8 +-
contrib/mandoc/mandoc_msg.c | 13 +-
contrib/mandoc/mandocd.8 | 8 +-
contrib/mandoc/mandocd.c | 15 +-
contrib/mandoc/mandocdb.c | 75 ++-
contrib/mandoc/manpath.c | 87 ++--
contrib/mandoc/mansearch.c | 6 +-
contrib/mandoc/mdoc.7 | 75 +--
contrib/mandoc/mdoc_html.c | 81 ++--
contrib/mandoc/mdoc_macro.c | 12 +-
contrib/mandoc/mdoc_man.c | 4 +-
contrib/mandoc/mdoc_markdown.c | 6 +-
contrib/mandoc/mdoc_state.c | 53 +-
contrib/mandoc/mdoc_term.c | 29 +-
contrib/mandoc/mdoc_validate.c | 16 +-
contrib/mandoc/out.c | 39 +-
contrib/mandoc/out.h | 7 +-
contrib/mandoc/read.c | 9 +-
contrib/mandoc/roff.7 | 43 +-
contrib/mandoc/roff.c | 858 +++++++++++++++++----------------
contrib/mandoc/roff.h | 27 +-
contrib/mandoc/roff_escape.c | 546 +++++++++++++++++++++
contrib/mandoc/roff_int.h | 5 +-
contrib/mandoc/roff_term.c | 4 +-
contrib/mandoc/st.c | 5 +-
contrib/mandoc/tag.c | 74 ++-
contrib/mandoc/tbl.7 | 12 +-
contrib/mandoc/tbl_html.c | 15 +-
contrib/mandoc/tbl_term.c | 23 +-
contrib/mandoc/term.c | 137 ++++--
contrib/mandoc/term.h | 7 +-
contrib/mandoc/term_ascii.c | 9 +-
contrib/mandoc/term_tab.c | 24 +-
contrib/mandoc/tree.c | 14 +-
usr.bin/mandoc/Makefile | 2 +
75 files changed, 3215 insertions(+), 1655 deletions(-)
diff --git a/contrib/mandoc/LICENSE b/contrib/mandoc/LICENSE
index 0a0fc1acd2ac..8b464f4e6aec 100644
--- a/contrib/mandoc/LICENSE
+++ b/contrib/mandoc/LICENSE
@@ -1,11 +1,11 @@
-$Id: LICENSE,v 1.22 2021/09/19 11:02:09 schwarze Exp $
+$Id: LICENSE,v 1.23 2022/06/25 12:44:25 schwarze Exp $
With the exceptions noted below, all non-trivial files contained
in the mandoc toolkit are protected by the Copyright of the following
developers:
+Copyright (c) 2010-2022 Ingo Schwarze
Copyright (c) 2008-2012, 2014 Kristaps Dzonsons
-Copyright (c) 2010-2021 Ingo Schwarze
Copyright (c) 1999, 2004, 2017 Marc Espie
Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger
Copyright (c) 2013 Franco Fichtner
@@ -13,6 +13,7 @@ Copyright (c) 2014 Baptiste Daroussin
Copyright (c) 2016 Ed Maste
Copyright (c) 2017 Michael Stapelberg
Copyright (c) 2017 Anthony Bentley
+Copyright (c) 2022 Anna Vyalkova
Copyright (c) 1998, 2004, 2010, 2015 Todd C. Miller
Copyright (c) 2008, 2017 Otto Moerbeek
Copyright (c) 2004 Ted Unangst
diff --git a/contrib/mandoc/Makefile b/contrib/mandoc/Makefile
index 48c4741812b6..cd3f16652069 100644
--- a/contrib/mandoc/Makefile
+++ b/contrib/mandoc/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.540 2021/09/21 11:04:40 schwarze Exp $
+# $Id: Makefile,v 1.543 2023/10/19 11:45:42 schwarze Exp $
#
-# Copyright (c) 2011, 2013-2021 Ingo Schwarze
+# Copyright (c) 2011, 2013-2022 Ingo Schwarze
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons
#
# Permission to use, copy, modify, and distribute this software for any
@@ -100,6 +100,7 @@ SRCS = arch.c \
man_validate.c \
mandoc.c \
mandoc_aux.c \
+ mandoc_dbg.c \
mandoc_msg.c \
mandoc_ohash.c \
mandoc_xr.c \
@@ -121,6 +122,7 @@ SRCS = arch.c \
preconv.c \
read.c \
roff.c \
+ roff_escape.c \
roff_html.c \
roff_term.c \
roff_validate.c \
@@ -186,6 +188,8 @@ DISTFILES = INSTALL \
mandoc.h \
mandoc_aux.h \
mandoc_char.7 \
+ mandoc_dbg.h \
+ mandoc_dbg_init.3 \
mandoc_escape.3 \
mandoc_headers.3 \
mandoc_html.3 \
@@ -232,6 +236,7 @@ LIBMDOC_OBJS = att.o \
LIBROFF_OBJS = eqn.o \
roff.o \
+ roff_escape.o \
roff_validate.o \
tbl.o \
tbl_data.o \
@@ -241,6 +246,7 @@ LIBROFF_OBJS = eqn.o \
LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
$(LIBMDOC_OBJS) \
$(LIBROFF_OBJS) \
+ $(DEBUG_OBJS) \
arch.o \
chars.o \
mandoc.o \
@@ -333,6 +339,7 @@ WWW_MANS = apropos.1.html \
soelim.1.html \
man.cgi.3.html \
mandoc.3.html \
+ mandoc_dbg_init.3.html \
mandoc_escape.3.html \
mandoc_headers.3.html \
mandoc_html.3.html \
@@ -409,6 +416,7 @@ base-install: mandoc demandoc soelim
mkdir -p $(DESTDIR)$(MANDIR)/man5
mkdir -p $(DESTDIR)$(MANDIR)/man7
mkdir -p $(DESTDIR)$(MANDIR)/man8
+ mkdir -p $(DESTDIR)$(MISCDIR)
$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
$(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
@@ -431,6 +439,7 @@ base-install: mandoc demandoc soelim
$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
$(INSTALL_MAN) makewhatis.8 \
$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(MISCDIR)
lib-install: libmandoc.a
mkdir -p $(DESTDIR)$(LIBDIR)
diff --git a/contrib/mandoc/Makefile.depend b/contrib/mandoc/Makefile.depend
index d5f6556c3e7e..5179e95d4715 100644
--- a/contrib/mandoc/Makefile.depend
+++ b/contrib/mandoc/Makefile.depend
@@ -1,8 +1,8 @@
arch.o: arch.c config.h roff.h
att.o: att.c config.h roff.h libmdoc.h
catman.o: catman.c config.h compat_fts.h
-cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h mansearch.h cgi.h
-chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h
+cgi.o: cgi.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h mansearch.h cgi.h
+chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h libmandoc.h
compat_err.o: compat_err.c config.h
compat_fts.o: compat_fts.c config.h compat_fts.h
compat_getline.o: compat_getline.c config.h
@@ -22,62 +22,63 @@ compat_strndup.o: compat_strndup.c config.h
compat_strsep.o: compat_strsep.c config.h
compat_strtonum.o: compat_strtonum.c config.h
compat_vasprintf.o: compat_vasprintf.c config.h
-dba.o: dba.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mansearch.h dba_write.h dba_array.h dba.h
-dba_array.o: dba_array.c config.h mandoc_aux.h dba_write.h dba_array.h
-dba_read.o: dba_read.c config.h mandoc_aux.h mansearch.h dba_array.h dba.h dbm.h
+dba.o: dba.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mansearch.h dba_write.h dba_array.h dba.h
+dba_array.o: dba_array.c config.h mandoc_aux.h mandoc_dbg.h dba_write.h dba_array.h
+dba_read.o: dba_read.c config.h mandoc_aux.h mandoc_dbg.h mansearch.h dba_array.h dba.h dbm.h
dba_write.o: dba_write.c config.h dba_write.h
dbm.o: dbm.c config.h mansearch.h dbm_map.h dbm.h
dbm_map.o: dbm_map.c config.h mansearch.h dbm_map.h dbm.h
-demandoc.o: demandoc.c config.h mandoc.h roff.h man.h mdoc.h mandoc_parse.h
-eqn.o: eqn.c config.h mandoc_aux.h mandoc.h roff.h eqn.h libmandoc.h eqn_parse.h
+demandoc.o: demandoc.c config.h mandoc.h mandoc_dbg.h roff.h man.h mdoc.h mandoc_parse.h
+eqn.o: eqn.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h eqn.h libmandoc.h eqn_parse.h
eqn_html.o: eqn_html.c config.h mandoc.h roff.h eqn.h out.h html.h
eqn_term.o: eqn_term.c config.h eqn.h out.h term.h
-html.o: html.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h
+html.o: html.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h out.h html.h manconf.h main.h
lib.o: lib.c config.h roff.h libmdoc.h lib.in
-main.o: main.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h term_tag.h main.h manconf.h mansearch.h
-man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
-man_html.o: man_html.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h html.h main.h
-man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
-man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h term_tag.h main.h
-man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h tag.h
-mandoc.o: mandoc.c config.h mandoc_aux.h mandoc.h roff.h libmandoc.h roff_int.h
-mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h
+main.o: main.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h mandoc_xr.h roff.h mdoc.h man.h mandoc_parse.h tag.h term_tag.h main.h manconf.h mansearch.h
+man.o: man.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
+man_html.o: man_html.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h out.h html.h main.h
+man_macro.o: man_macro.c config.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
+man_term.o: man_term.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h out.h term.h term_tag.h main.h
+man_validate.o: man_validate.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h tag.h
+mandoc.o: mandoc.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h libmandoc.h roff_int.h
+mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h
+mandoc_dbg.o: mandoc_dbg.c config.h compat_ohash.h mandoc_aux.h mandoc_dbg.h mandoc.h
mandoc_msg.o: mandoc_msg.c config.h mandoc.h
-mandoc_ohash.o: mandoc_ohash.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h
-mandoc_xr.o: mandoc_xr.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc_xr.h
-mandocd.o: mandocd.c config.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h
-mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h manconf.h mansearch.h dba_array.h dba.h
-manpath.o: manpath.c config.h mandoc_aux.h mandoc.h manconf.h
-mansearch.o: mansearch.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h
-mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
-mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
-mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h html.h main.h
-mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
-mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h
-mdoc_markdown.o: mdoc_markdown.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h main.h
-mdoc_state.o: mdoc_state.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
-mdoc_term.o: mdoc_term.c config.h mandoc_aux.h roff.h mdoc.h out.h term.h term_tag.h main.h
-mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h tag.h
+mandoc_ohash.o: mandoc_ohash.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h
+mandoc_xr.o: mandoc_xr.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc_xr.h
+mandocd.o: mandocd.c config.h mandoc.h mandoc_dbg.h roff.h mdoc.h man.h mandoc_parse.h main.h manconf.h
+mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h manconf.h mansearch.h dba_array.h dba.h
+manpath.o: manpath.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h manconf.h
+mansearch.o: mansearch.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h dbm.h
+mdoc.o: mdoc.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h out.h html.h main.h
+mdoc_macro.o: mdoc_macro.c config.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h out.h main.h
+mdoc_markdown.o: mdoc_markdown.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h main.h
+mdoc_state.o: mdoc_state.c config.h mandoc_dbg.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc_dbg.h roff.h mdoc.h out.h term.h term_tag.h main.h
+mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h mandoc_xr.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h tag.h
msec.o: msec.c config.h mandoc.h libmandoc.h msec.in
-out.o: out.c config.h mandoc_aux.h mandoc.h tbl.h out.h
+out.o: out.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h out.h
preconv.o: preconv.c config.h mandoc.h roff.h mandoc_parse.h libmandoc.h
-read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h libmandoc.h roff_int.h tag.h
-roff.o: roff.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mandoc_parse.h libmandoc.h roff_int.h tbl_parse.h eqn_parse.h predefs.in
+read.o: read.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h roff.h mdoc.h man.h mandoc_parse.h libmandoc.h roff_int.h tag.h
+roff.o: roff.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mandoc_parse.h libmandoc.h roff_int.h tbl_parse.h eqn_parse.h predefs.in
roff_html.o: roff_html.c config.h mandoc.h roff.h out.h html.h
roff_term.o: roff_term.c config.h mandoc.h roff.h out.h term.h
roff_validate.o: roff_validate.c config.h mandoc.h roff.h libmandoc.h roff_int.h
soelim.o: soelim.c config.h compat_stringlist.h
st.o: st.c config.h mandoc.h roff.h libmdoc.h
-tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h roff.h mdoc.h roff_int.h tag.h
-tbl.o: tbl.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h
-tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h
-tbl_html.o: tbl_html.c config.h mandoc.h roff.h tbl.h out.h html.h
-tbl_layout.o: tbl_layout.c config.h mandoc_aux.h mandoc.h tbl.h libmandoc.h tbl_int.h
+tag.o: tag.c config.h mandoc_aux.h mandoc_dbg.h mandoc_ohash.h compat_ohash.h roff.h mdoc.h roff_int.h tag.h
+tbl.o: tbl.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_parse.h tbl_int.h
+tbl_data.o: tbl_data.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_int.h
+tbl_html.o: tbl_html.c config.h mandoc_dbg.h mandoc.h roff.h tbl.h out.h html.h
+tbl_layout.o: tbl_layout.c config.h mandoc_aux.h mandoc_dbg.h mandoc.h tbl.h libmandoc.h tbl_int.h
tbl_opts.o: tbl_opts.c config.h mandoc.h tbl.h libmandoc.h tbl_int.h
-tbl_term.o: tbl_term.c config.h mandoc.h tbl.h out.h term.h
-term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h
-term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h manconf.h main.h
-term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h manconf.h main.h
-term_tab.o: term_tab.c config.h mandoc_aux.h out.h term.h
+tbl_term.o: tbl_term.c config.h mandoc_dbg.h mandoc.h tbl.h out.h term.h
+term.o: term.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h out.h term.h main.h
+term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h mandoc_dbg.h out.h term.h manconf.h main.h
+term_ps.o: term_ps.c config.h mandoc_aux.h mandoc_dbg.h out.h term.h manconf.h main.h
+term_tab.o: term_tab.c config.h mandoc_aux.h mandoc_dbg.h out.h term.h
term_tag.o: term_tag.c config.h mandoc.h roff.h roff_int.h tag.h term_tag.h
tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h tbl.h eqn.h main.h
diff --git a/contrib/mandoc/NEWS b/contrib/mandoc/NEWS
index 634ffaf6ccfa..fdec026e9fec 100644
--- a/contrib/mandoc/NEWS
+++ b/contrib/mandoc/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.40 2021/09/23 18:03:00 schwarze Exp $
+$Id: NEWS,v 1.41 2021/09/25 15:42:08 schwarze Exp $
This file lists the most important changes in the mandoc.bsd.lv distribution.
@@ -195,7 +195,7 @@ Changes in version 1.14.6, released on September 23, 2021
for an additional regression test
* Michal Nowak for reporting several code style issues
* TJ Townsend (OpenBSD) for help with CSS
- * Sevan Janiyan (NetBSD) and Robert Mustacchi (Illumos)
+ * Sevan Janiyan (Viewpoint Linux) and Robert Mustacchi (Illumos)
for extensive release testing
* Job Snijders, Kinichiro INOGUCHI, and Martijn van Duren (OpenBSD)
for checking patches
diff --git a/contrib/mandoc/TODO b/contrib/mandoc/TODO
index 4135a3eca6c8..58d0d6937746 100644
--- a/contrib/mandoc/TODO
+++ b/contrib/mandoc/TODO
@@ -1,6 +1,6 @@
************************************************************************
* Official mandoc TODO.
-* $Id: TODO,v 1.319 2021/09/21 17:58:13 schwarze Exp $
+* $Id: TODO,v 1.335 2024/09/21 12:08:54 schwarze Exp $
************************************************************************
Many issues are annotated for difficulty as follows:
@@ -68,6 +68,14 @@ are mere guesses, and some may be wrong.
but watch out for regressions in the high-level parsers
maybe it should not even remove comments? - consider T{\"
+- In the body of conditional requests, escape sequence expansion
+ must not be performed if the condition is false. This implies
+ the first part of a request line must be expanded before
+ request parsing (like it is now), but expansion in the second
+ part must be delayed.
+ to Nab 8 Aug 2023 20:05:32 +0200 Subject: if/ie d condition always true
+ loc ** exist *** algo *** size ** imp *
+
************************************************************************
* missing features
@@ -149,6 +157,11 @@ are mere guesses, and some may be wrong.
--- missing mdoc features ----------------------------------------------
+- support mixed case for section names
+ also, first section is not "NAME" should not appear more than once per page
+ Alejandro Colomar 28 Apr 2023 16:57:49 +0200
+ loc * exist * algo * size * imp ***
+
- .Sh and .Ss should be parsed and partially callable, see groff_mdoc(7)
reed at reedmedia dot net Sat, 21 Dec 2019 17:13:07 -0600
loc ** exist ** algo ** size ** imp *
@@ -292,7 +305,11 @@ are mere guesses, and some may be wrong.
--- missing misc features ----------------------------------------------
-- conisder whether man(1) fallback code in main.c/fs_*() can find files
+- use the default volume headers for sections with suffixes
+ certainly affects man(7); possibly mdoc(7)?; and also groff(1)
+ Alejandro Colomar 21 Aug 2022
+
+- consider whether man(1) fallback code in main.c/fs_*() can find files
like man3c/fopen.3c (illumos, Solaris) and man3p/fopen.3p (POSIX)
discussed with Robert Mustacchi 21 Sep 2021 10:39:40 -0700
loc * exist * algo ** size * imp **
@@ -302,6 +319,11 @@ are mere guesses, and some may be wrong.
mail to sternenseemann 19 Aug 2021 19:11:50 +0200
loc * exist ** algo ** size * imp **
+- handle Unicode letters in tags in both HTML and terminal output
+ thread "section headers with diacritics" starting with
+ Mario Blaettermann 24 Mar 2022 18:13:23 +0100
+ loc ** exist * algo * size * imp **
+
- -T man does not handle eqn(7) and tbl(7)
Stephen Gregoratto 16 Feb 2020 01:28:07 +1100
also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901636
@@ -325,6 +347,10 @@ are mere guesses, and some may be wrong.
(3) undefined, just output the character -> perhaps WARNING
loc *** exist ** algo ** size ** imp *** (parser reorg helps)
+- man.conf(5) alias aliasname dirname or just -Mb -Mx -Mp
+ mail to jmc@ Mar 23, 2015 03:53:14PM +0100
+ loc * exist * algo * size * imp **
+
- kettenis wants base roff, ms, and me Fri, 1 Jan 2010 22:13:15 +0100 (CET)
loc ** exist ** algo ** size *** imp *
@@ -443,6 +469,10 @@ are mere guesses, and some may be wrong.
reminded by jmc@ Thu, 23 Sep 2010 18:13:39 +0059
loc * exist ** algo *** size * imp ***
+- the man(7) single-font macros (e.g. .B) use .itc,
+ so ".B foo\c" followed by "bar" prints "bar" in bold
+ gbranden@ Sun, 5 Jun 2022 18:08:46 -0500
+
- a line starting with "\fB something" counts as starting with whitespace
and triggers a line break; found in audio/normalize-mp3(1)
This will become easier once escape sequences are represented
@@ -468,20 +498,46 @@ are mere guesses, and some may be wrong.
--- HTML issues --------------------------------------------------------
-- make the HTML scaffolding customozable with -O skip=...
+- support the idiom .TP .IP .TP for multi-paragraph list item bodies
+ to: Alejandro Colomar Thu, 19 Oct 2023 16:45:21 +0200
+ loc ** exist ** algo ** size ** imp **
+
+- .Nm without an argument and .Bx cause premature
+ Nab Sun, 5 Jun 2022 18:30:09 +0200
+
+- .Aq Mt could set and reset "white-space: nowrap";
+ Check whether other enclosure macros could profit from similar handling,
+ or whether that is covered by Unicode line-breaking classes WJ, ZW, GL, ZWJ.
+ John Gardner 25 Mar 2022 04:44:27 +1100
+
+- make the HTML scaffolding customizable with -O skip=...
mail to Oliver Corff 3 Jun 2021 17:28:02 +0200
more feedback from Oliver 3 Jun 2021 18:27:56 +0200
more feedback from Oliver 3 Jun 2021 23:37:18 +0200
+ would also be useful for
+ https://github.com/gbdev/rgbds-www/blob/master/
+ maintainer/support/man_postproc.awk
- .Bd -unfilled should not use monospaced font
anton@ 4 Mar 2021 08:19:35 +0100
loc ** exist * algo * size * imp **
-- HTML formatting of .nf should avoid
+- HTML formatting of .nf should avoid ,
+ even when input lines start with whitespace,
and not close and re-open on .P
my mail to ports@ 27 Jun 2021 16:09:20 +0200
+ reported again by Mohamed Akram 25 Jun 2022 16:28:18 +0000
loc ** exist ** algo * size * imp **
+- tbl(7) HTML output does not implement column width specifications
+ reported by Ted Bullock 11 Jan 2022 16:00:44 -0700
+ loc * exist * algo ? size ? imp *
+
+- link from flags in the SYNOPSIS to their descriptions
+ https://github.com/gbdev/rgbds-www/blob/master/
+ maintainer/support/man_postproc.awk
+ loc * exist * algo ** size * imp *
+
- get rid of the last handful of style= attributes such that
Content-Security-Policy: can be enabled without unsafe-inline
suggested by bentley@ Nov 10, 2019 at 06:02:49AM -0700
@@ -504,19 +560,18 @@ are mere guesses, and some may be wrong.
does this affect other characters, other source macros...?
Jackson Pauls 29 Aug 2017 16:56:27 +0100
-- The tables used to render the three-part page headers actually force
- the width of the to the max-width given for .
- Not yet sure how to fix that...
- Observed by an Anonymous Coward on undeadly.org:
- http://undeadly.org/cgi?action=article&sid=20140925064244&pid=1
- loc * exist * algo ** size * imp ***
-
- generate tags in HTML
idea from florian@ Tue, 7 Apr 2015 00:26:28 +0000
may be possible to implement with .Lk img://something.png alt_text
- check https://github.com/trentm/mdocml
+--- CSS issues ---------------------------------------------------------
+
+- use flexbox for .Bl-tag instead of the fragile float/clear mechanism
+ John Gardner 25 Mar 2022 04:44:27 +1100
+
+
************************************************************************
* formatting issues: gratuitous differences
************************************************************************
@@ -527,7 +582,17 @@ are mere guesses, and some may be wrong.
Steffen Nurpmeso Sat, 08 Nov 2014 13:34:59 +0100
loc * exist ** algo ** size * imp **
-- In .Bl -enum -width 0n, groff continues one the same line after
+- Multiple issues with .In below SYNOPSIS; groff behaviour is:
+ text line + .In -> no line break before #include
+ called .In -> no line break before angle bracket
+ .In + .In -> second one gets #include, too
+ two arguments -> line break before second
+ child macro -> line break before child
+ .In + text line -> line break before the text line
+ Evan Silberman Fri, 20 Sep 2024 16:48:19 -0700
+ loc ** exist ** algo * size * imp *
+
+- In .Bl -enum -width 0n, groff continues on the same line after
the number, mandoc breaks the line.
mail to kristaps@ Mon, 20 Jul 2009 02:21:39 +0200
loc * exist ** algo ** size * imp **
@@ -562,6 +627,10 @@ are mere guesses, and some may be wrong.
reported again by Nicolas Joly Thu, 1 Mar 2012 13:41:26 +0100 via wiz@ 5 Mar
reported again by Franco Fichtner Fri, 27 Sep 2013 21:02:28 +0200
reported again by Bruce Evans Fri, 17 Feb 2017 21:22:44 +0100 via bapt@
+ https://reviews.freebsd.org/D35245
+ even groff_mdoc(7) uses this: Nab Sun, 5 Jun 2022 22:16:37 +0200
+ When implementing this, try to avoid breaking existing manuals,
+ or at least fix them: Jan Stary Sun, 5 Jun 2022 22:48:05 +0200
loc *** exist *** algo *** size ** imp ***
An easy partial fix has been implemented as skip_leading_dot_word().
@@ -574,6 +643,10 @@ are mere guesses, and some may be wrong.
with .ps and .nf/.fi produce execessive blank lines, see libJudy
and graphics/dcmtk. The parser reorg may help with this.
+- The man(7) .UR macro produces UTF-8 angle brackets in -Tutf8 output mode
+ with groff, but ASCII <> with mandoc
+ Alejandro Colomar Mon, 7 Aug 2023 17:13:29 +0200 Subject: hostname
+
- trailing whitespace must be ignored even when followed by a font escape,
see for example
makes
@@ -590,6 +663,14 @@ are mere guesses, and some may be wrong.
To: deraadt@ 25 Oct 2020 23:37:01 +0100
loc ** exist * algo * size ** imp ***
+- warn about \\ and \. in interpretation mode
+ gbranden@, groff issue #62776, 10 Nov 2023 01:57:32 -0500
+
+- warn about output lines exceeding 80 characters
+ Alejandro Colomar Aug 22, 2022
+ not trivial because -T lint does not call any formatter
+ loc *** exist * algo ** size ** imp **
+
- warn about duplicate .Sh/.Ss heads
gre(4): Rename duplicate sections 20 Apr 2018 15:27:33 +0200
loc * exist * algo * size * imp **
diff --git a/contrib/mandoc/catman.c b/contrib/mandoc/catman.c
index b1bab0f68c4b..e46613eb0e8c 100644
--- a/contrib/mandoc/catman.c
+++ b/contrib/mandoc/catman.c
@@ -1,4 +1,4 @@
-/* $Id: catman.c,v 1.22 2020/06/14 23:40:31 schwarze Exp $ */
+/* $Id: catman.c,v 1.23 2021/10/15 15:04:02 schwarze Exp $ */
/*
* Copyright (c) 2017 Michael Stapelberg
* Copyright (c) 2017 Ingo Schwarze
@@ -62,7 +62,7 @@ run_mandocd(int sockfd, const char *outtype, const char* defos)
else
execlp("mandocd", "mandocd", "-T", outtype,
"-I", defos, sockfdstr, (char *)NULL);
- err(1, "exec");
+ err(1, "exec(mandocd)");
}
ssize_t
diff --git a/contrib/mandoc/cgi.c b/contrib/mandoc/cgi.c
index 91310ce404b4..57f3bb7a6e16 100644
--- a/contrib/mandoc/cgi.c
+++ b/contrib/mandoc/cgi.c
@@ -1,7 +1,8 @@
-/* $Id: cgi.c,v 1.175 2021/08/19 15:23:36 schwarze Exp $ */
+/* $Id: cgi.c,v 1.181 2023/04/28 19:11:03 schwarze Exp $ */
/*
- * Copyright (c) 2014-2019, 2021 Ingo Schwarze
+ * Copyright (c) 2014-2019, 2021, 2022 Ingo Schwarze
* Copyright (c) 2011, 2012 Kristaps Dzonsons
+ * Copyright (c) 2022 Anna Vyalkova
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -86,10 +87,10 @@ static void pg_search(const struct req *);
static void pg_searchres(const struct req *,
struct manpage *, size_t);
static void pg_show(struct req *, const char *);
-static void resp_begin_html(int, const char *, const char *);
+static int resp_begin_html(int, const char *, const char *);
static void resp_begin_http(int, const char *);
static void resp_catman(const struct req *, const char *);
-static void resp_copy(const char *);
+static int resp_copy(const char *, const char *);
static void resp_end_html(void);
static void resp_format(const struct req *, const char *);
static void resp_searchform(const struct req *, enum focus);
@@ -352,22 +353,26 @@ resp_begin_http(int code, const char *msg)
fflush(stdout);
}
-static void
-resp_copy(const char *filename)
+static int
+resp_copy(const char *element, const char *filename)
{
char buf[4096];
ssize_t sz;
int fd;
- if ((fd = open(filename, O_RDONLY)) != -1) {
- fflush(stdout);
- while ((sz = read(fd, buf, sizeof(buf))) > 0)
- write(STDOUT_FILENO, buf, sz);
- close(fd);
- }
+ if ((fd = open(filename, O_RDONLY)) == -1)
+ return 0;
+
+ if (element != NULL)
+ printf("<%s>\n", element);
+ fflush(stdout);
+ while ((sz = read(fd, buf, sizeof(buf))) > 0)
+ write(STDOUT_FILENO, buf, sz);
+ close(fd);
+ return 1;
}
-static void
+static int
resp_begin_html(int code, const char *msg, const char *file)
{
const char *name, *sec, *cp;
@@ -413,14 +418,14 @@ resp_begin_html(int code, const char *msg, const char *file)
"\n",
CUSTOMIZE_TITLE);
- resp_copy(MAN_DIR "/header.html");
+ return resp_copy("header", MAN_DIR "/header.html");
}
static void
resp_end_html(void)
{
-
- resp_copy(MAN_DIR "/footer.html");
+ if (resp_copy("footer", MAN_DIR "/footer.html"))
+ puts("");
puts("\n"
"");
@@ -431,7 +436,7 @@ resp_searchform(const struct req *req, enum focus focus)
{
int i;
- printf("
\n"
+ "\n",
scriptname, *scriptname == '\0' ? "" : "/",
scriptname, *scriptname == '\0' ? "" : "/");
resp_end_html();
@@ -573,33 +585,40 @@ static void
pg_noresult(const struct req *req, int code, const char *http_msg,
const char *user_msg)
{
- resp_begin_html(code, http_msg, NULL);
+ if (resp_begin_html(code, http_msg, NULL) == 0)
+ puts("");
resp_searchform(req, FOCUS_QUERY);
- puts("");
+ puts("
");
+ puts("");
+ puts("");
puts(user_msg);
puts("
");
+ puts(" ");
resp_end_html();
}
static void
pg_error_badrequest(const char *msg)
{
-
- resp_begin_html(400, "Bad Request", NULL);
- puts("Bad Request \n"
- "\n");
+ if (resp_begin_html(400, "Bad Request", NULL))
+ puts("");
+ puts("\n"
+ "Bad Request \n"
+ "");
puts(msg);
printf("Try again from the\n"
"main page .\n"
- "
", scriptname);
+ "
\n"
+ "\n", scriptname);
resp_end_html();
}
static void
pg_error_internal(void)
{
- resp_begin_html(500, "Internal Server Error", NULL);
- puts("Internal Server Error
");
+ if (resp_begin_html(500, "Internal Server Error", NULL))
+ puts("");
+ puts("Internal Server Error
");
resp_end_html();
}
@@ -630,6 +649,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
size_t i, iuse;
int archprio, archpriouse;
int prio, priouse;
+ int have_header;
for (i = 0; i < sz; i++) {
if (validate_filename(r[i].file))
@@ -696,14 +716,18 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
priouse = prio;
iuse = i;
}
- resp_begin_html(200, NULL, r[iuse].file);
+ have_header = resp_begin_html(200, NULL, r[iuse].file);
} else
- resp_begin_html(200, NULL, NULL);
+ have_header = resp_begin_html(200, NULL, NULL);
+ if (have_header == 0)
+ puts("");
resp_searchform(req,
req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY);
+ puts(" ");
if (sz > 1) {
+ puts("");
puts("");
for (i = 0; i < sz; i++) {
printf(" \n"
@@ -722,6 +746,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
" ");
}
puts("
");
+ puts(" ");
}
if (req->q.equal || sz == 1) {
@@ -743,7 +768,9 @@ resp_catman(const struct req *req, const char *file)
int italic, bold;
if ((f = fopen(file, "r")) == NULL) {
- puts("You specified an invalid manual file.
");
+ puts("\n"
+ " You specified an invalid manual file.\n"
+ "
");
return;
}
@@ -879,8 +906,10 @@ resp_format(const struct req *req, const char *file)
int fd;
int usepath;
- if (-1 == (fd = open(file, O_RDONLY, 0))) {
- puts("You specified an invalid manual file.
");
+ if (-1 == (fd = open(file, O_RDONLY))) {
+ puts("\n"
+ " You specified an invalid manual file.\n"
+ "
");
return;
}
@@ -966,8 +995,10 @@ pg_show(struct req *req, const char *fullpath)
return;
}
- resp_begin_html(200, NULL, file);
+ if (resp_begin_html(200, NULL, file) == 0)
+ puts("");
resp_searchform(req, FOCUS_NONE);
+ puts(" ");
resp_show(req, file);
resp_end_html();
}
@@ -1066,7 +1097,7 @@ main(void)
#if HAVE_PLEDGE
/*
* The "rpath" pledge could be revoked after mparse_readfd()
- * if the file desciptor to "/footer.html" would be opened
+ * if the file descriptor to "/footer.html" would be opened
* up front, but it's probably not worth the complication
* of the code it would cause: it would require scattering
* pledge() calls in multiple low-level resp_*() functions.
diff --git a/contrib/mandoc/chars.c b/contrib/mandoc/chars.c
index d54fc458aea2..72fe8df67e83 100644
--- a/contrib/mandoc/chars.c
+++ b/contrib/mandoc/chars.c
@@ -1,4 +1,4 @@
-/* $Id: chars.c,v 1.79 2020/02/13 16:18:29 schwarze Exp $ */
+/* $Id: chars.c,v 1.81 2022/06/26 20:33:43 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
* Copyright (c) 2011, 2014, 2015, 2017, 2018, 2020
@@ -92,7 +92,6 @@ static struct ln lines[] = {
{ "en", "-", 0x2013 },
{ "hy", "-", 0x2010 },
{ "e", "\\", 0x005c },
- { ".", ".", 0x002e },
{ "r!", "!", 0x00a1 },
{ "r?", "?", 0x00bf },
@@ -365,7 +364,7 @@ static struct ln lines[] = {
{ "de", "", 0x00b0 },
{ "%0", "", 0x2030 },
{ "fm", "\'", 0x2032 },
- { "sd", "''", 0x2033 },
+ { "sd", "\"", 0x2033 },
{ "mc", "", 0x00b5 },
{ "Of", "_\ba", 0x00aa },
{ "Om", "_\bo", 0x00ba },
diff --git a/contrib/mandoc/compat_strsep.c b/contrib/mandoc/compat_strsep.c
index 9765ac823eeb..29865ba4a468 100644
--- a/contrib/mandoc/compat_strsep.c
+++ b/contrib/mandoc/compat_strsep.c
@@ -1,4 +1,4 @@
-/* $Id: compat_strsep.c,v 1.5 2020/06/15 01:37:15 schwarze Exp $ */
+/* $Id: compat_strsep.c,v 1.6 2022/06/21 10:34:14 schwarze Exp $ */
/* $OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */
/*-
@@ -31,6 +31,8 @@
*/
#include "config.h"
+#include
+
/*
* Get next token from string *stringp, where tokens are possibly-empty
* strings separated by characters from delim.
diff --git a/contrib/mandoc/configure b/contrib/mandoc/configure
index 5cf4e081c2cb..7f5fa1976806 100755
--- a/contrib/mandoc/configure
+++ b/contrib/mandoc/configure
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: configure,v 1.81 2021/09/20 10:19:51 schwarze Exp $
+# $Id: configure,v 1.83 2023/10/19 11:45:42 schwarze Exp $
#
# Copyright (c) 2014-2021 Ingo Schwarze
#
@@ -37,6 +37,7 @@ SOURCEDIR=`dirname "${0}"`
MANPATH_BASE="/usr/share/man:/usr/X11R6/man"
MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
+DEBUG_MEMORY=0
OSENUM=
OSNAME=
UTF8_LOCALE=
@@ -99,6 +100,7 @@ NEED_GNU_SOURCE=0
NEED_OPENBSD_SOURCE=0
NEED_XPG4_2=0
+DEBUG_OBJS=
MANDOC_COBJS=
SOELIM_COBJS=
@@ -109,6 +111,7 @@ BIN_FROM_SBIN=
INCLUDEDIR=
LIBDIR=
MANDIR=
+MISCDIR=
READ_ALLOWED_PATH=
WWWPREFIX="/var/www"
@@ -334,6 +337,7 @@ runtest vasprintf VASPRINTF "" -D_GNU_SOURCE || true
# --- fts ---
if [ "${1}" = "-depend" ]; then
+ DEBUG_MEMORY=1
HAVE_FTS=0
HAVE_FTS_COMPARE_CONST=0
echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&2
@@ -461,6 +465,10 @@ echo
echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
echo "#define MANPATH_BASE \"${MANPATH_BASE}\""
echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
+if [ ${DEBUG_MEMORY} -ne 0 ]; then
+ echo "#define DEBUG_MEMORY ${DEBUG_MEMORY}"
+ DEBUG_OBJS=mandoc_dbg.o
+fi
echo "#define OSENUM ${OSENUM}"
[ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
[ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
@@ -613,6 +621,7 @@ exec > Makefile.local
[ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc"
[ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib/mandoc"
[ -z "${MANDIR}" ] && MANDIR="${PREFIX}/man"
+[ -z "${MISCDIR}" ] && MISCDIR="${PREFIX}/share/misc"
[ -z "${HTDOCDIR}" ] && HTDOCDIR="${WWWPREFIX}/htdocs"
[ -z "${CGIBINDIR}" ] && CGIBINDIR="${WWWPREFIX}/cgi-bin"
@@ -640,6 +649,7 @@ CC = ${CC}
CFLAGS = ${CFLAGS}
LDADD = ${LDADD}
LDFLAGS = ${LDFLAGS}
+DEBUG_OBJS = ${DEBUG_OBJS}
MANDOC_COBJS = ${MANDOC_COBJS}
SOELIM_COBJS = ${SOELIM_COBJS}
STATIC = ${STATIC}
@@ -650,6 +660,7 @@ BIN_FROM_SBIN = ${BIN_FROM_SBIN}
*** 7903 LINES SKIPPED ***
From nobody Mon Jul 14 16:47:16 2025
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 4bgpBs47DRz61xQG;
Mon, 14 Jul 2025 16:47:17 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBs0ctWz481J;
Mon, 14 Jul 2025 16:47:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511637;
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=ajwA8XXQ7he+KeE1CpkGIx9BUHzIK3Z9iLn1hWfgZEA=;
b=REw4iY8r8BKc3evKnzYGHwQjExEIp/j1mGkddIfLwig+xRV5AOg0CvXqPbLkJQhamecdEQ
IFUoEGJn359Z9o/o/SaOm0hido0jnHIA5c/pZzDEoBg2kH1T4a1tzCWyJNcNWvTEQWS4b4
ZNwk9A0GADq4ml7TZ5ycPJxYMD4bI+LK8SkNCgqrnmAOuP97WI6ARW4Rpv8YBOR9yvi5NU
abSL2nAu7wKDQSUeutlxsjRU+DUFCKBtnvTsQc0Gtjqg67YmGNY3eykiuAUQQndeS73/T6
f6EWtT4z4hK3RtjT0d9Hm1Az4oLw/T6dfwC8R20O11ruEETpn6Z16PzHezJOrg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511637;
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=ajwA8XXQ7he+KeE1CpkGIx9BUHzIK3Z9iLn1hWfgZEA=;
b=vvZxgzXYFwcflEyrANIzigOICdefG2xgoe8rCfbtXJAF0jPxJSgBy+/C2dI/zCxHT5Wnz9
KO3L2TkyYpg+TkWC9DKg54pLkEgpjAnJ1a/rO4s0YFuFtle3Lq8mXpI+VX3bLm1SYdZYLc
gTXX8YciIF+uy5zVX4SjvbPX3r20MYHOBnF0q1dFJyjbVwr92VGWyqbAvT+C0ASneYiVJc
VhIAxKJ8yqJsaC7i5/EeyIHnfrvDSz9ix8KttrVZ3jMfViBTV0iw06vzZMsH4/BPoqhysz
OLJn+mxQWhzMRx7XV2OSXaJ0NkoJdlM9gs7Lp7WOQsmnisizvCGn/5Kjtfsaow==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511637; a=rsa-sha256; cv=none;
b=eZvkDTCcbHCsE1QSl28vKmHR98jk2UFdaQy46AqnM/Pk6TGtHuyc4ox9OosWbE2lMt5Rwt
+XBh8MLPrh9AUn27kJgKFGtLEQWpbQ9IR8IJT2rgfoE5a/gfxCuRIbfFZ/NrKgNmlGy7km
xH4F1MfXs/kH6Eck61NImSlR7iFd7bP2UzSSuGq2qAZ8k2LYOcP4LwELWb7JnXFLZ+k1VI
RAmcEbBL8d20VGJZpbuMd+Uzd0eGyRfOsFGcUxrZZz3Jw8v026flkUv4U8p+EOV/tFPN68
fgFOsLe5f5FUEwx0oKze0H0oqfY3hFDwHWn7J7yuAEdQY5dI+ndIEhohovXHqA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBr6xcZz122M;
Mon, 14 Jul 2025 16:47:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlGwN065207;
Mon, 14 Jul 2025 16:47:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlGSI065204;
Mon, 14 Jul 2025 16:47:16 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:16 GMT
Message-Id: <202507141647.56EGlGSI065204@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 7876738b6038 - stable/14 - mandoc: remove duplicate
libstdthreads entry
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
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: 7876738b6038d6a08d0c648404c9b55bb954e5ae
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=7876738b6038d6a08d0c648404c9b55bb954e5ae
commit 7876738b6038d6a08d0c648404c9b55bb954e5ae
Author: Brooks Davis
AuthorDate: 2024-12-06 20:48:13 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:44 +0000
mandoc: remove duplicate libstdthreads entry
(cherry picked from commit 0fd7b4655666fce13c43d4562e5f9e54ad32145e)
---
contrib/mandoc/lib.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in
index bde0121f08f6..6b17aab5b27b 100644
--- a/contrib/mandoc/lib.in
+++ b/contrib/mandoc/lib.in
@@ -119,7 +119,6 @@ LINE("libsbuf", "Safe String Composition Library (libsbuf, \\-lsbuf)")
LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-lsdp)")
LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)")
LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)")
-LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)")
LINE("libSystem", "System Library (libSystem, \\-lSystem)")
LINE("libsysdecode", "System Argument Decoding Library (libsysdecode, \\-lsysdecode)")
LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)")
From nobody Mon Jul 14 16:47:17 2025
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 4bgpBt1hZmz61xjY;
Mon, 14 Jul 2025 16:47:18 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBt06GYz483t;
Mon, 14 Jul 2025 16:47:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511638;
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=GnQKnxjZkZ5/pChvk2jckk40fURYGtXLTMp+XvBTBmI=;
b=xSQPU3vfmeKmbXGyw9h0x1tI4UOdNeAaDfQRqmp0HT/34+ADa+Xe/Wpjoh6/2DoVJbzkwY
Gg9kaOS3LR1vvMTjL/eu7rSLmm9+GLVdNBKhTCGmbdE4CqaVUsDYoB+jq2fgMynWisctyF
/To0g3sx30yuIi2WcpOTuFzuPLqoJPPrf9mgnGACLtyocvSR1PaqD/zpn6iA0ifXZtzm/4
PV0ek3r7NNjcMcA2jA7SMDWMNq69Sy1fVCdC9idhVHlgFun3u1LdrcJtPdPlJBAW+ByCZ0
YE1yHihHvDAUbeg+/C+viJdv3/NDBNkmLEXYBd5H0cHzc1CTHlPos8RrfZZskg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511638;
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=GnQKnxjZkZ5/pChvk2jckk40fURYGtXLTMp+XvBTBmI=;
b=mukJZwf4kP3URKr0UY3TgoQAQhInjH4w1ZMRLap3egtoL6QaBfjmwjLK6Wd5V9RuCSL8NA
6tqCrjnQ+rEBjAe/GjgO9oMmeZIM7N/EQja42zposZlelChwfStENWAXK6kOFY9phLkUSo
mj5tnY1gsIYSXx6IoRn0295T3ILYKJp5+EQ8ddEuF2+zJkcNcQZtHLlhysFCy5rbfoJlJo
qs8QOdChDM7pFXidGCNa16oqwrz3ovGVKOBNOaWF1fzqfgei4SKqK1RT1jlMahIy92lvaM
LTXXD4T1D3xkb4kfAySsMklvOxfqScxb0OuU25n+v3y3OO9xTk7V+d5j1krB+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511638; a=rsa-sha256; cv=none;
b=jSCTs75bguHiSHi/A/56QYK2E+otTpen3PM7p7qJdM9R47OOnhmtpbI7FomU3Nw+5x1Qfp
+8/OjFHZmrl/c9Zu/DJUfnotfxNrzWhdbxIvkao8Ri4GfijiszRX8Hpfn1NX7CnocD0y0L
nylJT76DRGUG7gTR8ZE5c9tcuTe1ugE6BPtAOgb9wdbtAb3rT133jqQpIz4d9o3CP/b8jk
zXQ5y7EzZh2tGBYIX4MKTkdwXtUW4KcUmJpFU0S9HmYLi+ZebX/c97L4D4wEFtaPT7zCwj
5cuGfShrPDLHgzo5vgsCqrwkqZU1bHiuSeOETRXPde+7VeAW727M89fLdaaPMg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBs6nXBz11yj;
Mon, 14 Jul 2025 16:47:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlHEe065239;
Mon, 14 Jul 2025 16:47:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlHas065236;
Mon, 14 Jul 2025 16:47:17 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:17 GMT
Message-Id: <202507141647.56EGlHas065236@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: ec766614e3b8 - stable/14 - mandoc: drop 3p section
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
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: ec766614e3b87ddcbf8c922c92553ed0f3c5b0d6
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=ec766614e3b87ddcbf8c922c92553ed0f3c5b0d6
commit ec766614e3b87ddcbf8c922c92553ed0f3c5b0d6
Author: Brooks Davis
AuthorDate: 2024-12-09 17:25:36 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:44 +0000
mandoc: drop 3p section
The 3p is an OpenBSD thing and this list of sections is otherwise
entierly customized to FreeBSD.
Reviewed by: imp, bapt
Differential Revision: https://reviews.freebsd.org/D47948
(cherry picked from commit 3ca117c6bb1dffaa3542f58339154a7dd166d169)
---
contrib/mandoc/msec.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/mandoc/msec.in b/contrib/mandoc/msec.in
index fc198202fbf1..1d7518a5e43d 100644
--- a/contrib/mandoc/msec.in
+++ b/contrib/mandoc/msec.in
@@ -26,7 +26,6 @@ LINE("1", "FreeBSD General Commands Manual")
LINE("2", "FreeBSD System Calls Manual")
LINE("3", "FreeBSD Library Functions Manual")
LINE("3lua", "Lua Library Functions Manual")
-LINE("3p", "Perl Library Functions Manual")
LINE("4", "FreeBSD Kernel Interfaces Manual")
LINE("5", "FreeBSD File Formats Manual")
LINE("6", "FreeBSD Games Manual")
From nobody Mon Jul 14 16:47:18 2025
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 4bgpBw0fQjz61xQP;
Mon, 14 Jul 2025 16:47:20 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBv2QmSz483x;
Mon, 14 Jul 2025 16:47:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511639;
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=vNpjFL3owEOwqbFMWHtnk+GjcigFlR9I4IBhW5rtuvg=;
b=SHEwUzrlNVA/gmIw+kx21uqapjOurQ7lmyw4Y7st2Yv6iCIIMdCEsvEJ1jrO28PA/tZA1N
oEZ2qsaFb36fCuDp3hXSRKVpYQrAs3iFWNzlHJoL6n/wJQC92gMxqVfHRALIfUKtcSFwIb
0KOW6y16pex0GLZ250+fKQ0Pgs5OZkvDe5t75QjuapzGEP2s4e+MosPuWiL8vD1qgCqaUQ
3SWxErjIXAnfTngdATm9OdcO//CuuUKaUi/PFKJdpu+hmaqmKZ4oN5lk417RxESPW+cf1T
IhnYGUBYwX6XwZky7S2faNbeebortRfS4QArGU4+zoK4t/K1ZnfIrPgC6BNJwQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511639;
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=vNpjFL3owEOwqbFMWHtnk+GjcigFlR9I4IBhW5rtuvg=;
b=TVS05DJ1txA3zCDgdrG/DKPw6q/tmpvvmHPuRUB926SqPTrH+3u/ncPxHilW0KUqBf3D3S
YCFE+SiJsK2jaQFXWsbxK7XJQe/ARgnBz2bk5+FAXem2c4d8zzuhsIzbDfnPWQKU3VUpsN
qnhu7ghx0CLmB+D+79KdMnAStGx7Glov5yeqVJQRWDodHUjpRWFfu28P0w13mWiwdyG6Qp
/DIhsxaUBFvvm+lUtCV6hGIsdx+bgmQQE17yPHfG25o+T8WjZD4KxqBNUiNxcPyf85SY8N
VIxVvGZBtgWxQBReP/djJBBGQ8cre8YHW61ZCr3EDwTISSj/YQ2pthd9855H6w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511639; a=rsa-sha256; cv=none;
b=j3J0G7PO4H9aGGld3vgV8WfgsNLDLA1SANRqgcn0RslTYc1ifJLTWMGKYktbyF3TAEW2TE
39Wt39xWPrYNHTl/XEzChnphYveVfGGG8MBnBbLKNdtF6UM12lMzgol9ARwi35iyo4T5IX
YBl5gmowJcezsE+XoEstjw/gsC27Xh3m1m3FZJFc99qKgZTVm3zl7nTQrLkmTt79cKdzto
0+B6Up8EqhdorV6TfT4azbD/679Ec/wgQT04olJD7ou4JW8DsYxNi9Q0L2w+FuznMGjtyo
gn7rygxn6oxQDE0h34p7M1OQFUoOo7K4hdJZBY7xJJFVtp06U9sbvV8AWbGg2A==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBv0dhZz12Pw;
Mon, 14 Jul 2025 16:47:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlINM065275;
Mon, 14 Jul 2025 16:47:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlIp5065272;
Mon, 14 Jul 2025 16:47:18 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:18 GMT
Message-Id: <202507141647.56EGlIp5065272@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 241fb89acdd2 - stable/14 - mdoc.7/MANUAL STRUCTURE:
add HARDWARE
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
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: 241fb89acdd2971c9cdc300db1f0aad4e5d254cd
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=241fb89acdd2971c9cdc300db1f0aad4e5d254cd
commit 241fb89acdd2971c9cdc300db1f0aad4e5d254cd
Author: Alexander Ziaee
AuthorDate: 2024-10-13 15:03:14 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:45 +0000
mdoc.7/MANUAL STRUCTURE: add HARDWARE
FreeBSD Release infrastructure has been generating the Hardware
Compatibility Notes from this section for some decades. Make this more
obvious. This does change the upstream mdoc.7 in a minimal way to
document this, but the .Dd wasn't bumped to avoid conflicts with the
next mdoc/mandoc import.
Reported by: bz (HARDWAREs generating compatibility notes)
Reported by: grahamperrin (order listed in fdp-primer/man)
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1463
(cherry picked from commit d235f19d1bf1e3d9ca31822709464cc6250f44c2)
---
contrib/mandoc/mdoc.7 | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7
index 0eb697f9f0a7..9dbce2127361 100644
--- a/contrib/mandoc/mdoc.7
+++ b/contrib/mandoc/mdoc.7
@@ -137,6 +137,9 @@ The
utility processes files ...
\&.\e\(dq .Sh CONTEXT
\&.\e\(dq For section 9 functions only.
+\&.\e\(dq .Sh HARDWARE
+\&.\e\(dq For section 4 only.
+\&.\e\(dq Not used in OpenBSD.
\&.\e\(dq .Sh IMPLEMENTATION NOTES
\&.\e\(dq Not used in OpenBSD.
\&.\e\(dq .Sh RETURN VALUES
@@ -328,6 +331,10 @@ manual.
.It Em CONTEXT
This section lists the contexts in which functions can be called in section 9.
The contexts are autoconf, process, or interrupt.
+.It Em HARDWARE
+This section lists the hardware support
+provided by kernel modules in section 4.
+FreeBSD Hardware Compatibility Notes are generated from this section.
.It Em IMPLEMENTATION NOTES
Implementation-specific notes should be kept here.
This is useful when implementing standard functions that may have side
From nobody Mon Jul 14 16:47:20 2025
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 4bgpBx3MC6z61xKL;
Mon, 14 Jul 2025 16:47:21 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBw2tPHz484g;
Mon, 14 Jul 2025 16:47:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511640;
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=L10lqtlO0eboeTP+5k78osHm+1zlQG2n9sKCTefEp0M=;
b=rhJskgvvFuJEZ6XJXrYGMhZXCsH/SEzd0/eTRpTar5mGtBu+lPiE+JwsX1bTgyBOtRTJqp
riN1cgUN/1o6niiR8FHU1G5Qpq/w9TBJwWB9XQ9UqchT4RFt9X0kZfVfkltLqONVnK/tNQ
6EsZ+Towuwb2vj8igdrJHD0Od9fXEe96wt3lqCwmLlk6p4oe9uITrGIF66TRVuXroVK6r1
ry+DilGACROYv9ZTht1lbbAqXgBiab8QV0EL1KcYqGVdBe5XgkSo/xJjrIPC9p55cxENXx
+m2lEZoAIca1wQtJh56aTyidPJcosqxb1FdMlAihCz2rqpsWxiYyW5y5O7HyLg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511640;
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=L10lqtlO0eboeTP+5k78osHm+1zlQG2n9sKCTefEp0M=;
b=FK3UCpdSTsbFznhokmoxBFgdW3ihgyMeo2UD/LZ4lrxSjfK/jMi0FcMwZaQv8ds1j/Gi7U
cROSCi6F7F+S+7WbfpmT0nO9TIl9DUo3ZlzXVzy/qdjpISv5FJSoFcc/r5uzpnYZyU1N8V
xOx5ylmjUi/4Yf1lt4t1N1OjGkDqTuwbl5OQhJSxyFl0A7HXek3IPvpAWNPz3dIIrYBYr7
XlkS1gdiog7uqWDLIOJn+0guta3udsoDM2oqdhjjK28igDKv7uiMI8ZF4Bpa5tFq5xCieh
/QgdhBFaFrAJxodALJ40DfhSulOp7ZQ7hCoooybd5sE8HSf2rrBs7/AVnV0O5w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511640; a=rsa-sha256; cv=none;
b=Y18GL6txtK48hZTHsQcOOyYWOhaqh5DysgHlcdOmMSZV3tiWtkI4kCIbfnvo+E3eh6qT4M
BkQPHBvHH7W90MNgGTAl4fSaHaqQL5yU1c6FxupSTvEy2IhO/tItl8QW8A4cAtAfs/JiVJ
CDaoKNit4/2IwaD9EvuW0kMwO7E8ikxo6JwqzcJ6CwxYS5euwc5zr5hidOyJ6C9jBkusUy
kdnoxafQltAcxUT/f1dE4tj8bCRSCTRR8o1Y0/HXMW2CfQx0DCnHdrnnHTL8Sx5iKKAv1G
ZL6B3Xgu2QBkkODEgrLT6XdjyXpPBjvGz2VsI9Qj+KE++Ie4X+RjInHCFqN1zg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBw1FMqz1245;
Mon, 14 Jul 2025 16:47:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlKEd065316;
Mon, 14 Jul 2025 16:47:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlKWU065313;
Mon, 14 Jul 2025 16:47:20 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:20 GMT
Message-Id: <202507141647.56EGlKWU065313@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 9819cc22df7c - stable/14 - manuals: Align our tree
with upstream C23 macro
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
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: 9819cc22df7c49e2a9631c1afdec8bbe988e00b0
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=9819cc22df7c49e2a9631c1afdec8bbe988e00b0
commit 9819cc22df7c49e2a9631c1afdec8bbe988e00b0
Author: Alexander Ziaee
AuthorDate: 2025-05-05 18:52:06 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:45 +0000
manuals: Align our tree with upstream C23 macro
Switch all instances of the -isoC-2024 macro to -isoC-2023 selected by
upstream. Keep -isoC-2024 defined, but deprecated, for backwards compat.
MFC after: 3 days (resolved merge conflicts w/ cdefs and memccpy.3)
(cherry picked from commit 1b6936e125382523509901a4fc5b2932ed0e742d)
---
contrib/mandoc/st.c | 2 ++
lib/libc/string/memccpy.3 | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/mandoc/st.c b/contrib/mandoc/st.c
index 9b9fee4ded17..8a2c687dfc94 100644
--- a/contrib/mandoc/st.c
+++ b/contrib/mandoc/st.c
@@ -56,6 +56,8 @@ LINE("-isoC-tcor1", "ISO/IEC 9899/TCOR1:1994 (\\(lqISO\\~C90, Technical Corrigen
LINE("-isoC-tcor2", "ISO/IEC 9899/TCOR2:1995 (\\(lqISO\\~C90, Technical Corrigendum 2\\(rq)")
LINE("-isoC-99", "ISO/IEC 9899:1999 (\\(lqISO\\~C99\\(rq)")
LINE("-isoC-2011", "ISO/IEC 9899:2011 (\\(lqISO\\~C11\\(rq)")
+LINE("-isoC-2023", "ISO/IEC 9899:2024 (\\(lqISO\\~C23\\(rq)")
+/* the -isoC-2024 macro is deprecated in favor of upstream -isoC-2023 */
LINE("-isoC-2024", "ISO/IEC 9899:2024 (\\(lqISO\\~C23\\(rq)")
LINE("-iso9945-1-90", "ISO/IEC 9945-1:1990 (\\(lqPOSIX.1\\(rq)")
LINE("-iso9945-1-96", "ISO/IEC 9945-1:1996 (\\(lqPOSIX.1\\(rq)")
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index 54498610fde7..4c7bf0101792 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -82,7 +82,7 @@ The
function conforms to
.St -p1003.1-2004
and
-.St -isoC-2024 .
+.St -isoC-2023 .
.Sh HISTORY
The
.Fn memccpy
From nobody Mon Jul 14 16:47:21 2025
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 4bgpBy5SPZz61xDl;
Mon, 14 Jul 2025 16:47:22 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBx2nbYz47yW;
Mon, 14 Jul 2025 16:47:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511641;
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=Hlh8VFmIV7RTxfen6S/ysFq9XFWXKAlgBaYrsB/cDEA=;
b=DihcNxkqP87R8Xf1s6O2RvK1nUap7kX/cMfINBoCT66k0eQu0omC9pDKJxTsG9pqmr7vgG
KGbt9CF1c9w7V9xZ3NrdMIbsyE4eR09b8cFma1SbboarnLxSgTwzXBSzRAoFIFWgwMY9Q0
sQ0F8sfaI7B5S7DX+Rsb0WCzeqqJ7oAB5mZLHLilq3v38xdvN1pHkCPVRh558zJVBXf5Qe
oGX40SgaB5UqRMwFJ1W2iD83J2cyohJPRe0Up1zMER5e7isnruInk5ndTrDXFtGofY4i7Y
JF/kwA+MzRdorWL5iWUXOBqjbGL0ldUbJ9V7PbiACsDvJzKkvRp3+9jYM332xA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511641;
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=Hlh8VFmIV7RTxfen6S/ysFq9XFWXKAlgBaYrsB/cDEA=;
b=kCI5rAXu6QUrop7UD+7oe8hzuu4xrG1tTHJiXyFQdYypnj2zaBNBFL3PJXQZ5o/gD4zOiJ
TKzPxsHwij44RBDn8UzRAZL/wBu82FPONBaUHySTfCKwtq7nYUiaabvF6+RPLKQZ2tHdoW
8kKOaNHV4GGt1DnH+TVwYuq8an+zVO6aDKYHXA2lPu088nw5LyiomsHE6uyMknsEjm6us/
xJpZo7mVTMpgPDmO/yHQbwtEJT5Bq0Lq4k8YeUUPGJXBXtG8UjXTvYCLb7g+V2Q7ifhx4j
Smp92EpQeuDtApMEhYiWPrahrQNw1FVdZy1swp2osWRb3MU+7r4o9+krgiNtBw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511641; a=rsa-sha256; cv=none;
b=Bm9/tdo0EfiXRaM4lN/KS+aGubGukg5nbM5vymMaeWVrQQnyR7xK41bYEIWP3LENyRZY+3
qSJVRWdabpTkv0FSpECdvtHKuWZNz2qR1fcq6Icf3yYJJ0LtO2qd9TKtKo1R7E5GJ1KarM
MRunrwMWrP3/qUiy7qi+T1Ln4NrkEO15UCQaOGb92X0GrCDFtY/YgY7egPliEvB0SS3pZy
j4JaoC0qJmDIvmXJY5aPz60cmipIs+jo8IRpEqnTAdP2j9Ou19Njh6yTp2a62TGaUrdyRb
BW9jbUHxSTamfrATkdM+3Lvz4/vBpro6RksotmHxFuL9hnWyrcLEAcBH+FzhQA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBx21YCz12Px;
Mon, 14 Jul 2025 16:47:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlLDB065349;
Mon, 14 Jul 2025 16:47:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlLwA065346;
Mon, 14 Jul 2025 16:47:21 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:21 GMT
Message-Id: <202507141647.56EGlLwA065346@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: a271d8fd33b5 - stable/14 - mandoc: Vendor import of
upstream at 2025-04-08
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
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: a271d8fd33b5356a06b0d18b16a7a1eb9d5af980
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=a271d8fd33b5356a06b0d18b16a7a1eb9d5af980
commit a271d8fd33b5356a06b0d18b16a7a1eb9d5af980
Author: Alexander Ziaee
AuthorDate: 2025-06-12 21:25:42 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:45 +0000
mandoc: Vendor import of upstream at 2025-04-08
Interesting changes:
+ correct legacy mandoc date typo, reported on our very own bugzilla
+ improve libmandoc manual
+ strengthen recommendations to omit macros from title lines in mdoc(7)
+ improve html5 compliance in html output
+ improve RFC linking in markdown output
+ libmandoc and mdoc manuals have been improved
+ support arithmetic operations in tbl(7) column widths for DocBook
+ define the St -isoC-2023 macro for referencing the C23 spec
Approved by: mhorne (mentor, implicit)
Reviewed by: imp
Discussed with: adrian, bapt, brooks
Closes: https://github.com/freebsd/freebsd-src/pull/1689
(cherry picked from commit 80c12959679ab203459dc20eb9ece3a7328b7de5)
---
contrib/mandoc/TODO | 11 +++-
contrib/mandoc/libmandoc.h | 3 +-
contrib/mandoc/man.1 | 38 ++++++++++-
contrib/mandoc/mandoc.1 | 14 ++--
contrib/mandoc/mandoc.3 | 37 ++++++++++-
contrib/mandoc/mandoc.css | 5 +-
contrib/mandoc/mandoc.h | 5 +-
contrib/mandoc/mandoc_msg.c | 3 +-
contrib/mandoc/mdoc.7 | 36 +++++-----
contrib/mandoc/mdoc_html.c | 61 ++++++++++++-----
contrib/mandoc/mdoc_man.c | 7 +-
contrib/mandoc/mdoc_markdown.c | 35 +++++++++-
contrib/mandoc/out.c | 10 +--
contrib/mandoc/roff.c | 146 +++++++++++++++++++++--------------------
contrib/mandoc/st.c | 2 +-
contrib/mandoc/tbl.c | 3 +-
contrib/mandoc/tbl.h | 3 +-
contrib/mandoc/tbl_layout.c | 36 +++++-----
18 files changed, 304 insertions(+), 151 deletions(-)
diff --git a/contrib/mandoc/TODO b/contrib/mandoc/TODO
index 58d0d6937746..3f5a449af68f 100644
--- a/contrib/mandoc/TODO
+++ b/contrib/mandoc/TODO
@@ -1,6 +1,6 @@
************************************************************************
* Official mandoc TODO.
-* $Id: TODO,v 1.335 2024/09/21 12:08:54 schwarze Exp $
+* $Id: TODO,v 1.337 2025/04/08 21:53:14 schwarze Exp $
************************************************************************
Many issues are annotated for difficulty as follows:
@@ -234,6 +234,11 @@ are mere guesses, and some may be wrong.
--- missing man features -----------------------------------------------
+- When calling less(1), specify -P to print "name(sec) lines ..."
+ in the bottom line instead of "/tmp/man..."
+ Jan Engelhardt (SuSE) via Matej Cepl 06 Apr 2025 14:42:52 +0200
+ loc * exist * algo * size * imp **
+
- MANWIDTH
Markus Waldeck 9 Jun 2015 05:49:56 +0200
Laura Morales 26 Apr 2018 08:15:55 +0200
@@ -483,6 +488,10 @@ are mere guesses, and some may be wrong.
reveals lots of bugs both in groff and mandoc...
reported by bentley@ Wed, 22 May 2013 23:49:30 -0600
+- Make an underlined blank an underscore rather than a blank in both
+ groff and mandoc terminal output (likely tricky, needs investigation)
+ job@ 21 Jan 2025 18:03:52 +0000
+
--- PostScript and PDF issues ------------------------------------------
- PDF output doesn't use a monospaced font for .Bd -literal
diff --git a/contrib/mandoc/libmandoc.h b/contrib/mandoc/libmandoc.h
index ab7c29be510f..76183423603d 100644
--- a/contrib/mandoc/libmandoc.h
+++ b/contrib/mandoc/libmandoc.h
@@ -1,4 +1,4 @@
-/* $Id: libmandoc.h,v 1.80 2021/06/27 17:57:54 schwarze Exp $ */
+/* $Id: libmandoc.h,v 1.81 2025/01/05 16:58:22 schwarze Exp $ */
/*
* Copyright (c) 2013-2015,2017,2018,2020 Ingo Schwarze
* Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons
@@ -78,6 +78,7 @@ void roff_userret(struct roff *);
void roff_endparse(struct roff *);
void roff_setreg(struct roff *, const char *, int, char);
int roff_getreg(struct roff *, const char *);
+int roff_evalnum(int, const char *, int *, int *, char, int);
char *roff_strdup(const struct roff *, const char *);
char *roff_getarg(struct roff *, char **, int, int *);
int roff_getcontrol(const struct roff *,
diff --git a/contrib/mandoc/man.1 b/contrib/mandoc/man.1
index 888cabb4502b..b37d410e9130 100644
--- a/contrib/mandoc/man.1
+++ b/contrib/mandoc/man.1
@@ -1,4 +1,4 @@
-.\" $Id: man.1,v 1.41 2022/08/04 11:32:23 schwarze Exp $
+.\" $Id: man.1,v 1.42 2025/01/26 14:43:25 schwarze Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -31,7 +31,7 @@
.\"
.\" @(#)man.1 8.2 (Berkeley) 1/2/94
.\"
-.Dd $Mdocdate: August 4 2022 $
+.Dd $Mdocdate: January 26 2025 $
.Dt MAN 1
.Os
.Sh NAME
@@ -58,7 +58,19 @@ a specific category
.Pq Ar section
or
machine architecture
-.Pq Ar subsection .
+.Pq Ar subsection ,
+or searched for with
+.Fl k
+using
+.Xr apropos 1
+search expressions.
+The default pager,
+.Xr less 1 ,
+supports the command
+.Ic :t
+to jump to definitions of specific terms (see
+.Dv MANPAGER ,
+below).
.Pp
The options are as follows:
.Bl -tag -width Ds
@@ -345,6 +357,26 @@ See
.Xr mandoc 1
for details.
.Sh EXAMPLES
+Show all manual pages that mention the
+.Ev PWD
+environment variable:
+.Pp
+.Dl $ man -ak Ev=PWD
+.Pp
+Show the
+.Xr ksh 1
+manual and jump to the place where the
+.Ic pwd
+builtin command is described:
+.Pp
+.Dl $ man -O tag=pwd ksh
+.Pp
+Equivalently, use the command
+.Ql man ksh ,
+then type
+.Ql :tpwd
+and press the return key.
+.Pp
Format a page for pasting extracts into an email message \(em
avoid printing any UTF-8 characters, reduce the width to ease
quoting in replies, and remove markup:
diff --git a/contrib/mandoc/mandoc.1 b/contrib/mandoc/mandoc.1
index b1e0cf118336..32a3e2811513 100644
--- a/contrib/mandoc/mandoc.1
+++ b/contrib/mandoc/mandoc.1
@@ -1,6 +1,6 @@
-.\" $Id: mandoc.1,v 1.267 2023/11/13 19:13:01 schwarze Exp $
+.\" $Id: mandoc.1,v 1.270 2025/03/03 14:07:51 schwarze Exp $
.\"
-.\" Copyright (c) 2012, 2014-2023 Ingo Schwarze
+.\" Copyright (c) 2012, 2014-2023, 2025 Ingo Schwarze
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 13 2023 $
+.Dd $Mdocdate: March 3 2025 $
.Dt MANDOC 1
.Os
.Sh NAME
@@ -954,7 +954,7 @@ The
macro uses the legacy
.Xr man 7
date format
-.Dq yyyy-dd-mm .
+.Dq yyyy-mm-dd .
Consider using the conventional
.Xr mdoc 7
date format
@@ -1896,6 +1896,12 @@ The invalid character is discarded.
A table layout specification contains an opening parenthesis,
but no matching closing parenthesis.
The rest of the input line, starting from the parenthesis, has no effect.
+.It Sy "ignoring invalid column width in tbl layout"
+.Pq tbl
+A column width specifier in a table layout is empty, zero, or not a valid
+numerical expression.
+The width specifier is ignored and the column is made wide enough
+to accommodate all its data cells.
.It Sy "ignoring excessive spacing in tbl layout"
.Pq tbl
A spacing modifier in a table layout is unreasonably large.
diff --git a/contrib/mandoc/mandoc.3 b/contrib/mandoc/mandoc.3
index 4ecfbdebd8c2..6b759558e488 100644
--- a/contrib/mandoc/mandoc.3
+++ b/contrib/mandoc/mandoc.3
@@ -1,4 +1,4 @@
-.\" $Id: mandoc.3,v 1.44 2018/12/30 00:49:55 schwarze Exp $
+.\" $Id: mandoc.3,v 1.46 2025/02/25 17:03:54 schwarze Exp $
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
.\" Copyright (c) 2010-2017 Ingo Schwarze
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: December 30 2018 $
+.Dd $Mdocdate: February 25 2025 $
.Dt MANDOC 3
.Os
.Sh NAME
@@ -33,6 +33,8 @@
.In sys/types.h
.In stdio.h
.In mandoc.h
+.In roff.h
+.In mandoc_parse.h
.Pp
.Fd "#define ASCII_NBRSP"
.Fd "#define ASCII_HYPH"
@@ -141,6 +143,37 @@ or invoke
.Fn mparse_reset
and go back to step 2 to parse new files.
.El
+.Pp
+The design goals of the
+.Nm mandoc
+library are limited to providing the functionality required by the
+.Xr mandoc 1
+program.
+Consequently, the functions documented in the present manual page
+do not aim for API stability.
+Any third-party program using them typically requires adjustments after every
+.Nm mandoc
+release.
+Linking such a program requires
+.Fl lz
+because
+.Fn mparse_readfd
+calls
+.Xr gzdopen 3 ,
+.Xr gzread 3 ,
+.Xr gzerror 3 ,
+and
+.Xr gzclose 3 .
+For
+.Xr mandoc 1
+itself, the
+.Pa ./configure
+script automatically adds
+.Fl lz
+to the
+.Ev LDADD
+.Xr make 1
+variable.
.Sh REFERENCE
This section documents the functions, types, and variables available
via
diff --git a/contrib/mandoc/mandoc.css b/contrib/mandoc/mandoc.css
index 1dae127059d6..88432b9322b7 100644
--- a/contrib/mandoc/mandoc.css
+++ b/contrib/mandoc/mandoc.css
@@ -1,4 +1,4 @@
-/* $Id: mandoc.css,v 1.52 2022/07/06 14:34:59 schwarze Exp $ */
+/* $Id: mandoc.css,v 1.54 2025/01/25 03:18:55 schwarze Exp $ */
/*
* Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
*
@@ -179,7 +179,8 @@ h3.Ss { margin-top: 1.2em;
.RsP { }
.RsQ { }
.RsR { }
-.RsT { text-decoration: underline; }
+.RsT { font-style: normal;
+ font-weight: normal; }
.RsU { }
.RsV { }
diff --git a/contrib/mandoc/mandoc.h b/contrib/mandoc/mandoc.h
index 9ab68327ecb4..ccbf90392f4c 100644
--- a/contrib/mandoc/mandoc.h
+++ b/contrib/mandoc/mandoc.h
@@ -1,6 +1,6 @@
-/* $Id: mandoc.h,v 1.282 2023/10/21 17:10:17 schwarze Exp $ */
+/* $Id: mandoc.h,v 1.283 2025/01/05 18:14:39 schwarze Exp $ */
/*
- * Copyright (c) 2012-2022 Ingo Schwarze
+ * Copyright (c) 2012-2022, 2025 Ingo Schwarze
* Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons
*
* Permission to use, copy, modify, and distribute this software for any
@@ -193,6 +193,7 @@ enum mandocerr {
MANDOCERR_TBLLAYOUT_NONE, /* empty tbl layout */
MANDOCERR_TBLLAYOUT_CHAR, /* invalid character in tbl layout: char */
MANDOCERR_TBLLAYOUT_PAR, /* unmatched parenthesis in tbl layout */
+ MANDOCERR_TBLLAYOUT_WIDTH, /* invalid column width in tbl layout */
MANDOCERR_TBLLAYOUT_SPC, /* ignoring excessive spacing in tbl layout */
MANDOCERR_TBLDATA_NONE, /* tbl without any data cells */
MANDOCERR_TBLDATA_SPAN, /* ignoring data in spanned tbl cell: data */
diff --git a/contrib/mandoc/mandoc_msg.c b/contrib/mandoc/mandoc_msg.c
index baa709c70c83..b4ba9cec9683 100644
--- a/contrib/mandoc/mandoc_msg.c
+++ b/contrib/mandoc/mandoc_msg.c
@@ -1,6 +1,6 @@
/* $OpenBSD: mandoc_msg.c,v 1.8 2020/01/19 17:59:01 schwarze Exp $ */
/*
- * Copyright (c) 2014-2022 Ingo Schwarze
+ * Copyright (c) 2014-2022, 2025 Ingo Schwarze
* Copyright (c) 2010, 2011 Kristaps Dzonsons
*
* Permission to use, copy, modify, and distribute this software for any
@@ -192,6 +192,7 @@ static const char *const type_message[MANDOCERR_MAX] = {
"empty tbl layout",
"invalid character in tbl layout",
"unmatched parenthesis in tbl layout",
+ "ignoring invalid column width in tbl layout",
"ignoring excessive spacing in tbl layout",
"tbl without any data cells",
"ignoring data in spanned tbl cell",
diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7
index 9dbce2127361..edd74eafa328 100644
--- a/contrib/mandoc/mdoc.7
+++ b/contrib/mandoc/mdoc.7
@@ -1,4 +1,4 @@
-.\" $Id: mdoc.7,v 1.294 2024/09/22 10:34:58 schwarze Exp $
+.\" $Id: mdoc.7,v 1.296 2025/01/27 03:17:33 schwarze Exp $
.\"
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
.\" Copyright (c) 2010, 2011, 2013-2020 Ingo Schwarze
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 22 2024 $
+.Dd $Mdocdate: January 27 2025 $
.Dt MDOC 7
.Os
.Sh NAME
@@ -2304,13 +2304,14 @@ Close single-quoted context opened by
Begin a new section.
For a list of conventional manual sections, see
.Sx MANUAL STRUCTURE .
-These sections should be used unless it's absolutely necessary that
-custom sections be used.
-.Pp
-Section names should be unique so that they may be keyed by
-.Ic \&Sx .
-Although this macro is parsed, it should not consist of child node or it
-may not be linked with
+Use the conventional sections where applicable.
+For unusually long and complicated manual pages,
+adding custom sections is occasionally useful.
+.Pp
+Avoid using macros inside the
+.Ar TITLE LINE
+and keep that line unique within the manual page,
+such that it can be pointed to with
.Ic \&Sx .
.Pp
See also
@@ -2360,10 +2361,10 @@ the conventional sections described in
.Sx MANUAL STRUCTURE
rarely have subsections.
.Pp
-Sub-section names should be unique so that they may be keyed by
-.Ic \&Sx .
-Although this macro is parsed, it should not consist of child node or it
-may not be linked with
+Avoid using macros inside the
+.Ar Title line
+and keep that line unique within the manual page,
+such that it can be pointed to with
.Ic \&Sx .
.Pp
See also
@@ -2405,12 +2406,17 @@ The original C standard.
.It \-isoC-99
.St -isoC-99
.br
-The second major version of the C language standard.
+Edition 2 of the C language standard.
.Pp
.It \-isoC-2011
.St -isoC-2011
.br
-The third major version of the C language standard.
+Edition 3 of the C language standard.
+.Pp
+.It \-isoC-2023
+.St -isoC-2023
+.br
+Edition 5 of the C language standard.
.El
.It POSIX.1 before XPG4.2
.Pp
diff --git a/contrib/mandoc/mdoc_html.c b/contrib/mandoc/mdoc_html.c
index 74d753a76bfb..b67eac4be233 100644
--- a/contrib/mandoc/mdoc_html.c
+++ b/contrib/mandoc/mdoc_html.c
@@ -1,6 +1,6 @@
-/* $Id: mdoc_html.c,v 1.350 2022/07/06 16:05:40 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.353 2025/01/25 00:22:28 schwarze Exp $ */
/*
- * Copyright (c) 2014-2022 Ingo Schwarze
+ * Copyright (c) 2014-2022, 2025 Ingo Schwarze
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons
* Copyright (c) 2022 Anna Vyalkova
*
@@ -1456,7 +1456,7 @@ mdoc_rs_pre(MDOC_ARGS)
case ROFFT_BODY:
if (n->sec == SEC_SEE_ALSO)
print_otag(h, TAG_P, "c", "Pp");
- print_otag(h, TAG_CITE, "c", "Rs");
+ print_otag(h, TAG_SPAN, "c", "Rs");
break;
default:
abort();
@@ -1494,10 +1494,13 @@ static int
mdoc__x_pre(MDOC_ARGS)
{
struct roff_node *nn;
- const char *cattr;
+ const unsigned char *cp;
+ const char *cattr, *arg;
+ char *url;
enum htmltag t;
t = TAG_SPAN;
+ arg = n->child->string;
switch (n->tok) {
case MDOC__A:
@@ -1507,7 +1510,7 @@ mdoc__x_pre(MDOC_ARGS)
print_text(h, "and");
break;
case MDOC__B:
- t = TAG_I;
+ t = TAG_CITE;
cattr = "RsB";
break;
case MDOC__C:
@@ -1537,13 +1540,32 @@ mdoc__x_pre(MDOC_ARGS)
cattr = "RsQ";
break;
case MDOC__R:
+ if (strncmp(arg, "RFC ", 4) == 0) {
+ cp = arg += 4;
+ while (isdigit(*cp))
+ cp++;
+ if (*cp == '\0') {
+ mandoc_asprintf(&url, "https://www.rfc-"
+ "editor.org/rfc/rfc%s.html", arg);
+ print_otag(h, TAG_A, "ch", "RsR", url);
+ free(url);
+ return 1;
+ }
+ }
cattr = "RsR";
break;
case MDOC__T:
- cattr = "RsT";
+ t = TAG_CITE;
+ if (n->parent != NULL && n->parent->tok == MDOC_Rs &&
+ n->parent->norm->Rs.quote_T) {
+ print_text(h, "\\(lq");
+ h->flags |= HTML_NOSPACE;
+ cattr = "RsT";
+ } else
+ cattr = "RsB";
break;
case MDOC__U:
- print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+ print_otag(h, TAG_A, "ch", "RsU", arg);
return 1;
case MDOC__V:
cattr = "RsV";
@@ -1561,14 +1583,23 @@ mdoc__x_post(MDOC_ARGS)
{
struct roff_node *nn;
- if (n->tok == MDOC__A &&
- (nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A &&
- ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) &&
- ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A))
- return;
-
- /* TODO: %U */
-
+ switch (n->tok) {
+ case MDOC__A:
+ if ((nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A &&
+ ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) &&
+ ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A))
+ return;
+ break;
+ case MDOC__T:
+ if (n->parent != NULL && n->parent->tok == MDOC_Rs &&
+ n->parent->norm->Rs.quote_T) {
+ h->flags |= HTML_NOSPACE;
+ print_text(h, "\\(rq");
+ }
+ break;
+ default:
+ break;
+ }
if (n->parent == NULL || n->parent->tok != MDOC_Rs)
return;
diff --git a/contrib/mandoc/mdoc_man.c b/contrib/mandoc/mdoc_man.c
index d4fd88304fb0..5438b2ba5941 100644
--- a/contrib/mandoc/mdoc_man.c
+++ b/contrib/mandoc/mdoc_man.c
@@ -1,6 +1,6 @@
-/* $Id: mdoc_man.c,v 1.138 2023/04/28 19:11:04 schwarze Exp $ */
+/* $Id: mdoc_man.c,v 1.139 2025/01/24 22:37:24 schwarze Exp $ */
/*
- * Copyright (c) 2011-2021 Ingo Schwarze
+ * Copyright (c) 2011-2021, 2025 Ingo Schwarze
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -796,6 +796,9 @@ post_percent(DECL_ARGS)
if (mdoc_man_act(n->tok)->pre == pre_em)
font_pop();
+ if (n->parent == NULL || n->parent->tok != MDOC_Rs)
+ return;
+
if ((nn = roff_node_next(n)) != NULL) {
np = roff_node_prev(n);
nnn = nn == NULL ? NULL : roff_node_next(nn);
diff --git a/contrib/mandoc/mdoc_markdown.c b/contrib/mandoc/mdoc_markdown.c
index ecad77e308e6..06ca839a58b8 100644
--- a/contrib/mandoc/mdoc_markdown.c
+++ b/contrib/mandoc/mdoc_markdown.c
@@ -1,6 +1,6 @@
-/* $Id: mdoc_markdown.c,v 1.38 2024/08/13 12:44:00 schwarze Exp $ */
+/* $Id: mdoc_markdown.c,v 1.39 2025/01/20 07:01:17 schwarze Exp $ */
/*
- * Copyright (c) 2017, 2018, 2020 Ingo Schwarze
+ * Copyright (c) 2017, 2018, 2020, 2025 Ingo Schwarze
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -85,6 +85,7 @@ static int md_pre_Sh(struct roff_node *);
static int md_pre_Sm(struct roff_node *);
static int md_pre_Vt(struct roff_node *);
static int md_pre_Xr(struct roff_node *);
+static int md_pre__R(struct roff_node *);
static int md_pre__T(struct roff_node *);
static int md_pre_br(struct roff_node *);
@@ -159,7 +160,7 @@ static const struct md_act md_acts[MDOC_MAX - MDOC_Dd] = {
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %N */
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %O */
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %P */
- { NULL, NULL, md_post_pc, NULL, NULL }, /* %R */
+ { NULL, md_pre__R, md_post_pc, NULL, NULL }, /* %R */
{ NULL, md_pre__T, md_post__T, NULL, NULL }, /* %T */
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %V */
{ NULL, NULL, NULL, NULL, NULL }, /* Ac */
@@ -1580,6 +1581,34 @@ md_pre_Xr(struct roff_node *n)
return 0;
}
+static int
+md_pre__R(struct roff_node *n)
+{
+ const unsigned char *cp;
+ const char *arg;
+
+ arg = n->child->string;
+
+ if (strncmp(arg, "RFC ", 4) != 0)
+ return 1;
+ cp = arg += 4;
+ while (isdigit(*cp))
+ cp++;
+ if (*cp != '\0')
+ return 1;
+
+ md_rawword("[RFC ");
+ outflags &= ~MD_spc;
+ md_rawword(arg);
+ outflags &= ~MD_spc;
+ md_rawword("](http://www.rfc-editor.org/rfc/rfc");
+ outflags &= ~MD_spc;
+ md_rawword(arg);
+ outflags &= ~MD_spc;
+ md_rawword(".html)");
+ return 0;
+}
+
static int
md_pre__T(struct roff_node *n)
{
diff --git a/contrib/mandoc/out.c b/contrib/mandoc/out.c
index bb29f78c9701..f6f5859a1629 100644
--- a/contrib/mandoc/out.c
+++ b/contrib/mandoc/out.c
@@ -1,4 +1,4 @@
-/* $Id: out.c,v 1.85 2021/10/17 21:05:54 schwarze Exp $ */
+/* $Id: out.c,v 1.86 2025/01/05 18:14:39 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
* Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
@@ -117,7 +117,6 @@ void
tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
size_t offset, size_t rmargin)
{
- struct roffsu su;
const struct tbl_opts *opts;
const struct tbl_span *sp;
const struct tbl_dat *dp;
@@ -159,13 +158,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
continue;
/* Handle explicit width specifications. */
-
- if (dp->layout->wstr != NULL &&
- dp->layout->width == 0 &&
- a2roffsu(dp->layout->wstr, &su, SCALE_EN)
- != NULL)
- dp->layout->width =
- (*tbl->sulen)(&su, tbl->arg);
if (col->width < dp->layout->width)
col->width = dp->layout->width;
if (dp->layout->spacing != SIZE_MAX &&
diff --git a/contrib/mandoc/roff.c b/contrib/mandoc/roff.c
index bdb02101c053..7425b56873a0 100644
--- a/contrib/mandoc/roff.c
+++ b/contrib/mandoc/roff.c
@@ -1,6 +1,6 @@
-/* $Id: roff.c,v 1.400 2023/10/24 20:53:12 schwarze Exp $ */
+/* $Id: roff.c,v 1.405 2025/04/08 14:05:09 schwarze Exp $ */
/*
- * Copyright (c) 2010-2015, 2017-2023 Ingo Schwarze
+ * Copyright (c) 2010-2015, 2017-2025 Ingo Schwarze
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons
*
* Permission to use, copy, modify, and distribute this software for any
@@ -192,10 +192,8 @@ static int roff_ec(ROFF_ARGS);
static int roff_eo(ROFF_ARGS);
static int roff_eqndelim(struct roff *, struct buf *, int);
static int roff_evalcond(struct roff *, int, char *, int *);
-static int roff_evalnum(struct roff *, int,
- const char *, int *, int *, int);
-static int roff_evalpar(struct roff *, int,
- const char *, int *, int *, int);
+static int roff_evalpar(int, const char *, int *, int *,
+ char, int);
static int roff_evalstrcond(const char *, int *);
static int roff_expand(struct roff *, struct buf *,
int, int, char);
@@ -204,8 +202,8 @@ static void roff_expand_patch(struct buf *, int,
static void roff_free1(struct roff *);
static void roff_freereg(struct roffreg *);
static void roff_freestr(struct roffkv *);
-static size_t roff_getname(struct roff *, char **, int, int);
-static int roff_getnum(const char *, int *, int *, int);
+static size_t roff_getname(char **, int, int);
+static int roff_getnum(const char *, int *, int *, char, int);
static int roff_getop(const char *, int *, char *);
static int roff_getregn(struct roff *,
const char *, size_t, char);
@@ -258,9 +256,6 @@ static int roff_userdef(ROFF_ARGS);
/* --- constant data ------------------------------------------------------ */
-#define ROFFNUM_SCALE (1 << 0) /* Honour scaling in roff_getnum(). */
-#define ROFFNUM_WHITE (1 << 1) /* Skip whitespace in roff_evalnum(). */
-
const char *__roff_name[MAN_MAX + 1] = {
"br", "ce", "fi", "ft",
"ll", "mc", "nf",
@@ -1529,8 +1524,8 @@ roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char ec)
case 'B':
npos = 0;
ubuf[0] = iendarg > iarg && iend > iendarg &&
- roff_evalnum(r, ln, buf->buf + iarg, &npos,
- NULL, ROFFNUM_SCALE) &&
+ roff_evalnum(ln, buf->buf + iarg, &npos,
+ NULL, 'u', 0) &&
npos == iendarg - iarg ? '1' : '0';
ubuf[1] = '\0';
res = ubuf;
@@ -2002,7 +1997,7 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
return TOKEN_NONE;
mac = cp;
- maclen = roff_getname(r, &cp, ln, ppos);
+ maclen = roff_getname(&cp, ln, ppos);
deftype = ROFFDEF_USER | ROFFDEF_REN;
r->current_string = roff_getstrn(r, mac, maclen, &deftype);
@@ -2155,7 +2150,7 @@ roff_block(ROFF_ARGS)
namesz = 0;
} else {
iname = cp;
- namesz = roff_getname(r, &cp, ln, ppos);
+ namesz = roff_getname(&cp, ln, ppos);
iname[namesz] = '\0';
}
@@ -2226,7 +2221,7 @@ roff_block(ROFF_ARGS)
/* Get the custom end marker. */
iname = cp;
- namesz = roff_getname(r, &cp, ln, ppos);
+ namesz = roff_getname(&cp, ln, ppos);
/* Resolve the end marker if it is indirect. */
@@ -2427,74 +2422,81 @@ roff_cond_text(ROFF_ARGS)
/* --- handling of numeric and conditional expressions -------------------- */
/*
- * Parse a single signed integer number. Stop at the first non-digit.
+ * Parse a single signed decimal number. Stop at the first non-digit.
* If there is at least one digit, return success and advance the
* parse point, else return failure and let the parse point unchanged.
* Ignore overflows, treat them just like the C language.
*/
static int
-roff_getnum(const char *v, int *pos, int *res, int flags)
+roff_getnum(const char *v, int *pos, int *res, char unit, int skipspace)
{
- int myres, scaled, n, p;
-
- if (NULL == res)
- res = &myres;
+ double frac, myres;
+ int n, p;
p = *pos;
n = v[p] == '-';
if (n || v[p] == '+')
p++;
- if (flags & ROFFNUM_WHITE)
+ if (skipspace)
while (isspace((unsigned char)v[p]))
p++;
- for (*res = 0; isdigit((unsigned char)v[p]); p++)
- *res = 10 * *res + v[p] - '0';
+ for (myres = 0.0; isdigit((unsigned char)v[p]); p++)
+ myres = myres * 10.0 + (v[p] - '0');
+ if (v[p] == '.')
+ for (frac = 0.1; isdigit((unsigned char)v[++p]); frac *= 0.1)
+ myres += frac * (v[p] - '0');
+
if (p == *pos + n)
return 0;
if (n)
- *res = -*res;
+ myres *= -1.0;
/* Each number may be followed by one optional scaling unit. */
- switch (v[p]) {
+ if (v[p] != '\0' && strchr("ficvPmnpuM", v[p]) != NULL) {
+ if (unit != '\0')
+ unit = v[p];
+ p++;
+ }
+
+ switch (unit) {
case 'f':
- scaled = *res * 65536;
+ myres *= 65536.0;
break;
case 'i':
- scaled = *res * 240;
+ myres *= 240.0;
break;
case 'c':
- scaled = *res * 240 / 2.54;
+ myres *= 24000.0;
+ myres /= 254.0;
break;
case 'v':
case 'P':
- scaled = *res * 40;
+ myres *= 40.0;
break;
case 'm':
case 'n':
- scaled = *res * 24;
+ myres *= 24.0;
break;
case 'p':
- scaled = *res * 10 / 3;
+ myres *= 40.0;
+ myres /= 12.0;
break;
case 'u':
- scaled = *res;
break;
case 'M':
- scaled = *res * 6 / 25;
+ myres *= 24.0;
+ myres /= 100.0;
break;
default:
- scaled = *res;
- p--;
break;
}
- if (flags & ROFFNUM_SCALE)
- *res = scaled;
-
- *pos = p + 1;
+ if (res != NULL)
+ *res = myres;
+ *pos = p;
return 1;
}
@@ -2616,7 +2618,7 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
while (*cp == ' ')
cp++;
name = cp;
- sz = roff_getname(r, &cp, ln, cp - v);
+ sz = roff_getname(&cp, ln, cp - v);
if (sz == 0)
istrue = 0;
else if (v[*pos] == 'r')
@@ -2633,7 +2635,7 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
}
savepos = *pos;
- if (roff_evalnum(r, ln, v, pos, &number, ROFFNUM_SCALE))
+ if (roff_evalnum(ln, v, pos, &number, 'u', 0))
return (number > 0) == wanttrue;
else if (*pos == savepos)
return roff_evalstrcond(v, pos) == wanttrue;
@@ -2771,7 +2773,7 @@ roff_ds(ROFF_ARGS)
if (*name == '\0')
return ROFF_IGN;
- namesz = roff_getname(r, &string, ln, pos);
+ namesz = roff_getname(&string, ln, pos);
switch (name[namesz]) {
case '\\':
return ROFF_IGN;
@@ -2862,15 +2864,15 @@ roff_getop(const char *v, int *pos, char *res)
* or a single signed integer number.
*/
static int
-roff_evalpar(struct roff *r, int ln,
- const char *v, int *pos, int *res, int flags)
+roff_evalpar(int ln, const char *v, int *pos, int *res, char unit,
+ int skipspace)
{
if ('(' != v[*pos])
- return roff_getnum(v, pos, res, flags);
+ return roff_getnum(v, pos, res, unit, skipspace);
(*pos)++;
- if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))
+ if ( ! roff_evalnum(ln, v, pos, res, unit, 1))
return 0;
/*
@@ -2891,9 +2893,9 @@ roff_evalpar(struct roff *r, int ln,
* Evaluate a complete numeric expression.
* Proceed left to right, there is no concept of precedence.
*/
-static int
-roff_evalnum(struct roff *r, int ln, const char *v,
- int *pos, int *res, int flags)
+int
+roff_evalnum(int ln, const char *v, int *pos, int *res, char unit,
+ int skipspace)
{
int mypos, operand2;
char operator;
@@ -2903,29 +2905,29 @@ roff_evalnum(struct roff *r, int ln, const char *v,
pos = &mypos;
}
- if (flags & ROFFNUM_WHITE)
+ if (skipspace)
while (isspace((unsigned char)v[*pos]))
(*pos)++;
- if ( ! roff_evalpar(r, ln, v, pos, res, flags))
+ if ( ! roff_evalpar(ln, v, pos, res, unit, skipspace))
return 0;
while (1) {
- if (flags & ROFFNUM_WHITE)
+ if (skipspace)
while (isspace((unsigned char)v[*pos]))
(*pos)++;
if ( ! roff_getop(v, pos, &operator))
break;
- if (flags & ROFFNUM_WHITE)
+ if (skipspace)
while (isspace((unsigned char)v[*pos]))
(*pos)++;
- if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))
+ if ( ! roff_evalpar(ln, v, pos, &operand2, unit, skipspace))
return 0;
- if (flags & ROFFNUM_WHITE)
+ if (skipspace)
while (isspace((unsigned char)v[*pos]))
(*pos)++;
@@ -3062,6 +3064,8 @@ roff_getregro(const struct roff *r, const char *name)
return 24;
case 'j': /* Always adjust left margin only. */
return 0;
+ case 'l': /* Fixed line width for DocBook. */
+ return 78 * 24;
case 'T': /* Some output device is always defined. */
return 1;
case 'V': /* Fixed vertical resolution. */
@@ -3155,7 +3159,7 @@ roff_nr(ROFF_ARGS)
if (*key == '\0')
return ROFF_IGN;
- keysz = roff_getname(r, &val, ln, pos);
+ keysz = roff_getname(&val, ln, pos);
if (key[keysz] == '\\' || key[keysz] == '\t')
return ROFF_IGN;
@@ -3164,13 +3168,13 @@ roff_nr(ROFF_ARGS)
val++;
len = 0;
- if (roff_evalnum(r, ln, val, &len, &iv, ROFFNUM_SCALE) == 0)
+ if (roff_evalnum(ln, val, &len, &iv, 'u', 0) == 0)
return ROFF_IGN;
step = val + len;
while (isspace((unsigned char)*step))
step++;
- if (roff_evalnum(r, ln, step, NULL, &is, 0) == 0)
+ if (roff_evalnum(ln, step, NULL, &is, '\0', 0) == 0)
is = INT_MIN;
roff_setregn(r, key, keysz, iv, sign, is);
@@ -3187,7 +3191,7 @@ roff_rr(ROFF_ARGS)
name = cp = buf->buf + pos;
if (*name == '\0')
return ROFF_IGN;
- namesz = roff_getname(r, &cp, ln, pos);
+ namesz = roff_getname(&cp, ln, pos);
name[namesz] = '\0';
prev = &r->regtab;
@@ -3217,7 +3221,7 @@ roff_rm(ROFF_ARGS)
cp = buf->buf + pos;
while (*cp != '\0') {
name = cp;
- namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
+ namesz = roff_getname(&cp, ln, (int)(cp - buf->buf));
*** 180 LINES SKIPPED ***
From nobody Mon Jul 14 16:47:23 2025
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 4bgpC05Rtfz61xS8;
Mon, 14 Jul 2025 16:47:24 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBz3dbBz48WJ;
Mon, 14 Jul 2025 16:47:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511643;
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=T1slzvX0pbLaFvvisAekI4b4TOYdIOWGjimfqakMASM=;
b=riOTsBDSmqEe84nAnLs8N2hggHkKn/Z5E5Uf6ItMh6A3RnmJCs9y65o/sb2DJOMShP/OpH
yX20iiaR351FG4gbqkzohZoYc4/dY6xmBx9cG6z/FChIjK3kQISx4KRKuX7pkv+n1/ClfW
ngzZCssOh9KPVsEkEVPR/dgG/MUMtcB3AmGxmRDmxHmASaPsuibbwoEfwMWoMWGSXP3i+g
4nFikkaUTMSc86GvgWOn3C0/c6orA2luO5NXEiV69jAbZCixSLKqiT9xPKnSZo81f5lvDf
+fWgUMzdmfNhQx9h/hjRDHsB7l5h6ijwHAny9EYfeMY5wVPVGVko4B3tcn3C6g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511643;
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=T1slzvX0pbLaFvvisAekI4b4TOYdIOWGjimfqakMASM=;
b=O2+Aoyau4wJzGNoF5DSjLHgS/ToAmXpp7hFtBKTPkFCTEzWXOgkGUSsyvSl7eMCe5swCua
ReHDtRJtgZctJJnT6tNkWQAbwGxmaJDt5mWi2DuJuHrT1+8S9/ZCla4tEyeBK+zKgQFed0
iTXhzrUkPjzwILQ1wI/wVV0wtgyxFjuk2jAOkf7mWtGsDXQPewZfjWMSbgwTfpBn+mMJ7C
EN/bGFORxyG55liYVh+2JQ3ztNNpsUxHJQMbApJWw5O5r/ai1EwZY3nyEmbP74XeR+Of68
eFfxVQdZg5XqCFVsKwg3xLEHaTcXdzDrlVBda/6QZAh+MUk7M7Hb6AnZLhXxyg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511643; a=rsa-sha256; cv=none;
b=ebvX0oTIZVn7pQfRpHXWV+aw2D2sZovrwvCY84GjraT04cDzv5tzDJFRRqEmfB2+E5M4p+
DAqtlCJhQDUnvIzqXEfoxYc8JkYETLzdT94XHUXhQTc1j1X55ytmMjlEzM8+0f3NDI8MgH
zD1CUUTOE3Wkt1BiJmick7t3xzI1DzHhiYvcMboxzPn6nEoGHSwhJin+QcTOuw6vEFt5yh
PgqnPELC0wy6sESl7csGOyUxLbO0WTNZ4ASp7MO9h+y5rxJExkxH9CID2tVsBKhYB+QJIv
9foLF51tYVAYUxadR3P0PZrIYvFWUk+uqVdRThru4ig/6SKHn+OKaw7p9R0RGw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBz3B8Tz11yk;
Mon, 14 Jul 2025 16:47:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlNFX065415;
Mon, 14 Jul 2025 16:47:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlNbf065412;
Mon, 14 Jul 2025 16:47:23 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:23 GMT
Message-Id: <202507141647.56EGlNbf065412@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: d9e02d3b3ac3 - stable/14 - mandoc: Bump version string
to 1.14.6s20250613
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
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: d9e02d3b3ac376d95096d153d00bc07e5a77cc61
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=d9e02d3b3ac376d95096d153d00bc07e5a77cc61
commit d9e02d3b3ac376d95096d153d00bc07e5a77cc61
Author: Alexander Ziaee
AuthorDate: 2025-06-26 12:48:25 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:46 +0000
mandoc: Bump version string to 1.14.6s20250613
The mandoc compiler is still at version 1.14.6, but we have imported
several snapshots since the version was bumped. Append a snapshot date
string to the version to reflect this.
Requested by: wosch
Discussed with: bapt
(cherry picked from commit af2949cd29ef453a63a6345de396be866138b051)
---
contrib/mandoc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/mandoc/Makefile b/contrib/mandoc/Makefile
index cd3f16652069..7ec34a560504 100644
--- a/contrib/mandoc/Makefile
+++ b/contrib/mandoc/Makefile
@@ -15,7 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-VERSION = 1.14.6
+VERSION = 1.14.6s20250613
# === LIST OF FILES ====================================================
From nobody Mon Jul 14 16:47:22 2025
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 4bgpC01F95z61xMq;
Mon, 14 Jul 2025 16:47:24 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgpBy3djbz48Rf;
Mon, 14 Jul 2025 16:47:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752511642;
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=pt6YFo6Y9S74Oljy0Ycc8RPQBwWD8tWOzb9ciO9oGgA=;
b=nuwszwyv1A+9lrQnq0ftTYt3Qb1v+Ev+LtXNS7wdMojJAvcq1BVo4Zrfvq34dz8kWkIhTR
0RcU3Vhd3HKhD5R6q8UUz/Y2KSxP67Nzc5nAiXkDT8rROYg2vjAtgEfo6ZszmotP1uiwq2
8BLYnC8zwiA1OQagszLCJbYiOK/mBZS+58vJceIkwSedXonQO2UdzHfftJj9/RPCM8R5s2
55lpVFe+LxM4bDUjLr2O9E2SFWpGWKw2nJqDQ8Hf77RrRlCJhQrFfZE2ZrsJfLqvuINPIw
cfzcz8zc8TosIG4XttwfhICu+yVnrVs81mzJ30ldcIVU+qw97LtjzNtQVqfsLA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752511642;
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=pt6YFo6Y9S74Oljy0Ycc8RPQBwWD8tWOzb9ciO9oGgA=;
b=xkGxNvmIQ1XynOI9hQQBNRgSWPDxdS+qL+TjFKXIMxj1P5UYPMKCbEd0OkjZzZd5GZt2qq
6D8F3dpdPkQPJRTT7IS7NlBY2uwj9mcNYjF0fSQhaD9Hfd2n8wEyXr3IGA2ZdQh2ZXlfMf
42ohSPU1Q8Rs+27JYWCzhUO7VbdtWJK/Y40wHMkNq12sUzpSZd99DZN7QfKJV0r2UZUfHV
0ejyPHfQHFsekFpu7wgtFCZr1CphitsP1iBIer4mAhmGd+W7AuFwtv3nWNyHpdvh6/SSRm
kblpMHNANWcHADXAwgb8MZokv6dOboqDBpUqwlW/m7mZnH5RXp1UsUYpwcS2yQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752511642; a=rsa-sha256; cv=none;
b=deXnZfKp+xGimDe/ncKKyJ+qweyqdU26diDA9B3RJf0gHZQTjkLeHy7osDB7zzCKBionzg
isoqMLhbmQlETN3DOqFXBehL5inYOkEgw5DkimIjvwvmXXW+PIxPwFtnSdehYDt74W07jS
Z2pzzuxWf07hhGS/hQ94rMPrw/dUx3oO11jSYlSpijLdQX1MfIkK7M3x7KRfRnJAQa3Jxe
LhRFOioKrl80Z1X4946IQ31f/SgPjIeBjUjYhki7DXQx0q7tqyqOGz9oj0kz/brtqwz6Li
JTH4mCqOSUuWPcryExcTwPKKikWef4GXtyFtlgh+8BT/Tpm7np2/+8mDmpZUBg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgpBy2XsSz12Py;
Mon, 14 Jul 2025 16:47:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EGlMdB065382;
Mon, 14 Jul 2025 16:47:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EGlMCm065379;
Mon, 14 Jul 2025 16:47:22 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 16:47:22 GMT
Message-Id: <202507141647.56EGlMCm065379@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: d0b23791c667 - stable/14 - mandoc: Vendor import of
upstream at 2025-06-13
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
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: d0b23791c6677c3cc03d9e315beb66e8b4de717a
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=d0b23791c6677c3cc03d9e315beb66e8b4de717a
commit d0b23791c6677c3cc03d9e315beb66e8b4de717a
Author: Alexander Ziaee
AuthorDate: 2025-06-25 17:50:25 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 16:44:45 +0000
mandoc: Vendor import of upstream at 2025-06-13
Interesting changes:
+ Lb is now part of SNYOPSIS, the LIBRARY section is deprecated
+ Ft now takes multiple args, and no longer should be quoted
+ Fix a segfaut on malformed Tg markup
(cherry picked from commit 4c07abdbacf49e4ba749b8720916d8cd340a50b8)
---
contrib/mandoc/mandocdb.c | 27 ++++++++--
contrib/mandoc/mdoc.7 | 109 +++++++++++++++++++++++------------------
contrib/mandoc/mdoc_macro.c | 7 ++-
contrib/mandoc/mdoc_validate.c | 37 +++++++++++---
4 files changed, 117 insertions(+), 63 deletions(-)
diff --git a/contrib/mandoc/mandocdb.c b/contrib/mandoc/mandocdb.c
index c26a38a5f233..e8455588d225 100644
--- a/contrib/mandoc/mandocdb.c
+++ b/contrib/mandoc/mandocdb.c
@@ -1,6 +1,6 @@
-/* $Id: mandocdb.c,v 1.274 2024/05/14 21:19:12 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.275 2025/06/05 12:33:41 schwarze Exp $ */
/*
- * Copyright (c) 2011-2021, 2024 Ingo Schwarze
+ * Copyright (c) 2011-2021, 2024, 2025 Ingo Schwarze
* Copyright (c) 2011, 2012 Kristaps Dzonsons
* Copyright (c) 2016 Ed Maste
*
@@ -151,6 +151,8 @@ static int parse_mdoc_Fn(struct mpage *, const struct roff_meta *,
const struct roff_node *);
static int parse_mdoc_Fo(struct mpage *, const struct roff_meta *,
const struct roff_node *);
+static int parse_mdoc_Lb(struct mpage *, const struct roff_meta *,
+ const struct roff_node *);
static int parse_mdoc_Nd(struct mpage *, const struct roff_meta *,
const struct roff_node *);
static int parse_mdoc_Nm(struct mpage *, const struct roff_meta *,
@@ -299,7 +301,7 @@ static const struct mdoc_handler mdoc_handlers[MDOC_MAX - MDOC_Dd] = {
{ NULL, 0, 0 }, /* Hf */
{ NULL, 0, 0 }, /* Fr */
{ NULL, 0, 0 }, /* Ud */
- { NULL, TYPE_Lb, NODE_NOSRC }, /* Lb */
+ { parse_mdoc_Lb, 0, 0 }, /* Lb */
{ NULL, 0, 0 }, /* Lp */
{ NULL, TYPE_Lk, 0 }, /* Lk */
{ NULL, TYPE_Mt, NODE_NOSRC }, /* Mt */
@@ -1753,6 +1755,25 @@ parse_mdoc_Fo(struct mpage *mpage, const struct roff_meta *meta,
return 0;
}
+static int
+parse_mdoc_Lb(struct mpage *mpage, const struct roff_meta *meta,
+ const struct roff_node *n)
+{
+ char *cp;
+
+ for (n = n->child; n != NULL; n = n->next) {
+ if (n->flags & NODE_NOSRC)
+ continue;
+ cp = n->string;
+ if (n->sec == SEC_SYNOPSIS)
+ mandoc_asprintf(&cp, "lib%s", cp);
+ putkey(mpage, cp, TYPE_Lb);
+ if (n->sec == SEC_SYNOPSIS)
+ free(cp);
+ }
+ return 0;
+}
+
static int
parse_mdoc_Va(struct mpage *mpage, const struct roff_meta *meta,
const struct roff_node *n)
diff --git a/contrib/mandoc/mdoc.7 b/contrib/mandoc/mdoc.7
index edd74eafa328..55cc7fae688d 100644
--- a/contrib/mandoc/mdoc.7
+++ b/contrib/mandoc/mdoc.7
@@ -1,7 +1,7 @@
-.\" $Id: mdoc.7,v 1.296 2025/01/27 03:17:33 schwarze Exp $
+.\" $Id: mdoc.7,v 1.299 2025/06/13 16:18:28 schwarze Exp $
.\"
+.\" Copyright (c) 2010-2021, 2024, 2025 Ingo Schwarze
.\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons
-.\" Copyright (c) 2010, 2011, 2013-2020 Ingo Schwarze
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: January 27 2025 $
+.Dd $Mdocdate: June 13 2025 $
.Dt MDOC 7
.Os
.Sh NAME
@@ -195,15 +195,13 @@ See
and
.Ic \&Nd .
.It Em LIBRARY
-The name of the library containing the documented material, which is
-assumed to be a function in a section 2, 3, or 9 manual.
-The syntax for this is as follows:
-.Bd -literal -offset indent
-\&.Lb libarm
-.Ed
-.Pp
-See
-.Ic \&Lb .
+The name of the library containing the documented functions.
+Using this section is no longer recommended.
+If any
+.Ic \&Lb
+macro is needed, put it at the beginning of the
+.Em SYNOPSIS
+section instead.
.It Em SYNOPSIS
Documents the utility invocation syntax, function call syntax, or device
configuration.
@@ -225,11 +223,12 @@ Commands should be ordered alphabetically.
.Pp
For the second, function calls (sections 2, 3, 9):
.Bd -literal -offset indent
+\&.Lb libname \e" unless the functions are in libc
\&.In header.h
\&.Vt extern const char *global;
-\&.Ft "char *"
+\&.Ft char *
\&.Fn foo "const char *src"
-\&.Ft "char *"
+\&.Ft char *
\&.Fn bar "const char *src"
.Ed
.Pp
@@ -467,7 +466,8 @@ in the alphabetical
.Op Fl compact
.It Ic \&D1 Ta indented display (one line)
.It Ic \&Dl Ta indented literal display (one line)
-.It Ic \&Ql Ta in-line literal display: Ql text
+.It Ic \&Ql Ta normal in-line literal display: Ql text
+.It Ic \&Li Ta unquoted in-line literal display: Li text
.It Ic \&Bl , \&El Ta list block:
.Fl Ar type
.Op Fl width Ar val
@@ -498,7 +498,7 @@ in the alphabetical
.El
.Ss Semantic markup for function libraries
.Bl -column "Brq, Bro, Brc" description
-.It Ic \&Lb Ta function library (one argument)
+.It Ic \&Lb Ta function library (>0 arguments)
.It Ic \&In Ta include file (one argument)
.It Ic \&Fd Ta other preprocessor directive (>0 arguments)
.It Ic \&Ft Ta function type (>0 arguments)
@@ -1277,9 +1277,9 @@ and
.Ic \&Os .
.Tg Dl
.It Ic \&Dl Ar line
-One-line indented display.
-This is formatted as literal text and is useful for commands and
-invocations.
+One-line indented literal display.
+This is formatted using a constant-width font
+and is useful for commands and invocations.
It is followed by a newline.
.Pp
Examples:
@@ -1867,34 +1867,45 @@ but not the whitespace before the semicolon.
See also
.Ic \&Bl .
.Tg Lb
-.It Ic \&Lb Cm lib Ns Ar name
-Specify a library.
-.Pp
-The
-.Ar name
-parameter may be a system library, such as
-.Cm z
-or
-.Cm pam ,
-in which case a small library description is printed next to the linker
-invocation; or a custom library, in which case the library name is
-printed in quotes.
-This is most commonly used in the
+.It Ic \&Lb Cm lib Ns Ar name Op Cm lib Ns Ar name ...
+Specify one or more libraries to link against.
+Putting this macro at the beginning of the
.Em SYNOPSIS
-section as described in
-.Sx MANUAL STRUCTURE .
+section is recommended, in which case it prints this comment:
+.D1 /* Fl l Ns Ar name Oo Fl l Ns Ar name ... Oc */
.Pp
-Examples:
-.Dl \&.Lb libz
-.Dl \&.Lb libmandoc
+If used outside the
+.Em SYNOPSIS ,
+this macro prints
+.D1 library Dq Cm lib Ns Ar name
+instead.
+For system libraries, some operating systems
+print a short library description.
+.Pp
+Example:
+.Bd -literal -offset indent -compact
+\&.Sh SYNOPSIS
+\&.Lb libtls libssl libcrypto
+\&.In tls.h
+\&.Ft int
+\&.Fn tls_init void
+.Ed
.Tg Li
.It Ic \&Li Ar word ...
-Request a typewriter (literal) font.
-Deprecated because on terminal output devices, this is usually
-indistinguishable from normal text.
-For literal displays, use
-.Ic \&Ql Pq in-line ,
-.Ic \&Dl Pq single line ,
+Unquoted in-line literal display, always set in a constant-width font.
+In most cases, use
+.Ic \&Ql
+instead because on terminal output devices,
+.Ic \&Li
+is usually indistinguishable from normal text.
+This macro is only useful when enclosing the argument in quotes
+is explicitly not desired, for example because it already stands out
+due to being wrapped in another macro, e.g. in an
+.Ic \&It
+head.
+.Pp
+For longer literal displays, use
+.Ic \&Dl Pq single line
or
.Ic \&Bd Fl literal Pq multi-line
instead.
@@ -2207,15 +2218,17 @@ Close quoted context opened by
.Ic \&Qo .
.Tg Ql
.It Ic \&Ql Ar line
-In-line literal display.
+Normal in-line literal display, always set in constant-width font and
+additionally enclosed in quotes by many formatters in many cases.
This can be used for complete command invocations and for multi-word
code examples when an indented display is not desired.
.Pp
See also
-.Ic \&Dl
-and
+.Ic \&Dl ,
.Ic \&Bd
-.Fl literal .
+.Fl literal ,
+and
+.Ic \&Li .
.It Ic \&Qo Ar block
Multi-line version of
.Ic \&Qq .
@@ -3031,7 +3044,7 @@ then the macro accepts an arbitrary number of arguments.
.It Ic \&Hf Ta \&No Ta \&No Ta n
.It Ic \&Ic Ta Yes Ta Yes Ta >0
.It Ic \&In Ta Yes Ta Yes Ta 1
-.It Ic \&Lb Ta \&No Ta \&No Ta 1
+.It Ic \&Lb Ta \&No Ta \&No Ta >0
.It Ic \&Li Ta Yes Ta Yes Ta >0
.It Ic \&Lk Ta Yes Ta Yes Ta >0
.It Ic \&Lp Ta \&No Ta \&No Ta 0
diff --git a/contrib/mandoc/mdoc_macro.c b/contrib/mandoc/mdoc_macro.c
index 889b80a64a68..14b1ba0d228a 100644
--- a/contrib/mandoc/mdoc_macro.c
+++ b/contrib/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.235 2022/04/14 16:43:44 schwarze Exp $ */
+/* $Id: mdoc_macro.c,v 1.237 2025/06/13 14:24:56 schwarze Exp $ */
/*
* Copyright (c) 2010, 2012-2021 Ingo Schwarze
* Copyright (c) 2008-2012 Kristaps Dzonsons
@@ -92,7 +92,7 @@ static const struct mdoc_macro mdoc_macros[MDOC_MAX - MDOC_Dd] = {
{ in_line_eoln, 0 }, /* Fd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */
- { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ft */
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ic */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Li */
@@ -448,8 +448,7 @@ dword(struct roff_man *mdoc, int line, int col, const char *p,
if (d == DELIM_MAX)
d = mdoc_isdelim(p);
- if (may_append &&
- ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) &&
+ if (may_append && ! (mdoc->flags & (MDOC_KEEP | MDOC_SMOFF)) &&
d == DELIM_NONE && mdoc->last->type == ROFFT_TEXT &&
mdoc_isdelim(mdoc->last->string) == DELIM_NONE) {
roff_word_append(mdoc, p);
diff --git a/contrib/mandoc/mdoc_validate.c b/contrib/mandoc/mdoc_validate.c
index 5271dfb523b9..4ca1253e4b70 100644
--- a/contrib/mandoc/mdoc_validate.c
+++ b/contrib/mandoc/mdoc_validate.c
@@ -1,6 +1,6 @@
-/* $Id: mdoc_validate.c,v 1.391 2022/06/08 16:31:46 schwarze Exp $ */
+/* $Id: mdoc_validate.c,v 1.393 2025/06/05 12:38:26 schwarze Exp $ */
/*
- * Copyright (c) 2010-2021 Ingo Schwarze
+ * Copyright (c) 2010-2022, 2025 Ingo Schwarze
* Copyright (c) 2008-2012 Kristaps Dzonsons
* Copyright (c) 2010 Joerg Sonnenberger
*
@@ -991,18 +991,39 @@ post_ex(POST_ARGS)
static void
post_lb(POST_ARGS)
{
- struct roff_node *n;
- const char *p;
+ struct roff_node *n, *nch;
+ const char *ccp;
+ char *cp;
post_delim_nb(mdoc);
n = mdoc->last;
- assert(n->child->type == ROFFT_TEXT);
+ nch = n->child;
+ assert(nch->type == ROFFT_TEXT);
mdoc->next = ROFF_NEXT_CHILD;
- if ((p = mdoc_a2lib(n->child->string)) != NULL) {
+ if (n->sec == SEC_SYNOPSIS) {
+ roff_word_alloc(mdoc, n->line, n->pos, "/*");
+ mdoc->last->flags = NODE_NOSRC;
+ while (nch != NULL) {
+ roff_word_alloc(mdoc, n->line, n->pos, "-l");
+ mdoc->last->flags = NODE_DELIMO | NODE_NOSRC;
+ mdoc->last = nch;
+ assert(nch->type == ROFFT_TEXT);
+ cp = nch->string;
+ if (strncmp(cp, "lib", 3) == 0)
+ memmove(cp, cp + 3, strlen(cp) - 3 + 1);
+ nch = nch->next;
+ }
+ roff_word_alloc(mdoc, n->line, n->pos, "*/");
+ mdoc->last->flags = NODE_NOSRC;
+ mdoc->last = n;
+ return;
+ }
+
+ if ((ccp = mdoc_a2lib(n->child->string)) != NULL) {
n->child->flags |= NODE_NOPRT;
- roff_word_alloc(mdoc, n->line, n->pos, p);
+ roff_word_alloc(mdoc, n->line, n->pos, ccp);
mdoc->last->flags = NODE_NOSRC;
mdoc->last = n;
return;
@@ -3101,6 +3122,6 @@ macro2len(enum roff_tok macro)
return 10;
default:
break;
- };
+ }
return 0;
}
From nobody Mon Jul 14 17:26:56 2025
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 4bgq4d07gDz620jH;
Mon, 14 Jul 2025 17:26:57 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgq4c4bHLz3XD5;
Mon, 14 Jul 2025 17:26:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752514016;
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=uy/Uq7OpXnbIKeXzYzd/b9nESUSAzQgywGW7W5o1e8k=;
b=fWK3MDpBkLkjS/eRCcwnt96/IAmxpBlpT/VZxkDUlIRPVoZYgdcxy8QmTdqQC6ORMEEi+3
+ByXPJfDHVbje3lM7tKv5vZJnrkaFW2d8PQOiBjoUPlBoEDIE6vBFobQW7SH5OR+E4Yuzw
1LFfmxJunmlVnsR2qCjOvrKfmpijFuzFqMYCrQp78BN9/NtettrfBuB4h/7Dw3qMJnwFR7
NWEaE33fqL+KPCZo6qCssSVHzKxksCTuA8ejMEzD2N4daDOqflv1cIyjJpjTK2cQ/CqVRW
ZnFeG1JqykUsK9svni4b960BX3zEr1TeOE4RJT4DrlhpChypHap5SZo+zrYmNQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752514016;
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=uy/Uq7OpXnbIKeXzYzd/b9nESUSAzQgywGW7W5o1e8k=;
b=kKpHdTS2jw4x8/GJ0GU1Kl9Aqo11tMuEr9Htnn+29dxFilaHCJpsEHV1hPjf8/xDaULlf4
/FtZFO3tVn1jGWIyeNxWViIT6cw0Ko2EfUMTa1zZU0iyc2OUmAe5jiFIV2rKnnZ5ObutMA
p9vaX5ysFp0vhm7YJA1gjvksPLpInenrNwQOgUucgcuXjZZI8vSoWrL99BM9gJ79OPAR7t
dVEDNx81f9rfnQgrNaWYZrW/0hVg4xWWPkXT+B0Zwoj30D/Lem0MYamXSx2FlmCLDVQZjI
cn1nFtpcOM6AF/6ANue0xS77lUun2ty16h2Hqv3sFF13nZujENTHRux2JfzpzQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752514016; a=rsa-sha256; cv=none;
b=tTqGs0+KNk/RP3OlQTEeqSmy8DSds2x3Hm7g/R4yiZESAgfncyTXpdJd5Zs74ZPOFhDSFG
c4lc2v/9q+WhW8DzD80RLQ1oPip3KrVf+qNqeACbuQgnhnzvDUz5xMD7vmBpX7RKlFtqVS
OiWNfIujBVQrXJ6zLKmKH5Lw0Oo+185xOCswUirC8LGjkUiheZ0+EyrEH2emNckMbLG92+
a8HQoUD4BEhRE3P4OpvS15Z4WdReRZutBI7Zhf1dSEG+mYVM8yUjU/Zuhs0pik08fxK0O2
YsPWYvxtmijIUD/Eu3kXSJpQ0BYGK1yeX9OBJXJUjteBDfbm6NtSoUK6/SqBCQ==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgq4c3vjhz13fQ;
Mon, 14 Jul 2025 17:26:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EHQuP8041058;
Mon, 14 Jul 2025 17:26:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EHQun7041055;
Mon, 14 Jul 2025 17:26:56 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 17:26:56 GMT
Message-Id: <202507141726.56EHQun7041055@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 0410aae4f8db - stable/14 - pf.4: Add pf_enable to
SYNOPSIS
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
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: 0410aae4f8db0701a3e66fb1a3819251b62986e6
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=0410aae4f8db0701a3e66fb1a3819251b62986e6
commit 0410aae4f8db0701a3e66fb1a3819251b62986e6
Author: Alexander Ziaee
AuthorDate: 2025-07-01 17:09:14 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 17:23:06 +0000
pf.4: Add pf_enable to SYNOPSIS
MFC after: 3 days
Reviewed by: Pau Amma
Reviewed by: Felix Johnson
Differential Revision: https://reviews.freebsd.org/D51117
(cherry picked from commit 65bc8e9192dd19bca3ed89586a23a74cd449f7b2)
---
share/man/man4/pf.4 | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index e0526552507c..2cc80b961767 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 20, 2023
+.Dd July 1, 2025
.Dt PF 4
.Os
.Sh NAME
@@ -37,6 +37,10 @@
.Cd "options PF_DEFAULT_TO_DROP"
.Pp
In
+.Xr rc.conf 5 :
+.Cd pf_enable="YES"
+.Pp
+In
.Xr loader.conf 5 :
.Cd net.pf.states_hashsize
.Cd net.pf.source_nodes_hashsize
From nobody Mon Jul 14 17:26:58 2025
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 4bgq4g054Rz620hD;
Mon, 14 Jul 2025 17:26: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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgq4f5JTdz3XM9;
Mon, 14 Jul 2025 17:26:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752514018;
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=pO5ymebQPh8NQgbo73E9ylFmBeZbFHBNTJNntjVVrPk=;
b=oRbspMZyUkPBOJos9Tq8Hgnlxo/6DmO++dqK7s6Mv38gZ+cAB9HPKtsy/1zPvx/NNBRARe
IE8mGUoHIm3bqWE5izG9PSTB6mfbPAqQCHCfv+jOFdURA8JjX0H/0uqb1oxA0Q5aaYW7lU
4sYopTeqS1mWs8u2VTkqqP1zIyppNAKqQi80ZN82lJKEwh6cBKo6Y4QXmHHwTgiJ4cc+zI
L5QK30i3JO5XqQm+nCxVXHQ6pSoFVpoEN5O6CNX7Stfv+uz7jS83xJ0WvdX85FpQ05IN88
BoSSP2x7Nue3clMyK0Z6hVHp26LhKyu79WkL68OBjRSZkZtT9szb5mz1WSZ70g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752514018;
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=pO5ymebQPh8NQgbo73E9ylFmBeZbFHBNTJNntjVVrPk=;
b=pPktDhgClemHz6tpA65IgcEV9umHOyuPcPDuKuK5TR1IbGrp7gcKfKeNa2aIxC6DIxTr9Q
qBD+4Ky1ZmETIt41uLWU0nW9/uk3kDPAKy05x5AK8odszoNalZYV5TxhdNcNMWRIQKSBJP
dXp9dCYf9JYHR0al2HUHs4Z4u39vTFtEuX7Z1+lFCOqZT+UGNSBIP9v3+nMzSCQ1ZBnFc5
Vil/51uSRjx7PQSUf72I6zyJ3UQopR9ROs+YqXqR+/eWFKyeLMinFnPsrKjqoqMl7emANm
T5qSF5ViRADD/dDDIfAS61mCtE+zfh+UEmokschPLxBy9U8YS4etZ+xHkdzXMQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752514018; a=rsa-sha256; cv=none;
b=PiIKbro1U9WqncGvGs3wcCuDc/zI9sgba9uiSjwLVWED4qSRWIJjkCaZy57GSsX6TpW5+J
ukOJuz9kMhGwzxJpqQ1UIupsgDSkAE49t9ic5L0URpYKLHP1Q9JhcLoxispQWZ2xI8yMW4
7cmtsX0gWLeu11VffRdscb/ZLlGjYyLoTo2ixJZjImUrYT2RTOwTgTGdh4gofwm9Ou36E1
e8UnTEwj/Ku0QWhwKlOS/Ha14Qj60yPFFltua/ws71vuT/8Ov7U6K1p3Y0cU7DxGApTK2u
aQ3Ih93zRRIqS08xAFsmwBEuHwOW/aieW6Y+nDd4sfvSSZwBR/i2B6S/V59Bzg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgq4f4wM6z13fR;
Mon, 14 Jul 2025 17:26:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EHQwBY041127;
Mon, 14 Jul 2025 17:26:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EHQw4e041124;
Mon, 14 Jul 2025 17:26:58 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 17:26:58 GMT
Message-Id: <202507141726.56EHQw4e041124@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 8c79b9db2bcc - stable/14 - truncate.1: Polish title
and examples
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
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: 8c79b9db2bcc76bce8a1cd8e950bce806d70edcb
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=8c79b9db2bcc76bce8a1cd8e950bce806d70edcb
commit 8c79b9db2bcc76bce8a1cd8e950bce806d70edcb
Author: Alexander Ziaee
AuthorDate: 2024-12-30 06:11:15 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 17:23:30 +0000
truncate.1: Polish title and examples
+ describe better
+ switch examples to human readable sizes, with consistent spacing
+ `Downsize ... in 5 Megabytes` >> `Downsize ... by 5 Megabytes`
+ remove prompt from lone example with prompt for consistency
+ remove x permissions from kernel example
+ examples now fit on standard console without wrapping
While here:
+ fold a line to eliminate linter warning + tag spdx
+ add -nosplit to AUTHORS to eliminate a rendering glitch
MFC after: 3 days
Discussed with: asomers, jhb, maxim
Reviewed by: imp (previous version)
Closes: https://github.com/freebsd/freebsd-src/pull/1568
(cherry picked from commit 91ad27bcfc496393ba88f39ca13cdf1c59a7f487)
---
usr.bin/truncate/truncate.1 | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index f6b8b0cc37c9..aa70943b889f 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -1,4 +1,6 @@
.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
.\" Copyright (c) 2000 Sheldon Hearn .
.\" All rights reserved.
.\" Copyright (c) 2021 The FreeBSD Foundation
@@ -27,12 +29,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 6, 2025
+.Dd July 9, 2025
.Dt TRUNCATE 1
.Os
.Sh NAME
.Nm truncate
-.Nd truncate, extend the length of files, or perform space management in files
+.Nd resize files or manage file space
.Sh SYNOPSIS
.Nm
.Op Fl c
@@ -132,7 +134,8 @@ file system space deallocation may be performed in the operation region.
The space management operation is performed at the given
.Ar offset
bytes in the file.
-If this option is not specified, the operation is performed at the beginning of the file.
+If this option is not specified,
+the operation is performed at the beginning of the file.
.It Fl l Ar length
The length of the operation range in bytes.
This option must always be specified if option
@@ -195,9 +198,9 @@ truncate -c -s 10M test_file
.Pp
Same as above but create the file if it does not exist:
.Bd -literal -offset indent
-truncate -s 10M test_file
-ls -l test_file
--rw-r--r-- 1 root wheel 10485760 Jul 22 18:48 test_file
+truncate -s +10M test_file
+ls -lh test_file
+-rw-r--r-- 1 root wheel 10M Jul 22 18:48 test_file
.Ed
.Pp
Adjust the size of
@@ -207,10 +210,10 @@ to the size of the kernel and create another file
with the same size:
.Bd -literal -offset indent
truncate -r /boot/kernel/kernel test_file test_file2
-ls -l /boot/kernel/kernel test_file*
--r-xr-xr-x 1 root wheel 31352552 May 15 14:18 /boot/kernel/kernel
--rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file
--rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file2
+ls -lh /boot/kernel/kernel test_file*
+-r--r--r-- 1 root wheel 30M May 15 14:18 /boot/kernel/kernel
+-rw-r--r-- 1 root wheel 30M Jul 22 19:15 test_file
+-rw-r--r-- 1 root wheel 30M Jul 22 19:15 test_file2
.Ed
.Pp
Increase the size of the file
@@ -228,9 +231,9 @@ Reduce the size of the file
by 5 megabytes:
.Bd -literal -offset indent
truncate -s -5M test_file
-ls -l test_file*
--rw-r--r-- 1 root wheel 31352552 Jul 22 19:19 test_file
--rw-r--r-- 1 root wheel 31352552 Jul 22 19:15 test_file2
+ls -lh test_file*
+-rw-r--r-- 1 root wheel 25M Jul 22 19:17 test_file
+-rw-r--r-- 1 root wheel 30M Jul 22 19:15 test_file2
.Ed
.Sh SEE ALSO
.Xr dd 1 ,
@@ -247,6 +250,7 @@ The
utility first appeared in
.Fx 4.2 .
.Sh AUTHORS
+.An -nosplit
The
.Nm
utility was written by
From nobody Mon Jul 14 17:26:59 2025
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 4bgq4h1c3Qz620lr;
Mon, 14 Jul 2025 17:27:00 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgq4g5tVBz3X6d;
Mon, 14 Jul 2025 17:26:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752514019;
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=zBxNSKUrL8qd5DjncxkBuU1YBxS9rEyd6yZlwQ2/0D8=;
b=GkRS2IQjcXv3jEYqykWX7AxEvqqKcm+seTMR0SxJgHZHY1oHEFuto5xhXS/1BQINn9H6d7
ahpi+PoBwF58fPCtb0WymX2de5gXxzIEA0Hpa0fpxmkdhgvQWo4R5qkXb29FZKc4TIh9UF
PAo17GCWlyS+NUyjhf37R58Pa6KiNquyiGI+S8obm8Yll7Qmw7qhRRIxVXpe1upf+nHxYx
39rpr5FTCGsrAhAvpE3jIdhzIVO3Rfh/wdvgUNT2dAf17KHScucScVJxIGey0uNgPST943
s4kx7Wx/y6hRjpGvpC1m3acZ2xKw59n+4dRUATMELwF11on1ThV7fABMMZGgFA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752514019;
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=zBxNSKUrL8qd5DjncxkBuU1YBxS9rEyd6yZlwQ2/0D8=;
b=VaYKQBFh+4VpBOk09HV86fZUZ+NlheHNVmRa2ecXjuzdPijK2cl0VPDHlO6YLYUy73A4si
6xVveNGTFcCKcbd6MGCPJc/0DLlF8JItGmoc0D4zfs2XS3VSirf78RuTWTjN079Sz3hNZV
1NXRZMDG8hkdpBcYlG9mzeBjUb1eGdQW2r4ZnyW9YVgR3XNClG0o9dJVbGVHVCNoi+Phxr
sGLfX9wJEoKZmfsRyOaEANClGT+toO+vr2qptBNgzECRKNnoZM/hA/257S6Wgx9D+dWcTg
zJLCuIA/R/wnnuQkQC/cNnvj6/8HAD/txqL9qCqYEXHb4tmtM4tVVU78VoUY2w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752514019; a=rsa-sha256; cv=none;
b=CGVcVNEp5ZQ0qYNFPnnLjTIAxAuS010M17hJfMWRoyQ+1GSSIPaDjICfLmJRyqmAkZfTgV
RijKRU/A5xPB0HGW5iD7x/OeJXJO+DmAIvUUwdA5TGEjoWR2ZJkzmmAIjtnZUqF0vFRnLh
MhU8noCv70I/4tY2aaSA9GUqHyl56f5FSwPiEyK0m4e2GAdE4KF6OC7eYcBs+khK6C6gPr
oaGqUTCDvWnWqfwGEnlXco7QAJDEIufJjrMYE3VTTHy/pz7w/kBoucV22dbOmn6aTo6x3n
3SVXJvicu0mOKQSRuqM+tdlW61ns4CYZLTdP8CrVjAdfMJ/uUoXT8pSIiyQDqg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgq4g5VKZz13j1;
Mon, 14 Jul 2025 17:26:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EHQxnI041169;
Mon, 14 Jul 2025 17:26:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EHQxIW041166;
Mon, 14 Jul 2025 17:26:59 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 17:26:59 GMT
Message-Id: <202507141726.56EHQxIW041166@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: b98efcdb6210 - stable/14 - builtin.1: streamlined
rewrite + document keybinds
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
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: b98efcdb6210e1a38cda7725b873e3dd5f98a1f2
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=b98efcdb6210e1a38cda7725b873e3dd5f98a1f2
commit b98efcdb6210e1a38cda7725b873e3dd5f98a1f2
Author: Alexander Ziaee
AuthorDate: 2024-10-17 22:43:14 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 17:23:30 +0000
builtin.1: streamlined rewrite + document keybinds
+ clean title: one line with keywords, builtin's mlinked
+ additional search terms: FreeBSD, index
+ synopsis: builtins are documented in your shell's manual
+ clear/scoped introduction: increase straightforwardness
+ table alignment fixed, now renders nicely on MANWIDTH=59
+ keybindings: fundamentals now documented, more please?
+ improved structure and flow, and a spdx tag
+ remove info(1) from SEE ALSO
MFC after: 3 days
Discussed with: imp,jlduran
Reviewed by: imp
Closes: https://github.com/freebsd/freebsd-src/pull/1481
(cherry picked from commit 42df4faf7004aabb4f06acd71f860f12977db3ad)
---
share/man/man1/Makefile | 1 +
share/man/man1/builtin.1 | 269 ++++++++++++++++-------------------------------
2 files changed, 93 insertions(+), 177 deletions(-)
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index d90ca34e31be..00dce758dcd8 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -57,6 +57,7 @@ MLINKS= builtin.1 alias.1 \
builtin.1 if.1 \
builtin.1 jobid.1 \
builtin.1 jobs.1 \
+ builtin.1 keybinds.1 \
builtin.1 limit.1 \
builtin.1 log.1 \
builtin.1 logout.1 \
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index d546548ab4e5..ee89006caea5 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -1,4 +1,6 @@
.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
.\" Copyright (c) 1999 Sheldon Hearn
.\"
.\" All rights reserved.
@@ -24,175 +26,33 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 21, 2010
+.Dd March 29, 2025
.Dt BUILTIN 1
.Os
.Sh NAME
.Nm builtin ,
-.Nm \&! ,
-.Nm % ,
-.Nm \&. ,
-.Nm \&: ,
-.Nm @ ,
-.Nm \&[ ,
-.Nm { ,
-.Nm } ,
-.Nm alias ,
-.Nm alloc ,
-.Nm bg ,
-.Nm bind ,
-.Nm bindkey ,
-.Nm break ,
-.Nm breaksw ,
-.Nm builtins ,
-.Nm case ,
-.Nm cd ,
-.Nm chdir ,
-.Nm command ,
-.Nm complete ,
-.Nm continue ,
-.Nm default ,
-.Nm dirs ,
-.Nm do ,
-.Nm done ,
-.Nm echo ,
-.Nm echotc ,
-.Nm elif ,
-.Nm else ,
-.Nm end ,
-.Nm endif ,
-.Nm endsw ,
-.Nm esac ,
-.Nm eval ,
-.Nm exec ,
-.Nm exit ,
-.Nm export ,
-.Nm false ,
-.Nm fc ,
-.Nm fg ,
-.Nm filetest ,
-.Nm fi ,
-.Nm for ,
-.Nm foreach ,
-.Nm getopts ,
-.Nm glob ,
-.Nm goto ,
-.Nm hash ,
-.Nm hashstat ,
-.Nm history ,
-.Nm hup ,
-.Nm if ,
-.Nm jobid ,
-.Nm jobs ,
-.Nm kill ,
-.Nm limit ,
-.Nm local ,
-.Nm log ,
-.Nm login ,
-.Nm logout ,
-.Nm ls-F ,
-.Nm nice ,
-.Nm nohup ,
-.Nm notify ,
-.Nm onintr ,
-.Nm popd ,
-.Nm printenv ,
-.Nm printf ,
-.Nm pushd ,
-.Nm pwd ,
-.Nm read ,
-.Nm readonly ,
-.Nm rehash ,
-.Nm repeat ,
-.Nm return ,
-.Nm sched ,
-.Nm set ,
-.Nm setenv ,
-.Nm settc ,
-.Nm setty ,
-.Nm setvar ,
-.Nm shift ,
-.Nm source ,
-.Nm stop ,
-.Nm suspend ,
-.Nm switch ,
-.Nm telltc ,
-.Nm test ,
-.Nm then ,
-.Nm time ,
-.Nm times ,
-.Nm trap ,
-.Nm true ,
-.Nm type ,
-.Nm ulimit ,
-.Nm umask ,
-.Nm unalias ,
-.Nm uncomplete ,
-.Nm unhash ,
-.Nm unlimit ,
-.Nm unset ,
-.Nm unsetenv ,
-.Nm until ,
-.Nm wait ,
-.Nm where ,
-.Nm which ,
-.Nm while
-.Nd shell built-in commands
+.Nm keybinds
+.Nd index of FreeBSD shell built-in commands
.Sh SYNOPSIS
-See the built-in command description in the appropriate shell manual page.
+See the manual for your shell for operation details.
.Sh DESCRIPTION
-Shell builtin commands are commands that can be executed within the
-running shell's process.
-Note that, in the case of
-.Xr csh 1
-builtin commands, the command is executed in a subshell if it occurs as
-any component of a pipeline except the last.
-.Pp
-If a command specified to the shell contains a slash
-.Ql / ,
-the shell will not execute a builtin command, even if the last component
-of the specified command matches the name of a builtin command.
-Thus, while specifying
-.Dq Li echo
-causes a builtin command to be executed under shells that support the
-.Nm echo
-builtin command,
-specifying
-.Dq Li /bin/echo
-or
-.Dq Li ./echo
-does not.
-.Pp
-While some builtin commands may exist in more than one shell, their
-operation may be different under each shell which supports them.
-Below is a table which lists shell builtin commands, the standard shells
-that support them and whether they exist as standalone utilities.
-.Pp
-Only builtin commands for the
+This page provides an index of
+.Nm
+commands, keywords, and keyboard bindings provided by
.Xr csh 1
and
-.Xr sh 1
-shells are listed here.
-Consult a shell's manual page for
-details on the operation its builtin commands.
-Beware that the
-.Xr sh 1
-manual page, at least, calls some of these commands
-.Dq built-in commands
-and some of them
-.Dq reserved words .
-Users of other shells may need to consult an
-.Xr info 1
-page or other sources of documentation.
-.Pp
-Commands marked
-.Dq Li No**
-under
-.Em External
-do exist externally,
-but are implemented as scripts using a builtin command of the same name.
-.Bl -column ".Ic uncomplete" ".Em External" ".Xr csh 1" ".Xr sh 1" -offset indent
-.It Em Command Ta Em External Ta Xr csh 1 Ta Xr sh 1
+.Xr sh 1 ,
+the command line interpreters which comprise the
+.Bx
+user environment.
+.Ss Commands
+Below is a table which lists
+.Nm
+commands and keywords,
+whether they exist as standalone utilities,
+and the standard shells that provide them.
+.Bl -column "uncomplete" "Standalone" "csh(1)" "sh(1)" -offset indent
+.It Em Command Ta Em Standalone Ta Xr csh 1 Ta Xr sh 1
.It Ic \&! Ta \&No Ta \&No Ta Yes
.It Ic % Ta \&No Ta Yes Ta \&No
.It Ic \&. Ta \&No Ta \&No Ta Yes
@@ -201,9 +61,9 @@ but are implemented as scripts using a builtin command of the same name.
.It Ic \&[ Ta Yes Ta \&No Ta Yes
.It Ic { Ta \&No Ta \&No Ta Yes
.It Ic } Ta \&No Ta \&No Ta Yes
-.It Ic alias Ta No** Ta Yes Ta Yes
+.It Ic alias Ta No* Ta Yes Ta Yes
.It Ic alloc Ta \&No Ta Yes Ta \&No
-.It Ic bg Ta No** Ta Yes Ta Yes
+.It Ic bg Ta No* Ta Yes Ta Yes
.It Ic bind Ta \&No Ta \&No Ta Yes
.It Ic bindkey Ta \&No Ta Yes Ta \&No
.It Ic break Ta \&No Ta Yes Ta Yes
@@ -211,9 +71,9 @@ but are implemented as scripts using a builtin command of the same name.
.It Ic builtin Ta \&No Ta \&No Ta Yes
.It Ic builtins Ta \&No Ta Yes Ta \&No
.It Ic case Ta \&No Ta Yes Ta Yes
-.It Ic cd Ta No** Ta Yes Ta Yes
+.It Ic cd Ta No* Ta Yes Ta Yes
.It Ic chdir Ta \&No Ta Yes Ta Yes
-.It Ic command Ta No** Ta \&No Ta Yes
+.It Ic command Ta No* Ta \&No Ta Yes
.It Ic complete Ta \&No Ta Yes Ta \&No
.It Ic continue Ta \&No Ta Yes Ta Yes
.It Ic default Ta \&No Ta Yes Ta \&No
@@ -233,22 +93,22 @@ but are implemented as scripts using a builtin command of the same name.
.It Ic exit Ta \&No Ta Yes Ta Yes
.It Ic export Ta \&No Ta \&No Ta Yes
.It Ic false Ta Yes Ta \&No Ta Yes
-.It Ic fc Ta No** Ta \&No Ta Yes
-.It Ic fg Ta No** Ta Yes Ta Yes
+.It Ic fc Ta No* Ta \&No Ta Yes
+.It Ic fg Ta No* Ta Yes Ta Yes
.It Ic filetest Ta \&No Ta Yes Ta \&No
.It Ic fi Ta \&No Ta \&No Ta Yes
.It Ic for Ta \&No Ta \&No Ta Yes
.It Ic foreach Ta \&No Ta Yes Ta \&No
-.It Ic getopts Ta No** Ta \&No Ta Yes
+.It Ic getopts Ta No* Ta \&No Ta Yes
.It Ic glob Ta \&No Ta Yes Ta \&No
.It Ic goto Ta \&No Ta Yes Ta \&No
-.It Ic hash Ta No** Ta \&No Ta Yes
+.It Ic hash Ta No* Ta \&No Ta Yes
.It Ic hashstat Ta \&No Ta Yes Ta \&No
.It Ic history Ta \&No Ta Yes Ta \&No
.It Ic hup Ta \&No Ta Yes Ta \&No
.It Ic if Ta \&No Ta Yes Ta Yes
.It Ic jobid Ta \&No Ta \&No Ta Yes
-.It Ic jobs Ta No** Ta Yes Ta Yes
+.It Ic jobs Ta No* Ta Yes Ta Yes
.It Ic kill Ta Yes Ta Yes Ta Yes
.It Ic limit Ta \&No Ta Yes Ta \&No
.It Ic local Ta \&No Ta \&No Ta Yes
@@ -265,7 +125,7 @@ but are implemented as scripts using a builtin command of the same name.
.It Ic printf Ta Yes Ta \&No Ta Yes
.It Ic pushd Ta \&No Ta Yes Ta \&No
.It Ic pwd Ta Yes Ta \&No Ta Yes
-.It Ic read Ta No** Ta \&No Ta Yes
+.It Ic read Ta No* Ta \&No Ta Yes
.It Ic readonly Ta \&No Ta \&No Ta Yes
.It Ic rehash Ta \&No Ta Yes Ta \&No
.It Ic repeat Ta \&No Ta Yes Ta \&No
@@ -288,26 +148,68 @@ but are implemented as scripts using a builtin command of the same name.
.It Ic times Ta \&No Ta \&No Ta Yes
.It Ic trap Ta \&No Ta \&No Ta Yes
.It Ic true Ta Yes Ta \&No Ta Yes
-.It Ic type Ta No** Ta \&No Ta Yes
-.It Ic ulimit Ta No** Ta \&No Ta Yes
-.It Ic umask Ta No** Ta Yes Ta Yes
-.It Ic unalias Ta No** Ta Yes Ta Yes
+.It Ic type Ta No* Ta \&No Ta Yes
+.It Ic ulimit Ta No* Ta \&No Ta Yes
+.It Ic umask Ta No* Ta Yes Ta Yes
+.It Ic unalias Ta No* Ta Yes Ta Yes
.It Ic uncomplete Ta \&No Ta Yes Ta \&No
.It Ic unhash Ta \&No Ta Yes Ta \&No
.It Ic unlimit Ta \&No Ta Yes Ta \&No
.It Ic unset Ta \&No Ta Yes Ta Yes
.It Ic unsetenv Ta \&No Ta Yes Ta \&No
.It Ic until Ta \&No Ta \&No Ta Yes
-.It Ic wait Ta No** Ta Yes Ta Yes
+.It Ic wait Ta No* Ta Yes Ta Yes
.It Ic where Ta \&No Ta Yes Ta \&No
.It Ic which Ta Yes Ta Yes Ta \&No
.It Ic while Ta \&No Ta Yes Ta Yes
.El
+.Pp
+\&No*: Commands marked
+.Ql No*
+exist externally, but are implemented as scripts using a
+.Nm
+command of the same name.
+.Ss Keybinds
+The command line environment also provides the following
+default keyboard bindings:
+.Bl -column "Process Info (SIGINFO)" "^M | ^J" "^M | ^J" -offset indent
+.It Em Signal Ta Xr csh 1 Ta Xr sh 1
+.It Ic Backspace Ta ^H Ta ^H
+.It Ic Carriage Return Ta ^M | ^J Ta ^M | ^J
+.It Ic Tab Ta ^I Ta ^I
+.It Ic Beginning of Line Ta ^A Ta ^A
+.It Ic End of Line Ta ^E Ta ^E
+.It Ic Cursor Forward Ta ^F Ta ^F
+.It Ic Cursor Backward Ta ^B Ta ^B
+.It Ic Clear Screen Ta ^L Ta ^L
+.It Ic Cut Line Ta ^U Ta ^U
+.It Ic Cut Word Backwards Ta ^W Ta ^W
+.It Ic Cut Rest of Line Ta ^K Ta ^K
+.It Ic Paste Last Cut Ta ^Y Ta ^Y
+.It Ic Typo Ta ^T Ta ^T
+.It End of File Po Ic EOF Pc Ta ^D Ta ^D
+.It Interupt Po Ic SIGINT Pc Ta ^C Ta ^C
+.It Process info Po Ic SIGINFO Pc Ta ^T Ta ^T
+.It Ic Search History Ta \&No Ta ^R
+.It Ic Exit Search History Ta \&No Ta ^G
+.It Ic Previous Command Ta ^P Ta ^P
+.It Ic Next Command Ta ^N Ta ^N
+.It Ic Print Next Character Ta ^V Ta ^V
+.It Ic Pause Job Ta ^S Ta ^S
+.It Ic Resume Job Ta ^Q Ta ^Q
+.It Suspend Job Ic (SIGTSTP) Ta ^Z Ta ^Z
+.It Ic Scrollback Mode Ta ScrLk* Ta ScrLk*
+.El
+.Pp
+\&*: Bindings marked
+.Ql *
+are provided by
+.Xr vt 4 ,
+the console driver.
.Sh SEE ALSO
.Xr csh 1 ,
.Xr echo 1 ,
.Xr false 1 ,
-.Xr info 1 ,
.Xr kill 1 ,
.Xr login 1 ,
.Xr nice 1 ,
@@ -326,5 +228,18 @@ The
manual page first appeared in
.Fx 3.4 .
.Sh AUTHORS
+.An -nosplit
This manual page was written by
+.An Alexander Ziaee Aq Mt ziaee@FreeBSD.org
+from an earlier version by
.An Sheldon Hearn Aq Mt sheldonh@FreeBSD.org .
+.Sh CAVEATS
+While
+.Nm
+commands may exist in more than one shell or standalone,
+each may be implemented differently.
+.Pp
+Standalone utilities and their manuals must be called by their path
+from a shell with a
+.Nm
+command of the same name.
From nobody Mon Jul 14 17:27:00 2025
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 4bgq4j2pTZz620r9;
Mon, 14 Jul 2025 17:27:01 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bgq4j0CyHz3X9g;
Mon, 14 Jul 2025 17:27:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752514021;
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=gg6jMp7dchFosPoiIV178f5qibAdHR/VvsTy+btaNFM=;
b=AE1Tb0PPj0w/1bOdKMini4yQz67X/se0RNghjQI8X4juIn9+Hk2RXf+oDOimxumTVxfSxB
FWAbr6K9FYA1wFEMrYKzecEX6zoFl7uyAK8BVqNfFcVLIXZvLWsQqwea5My77KIEOFcoZm
2jtMYpvUfeuCcTfJ6R/IrFBjGJBxPc+thxXJgoHlNHRO7CZf3ppZzfPOlSwOQw8Gvwf7zd
56oDeCYrYhawmeVx82RGtkSiJtDDUQWoBqRwW/KMsPm0+nHIYU8PMG4vyLZu875xdoxqjX
sAeiq4a1XfTnndoMm2fxev9lgw86XRSbhF2z2H6x/XrGbPh6p719dhItZ2jS+g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752514021;
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=gg6jMp7dchFosPoiIV178f5qibAdHR/VvsTy+btaNFM=;
b=BwA2zCXUUomH1TT5MbMwIr5/NyVV/cVAdafjhZESgZPgfXL9L+8cGJLfxA9IqkMkgvVnwE
YX2112T/2o7wBab5KqVcQ8wf2CLxbbqmDX0frIDHlUDoUvchifOr/6ZZsFgcr1Gc3yCfq+
Zs2fsjprMwlEhSDP6SOZrkw/WXkZhFYYhjdE2c4YS9et99sqXaC5Q/yljXqQIv2Le7j2KS
+ln2FajpUjbbyLATaNoWqh4QScm0N//T5/I3LNZa/HKT557PwikSBYLw2V+WO/gPJP/NtW
KyY6ELgtjLRnOKzO7QV3xTZAHr+uBblEkhuOzua2xJWK/VIbX663k357Z/J9LA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752514021; a=rsa-sha256; cv=none;
b=mmhGHIwNjgosFPXAosC2HQ+Jv9gXKo7vYHu8RqujnfGgp/jD4p6HLeNEdo7ukPm2ZE7x5y
EFHeJtZ99AxYl6/LNkBGfJB7Uwnwx7XpB+s7hCbKd0MmzhKUWvjtYw9UeQpmZyTmkSbtNz
kKbmSz9T/0DF7Y4c4iORHEr1hrt5g24OrMPcl/7f3VPatXRW4ePDZdRGraB58uwizDMuF0
5ilx6r1KWSX2zuDFU/O/DU15P41xxxcIPOxv5jy+gfTiN+xGp30LEzexNQEb6pU9ZKm5GF
pqbqXUCjnfrevJ2tQshIFKpSUILd8jiYTuVnSLmPBPZMLn+5ZiXxhPM8ESLP8Q==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgq4h6k5Yz13fS;
Mon, 14 Jul 2025 17:27:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EHR07m041211;
Mon, 14 Jul 2025 17:27:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EHR0PD041208;
Mon, 14 Jul 2025 17:27:00 GMT
(envelope-from git)
Date: Mon, 14 Jul 2025 17:27:00 GMT
Message-Id: <202507141727.56EHR0PD041208@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Ziaee
Subject: git: 23e4075a4add - stable/14 - bectl.8: Describe better
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
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: 23e4075a4add6af5d83be3bd47779a99667cff7a
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ziaee:
URL: https://cgit.FreeBSD.org/src/commit/?id=23e4075a4add6af5d83be3bd47779a99667cff7a
commit 23e4075a4add6af5d83be3bd47779a99667cff7a
Author: Alexander Ziaee
AuthorDate: 2025-06-13 19:37:23 +0000
Commit: Alexander Ziaee
CommitDate: 2025-07-14 17:24:13 +0000
bectl.8: Describe better
+ Concise document description for consistency and apropos results
+ Improve introductory paragraph, mentioning boot loader support
+ Explain -r in "Supported Subcommands and Flags"
+ Clarify the purpose of the check subcommand
+ Add two basic examples, creating and mounting
+ Fold some long lines, correct a stray capitalization.
MFC after: 3 days
Co-authored-by: kevans
(cherry picked from commit d7baf5f70802a9045f5792a7063b2614bf17356a)
---
sbin/bectl/bectl.8 | 121 ++++++++++++++++++++++++++++-------------------------
1 file changed, 65 insertions(+), 56 deletions(-)
diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8
index a77039c94d26..fd939f20e694 100644
--- a/sbin/bectl/bectl.8
+++ b/sbin/bectl/bectl.8
@@ -5,12 +5,12 @@
.\"
.\" @(#)be.1
.\"
-.Dd March 18, 2024
+.Dd June 13, 2025
.Dt BECTL 8
.Os
.Sh NAME
.Nm bectl
-.Nd Utility to manage boot environments on ZFS
+.Nd manage ZFS boot environments
.Sh SYNOPSIS
.Nm
.Op Fl h
@@ -82,34 +82,31 @@
.Sh DESCRIPTION
The
.Nm
-command is used to setup and interact with ZFS boot environments, which are
-bootable clones of datasets.
-.Pp
-A boot environment allows the system to be upgraded, while preserving the
-pre-upgrade system environment.
-.Pp
-.Nm
-itself accepts an
-.Fl r
-flag specified before the command to indicate the
-.Ar beroot
-that should be used as the boot environment root, or the dataset whose children
-are all boot environments.
-Normally this information is derived from the bootfs property of the pool that
-is mounted at
-.Pa / ,
-but it is useful when the system has not been booted into a ZFS root or a
-different pool should be operated on.
-For instance, booting into the recovery media and manually importing a pool from
-one of the system's resident disks will require the
-.Fl r
-flag to work.
+utility manages bootable ZFS clones called boot environments.
+Boot envionments allow system changes to be tested safely,
+as they are selectable directly from the boot
+.Xr loader 8 .
+This utility can
+.Cm create ,
+.Cm list ,
+.Cm mount ,
+or
+.Cm jail
+boot environments.
+Once the changes have been tested, the boot environment can be
+.Cm unmount Ns ed ,
+.Cm activate Ns d ,
+.Cm rename Ns d ,
+and
+.Cm destroy Ns ed .
.Ss Supported Subcommands and Flags
-.Bl -tag -width activate
-.It Xo
-.Fl h
-.Xc
+.Bl -tag -width indent
+.It Fl h
Print usage information and exit.
+.It Fl r Ar beroot Sy Ar subcommand
+Specify a parent dataset for the boot environment to use for
+.Ar subcommand
+for operation on manually imported pools or unusual layouts.
.It Xo
.Cm activate
.Op Fl t | Fl T
@@ -124,19 +121,19 @@ flag is given, this takes effect only for the next boot.
Flag
.Fl T
removes temporary boot once configuration.
-Without temporary configuration, the next boot will use zfs dataset specified
-in boot pool
+Without temporary configuration,
+the next boot will use zfs dataset specified in boot pool
.Ar bootfs
property.
.It Xo
.Cm check
.Xc
-Performs a silent sanity check on the current system.
+Perform a check to see if the current system can use boot environments.
If boot environments are supported and used,
.Nm
will exit with a status code of 0.
-Any other status code is not currently defined and may, in the future, grow
-special meaning for different degrees of sanity check failures.
+Any other status code is not currently defined and may, in the future,
+grow special meaning for different degrees of sanity check failures.
.It Xo
.Cm create
.Op Fl r
@@ -164,8 +161,8 @@ environment.
.Pp
If
.Nm
-is creating from another boot environment, a snapshot of that boot environment
-will be created to clone from.
+is creating from another boot environment,
+a snapshot of that boot environment will be created to clone from.
.It Xo
.Cm create
.Op Fl r
@@ -176,8 +173,10 @@ Create a snapshot of the boot environment named
.Pp
If the
.Fl r
-flag is given, a recursive snapshot of the boot environment will be created.
-A snapshot is created for each descendant dataset of the boot environment.
+flag is given,
+a recursive snapshot of the boot environment will be created.
+A snapshot is created for each descendant dataset
+of the boot environment.
See
.Sx Boot Environment Structures
for a discussion on different layouts.
@@ -243,8 +242,8 @@ If
.Ar utility
is specified, it will be executed instead of
.Pa /bin/sh .
-The jail will be destroyed and the boot environment unmounted when the command
-finishes executing, unless the
+The jail will be destroyed and the boot environment unmounted
+when the command finishes executing, unless the
.Fl U
argument is specified.
.Pp
@@ -271,11 +270,11 @@ The following default parameters are provided:
.It Va allow.mount Ta Cm true
.It Va allow.mount.devfs Ta Cm true
.It Va enforce_statfs Ta Cm 1
-.It Va name Ta Set to jail ID.
+.It Va name Ta set to jail ID
.It Va host.hostname Ta Va bootenv
-.It Va path Ta Set to a path in Pa /tmp
+.It Va path Ta set to a path in Pa /tmp
generated by
-.Xr libbe 3 .
+.Xr libbe 3
.El
.Pp
All default parameters may be overwritten.
@@ -300,8 +299,8 @@ or combination of
.It Fl a
Display all datasets.
.It Fl D
-Display the full space usage for each boot environment, assuming all
-other boot environments were destroyed.
+Display the full space usage for each boot environment,
+assuming all other boot environments were destroyed.
.It Fl H
Used for scripting.
Do not print headers and separate fields by a single tab instead of
@@ -353,8 +352,8 @@ will make a directory such as
.Pa be_mount.c6Sf
in
.Pa /tmp .
-Randomness in the last four characters of the directory name will prevent
-mount point conflicts.
+Randomness in the last four characters of the directory name
+will prevent mount point conflicts.
Unmount of an environment, followed by mount of the same environment
without giving a
.Ar mountpoint ,
@@ -364,7 +363,7 @@ Rename the given
.Ar origBeName
to the given
.Ar newBeName .
-The boot environment will not be unmounted in order for this rename to occur.
+The boot environment will not be unmounted for this rename to occur.
.It Cm ujail Brq Ar jailId | jailName | beName
.It Cm unjail Brq Ar jailId | jailName | beName
Destroy the jail created from the given boot environment.
@@ -392,8 +391,8 @@ boot environment layout, as created by the Auto ZFS option to
.Xr bsdinstall 8 ,
is a
.Dq shallow
-boot environment structure, where boot environment datasets do not have any
-directly subordinate datasets.
+boot environment structure, where boot environment datasets
+do not have any directly subordinate datasets.
Instead, they're organized off in
.Pa zroot/ROOT ,
and they rely on datasets elsewhere in the pool having
@@ -421,7 +420,8 @@ set to
.Dv off ,
thus files in
.Pa /usr
-typically fall into the boot environment because this dataset is not mounted.
+typically fall into the boot environment
+because this dataset is not mounted.
.Pa zroot/usr/src
is mounted, thus files in
.Pa /usr/src
@@ -447,8 +447,8 @@ Note that the subordinate datasets now have
.Dv canmount
set to
.Dv noauto .
-These are more obviously a part of the boot environment, as indicated by their
-positioning in the layout.
+These are more obviously a part of the boot environment,
+as indicated by their positioning in the layout.
These subordinate datasets will be mounted by the
.Dv zfsbe
.Xr rc 8
@@ -470,16 +470,25 @@ A future version of
may default to handling both styles and deprecate the various
.Fl r
flags.
-.\" .Sh EXAMPLES
-.\" .Bl -bullet
-.\" .It
+.Sh EXAMPLES
+Create a boot environment, named with today's date,
+containing snapshots of the root dataset and of all child datasets:
+.Pp
+.Dl bectl create -r `date +%Y%m%d`
+.Pp
+Mount a previous boot environment,
+.Ar yesterdaysbe ,
+to
+.Pa /mnt :
+.Pp
+.Dl bectl mount yesterdaysbe /mnt
.\" To fill in with jail upgrade example when behavior is firm.
-.\" .El
.Sh SEE ALSO
.Xr libbe 3 ,
.Xr zfsprops 7 ,
.Xr beinstall.sh 8 ,
.Xr jail 8 ,
+.Xr loader 8 ,
.Xr zfs 8 ,
.Xr zpool 8
.Sh HISTORY
From nobody Tue Jul 15 00:24:13 2025
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 4bh0L62fdGz61fFb;
Tue, 15 Jul 2025 00:24:14 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bh0L56T6Pz45Tj;
Tue, 15 Jul 2025 00:24:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752539053;
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=+9Txxj4Gb2NfEuWrlDJwobJzdShjBl2lIOZ/Qtx0rmg=;
b=f2/iVUHjtxlBQWBUJRfIU04tpcNbuVm1i/1yw4kXdXY6W8DNQgQPn+zaxxg8ym3kFIFwHc
WAzVQgsFmsNTK1PmcJORoszEfmq7XPLRztLyhz8AJla/C5wZ9Aa50EYET2/Nt8EfYxmoBY
g572zaL0BQ57R/kvEedjShC1DMGmKFnvVQwb8h9KjYeTYb4RA/FDjScjMicdK5d/PMxCcM
H16cKPTDijJEqn4TBjF/eggXlO7nYXKH98StIeWlcQZRbpCucBm8v/QJvpm52UbSMDZF3i
F/lQDnJUty8poRiQ5PEFPzxwijegcdroB7uPHHrjsC+AdGlKEYQk8zjqFmdLdQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752539053;
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=+9Txxj4Gb2NfEuWrlDJwobJzdShjBl2lIOZ/Qtx0rmg=;
b=bNQWHXpy/Gp91dg+5r5XkHA5fEDyY+QFM9db/nqz5CggpwsXI5iLTAKQgCjG4GCbCj2bO1
PombyRG6wf9YcbhkULfUxaOYey5KPp6eefEZXan3MWFnmmPQwZP/RbN32EXmeC+4M//z8E
fDD2QXooUdZre6/XOQiUGmUcfTCvgZB7wyMW1SSdfmV3OP+LOrPJwwtqPIAsDInSrka5qT
bRRVHXV8kgrGlOhJnBI+W7Q/Mz+y3fOi3I7lpsURh4GAlpcBFNBN+5Gqn9zGnRqvlzSxwu
Tug7UKmakokoJNcmlmAph1AvttppeLJCH3tCR1/JrWTJdMDcfq3LSDh8mQbSZQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752539053; a=rsa-sha256; cv=none;
b=anGCEcO4PYFb476gXPfFt727BVfgtQubKQ44VYD1Dp4sPpdMOcJpJdH41ukdixdiBdVL+i
04xrJSvlfFk+mg/YwtaJVMbKVbE89kOI7hTOdsgNdok+LoTAXAWo2wFE4Voh0U67LXDABw
NKSyu64P6bGCAM8fSAz0PanZJEBDbiJ42Gzw3VzczX2uNMG1KrIu57GIRsxjWy3P24D7EO
h6g/DwKq0WsQTqa/c85+Ibsq0ePhtoH1yCa7glX4kaCk84x81eQYnaJgjQAjSOayh6SvsS
pAtRNGgyLXiktA52NN9z5IeumXbo/AVKf2IeuyCBH0A2zljStbwAAWv1Cw9Niw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bh0L563Yfz245;
Tue, 15 Jul 2025 00:24:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56F0OD2j034076;
Tue, 15 Jul 2025 00:24:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56F0ODTd034073;
Tue, 15 Jul 2025 00:24:13 GMT
(envelope-from git)
Date: Tue, 15 Jul 2025 00:24:13 GMT
Message-Id: <202507150024.56F0ODTd034073@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: f668b5a413d9 - stable/14 - rc.subr: Fix a typo in
check_jail()'s description
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: f668b5a413d90084f02f0f2f204c7dbf3563b3a9
Auto-Submitted: auto-generated
The branch stable/14 has been updated by 0mp:
URL: https://cgit.FreeBSD.org/src/commit/?id=f668b5a413d90084f02f0f2f204c7dbf3563b3a9
commit f668b5a413d90084f02f0f2f204c7dbf3563b3a9
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-07-12 16:23:03 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-07-15 00:23:47 +0000
rc.subr: Fix a typo in check_jail()'s description
MFC after: 3 days
Event: Berlin Hackathon 202507
(cherry picked from commit 5d5258653ba4b37c38e48443f265ee4dcedf9a50)
---
libexec/rc/rc.subr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index c6bc6d1a1395..61c10370250e 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -2213,7 +2213,7 @@ check_required_after()
}
# check_jail mib
-# Return true if security.jail.$mib exists and set to 1.
+# Return true if security.jail.$mib exists and is set to 1.
check_jail()
{
From nobody Tue Jul 15 00:24:52 2025
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 4bh0Ls59wRz61f0R;
Tue, 15 Jul 2025 00:24: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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bh0Ls0b5gz45vy;
Tue, 15 Jul 2025 00:24:53 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752539093;
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=ZMP7Qxz3WAeoF6CneVtNzKAFckRy//iNz3VKtjnNH5A=;
b=gOdXjcsPNbSSvH2IAe26ozvMFOnPW0reKPq08GbMcYN25U7W346tzGinUEVpRT7Uur1Oxx
4a309l6LYmrFxtXUmimSSSDluR8en3rwxb+AsdOdnvnkAIKQujxZbybVmnkqDGj78U4EwR
ynHbFV8VxCOpSCxljzjq/JDOp8HX8XZ8s39oKKNP5f3ATg6VIFOQsCQuXoLAYHbqrlUeAv
xd0EvIyssFqO1lpUP2VLdqlfQUsW09Jvpq1Ys/jAezv5Dbl1ohFZheBVPuyQteSmhjsSbE
j5EibVKE6es+1QvY1QT+pK6q6ODgwPL5fB6HKRbsNhQ+a5RK3K57j+jUknaAYg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752539093;
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=ZMP7Qxz3WAeoF6CneVtNzKAFckRy//iNz3VKtjnNH5A=;
b=UaskOZScQ7s4BdrZEF0+DzqstKXJ6qvSllN3ya7WWO1dG7pxd0Tjy9yMLySJx/Msk3JiLu
hMBWHPtC9wFRNTOuWNYaHMJi2gygDhUTw6xin8vVXLpJs7g9ZS9wKVKaJSyPMzHpKatsFL
vaVtjlTvEs/g7GV95U/orUcNgv5pLpbPtVUIg1R102tfGxcbb5ak7Nh3RlmxpCRHFu3Xvc
DRv8WDKIkp3b5EQdsL1iMvHuf66DXpwbD8rmItDc2H4WOcNdbXslp9bVOUnlPq3D/cBaqE
/g9bR+2lJx74eQyJfoVp+Vqu2Pvx/EMDIFazyxYxhY0BwMDgki6rv1gYrczQLQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752539093; a=rsa-sha256; cv=none;
b=fD+SwqDYUPTVFEeCNcoobA4uSr33fXGnI2w4Kh4SwNZmyv/pn6ZsgoOOkvaUXZtLd5Pl29
++CtBBMY1ioBbttHp8jeP8fGcucI73PQZ3rXYBfJEO/HgJrYhceegzKz4NGuDMHo3LMoGt
TS8NDaiQ/LphrsNNnes75B/6TF9GPb2elwnFk2FryIPRxKromSoOisOMN9ZYgtGayCfR4D
x2ajXfCOWLzBnqfnn4O7K4oKBSiS5JAaxiT/WVBj/AatESjZYIQjhEGpZ0j2YM9co+Qssa
MsSEG16y22gOM1RaPv/liLTw3iwZQH9KFIzhGOgoZVUA3yQ6NpaJyFs7/ZYOdg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bh0Lr6Vzvz26k;
Tue, 15 Jul 2025 00:24:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56F0Oq2q034394;
Tue, 15 Jul 2025 00:24:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56F0OqZF034391;
Tue, 15 Jul 2025 00:24:52 GMT
(envelope-from git)
Date: Tue, 15 Jul 2025 00:24:52 GMT
Message-Id: <202507150024.56F0OqZF034391@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: cdd5fece162b - stable/13 - rc.subr: Fix a typo in
check_jail()'s description
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: cdd5fece162ba9ec5f8165adce397b1879a9c68e
Auto-Submitted: auto-generated
The branch stable/13 has been updated by 0mp:
URL: https://cgit.FreeBSD.org/src/commit/?id=cdd5fece162ba9ec5f8165adce397b1879a9c68e
commit cdd5fece162ba9ec5f8165adce397b1879a9c68e
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2025-07-12 16:23:03 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2025-07-15 00:24:27 +0000
rc.subr: Fix a typo in check_jail()'s description
MFC after: 3 days
Event: Berlin Hackathon 202507
(cherry picked from commit 5d5258653ba4b37c38e48443f265ee4dcedf9a50)
---
libexec/rc/rc.subr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
index 99dcc41c50a1..6a10dcc8e01f 100644
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -2154,7 +2154,7 @@ check_required_after()
}
# check_jail mib
-# Return true if security.jail.$mib exists and set to 1.
+# Return true if security.jail.$mib exists and is set to 1.
check_jail()
{
From nobody Tue Jul 15 13:46:35 2025
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 4bhL7w2sM8z62QDT;
Tue, 15 Jul 2025 13:46:36 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhL7v6Jw4z3snk;
Tue, 15 Jul 2025 13:46:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752587195;
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=kRZCUtJFa4zKzfMjKB+OzSKNYeV4V3+TTBPMI3xkKGU=;
b=rvvO0dPzslT+TePPdO8nJPt9xyLmTsm33AkH1tUmLHCpAMGVhOSb7sM9L59FFupWdLJc29
PsHkGdneYkXKiDhCIkBamebq6hmEwANaWnb3b66ck4HaFs8ZQ7yE5iBucGqVsD5j6Cs70I
+GfnjS6Ptwfc+p46uvK6RMcIJAST8j5x5Ii6K3WfeDyZTuXivk8AV+eXhn+QtR/xMGSR2t
2WpVK0htoiM0A53vurlPOouYcHYraayXSOg/COnsypoMaVPIBFFiexa+8i4nwxNThFyxuz
mWGFLJw3IPfK67DDNWDbNZY0sS6dKCLKoMBFksEcz4tNjus0lnhk83JcFu2BIg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752587195;
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=kRZCUtJFa4zKzfMjKB+OzSKNYeV4V3+TTBPMI3xkKGU=;
b=hxobyK6znO1H/eFjOvl1Dp/BJT9AmfSDuVkVdsn2OPD0QzH4iOo20pV7Z+AYyr5J8dEVR4
vn4ZrDNdE+Wk15L+AV7gVSjOWOzPsAfKO4612cx/WcvkyEGU8ClwWsgTJIRo1ZkCxTWORx
+V9yDguMty0mMIwKax9w/KuUFwv3gRf8llZbMwMCrZawB+554XOUZ5hGlvnpe50Ql9rNmi
pa1w/huulmK+AvMFgUoWz7oy5hEqWPy3d4XhqoWr2DVT9UsoHqRXTnv3UdUoGR0E9z64ka
DnCB4UTEBtK4LxO8VnxtNziKy/+fls83j2K/ZcIj/iR91t35C0kQOyR2jniPhw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752587195; a=rsa-sha256; cv=none;
b=nIDp3cftrCQy+3OvHdW8QbUhoh7CiC3EowrhmqTeElxoQghi/cCpcKpj45LsJH2Ag2EcYq
gg5I+mGBmcx8JgN2moEevIuKxwZaYFh+5XWrgOXiuKHcsbwzaREBfyfgWWbNZWXucc9tm8
Y+B18ZL/6iqs6lIgSHMW3OOaEC9flPmQiNUS5jcFhFYzeFvBnGnzjBGJ2dj8/4AiIL71Z9
3hTEh12jjdCixRmc6hAHVuF0U56L1sAenr6Dok7Hv0lDK6pqWtib+V6ZoOwI6xsOz34QR4
q1CkVjTUnI9Anw2zc+M9BvTS0if24q4A4tov37kSHtaxXRbqP/WIbSmqnXQxcA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhL7v5YYyzhwc;
Tue, 15 Jul 2025 13:46:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56FDkZim041878;
Tue, 15 Jul 2025 13:46:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FDkZXf041875;
Tue, 15 Jul 2025 13:46:35 GMT
(envelope-from git)
Date: Tue, 15 Jul 2025 13:46:35 GMT
Message-Id: <202507151346.56FDkZXf041875@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston
Subject: git: 025287a38dac - stable/14 - vm_pageout: Make the OOM
killer less aggressive
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 025287a38dacfbeaa570f35650396fb016f54c9e
Auto-Submitted: auto-generated
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=025287a38dacfbeaa570f35650396fb016f54c9e
commit 025287a38dacfbeaa570f35650396fb016f54c9e
Author: Mark Johnston
AuthorDate: 2025-06-27 13:09:39 +0000
Commit: Mark Johnston
CommitDate: 2025-07-15 13:46:24 +0000
vm_pageout: Make the OOM killer less aggressive
A problem can arise if we enter a shortfall of clean, inactive pages.
The PID controller will attempt to overshoot the reclamation target
because repeated scans of the inactive queue are just moving pages to
the laundry queue, so inactive queue scans fail to address an
instantaneous page shortage. The laundry thread will launder pages and
move them back to the head of the inactive queue to be reclaimed, but
this does not happen immediately, so the integral term of the PID
controller grows and the page daemon tries to reclaim pages in excess of
the setpoint. However, the laundry thread will only launder enough
pages to meet the shortfall: vm_laundry_target(), which is the same as
the setpoint.
Oonce the shortfall is addressed by the laundry thread, no more clean
pages will appear in the inactive queue, but the page daemon may keep
scanning dirty pages due to this overshooting. This can result in a
spurious OOM kill.
Thus, reset the sequence counter if we observe that there is no
instantaneous free page shortage.
Reviewed by: alc, kib
MFC after: 2 weeks
Sponsored by: Klara, Inc.
Sponsored by: Modirum MDPay
Differential Revision: https://reviews.freebsd.org/D51015
(cherry picked from commit 78546fb0e3215c07f970c1bcbf15bba2f5852c76)
---
sys/vm/vm_pageout.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 83f655eb852e..378fd3b834de 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1821,8 +1821,14 @@ vm_pageout_mightbe_oom(struct vm_domain *vmd, int page_shortage,
{
int old_vote;
+ /*
+ * Do not trigger an OOM kill if the page daemon is able to make
+ * progress, or if there is no instantaneous shortage. The latter case
+ * can happen if the PID controller is still reacting to an acute
+ * shortage, and the inactive queue is full of dirty pages.
+ */
if (starting_page_shortage <= 0 || starting_page_shortage !=
- page_shortage)
+ page_shortage || !vm_paging_needed(vmd, vmd->vmd_free_count))
vmd->vmd_oom_seq = 0;
else
vmd->vmd_oom_seq++;
From nobody Tue Jul 15 13:46:36 2025
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 4bhL7x4T5qz62QBw;
Tue, 15 Jul 2025 13:46:37 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhL7x03h1z3sjk;
Tue, 15 Jul 2025 13:46:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752587197;
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=BWEM7uyGZ8xJBaC8oyLTUG19hwk+qzpV26kePsm2f70=;
b=oh2zGnn8R1PUHdgAGXOC6viLBFvzYBVl/RvGroevHojc3Zxsj5GmqQK4t8bIzB4YfylhdS
kBxVuzldr9O70sOcNW7tYmKndNRAEMmPef9R4x3e06B3hzZrSYcsbdNvAnYUcVa0ejgGI9
u2Y//U7ikyq/uFlvpUySEmdFdF2qDpoWrKYNuYgmjsPg4tnOGC7P6HIFzNQiy6g6l9Bcpd
Aff/zTAHty90HyPQOu58OqaKVZpJHL77eWOrzhHV9ZFVO1bQv/BL7amy/vjiOfz+/jK2Y0
MjtRW/f76N77VaVQkXJm7Br4jNVsLC89uaVUn+f5WL+PA6R0KYLrm0apylzaAw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752587197;
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=BWEM7uyGZ8xJBaC8oyLTUG19hwk+qzpV26kePsm2f70=;
b=t8wL3JUHOEUAfATbQ99mUX1NUppzVp1FpB5IQ93NBbP58icpFsesgqw81D6xmoFESFaR6K
wpUi2V3POhy2NJP6rhTVo9Wp+0UGafWN30xOIAEfugFSHllzzLRAEq/Op8L94YlchIRGPw
Kbfwf056g6kU83i8Ju6PAnVXRfDASVtLH2e+0hqLo/BKP9qt3HrXh2PuN3KBtq/zIj5zP5
/gzrPs76QXkL0X53pzUhv+symXRoQwfHNU8LPtvJ7dgyHeOm4CzLR7hhEPLbzCz+eheYgo
/y2kvcDfmr44P+qIyYApJFZ+5VC3z+5+luNVPKSAbLULr/aaQalzdj+4qt43iw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752587197; a=rsa-sha256; cv=none;
b=FdvZ4W6K3xWJ0pd9OcPxS2zD+LtGxSDPVblm+RRnWlZbNYqq7/8P1v0lzAUoPz9nqOKgaR
DzdKYXKEWon3WKxpyNrui8tiMuPRPSgC9Zf/2I0KBRgUF01jZ/1NDyjz66f9iYXyeT3GgN
hOkNqzn6PL8Jlyu++1xZGpJ7VeQhLQSKtd3Hg9YVHsVm/QEawsUO2acZzDU5jKGDE8+x5A
vjbF1+wm8UP3Hmlz9wayiI1EX2H6XiCfu9aKg2mRrAb9MLF/xR7dNGLWqlSndqMcmZN2C8
K+VChzFwhVBilJX6fWGuew31UpNHudzjJ/2+svTwpXAnDscq8wBzW9uvgIqqWA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhL7w6mj6zjRr;
Tue, 15 Jul 2025 13:46:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56FDkanZ041912;
Tue, 15 Jul 2025 13:46:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FDkaDA041909;
Tue, 15 Jul 2025 13:46:36 GMT
(envelope-from git)
Date: Tue, 15 Jul 2025 13:46:36 GMT
Message-Id: <202507151346.56FDkaDA041909@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston
Subject: git: 854ac20aca7d - stable/14 - Makefile.inc1: Set
SOURCE_DATE_EPOCH in more pkg targets
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 854ac20aca7dc2a3819d540fd34945fdfd040313
Auto-Submitted: auto-generated
The branch stable/14 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=854ac20aca7dc2a3819d540fd34945fdfd040313
commit 854ac20aca7dc2a3819d540fd34945fdfd040313
Author: Mark Johnston
AuthorDate: 2025-06-27 13:06:58 +0000
Commit: Mark Johnston
CommitDate: 2025-07-15 13:46:24 +0000
Makefile.inc1: Set SOURCE_DATE_EPOCH in more pkg targets
Otherwise timestamps in the underlying tar files are not reproducible.
I believe this was a simple omission, other package targets specify the
timestamp this way.
Reviewed by: bapt
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D51066
(cherry picked from commit 78d91e21bf72a1b706c4152c4f8e2fed3fcbdac3)
---
Makefile.inc1 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index d9ac4491ef77..ec1558e3daef 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2101,7 +2101,9 @@ create-packages-source: _pkgbootstrap _repodir .PHONY
${_+_}@cd ${.CURDIR}; \
${MAKE} -f Makefile.inc1 \
DESTDIR=${SSTAGEDIR} \
- PKG_VERSION=${PKG_VERSION} create-source-packages
+ PKG_VERSION=${PKG_VERSION} \
+ SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
+ create-source-packages
create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source
@@ -2283,7 +2285,10 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
sign-packages: .PHONY
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} real-sign-packages
+ ${MAKE} -f Makefile.inc1 \
+ PKG_VERSION=${PKG_VERSION} \
+ SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
+ real-sign-packages
real-sign-packages: _pkgbootstrap .PHONY
printf "version = 2;\n" > ${WSTAGEDIR}/meta
From nobody Wed Jul 16 02:21:22 2025
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 4bhftq0Mqfz61wgG;
Wed, 16 Jul 2025 02:21:23 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhftp6nwhz3tF6;
Wed, 16 Jul 2025 02:21:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752632483;
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=G/9aRSrNbnZ9na9bQtPpyIPL6gzc2uid03DbE7dAWnM=;
b=o/JPemo/0+CIuXeaRYZGFQGqx7/dC5/WX+DMcuol+5bEITa9oPy+AMVkvqO+cyvWuDXaRp
pptrLJhxi3gBunQOY7uxmPeWkND02bs4pB6Z8E/tcuDT4QAwG5HDnUSO3FWJlNTFWC28jH
iUpv+hpTp4Vb/+IQl7FQ+1ddI3CjlFtp6+IEoMqVt3yW3tU55lZbAuzHjp+dvuZDi1ry5l
ke8G3hC5GjW8spLsf9dCnFXdaDN7jptru+dZFExsFEWPHxmv4EfhiuDt5MOOPQ79Hrphjm
5Kuv3sBq0MEBdikLdh2VALxvy3CdueGQZIibxQHIgtpSI8d2eJ4rs84+uGBUCQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752632482;
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=G/9aRSrNbnZ9na9bQtPpyIPL6gzc2uid03DbE7dAWnM=;
b=ZFIhzyIofITBBsD+87NZrQT2RZhIPdjlPs2anCVnKwa5rWRMPN+QsF6O6FXKVb8vBltRep
xKTz55mvOc0ph87ka7IoaPvo8P8ESB4cKJ/WEnMz8lCn0gEfwky+br192NPNy/HTS9pnqv
+B4bU56duwDcdgLHjYrSERHx+dZV7yYy40KVWulmXkxjk7hnQUPdtzSLoGPMhbpc/RRAQe
f7vr6he/ubcYDTp3gd8rDHwgdVmVbkaxTnaGAkqboFUhbMoptxM0jA222nexCz/YXYRZOa
SsO9KNuUb8H7gvWKxoV3UNEZxOEtW5rqlttpRof3fV79jzaAcwcBWB2v7bYTjg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752632483; a=rsa-sha256; cv=none;
b=XHPk1knuWQds+F25KmXnhF2P0EHH7lRFtSvby7ANhzKPf8tuwhMm6Zd1LsClBprrIWHeR5
JwlZmBjPQZwB7x8uJG4IIM2EZxa/NUjlZMKt9LsQU7bk6HG38ZVQSzYDH7rkzfW2LjGgz2
kmPRnzfr34/VsBW68IAYIqu9e4DPHPiq9KRtnoHiTzv5Gkt+eu27XhpdGeLfUJhqN2NENF
ejKWnVvBgufR1zmo3XigPdbMWHVrDTifLH8GJTnaRWQBOgRILlDL6cA4+gmdk50i9Nk0ak
PAT597N5D6b/PGvCaByk/hlCTRR3E/hokjghogei0qynT3zmwNCn9ILzoaPQ4A==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhftp6PNgz15V8;
Wed, 16 Jul 2025 02:21:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56G2LM9a066303;
Wed, 16 Jul 2025 02:21:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56G2LM5T066300;
Wed, 16 Jul 2025 02:21:22 GMT
(envelope-from git)
Date: Wed, 16 Jul 2025 02:21:22 GMT
Message-Id: <202507160221.56G2LM5T066300@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Koichiro Iwao
Subject: git: 16879ba61595 - stable/13 - ifconfig.8: remove
accept_rev_ethip_ver and send_rev_ethip_ver
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: meta
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 16879ba615952712df4a23e12fa2ff64a6b2d100
Auto-Submitted: auto-generated
The branch stable/13 has been updated by meta:
URL: https://cgit.FreeBSD.org/src/commit/?id=16879ba615952712df4a23e12fa2ff64a6b2d100
commit 16879ba615952712df4a23e12fa2ff64a6b2d100
Author: Koichiro Iwao
AuthorDate: 2025-07-11 12:06:34 +0000
Commit: Koichiro Iwao
CommitDate: 2025-07-16 02:19:47 +0000
ifconfig.8: remove accept_rev_ethip_ver and send_rev_ethip_ver
It is removed long ago [1] and unavailable on FreeBSD 11 and later,
but the corresponding entries in the man page were not removed
accordingly.
[1] https://cgit.freebsd.org/src/commit/?id=b1c250ff3ff6af36e95f5cf910973133c3445704
MFH after: 3 days
Reviewed by: mhorne
Approved by: mhorne
Differential Revision: https://reviews.freebsd.org/D51261
(cherry picked from commit cca6a72d7f7131685a082c123aff17208aa1693f)
---
sbin/ifconfig/ifconfig.8 | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 28b6f2dfb72e..68384d4994a9 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -27,7 +27,7 @@
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
.\"
-.Dd May 12, 2024
+.Dd July 11, 2025
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -2793,16 +2793,6 @@ interfaces previously configured with
Another name for the
.Fl tunnel
parameter.
-.It Cm accept_rev_ethip_ver
-Set a flag to accept both correct EtherIP packets and ones
-with reversed version field.
-Enabled by default.
-This is for backward compatibility with
-.Fx 6.1 ,
-6.2, 6.3, 7.0, and 7.1.
-.It Cm -accept_rev_ethip_ver
-Clear a flag
-.Cm accept_rev_ethip_ver .
.It Cm ignore_source
Set a flag to accept encapsulated packets destined to this host
independently from source address.
@@ -2811,16 +2801,6 @@ from the load balancers.
.It Cm -ignore_source
Clear a flag
.Cm ignore_source .
-.It Cm send_rev_ethip_ver
-Set a flag to send EtherIP packets with reversed version
-field intentionally.
-Disabled by default.
-This is for backward compatibility with
-.Fx 6.1 ,
-6.2, 6.3, 7.0, and 7.1.
-.It Cm -send_rev_ethip_ver
-Clear a flag
-.Cm send_rev_ethip_ver .
.El
.Ss GRE Tunnel Parameters
The following parameters apply to GRE tunnel interfaces,
From nobody Wed Jul 16 07:39:58 2025
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 4bhnyQ6CQsz62DQx;
Wed, 16 Jul 2025 07:39:58 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhnyQ4QMdz40c1;
Wed, 16 Jul 2025 07:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752651598;
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=S/IdMWYE3ixG1CUvXXC5ZB7a0gEyC3tI6zoOWgrX7HU=;
b=dZRxDNuOMheEADAKfNo3Hba3Vp5E6NToRjK+4IBY9zKEu7DlNhAMYrNsoIP7rI+Dn6S+WC
hmBR4yUoWBja3wU+BdHOCGvI2kLWA0YExeB4zQFRGLbxvrGqzmkfFUCQd36mqXvLRbm+d6
Eye1Wxv7gD9dUx3WFRqY8WMcYwuOIQOXG2x1lJns1xncX45YrdrUmlNh2TvyBQX16kyZTV
IT8KjitklYHNfz9+r63sk1stcmqwDTFA/gxZdMmYTQPrVdub54NJVKMj+/qA4CGprew7Wy
dfgHRWnu+wjFKaGXUlxNQiK4ygal9OoRZ46P8AEQW8sQbBOhSTMsD7BU8nfIJA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752651598;
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=S/IdMWYE3ixG1CUvXXC5ZB7a0gEyC3tI6zoOWgrX7HU=;
b=J9Y+wgk3/byKZ5N+LlJB+si7+T/rwl46p6Y96Pq4vuVybmFfN0DBT9l+68kb4FBNeyj5Ny
LrVg8DGjcts6XkqdGKdTOTTFxLRxm0sYfHVmt/i5dvvqWP5eLX50jwyhO33vzFUPgiL7pN
qDbt3PWLANSXP8Q13Ftw/t3iXhJrQCijn8IbgyKhCQdX8oPw8Dg9f6OZp7Bgp308HH5VfS
KuaGcXoKUSf++jSvKfZEbeWeTtKzbzSQyd0hYyrAF/3YKKUW3sMGEJbTF1QI3FDBQrUvlV
hqbUPmnL2bZCN7CqdygPOI5c6NptHJepIlLqJMPnGW66rUOrmQhKUBiSnDQlQA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752651598; a=rsa-sha256; cv=none;
b=TL8whLzSjozvxo8r3Dnqkl/1fVZQnrFf3WBfvxEoe08clPfBntvxFh/camsl4QXmW7wd+N
NXymrRifd6PGiAV+FfLQFUPFL1yJwgkI6mLKMfcOU4OETGHuJ9o/1agmyCCeMPAeI7D8lz
I5jCiv3CXImTUJU+98Azr2PShz18V9E6vjmexUCGxSsaJzOUimzEHCNuFw5tkSmEREvUmv
4jiIyA1dDhyW3sfltEEUCNof6XqUy+Z5mBudUuYLsPt1uror6b61cbRarKlE0QOr/y6yUz
4U8+h6G7pWREMiH9pdqbvOo1zoh8QH1fd19ysbXW/CztGBmYvzV26G5L0vyE4g==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhnyQ3qNtz1Fp1;
Wed, 16 Jul 2025 07:39:58 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56G7dwB8058495;
Wed, 16 Jul 2025 07:39:58 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56G7dwnF058492;
Wed, 16 Jul 2025 07:39:58 GMT
(envelope-from git)
Date: Wed, 16 Jul 2025 07:39:58 GMT
Message-Id: <202507160739.56G7dwnF058492@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Koichiro Iwao
Subject: git: 3348498d96d5 - stable/14 - ifconfig.8: remove
accept_rev_ethip_ver and send_rev_ethip_ver
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: meta
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 3348498d96d5c1a11c87f9983185c48d29a504b5
Auto-Submitted: auto-generated
The branch stable/14 has been updated by meta:
URL: https://cgit.FreeBSD.org/src/commit/?id=3348498d96d5c1a11c87f9983185c48d29a504b5
commit 3348498d96d5c1a11c87f9983185c48d29a504b5
Author: Koichiro Iwao
AuthorDate: 2025-07-11 12:06:34 +0000
Commit: Koichiro Iwao
CommitDate: 2025-07-16 02:17:26 +0000
ifconfig.8: remove accept_rev_ethip_ver and send_rev_ethip_ver
It is removed long ago [1] and unavailable on FreeBSD 11 and later,
but the corresponding entries in the man page were not removed
accordingly.
[1] https://cgit.freebsd.org/src/commit/?id=b1c250ff3ff6af36e95f5cf910973133c3445704
MFH after: 3 days
Reviewed by: mhorne
Approved by: mhorne
Differential Revision: https://reviews.freebsd.org/D51261
(cherry picked from commit cca6a72d7f7131685a082c123aff17208aa1693f)
---
sbin/ifconfig/ifconfig.8 | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 2f87ae8b8a5f..ce15e3a68abc 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 6, 2024
+.Dd July 11, 2025
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -2828,16 +2828,6 @@ interfaces previously configured with
Another name for the
.Fl tunnel
parameter.
-.It Cm accept_rev_ethip_ver
-Set a flag to accept both correct EtherIP packets and ones
-with reversed version field.
-Enabled by default.
-This is for backward compatibility with
-.Fx 6.1 ,
-6.2, 6.3, 7.0, and 7.1.
-.It Cm -accept_rev_ethip_ver
-Clear a flag
-.Cm accept_rev_ethip_ver .
.It Cm ignore_source
Set a flag to accept encapsulated packets destined to this host
independently from source address.
@@ -2846,16 +2836,6 @@ from the load balancers.
.It Cm -ignore_source
Clear a flag
.Cm ignore_source .
-.It Cm send_rev_ethip_ver
-Set a flag to send EtherIP packets with reversed version
-field intentionally.
-Disabled by default.
-This is for backward compatibility with
-.Fx 6.1 ,
-6.2, 6.3, 7.0, and 7.1.
-.It Cm -send_rev_ethip_ver
-Clear a flag
-.Cm send_rev_ethip_ver .
.El
.Ss GRE Tunnel Parameters
The following parameters apply to GRE tunnel interfaces,
From nobody Wed Jul 16 12:47:26 2025
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 4bhwnB641tz62T7F;
Wed, 16 Jul 2025 12:47:26 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhwnB5P4Kz481S;
Wed, 16 Jul 2025 12:47:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752670046;
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=b+3UpC4QElSw+qm0wYibKEDchnxkqta3bArgru/Wsjo=;
b=wAnoFn/ia/weDOs8w1rjW9Sguv65PpHwfTfjyAUpMbBZD7rWZSvv/Az3nql+ooNGRQ2gHo
e81X5ZMOu8p4NmDj9kjFSvYHpfIyxln3nflnlX8nVmuR3owGSprt1J1ZGivUIkVxN6DBD7
5/NgoDlSFptaGqV9oBVT2gGS/pRiCWTxH1CpR1pimtUcwZBhX2EfmSWNBPeUqKG1kqnWCB
YYgDS9HIsGHsHJRArW3e0IIA/ZZPbBtJd7aZzqUTAwfM5AFlCnZCTbl6m0ONZaqjYk7N92
Iyrd29HnsCTxmZFu9D9UaaA+CrFd71ob7n14vLtMtVwtt2EWuOx4msFOFf27EQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752670046;
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=b+3UpC4QElSw+qm0wYibKEDchnxkqta3bArgru/Wsjo=;
b=KkQy+NB9DmBLKgzaXhEfO73nYKvQDumCooRK5dOG7jSkzvJar8pjvEnb7unKF3vesDzpDG
UG7wIsyXxnI4/Z5tf5h5KMFIc+3U0MPrIFtsc31Z3cKLfGMcEZ6e+436ZC1OxTzyAeDVJi
ig5nIvZKh6Q3sbCSZMkvXRDmDuoIuil+sw5HVkiFSsKLolCfk3aDfFt9Uqordj/VNclygB
y49VZnCChUcMCN5thV71sRMgam7DI/rODbwjcQHu8oD//YUfvsnP/es0uR4XJzI/eLQN2P
SQHY3rUt1f30WhqDSUUB7fbE1B523dlIh68SjH5mGHrs67P7SMGWKyr+s+dGeg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752670046; a=rsa-sha256; cv=none;
b=PhwKd4c4isMzZyri9cSxU/GVsLkrxIYFug2dDlCbSTdUVe+fAMljGz6ByzFXfSZWI+YAle
5j77R57B31RO6FJGvcJJ+H2UEa5i/QsT4HSsp0m7VAbERbyuJpvdgRs7GZmKi3lbfNTN68
rxg7rM2Izoa3Vxpil8VPWLHi3k8VXf4s0q9FeYLDv9l97lnvN0K6n7BeuheJpdfE90Axml
H9f/Q1nOIsq9CuvqoaM9UspZ4SiR1u2YeOJ0ZuTzFDG19RSP5Key2pT4UuNWeFIT57iLTw
wWu9HxPwtrg2K2AfLs7gqE+R+k0044PfwhuXPX03hvA17bTFd0QVPOSdZZ+jSg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhwnB4R5Vz1PZB;
Wed, 16 Jul 2025 12:47:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56GClQip042095;
Wed, 16 Jul 2025 12:47:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GClQgo042092;
Wed, 16 Jul 2025 12:47:26 GMT
(envelope-from git)
Date: Wed, 16 Jul 2025 12:47:26 GMT
Message-Id: <202507161247.56GClQgo042092@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost
Subject: git: d7e62fc3d719 - stable/14 - pf: ignore state update
with invalid rtableid
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: d7e62fc3d719469297681919b7bf0ed010b05344
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=d7e62fc3d719469297681919b7bf0ed010b05344
commit d7e62fc3d719469297681919b7bf0ed010b05344
Author: Kristof Provost
AuthorDate: 2025-07-08 11:21:20 +0000
Commit: Kristof Provost
CommitDate: 2025-07-16 08:06:10 +0000
pf: ignore state update with invalid rtableid
It's possible for a peer to send us a state update with an rtableid we don't
support (i.e. >= net.fibs).
Drop these updates rather than potentially crashing later by setting an invalid
fib number.
PR: 287981
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 4af4fefedd1bf14b5a27387075edde98744b722e)
---
sys/netpfil/pf/if_pfsync.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 64c938ee52ee..8c080b472653 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -699,6 +699,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version)
__func__, msg_version);
}
+ if (! (st->act.rtableid == -1 ||
+ (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs)))
+ goto cleanup;
+
st->id = sp->pfs_1301.id;
st->creatorid = sp->pfs_1301.creatorid;
pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src);
From nobody Wed Jul 16 12:47:27 2025
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 4bhwnD25R7z62TYK;
Wed, 16 Jul 2025 12:47:28 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bhwnC4YR9z481W;
Wed, 16 Jul 2025 12:47:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752670047;
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=7dweWn1Q+pprZ0AySDbZya5as9g1V0C6V5ZC31eO4Go=;
b=ZAOuOwdwdWpn1nRuCqouSspbgW39h8L5EpeHbh/7Gj3A1l69zjxmq51sYlM46ViOG36ygO
uGwciBmrlADR+QNbyf+w0sdXBofpXZDOhQvg6MjTUPXsZO+1mHPSZeoZm6UMsDgfstk7Qd
+48K3JoNXrchndEV2wTVQyam2jgNJ/qKQmchhxODqPoYufWZNwx56e5q026T+EBoCdXlSR
HMfNikcQ2sJeupZlHFl/lSOjah3Ccs7iwGDXSecm+LnN+3XeMgrzsXE5Vmn3KJNrywBPog
9AgjzNCOkQt+kxXSdKMxtSK4CqKAmHsokT8RzcX4JX0Wp3i5mYmCJYKbJE+/+Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752670047;
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=7dweWn1Q+pprZ0AySDbZya5as9g1V0C6V5ZC31eO4Go=;
b=MrXAxkHz7xaQR5R9y5HUB1M0af7FH0tB6mNhbYay3WLxXzknPyx9KazDoUVPmx3YEeOv+l
jXhGQnay/v9xXGiq5Nr0O0HmZ5vHggJkIarmQINCh1V3LyMKGgb280Uk6wjiLZy0bItYVS
ROloGLm5X0HVAwCdIW/NuZJQ/b0hS3WpLC8UXsAOOhu1ktVEdTSgg+RFQYVkVfd+DQyFkf
eOtZ0pbTSy3nCnlk/lPAXeDpBiBW/miwn8HPk4bHbSW/AedxQteeevovQ+hnZTlA8OyRoN
TEM9N1cFT8lh/vaOiAKJyrz/xsPO5OrogEhA+p7eFcon3/FKmy4rXJpfG2R8/w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752670047; a=rsa-sha256; cv=none;
b=c0yPLN83zh5vZH+LMomfMrn6TVg6zGB7LxsO1+AlvpT8+j8AKBFoTm/Sw7EF/UG3vgGmxa
86SFDfZp14wNhUNPkyzhpV7vX4mIQvd06cmTqUiAGXKppqflMbRN1uNn7ItnWW8wXeewDp
KsQEAUq/IzqifTHMKgVKmHqnvmoIz78YfsHUElRYKt8bxe9D2Rhgmr3ZPEo+606TIyJHJ1
dIn+JIYyaC6YrwHwjUnCtrVE1prX2/W0bi0rxQmvADClqhzP1sCHTB0w9ZzL7YQHaOItjt
AKGGJTqiAwMWqJex5C+KTxnUkLLPtaAeTQmrx4vjQMfjIVF1VuvWKjAfC9Rs3A==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bhwnC48scz1NZk;
Wed, 16 Jul 2025 12:47:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56GClRtC042129;
Wed, 16 Jul 2025 12:47:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GClRaF042126;
Wed, 16 Jul 2025 12:47:27 GMT
(envelope-from git)
Date: Wed, 16 Jul 2025 12:47:27 GMT
Message-Id: <202507161247.56GClRaF042126@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost
Subject: git: b2d979b1ea6c - stable/14 - pf tests: sync a state
with an rtableid that doesn't exist
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kp
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: b2d979b1ea6c43861e195852d7a7f1ace51cf10d
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=b2d979b1ea6c43861e195852d7a7f1ace51cf10d
commit b2d979b1ea6c43861e195852d7a7f1ace51cf10d
Author: Kristof Provost
AuthorDate: 2025-07-08 15:14:16 +0000
Commit: Kristof Provost
CommitDate: 2025-07-16 08:08:02 +0000
pf tests: sync a state with an rtableid that doesn't exist
Create a state with an rtableid (i.e. fib) that doesn't exist on the receiving
side. This used to not be handled, and could provoke panics. Create such a
situation to ensure we still don't panic.
PR: 287981
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit f651e87be28dd6c3f466dc865b1a036089b892ff)
---
tests/sys/netpfil/pf/pfsync.sh | 85 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index 441221f39d27..01d76e23889c 100644
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -826,6 +826,90 @@ basic_ipv6_cleanup()
pfsynct_cleanup
}
+atf_test_case "rtable" "cleanup"
+rtable_head()
+{
+ atf_set descr 'Test handling of invalid rtableid'
+ atf_set require.user root
+}
+
+rtable_body()
+{
+ pfsynct_init
+
+ epair_sync=$(vnet_mkepair)
+ epair_one=$(vnet_mkepair)
+ epair_two=$(vnet_mkepair)
+
+ vnet_mkjail one ${epair_one}a ${epair_sync}a
+ vnet_mkjail two ${epair_two}a ${epair_sync}b
+
+ # pfsync interface
+ jexec one ifconfig ${epair_sync}a 192.0.2.1/24 up
+ jexec one ifconfig ${epair_one}a 198.51.100.1/24 up
+ jexec one ifconfig pfsync0 \
+ syncdev ${epair_sync}a \
+ maxupd 1 \
+ up
+ jexec two ifconfig ${epair_two}a 198.51.100.1/24 up
+ jexec two ifconfig ${epair_sync}b 192.0.2.2/24 up
+ jexec two ifconfig pfsync0 \
+ syncdev ${epair_sync}b \
+ maxupd 1 \
+ up
+
+ # Make life easy, give ${epair_two}a the same mac addrss as ${epair_one}a
+ mac=$(jexec one ifconfig ${epair_one}a | awk '/ether/ { print($2); }')
+ jexec two ifconfig ${epair_two}a ether ${mac}
+
+ # Enable pf!
+ jexec one /sbin/sysctl net.fibs=8
+ jexec one pfctl -e
+ pft_set_rules one \
+ "set skip on ${epair_sync}a" \
+ "pass rtable 3 keep state"
+ # No extra fibs in two
+ jexec two pfctl -e
+ pft_set_rules two \
+ "set skip on ${epair_sync}b" \
+ "pass keep state"
+
+ ifconfig ${epair_one}b 198.51.100.254/24 up
+ ifconfig ${epair_two}b 198.51.100.253/24 up
+
+ # Create a new state
+ env PYTHONPATH=${common_dir} \
+ ${common_dir}/pft_ping.py \
+ --sendif ${epair_one}b \
+ --fromaddr 198.51.100.254 \
+ --to 198.51.100.1 \
+ --recvif ${epair_one}b
+
+ # Now
+ jexec one pfctl -ss -vv
+ sleep 2
+
+ # Now try to use that state on jail two
+ env PYTHONPATH=${common_dir} \
+ ${common_dir}/pft_ping.py \
+ --sendif ${epair_two}b \
+ --fromaddr 198.51.100.254 \
+ --to 198.51.100.1 \
+ --recvif ${epair_two}b
+
+ echo one
+ jexec one pfctl -ss -vv
+ jexec one pfctl -sr -vv
+ echo two
+ jexec two pfctl -ss -vv
+ jexec two pfctl -sr -vv
+}
+
+rtable_cleanup()
+{
+ pfsynct_cleanup
+}
+
atf_test_case "route_to" "cleanup"
route_to_head()
{
@@ -933,5 +1017,6 @@ atf_init_test_cases()
atf_add_test_case "timeout"
atf_add_test_case "basic_ipv6_unicast"
atf_add_test_case "basic_ipv6"
+ atf_add_test_case "rtable"
atf_add_test_case "route_to"
}
From nobody Thu Jul 17 00:28:48 2025
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 4bjDLT04SKz62Bcp;
Thu, 17 Jul 2025 00:28:49 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bjDLS4qrzz3JVq;
Thu, 17 Jul 2025 00:28:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752712128;
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=zexe+qWQU5oR6lNA69CoqhLYQ+O+Tdszf7eQuu95+FI=;
b=UCJpZM/LjZIe0Z5PHOxwAkb7udBBcYw+r/Lq7RnnjpRVUwKKDG4nb6BsuHhJrwpIA2y3/h
ckQO2lRIazxYfuWQjiFG4hgMNRhVkoHHh7hIw78xoe1HwpmKRj6Y9D+pwOx7DUAA8jh7uJ
a0PWsHHtloDZcJKT9PM31+l3Vbv4SKk1eTa8VT0enEzuyIk0tNLG5OGLFAl9XOW4S71YY7
YlwHkJqB+hzIcMz/+GLkkIq2dIC4T9/XGRQowvhnKK8BRGQEqIUNVbvCyGzHPwpxvCq5ci
qmcS2YlLUuIyZK0Fes0u0EGw2X+UMjV3aQnPqb48101b6fJtMus0FzXLOxFIYA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752712128;
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=zexe+qWQU5oR6lNA69CoqhLYQ+O+Tdszf7eQuu95+FI=;
b=qthAGImkeeR+eSCpAWoLHS4mff59VbVqkCtRw8Xe4sa1KH2pwjwEKKP5HrF/HZcsU3bon5
3q2v0z+oRxV9onWiECEOYRvfFYRsYk585kAAl+kBasofI7UYAF+F7uNIO+QBG2IULh+aK/
1XhUMPo9LTRQT52JaNrTWEIhTfyOuMl+9iTz+64LsAEVPcdX0kz513AW1QfZvLQnii9U0T
EucCO2gFFuNnuM4xDnZboJ8nmY0LooDAMNrQrKswXEFAOqhjWurSNzqAPpGah+1Ph5OFeJ
U9+1YCUFQ7NIpvW6pUAW8BrVCwEh1Upbp1dSci4R9O5CKI/KFj14F/zw3PR7ag==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752712128; a=rsa-sha256; cv=none;
b=S1+2P3Kbd1+d0s9q7mRtKsct/Ay2pN184PI6tzGgxjPSU5IqVfzWnCD3fspJAolMWI0vi5
tWe5mmkh38WNbqYBtLEzVlr/ClgPB0CCLMA7hSOSZW7qwKhdQGFnKCEsT8gGu1b2lH+j+r
iWU5bSKVm92H6Af/TIM5EPouv4jWh5YD4PMoPG4SPxkn1H30v9hjHaViNIOuBxJkpEP9hk
HNfrFmWp2MoRcvQF7mtwhGguBTjvoIaGPuqC2hzHEq0pY0VTHunH1UFVxDQdchqEYlTgqS
m/Iy4mnIVQYmKBmk2Sv+k9AncYfoU842UOnDs+wdkqHl60kTnoxEWmenSnypIw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bjDLS4HJWzY8T;
Thu, 17 Jul 2025 00:28:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56H0Smet064312;
Thu, 17 Jul 2025 00:28:48 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56H0Smvt064309;
Thu, 17 Jul 2025 00:28:48 GMT
(envelope-from git)
Date: Thu, 17 Jul 2025 00:28:48 GMT
Message-Id: <202507170028.56H0Smvt064309@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov
Subject: git: 76e5fcc2874e - stable/14 - ast: do not dereference
NULL td_proc in CTR statement
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 76e5fcc2874e821d28804a6e2c25b3f7aaf5f9ce
Auto-Submitted: auto-generated
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=76e5fcc2874e821d28804a6e2c25b3f7aaf5f9ce
commit 76e5fcc2874e821d28804a6e2c25b3f7aaf5f9ce
Author: Konstantin Belousov
AuthorDate: 2025-07-14 21:54:34 +0000
Commit: Konstantin Belousov
CommitDate: 2025-07-17 00:28:21 +0000
ast: do not dereference NULL td_proc in CTR statement
(cherry picked from commit 42f1054ef12d10f3ba46770b985a320b0ceb9f2f)
---
sys/kern/subr_trap.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 5a89ba8b6500..e836e5383c4b 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -340,8 +340,9 @@ ast_handler(struct thread *td, struct trapframe *framep, bool dtor)
td->td_ast = 0;
}
- CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td, td->td_proc->p_pid,
- td->td_proc->p_comm);
+ CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td,
+ td->td_proc == NULL ? -1 : td->td_proc->p_pid,
+ td->td_proc == NULL ? "" : td->td_proc->p_comm);
KASSERT(framep == NULL || TRAPF_USERMODE(framep),
("ast in kernel mode"));
From nobody Sat Jul 19 05:16:24 2025
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 4bkZdP4nzPz62K7w;
Sat, 19 Jul 2025 05:16: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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bkZdN6J5wz3vyt;
Sat, 19 Jul 2025 05:16:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752902184;
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=rlbVLSBVjMN8xiqjInBGvkzjfuECXC08JtgJwIg7GL8=;
b=r/xTl8HbubFJagLxrYiQLkuXMa562yqo8pIxbyrEuUkmNg3Lka8uowLmFm1Liju5diawAp
PXe5PNg/tCWqn1xs6yBzCcGx2tOnmKf+2OBhJTEj2+kABgzRi0jDaPEXaQNMA6qpLzYdZY
VcSrJ4vr/6Dc6SNUCaVVykIpwqG44WJSQiNvJiUfySX8DrD/D0Chekm4Xh4Iqf3E1sh9q4
SY9g7NRndTuQZdNQBbzPC2YjmU+GWx3zQNSNsGtC6u8N1VLRpVGJJK33+mWLzK78AFeLqK
EoDWDBRjfIxGnV35vr4x/laI4fvaicvwYMRLNaREoLH2CFSxaYvjA6aqKj1rBg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752902184;
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=rlbVLSBVjMN8xiqjInBGvkzjfuECXC08JtgJwIg7GL8=;
b=Am3PYoDtbzfFE27yqyOBacWklsEcEgyTVU+NXBz7D/yh+1wOQ9NZqYdsQr3rpRDlqDZ8Xr
U+8lFVOzqfKgONKc9ZSDIJRZSjtfVLV/MQyecLuJQQqeTGfxpE9LRs7lgBtSp534hr6+yE
AKHtlRhhn3oXYKiEnp2ldnM0gOcLYkzU+5nkoNoSAKV8rswrkAMJ9xBWHYpd/3V5Jyi7Ow
qi5eaQBAHbjtfbhmFAcdg3EkI4NnjQ+EgOump50eZRdtleOJqISsZ74YSX5hHa65TXn0db
vUAMSOjf2uQDO/qb2qQjU8SZQy4ktDMud9XVCwiGxD5PFAH+jkc3kCkjrPNvWQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752902184; a=rsa-sha256; cv=none;
b=YVJ7+pH46lyGY5Btl6Cxd/oi0WdhJzl877Z0xJRYVX5MIRA0ghOCCfVGaYkhE50F1IYnlZ
1JFMcM+AE+7yAcTOwFUp1xCI6jzGqnSRk6DPhsiyelloQJHhjrVU1/c1zPyzukIfMxVs34
1B8+ROWz8YKCFrn7O1iInbTfVDlB9HdhLVJv0dnCyYBkJgZAeQwhEFr2WGEm9xMUddtEp9
YhT2oooYQK5QI9I9k8LSkSvD3EPb+eRA3oDmNMoi9D5zhDUSXgdUVgiQ/DQ3AN5TNnKv2B
HQJgnhNd/YQMe4xnjBIPVrBPweCfv5JvSo8l7b9YIwS2BAUg5pD5yRNQufKvIg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkZdN4SYxz1Bkl;
Sat, 19 Jul 2025 05:16:24 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56J5GODN028478;
Sat, 19 Jul 2025 05:16:24 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56J5GO6q028475;
Sat, 19 Jul 2025 05:16:24 GMT
(envelope-from git)
Date: Sat, 19 Jul 2025 05:16:24 GMT
Message-Id: <202507190516.56J5GO6q028475@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lexi Winter
Subject: git: ecf88947ef74 - stable/14 - nlmsg_report_err_msg: add
__printflike annotation
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ivy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: ecf88947ef74607c9885b7d01b6bb2cfdf959b02
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=ecf88947ef74607c9885b7d01b6bb2cfdf959b02
commit ecf88947ef74607c9885b7d01b6bb2cfdf959b02
Author: Lexi Winter
AuthorDate: 2025-07-10 21:02:21 +0000
Commit: Lexi Winter
CommitDate: 2025-07-19 01:04:20 +0000
nlmsg_report_err_msg: add __printflike annotation
Reviewed by: kevans, kp
Approved by: kevans (mentor)
Differential Revision: https://reviews.freebsd.org/D51234
(cherry picked from commit db55cc8110ceea084c6f52a1ecfd6ab87e0aac2b)
---
sys/netlink/netlink_message_parser.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h
index 0242177fdd26..82341fef8458 100644
--- a/sys/netlink/netlink_message_parser.h
+++ b/sys/netlink/netlink_message_parser.h
@@ -196,7 +196,8 @@ int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt,
int nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt,
const void *arg, void *target);
-bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...);
+bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...)
+ __printflike(2, 3);
#define NLMSG_REPORT_ERR_MSG(_npt, _fmt, ...) { \
nlmsg_report_err_msg(_npt, _fmt, ## __VA_ARGS__); \
From nobody Sat Jul 19 05:16:23 2025
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 4bkZdM6Fhtz62K1W;
Sat, 19 Jul 2025 05:16:23 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bkZdM42qZz3vqd;
Sat, 19 Jul 2025 05:16:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752902183;
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=ESP4S9aQpnDf5e8TrOBrBFBSEMbPqAQN9O4+FcHCJ48=;
b=rjIEkGI8f0WFmksPyp4RmPtysDmzpRBcxaoiZJuHcgABidjU/MmPV5nlGZsOQR4UkTbIuL
jBOH6Nuy4o9SjURyxq0MOi3pYv87Y7D1PO9VIl8+qeF9jYCe5dKam909N5K9HlNvoCOXn8
deDh2OnY/RbSxIQ+7d4fOaiAxDWUZo9+SKY2g8pPmTM6sd8xOHpbdaei+z5YOMt2gnofuI
Tl8XDapyMveVvQfSudaL9j21uGb/YjMw/t/GgO3x5tGUC53xnjGMqufAEU3gBUUSbEjczb
CJ14FpjHfygGf7V+Q2He4fAjKPZP3ARRhYYBvvrXqAN4NkcGPGkMtJDc0oR0FA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752902183;
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=ESP4S9aQpnDf5e8TrOBrBFBSEMbPqAQN9O4+FcHCJ48=;
b=blwIBwIRDzsKHCjrcDasDXiObU4vCXHc6M5fgj2aHiweF0LAys6akXqO7GSwOUfMNu4aEC
d9KsGT+wBdYY/ygM0K1qRSISuBnlB6ATDWp2uCdwwgHs9bs1PyxkMe5KUHZ27outQhP/hu
ozsYNggoPACtXpiRBBM31/acjl3UGQD1teXMobQcUGWKBUvOi8e4wKu6F+eMRDAeuf4y6N
V5OUeUVnOpYI2+xC/5EQWhyAnVVwbfmuL6ZisanWIvrn0541OLjeeKf97BTMFTOlqKGF7c
BVSN+3i/6/LbBasrvOmHLBqZYJWKQhYaXMT4eIVn4d6t5JrgY/5pmw9wTa8Iyg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752902183; a=rsa-sha256; cv=none;
b=UcL4wkTA/znbD/MOGvao31Mv028INLYHhZ96uX2yPUJejTe4slwwd6hlhiWp1s+D2SMOYR
KWk/cu0jtgS40z/MEqutEbF2sbBqn7WkSgRavO/qy5WBBRbVAnp6gAToOJdJ2qknLFXjoP
vsqNWhSuHVI/PGm2LSkQLuuys8dKW4z05w/0K5UT7EVl+6KDZKtnOmO5FvWcbOPX+f1G1e
NPpjAhtz9A+oPbgUS1gi0iK11XAcpB5Ot7/RhTD/yacEp09Pt9UOBCSqnF7rti8s1edJPu
NMi/RU858hGS9tM09ilGq0/iSNdTKYwg4a/2JoGn6IQ+WrwF7GdGMzggfJHFMg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkZdM3T4Qz1Btr;
Sat, 19 Jul 2025 05:16:23 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56J5GNbx028445;
Sat, 19 Jul 2025 05:16:23 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56J5GN6G028442;
Sat, 19 Jul 2025 05:16:23 GMT
(envelope-from git)
Date: Sat, 19 Jul 2025 05:16:23 GMT
Message-Id: <202507190516.56J5GN6G028442@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lexi Winter
Subject: git: d350c18f98fd - stable/14 - deprecate RIP
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ivy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: d350c18f98fd41e773a4856bff268f4f8060b21e
Auto-Submitted: auto-generated
The branch stable/14 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=d350c18f98fd41e773a4856bff268f4f8060b21e
commit d350c18f98fd41e773a4856bff268f4f8060b21e
Author: Lexi Winter
AuthorDate: 2025-07-06 23:22:42 +0000
Commit: Lexi Winter
CommitDate: 2025-07-19 01:03:53 +0000
deprecate RIP
Per https://wiki.freebsd.org/DeprecationPlan, deprecate RIP in 15.0R,
with the intention of removing it in 16.0R.
Add a note to the manpages of routed(8), rdisc(8), rtquery(8),
route6d(8) and rip6query(8) noting that they will be removed
in a future release.
RIP has been obsolete for over 20 years and no one is running it on
modern networks. If someone really needs RIP, there are alternatives
such as 'bird' or 'quagga' available from ports; there is no need to
ship it in base.
Relnotes: yes
Reviewed by: des
Approved by: des (mentor)
Differential Revision: https://reviews.freebsd.org/D50292
(cherry picked from commit 4b7cdb5a420f518fbe1968a6916b6d017f54025d)
---
sbin/routed/routed.8 | 9 ++++++++-
sbin/routed/rtquery/rtquery.8 | 7 ++++++-
usr.sbin/rip6query/rip6query.8 | 8 +++++++-
usr.sbin/route6d/route6d.8 | 7 ++++++-
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 08d39041cdf9..828960d920ff 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -29,13 +29,20 @@
.\"
.\" @(#)routed.8 8.2 (Berkeley) 12/11/93
.\"
-.Dd June 27, 2022
+.Dd May 20, 2025
.Dt ROUTED 8
.Os
.Sh NAME
.Nm routed ,
.Nm rdisc
.Nd network RIP and router discovery routing daemon
+.Sh DEPRECATION NOTICE
+The
+.Nm routed
+and
+.Nm rdisc
+utilities are deprecated and will be removed in
+.Fx 16.0 .
.Sh SYNOPSIS
.Nm
.Op Fl isqdghmpAtv
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index de5e1fc7cf96..ff46a3414dcf 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,11 +1,16 @@
.\" $Revision: 2.27 $
.\"
-.Dd June 1, 1996
+.Dd May 20, 2025
.Dt RTQUERY 8
.Os
.Sh NAME
.Nm rtquery
.Nd query routing daemons for their routing tables
+.Sh DEPRECATION NOTICE
+The
+.Nm
+utility is deprecated and will be removed in
+.Fx 16.0 .
.Sh SYNOPSIS
.Nm
.Op Fl np1
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8
index 856a59138bc1..92e49f5ade58 100644
--- a/usr.sbin/rip6query/rip6query.8
+++ b/usr.sbin/rip6query/rip6query.8
@@ -29,13 +29,19 @@
.\"
.\" $Id: rip6query.8,v 1.2 2000/01/19 06:24:55 itojun Exp $
.\"
-.Dd October 7, 1999
+.Dd May 20, 2025
.Dt RIP6QUERY 8
.Os
.Sh NAME
.Nm rip6query
.Nd RIPng debugging tool
.\"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+utility is deprecated and will be removed in
+.Fx 16.0 .
+.\"
.Sh SYNOPSIS
.Nm
.Op Fl I Ar interface
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 3a7bc8721923..e9ad3266ba26 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -14,12 +14,17 @@
.\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
.\" A PARTICULAR PURPOSE.
.\"
-.Dd November 18, 2012
+.Dd May 20, 2025
.Dt ROUTE6D 8
.Os
.Sh NAME
.Nm route6d
.Nd RIP6 Routing Daemon
+.Sh DEPRECATION NOTICE
+The
+.Nm
+utility is deprecated and will be removed in
+.Fx 16.0 .
.Sh SYNOPSIS
.Nm
.Op Fl adDhlnqsS
From nobody Sat Jul 19 05:16:46 2025
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 4bkZdr0BdGz62Jlv;
Sat, 19 Jul 2025 05:16:48 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bkZdq0Wk6z3wKC;
Sat, 19 Jul 2025 05:16:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752902207;
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=NJ8/yJ2dkhfy0gIhZ4SVts80BxaKub2obVXyovWAB8Q=;
b=tUW2ARNgM1vur6/ZFhmJCckBkl4wtj8hCVOxhvko4W+AiZEUeBMByncJvux0+peUWdVEVu
1Uvm/BNsJGpnj4FtQoLA7n89eIJ0uiujzhSJTVfq1vYJ7IEKV/INzRQhdAm8BeyvcJBpG3
nyzOd6x0Ji3y5qt2JkeTozdFK6dQughTcW1pYs6ZhESIADVmw+zNhk4fhll90RqfFY59Jb
tqSBPnOIYKZEEb/E+U/KA/DAdxfWUItiDIAVptntprSOQrbO0dz4dOPcpvgRiFl5XivOBI
85soZ56kPAy78X2jmUc7auPM5EmnpkCl2vR8K7n4uT2xigTcCudGsMqUuulb1w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752902207;
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=NJ8/yJ2dkhfy0gIhZ4SVts80BxaKub2obVXyovWAB8Q=;
b=fK+86FGRTgCsRwXk8QNoYJhc6tDNVC+FO89A4YM52R7HwZM4piMz0vjrvDc1X1lNlZSsKz
U7pJhJZJ9BYUu46O2/uuelxiPoNblH5n5xWIVFNjMsVM9LIv+rzKmO6DwMhveIiErQunAV
Vocc/Zr1sKY5AFGM78CIOSI5qCSClrWu/dn6Wbes8zqC0sZi36n+phbZ9H2qz8axSQyGDZ
Pm45tC+nwvZ8EbL70szx9Uv5mlY3xRRj/qbvyStWaJxoWCm6HwdQpX1SurgSyx7SM+4Ejm
U+N93GGgK7+SBjVUaJ4Aj6x5b9co874wljEiMg+0Skall246cfrVvhB2Abd3zg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752902207; a=rsa-sha256; cv=none;
b=LgZJDZZyuHDkwgyyWtwNBvExAZQLlOH7pw+Jo/N8aI7ZPuAK9786TLnG46fnUw7WRT/mmV
AdfP7M/Xl5sJwyJ3dLu5ehP/OBSJ2tLYuekbDQd7TRL+OX0l8/OO5En7wOA/H59EDwjOIf
zs2W45Zyk2g414b3yRtJmebJ0v6wB99eenHSNniFk3W/tgKbaPlrVFHDHwuUXjfP/1JaP1
hConwl+wEz+BvbIwtQlFbUqD1ynBbsWF70gwV2nALM5lGpVzE/NgYqrLbuuQEoyKtKv3a/
8fQejo+Kuz/FLWmTpoif4poXBFjBSFcclx4KH8TCep5u41seyEYLeVuXsHUH6g==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkZdp6QYYz1BcQ;
Sat, 19 Jul 2025 05:16:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56J5GkhM028766;
Sat, 19 Jul 2025 05:16:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56J5GkO5028763;
Sat, 19 Jul 2025 05:16:46 GMT
(envelope-from git)
Date: Sat, 19 Jul 2025 05:16:46 GMT
Message-Id: <202507190516.56J5GkO5028763@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lexi Winter
Subject: git: 2c8c8fe02a87 - stable/13 - nlmsg_report_err_msg: add
__printflike annotation
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ivy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2c8c8fe02a8789f9716212c45ced15f75173b50b
Auto-Submitted: auto-generated
The branch stable/13 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=2c8c8fe02a8789f9716212c45ced15f75173b50b
commit 2c8c8fe02a8789f9716212c45ced15f75173b50b
Author: Lexi Winter
AuthorDate: 2025-07-10 21:02:21 +0000
Commit: Lexi Winter
CommitDate: 2025-07-19 01:12:29 +0000
nlmsg_report_err_msg: add __printflike annotation
Reviewed by: kevans, kp
Approved by: kevans (mentor)
Differential Revision: https://reviews.freebsd.org/D51234
(cherry picked from commit db55cc8110ceea084c6f52a1ecfd6ab87e0aac2b)
---
sys/netlink/netlink_message_parser.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h
index 7b5fde49a07c..c07c3b288796 100644
--- a/sys/netlink/netlink_message_parser.h
+++ b/sys/netlink/netlink_message_parser.h
@@ -190,7 +190,8 @@ int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt,
int nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt,
const void *arg, void *target);
-bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...);
+bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...)
+ __printflike(2, 3);
#define NLMSG_REPORT_ERR_MSG(_npt, _fmt, ...) { \
nlmsg_report_err_msg(_npt, _fmt, ## __VA_ARGS__); \
From nobody Sat Jul 19 05:16:47 2025
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 4bkZdr4RcWz62KBT;
Sat, 19 Jul 2025 05:16:48 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4bkZdr0MFgz3w6R;
Sat, 19 Jul 2025 05:16:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1752902208;
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=D2T4pinAgXcaT9+KtW9KVPaESWWOv4xcSMSccW/koPY=;
b=DWA4fyXRhgyAESlz8J2uYhu2wHGrghQW2Mi6HI80b/tWh6PDOgobuG3EYiTwZXjfw+Bg3A
0GN4yO3Ucu5SD9oXxwUuqzqvtTHo59b+Vc0wCUQS8Q7W2Y7mPhfafTTsyZZxjPskJ9+qt2
lfo05So5KuRIGmmHHSrDI+Ppl49oNMOH2UN7N5jH5zPThQGTeAqSZTVmYMDSz3EACfztYy
/7tYgtCV7NZ3kEqKKNGPgjsJzpj+wEZVBSIrPP7XT3E71QW8gHeYrUryeNyVmix+xFqFOu
6iIfDZqlKaJuSTZqYximW0co9zUECoerGKxeGceFM+ZdvgtemqwWWxWXc1bj7w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1752902208;
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=D2T4pinAgXcaT9+KtW9KVPaESWWOv4xcSMSccW/koPY=;
b=B10uMRpmRx7VrXaDEVkz592GiYV5EHyFK3J5sp6Y0Kqc717aUwhRLoer+JVZb5RuOrAXO0
Pqu9QrQWO2u0J3KKQ5nje2ZWy7XZRRJBLPpgnNHOXULJXMrkf8RjMCU9e1LoxwFYfdCwWB
DxbzyuW9WFnyWEeur9ZX1BC9Dc3/d3LmP+q7GH8m9ISfryvvk6lhfh2ZEV9iMc/Ul6Vppw
scNfJ2itjrhJSbHZo2pGqDHx9VfAxi1C9tKe48vcFOsO0MW5trOui/EiFxTZZe6bAtlJig
DuVHVdF5BEC0DdA+xPjzHeZwwv2tXIdr5mBWE3j7wwfyl51E6ug5NFst9KBr+g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752902208; a=rsa-sha256; cv=none;
b=PiB/jYXg5pI0yR8zvEhsN1VVBzx/jjb8kwyR5Empf/IM+z8VdR+I5qjMZfiF0Il0v/ONPr
zoqSPJ5VJz3TGIvzk6QUuq9XQks1U5P4+XXgur7YNMAxD+EXzcvsoeeFhNaojOq9kAwp8E
8dZpXue29OuBKfcj+s23mK1mYLwG07AoznWRSr3Gk0hbwSfFps+7SKiG4IIvPrJL4LIunA
WLBYtQIh2PDOcFQL6PgRssJZfH5NqSr4LcoL2/oAVtD9FXmL/yvM5VauQMSqbEE/ypQEt/
rtfn8rGM80qqvep0Hat+4FEB3AnU+5KDNNjyn9suJ0jLUm0aV/UdrAK4U/SlNw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkZdq6l24z1BZB;
Sat, 19 Jul 2025 05:16:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56J5GlnG028800;
Sat, 19 Jul 2025 05:16:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56J5GltM028797;
Sat, 19 Jul 2025 05:16:47 GMT
(envelope-from git)
Date: Sat, 19 Jul 2025 05:16:47 GMT
Message-Id: <202507190516.56J5GltM028797@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lexi Winter
Subject: git: 42dd8f4add1f - stable/13 - inetd.conf: remove -[46]
from the ssh entry
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ivy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 42dd8f4add1f2b485f2f9b44685af34a1ef235a5
Auto-Submitted: auto-generated
The branch stable/13 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=42dd8f4add1f2b485f2f9b44685af34a1ef235a5
commit 42dd8f4add1f2b485f2f9b44685af34a1ef235a5
Author: Lexi Winter
AuthorDate: 2025-07-15 04:44:38 +0000
Commit: Lexi Winter
CommitDate: 2025-07-19 01:13:21 +0000
inetd.conf: remove -[46] from the ssh entry
sshd doesn't require these flags, and including them makes outgoing
connections (e.g., port forwarding) restricted to the family of the
inbound connection, which is not usually desirable and also not how
standalone sshd works.
MFC after: 3 days
Reviewed by: kevans
Approved by: kevans (mentor)
Differential Revision: https://reviews.freebsd.org/D51296
(cherry picked from commit 6738882248a755aad859784150969085e006cf89)
---
usr.sbin/inetd/inetd.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/inetd/inetd.conf b/usr.sbin/inetd/inetd.conf
index 7fef6c8fea0d..5fd058e2f467 100644
--- a/usr.sbin/inetd/inetd.conf
+++ b/usr.sbin/inetd/inetd.conf
@@ -7,8 +7,8 @@
#
#ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l
#ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l
-#ssh stream tcp nowait root /usr/sbin/sshd sshd -i -4
-#ssh stream tcp6 nowait root /usr/sbin/sshd sshd -i -6
+#ssh stream tcp nowait root /usr/sbin/sshd sshd -i
+#ssh stream tcp6 nowait root /usr/sbin/sshd sshd -i
#telnet stream tcp nowait root /usr/libexec/telnetd telnetd
#telnet stream tcp6 nowait root /usr/libexec/telnetd telnetd
#shell stream tcp nowait root /usr/local/sbin/rshd rshd
From nobody Sun Jul 20 09:12:01 2025
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 4blHpn6FyCz61qFW;
Sun, 20 Jul 2025 09:12:01 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4blHpn4l4nz3gkN;
Sun, 20 Jul 2025 09:12:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1753002721;
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=ymXnf/bHmNKzPVBPaiKXCNtz0oJXBjxAQVQ3qYJk7oU=;
b=N0AaHN+ZCAnqLTjQiWq9HSnqQRz5LqGeEAYPQznVeGODvg1L91hkh4/VZToBx1hrdRhUaZ
r6TkOt9JpyA5PgVy0raNbOr+qxXnD0klrCbBrTnLAcyCWytlrkCbT7UoWrYFBdpYvqv/GD
9tFOO3YHxORPtr8zUeVQCojzCl34ojlL3R1h2/eU27kP9Z+ZXSOEfSjOFmkYWNf0ai7kMU
tSqYQekPf263MWwVyhQpZnW9UXSN/WNwIjS2Z6VrMNx1Mpyi2wDYMkNWeIXtEoRTC4ob7J
50BY0ysHRg3PXb5gpb/kcfjc21H1K1Yizf+cVU9eAWgwR5fBVshxDqiP9EkIHw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1753002721;
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=ymXnf/bHmNKzPVBPaiKXCNtz0oJXBjxAQVQ3qYJk7oU=;
b=o3OdpLilD+twOJ8kFqvecwmvaOSGrbVkORhUTY+Iw6eRSAp2N/NK16lbJiBEP0QU9tgk91
/xoUSr8rH6xz5y0VIar1NRs4DWxhwZW/xywXL2imA9xEA9DyBYyF0kpZmuZPOwkHEg/MaE
5JRKxMNZ5LS+b1oqLEN4zsy08U8nJ06LwQJDezf56D+X1ozvZ2RRXDCP7uyOpVAKAW8KI+
A8eY3aKyRCQ4oNScAm2RWJGkBozx0VP+dpWMwbfiB8qNJg2tD1S0mWPaRJnq16F3W/nJrm
gL2RWonYYHPZQxVADFGAZyZy8FtaCbqvxO/MdUNMQFXCFyF7bHkP2eelnJ7S5A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753002721; a=rsa-sha256; cv=none;
b=xUVo3CbeD3hvvDIlEYsK18HAc2BXnRiN8hrzAvjQ6BIhnQXgah9XzO8LOTcvnDfrxK+YsO
WKEiVH4QRFyrZwaU5Q/adsmUXco30a1uk3UUp2WvspEonAxOC3C0FU9J3KdZ1Rivb712BA
41SBy/2LWo6I2PHMqSu4WI7ehrcK4CK2ABynkMtyfRLcE4or1c97d0RSS/EZlQrJ3YkfTe
Uvhh0N//l4wXaIyfrvIYArf5sxRZ/2xdGXtV7sxM97MQtJFBfyu+5vqf6h6ZzCXctXVrCK
caSY9fPeSQe9BbnpgoSmDiuMRbOZ1io4P7YMAn0tIGkqJF6V8f8TZGNr8VUpOA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4blHpn46c3z15lt;
Sun, 20 Jul 2025 09:12:01 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56K9C1k4091655;
Sun, 20 Jul 2025 09:12:01 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56K9C1kw091652;
Sun, 20 Jul 2025 09:12:01 GMT
(envelope-from git)
Date: Sun, 20 Jul 2025 09:12:01 GMT
Message-Id: <202507200912.56K9C1kw091652@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lars Engels
Subject: git: 000755e790df - stable/14 - bluetooth-config: Fix
command line parsing
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: lme
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 000755e790dfd6c78a87c10133c46b55b634ffab
Auto-Submitted: auto-generated
The branch stable/14 has been updated by lme:
URL: https://cgit.FreeBSD.org/src/commit/?id=000755e790dfd6c78a87c10133c46b55b634ffab
commit 000755e790dfd6c78a87c10133c46b55b634ffab
Author: Dirk Engling
AuthorDate: 2025-07-13 09:25:24 +0000
Commit: Lars Engels
CommitDate: 2025-07-20 09:10:45 +0000
bluetooth-config: Fix command line parsing
This addresses the problems encountered when parsing options in bluetooth-config.
- the optional parameters were not properly shifted after consumption
- the command line parameter count was checked before getopts and not after
Reported by: sjg
Approved by: kp
MFC after: 7 days
Event: Berlin Hackathon 202507
Differential Revision:
(cherry picked from commit 5031da20599bb1163f0e8d1c4b415ab3bbebce00)
---
usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
index 48a399a82fc7..148325fcecbc 100755
--- a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
+++ b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
@@ -17,7 +17,7 @@ main() {
unset node device started bdaddresses retry
# Only one command at the moment is scan (+ add)
-[ "$#" -eq 1 -a "$1" = "scan" ] || print_syntax
+[ "$1" = "scan" ] || print_syntax
shift
# Get command line options
@@ -28,6 +28,12 @@ while getopts :d:n: arg; do
?) print_syntax;;
esac
done
+shift "$((OPTIND-1))"
+
+# If there's leftover parameters, print usage
+[ "$#" -eq 0 ] || print_syntax
+shift
+
# No use running without super user rights
if [ $( id -u ) -ne 0 ]; then
From nobody Sun Jul 20 09:12:27 2025
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 4blHqH2vkNz61q6q;
Sun, 20 Jul 2025 09:12:27 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4blHqH2Cq0z3hDP;
Sun, 20 Jul 2025 09:12:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1753002747;
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=sNK8AAf0rKVh2kObBUIFY+NtJLmOPg1SXSCln85W5QE=;
b=AuMOj9YyVxtwryeuaR/BKETXErJfrWX6118AfnJ3YLGFCFeeZSt7sTTAHeT4/OCjBDze33
ljzDNQamScbm/b/gmxWvKAaIVMxb1DqdP5qvMVFAXLjPRdHsvVfwpK/bYMcSa9S/todRIo
30rM+G4qu0Y8sGBpDgMTgnk2Juph1GPGJBtyL/grct273OsqMHKw7TwzYRbXpOdGrLW/M0
/DyljNE2ou9TcMidJl6WnltAw1MWN8ovihYOoV319KiUGZf8Bs01dub04v2KCVNuPx7bbc
feD6iAhsxcdWi88mgn6izkucs97iiDQp33fArmJxZ+5KxasKyw9p0Q5/WRqQYg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1753002747;
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=sNK8AAf0rKVh2kObBUIFY+NtJLmOPg1SXSCln85W5QE=;
b=r5GaSbYfSD/3wEC95lrZw31j3inU6NAeInqVqI1luYAc/liS/9Ckry1ykOvhZvYfKVXdFm
W94kYJLvk+B4QeMAMM05XaBQeKiI45SzKEpm3fAKpaR8ihohxBS6bEcP1ot0j2DKSdOmIE
sJOHzF0OfeJvTwf34GCLg9bu6lq7WPBW6oLoyQT8LIhWrIKOI9bQkMTcBFLBTuUZS4M4Wt
lj/cupN/ZkdrFOX5l7MNScVx7PUMSdhcPpLd9I41fK3nfJzEacPOyp/j6mpm4pnIGgQ7WT
3R/UGuJFS45DJVsQIH2L284s3VfvykvaHSzIukmHFLv2lRLLr23ltqXAEu9hTg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753002747; a=rsa-sha256; cv=none;
b=PJ67etqNN36zl+cvGVT2o5a/iUQ5ZSAtd+5bVF4ZstTGOqZof+zQX32WVlvC3ZVrElj65O
zQzbJzFSV5gdmWDxj/vHDVUMI346+nw1mMRCgIEbUen6ovRu+KGuR8/xWDMOuwDbGNflJk
gG2MjQ1MM/82UXD7kckM1rlSx54nIacu4jzroXtGx+k5LPbnXmB32/1xSN4B6k6ZCO9g2j
aaxyKYYRGCbTzczM2K70nTbQIyk1wrC8QaKD8QwJTAjHiWGLsQ2DfMSQMRlLcqpAVGhh7R
ZBCcUPvwos1RTfgoM6yc3fI65iCHBSQ6IZCO2hA5DlatpGE8loukA80HuyOi+g==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4blHqH1lfWz15mZ;
Sun, 20 Jul 2025 09:12:27 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56K9CR9g091879;
Sun, 20 Jul 2025 09:12:27 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56K9CRh9091876;
Sun, 20 Jul 2025 09:12:27 GMT
(envelope-from git)
Date: Sun, 20 Jul 2025 09:12:27 GMT
Message-Id: <202507200912.56K9CRh9091876@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Lars Engels
Subject: git: da5827a63ce5 - stable/13 - bluetooth-config: Fix
command line parsing
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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: lme
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: da5827a63ce5065e485ffd3f11a194e516fd9ee2
Auto-Submitted: auto-generated
The branch stable/13 has been updated by lme:
URL: https://cgit.FreeBSD.org/src/commit/?id=da5827a63ce5065e485ffd3f11a194e516fd9ee2
commit da5827a63ce5065e485ffd3f11a194e516fd9ee2
Author: Dirk Engling
AuthorDate: 2025-07-13 09:25:24 +0000
Commit: Lars Engels
CommitDate: 2025-07-20 09:12:16 +0000
bluetooth-config: Fix command line parsing
This addresses the problems encountered when parsing options in bluetooth-config.
- the optional parameters were not properly shifted after consumption
- the command line parameter count was checked before getopts and not after
Reported by: sjg
Approved by: kp
MFC after: 7 days
Event: Berlin Hackathon 202507
Differential Revision:
(cherry picked from commit 5031da20599bb1163f0e8d1c4b415ab3bbebce00)
---
usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
index 48a399a82fc7..148325fcecbc 100755
--- a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
+++ b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh
@@ -17,7 +17,7 @@ main() {
unset node device started bdaddresses retry
# Only one command at the moment is scan (+ add)
-[ "$#" -eq 1 -a "$1" = "scan" ] || print_syntax
+[ "$1" = "scan" ] || print_syntax
shift
# Get command line options
@@ -28,6 +28,12 @@ while getopts :d:n: arg; do
?) print_syntax;;
esac
done
+shift "$((OPTIND-1))"
+
+# If there's leftover parameters, print usage
+[ "$#" -eq 0 ] || print_syntax
+shift
+
# No use running without super user rights
if [ $( id -u ) -ne 0 ]; then
From nobody Sun Jul 20 14:09:30 2025
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 4blQQ30hxRz629Br;
Sun, 20 Jul 2025 14:09:31 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4blQQ26VPvz49qT;
Sun, 20 Jul 2025 14:09:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1753020570;
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=kN3gMtH4lgxQeJfUZROny/mX4VC6MYMvCkxNMNbtyAM=;
b=CErkP5wzEpLxZFwBNETmhNwoN5uN8GzopCRM9wlBj+b+/Xj4sNwDDrRV8beAmFYoHFPtBg
P6eP4FK1exh+/2vaCfr5nj9Uowl2A1cjuIPI8MUADdCq6vHCVq8/6pFfPE/+Yns6WNLF1m
oRdqOzGDmgEyS0fUQIQnGxc9Z6oJj5oJIzjKgpMNjOmWgN74Ym367JarD8T9XhsqwrqmEe
kHOA9ZHdlnopk1eLqHfC+xdfPUzmHq8nHPIR9bW89G5UsBwpYM2cMQ9BrwJFumS421jBve
Bop+1vHFE+2Ltkj0tr6pUJdztGzV55ChCZsjpPQWmPqI5YSnmy8rwRXYGn0VzQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1753020570;
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=kN3gMtH4lgxQeJfUZROny/mX4VC6MYMvCkxNMNbtyAM=;
b=jJYU+ISg+3Gj/pKgt6eYDKn4Akdg2j0Cv5z5nuIbr3M7Yr+bIZIjszxBpkmOt2Oslabgti
8lubOCOuo88u2GYs74ENYLEc4vAmSH5QPsW5u0F94qfSMky0PiSDxofm2khaAGTZLFOdNq
E0NCurtW08x7YAmIFG4PHGeKveWhSsjIdzmVL54YZcpwLo1q8i2ykgwaq/NouxftmzGE2+
/Ur+u/5BjfupEohukrN8qAMMVv+3vLaOsNiqTqv7zEgiFya3PElbte8SZFO6m8da0mc5eO
ZKM0vZofKlKdb94yiKhO5zxgo+sJa1hUT/AHpn7txT1mJBXUBQg4s/Y0Hlrr1A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753020570; a=rsa-sha256; cv=none;
b=E/H7JvIYihbx53pkyTdIopEIVmVrOdEdjyhjwKUk35GLma72iQCVKLrhTFLGJAmtzXfocP
hffDVJS5scO4pRiMqml7+KaYT2ucxxzIXdh7HXM7qXaSRdx+2l0BR+oO0zkdx4T0lFnsYi
5al/r68sjKyFmhjqkk7S3X1Oobye4/BH6bDOL1hSHdVT3gM0JQ2ugH3FfDp9WL82amP/ff
VRQOILExxadus7AM20l8lTArsxnwboPbgh7Dg/gj7fD2a7Gq0a2WIdoOIWerp7wYVFAVrw
L8BRrfzu3OeorYjZHNB1f7mlB2uw3A5UrqVQetidPqPk8+MbpDRxiBvPRr/oIg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(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 did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4blQQ25g6fz19M;
Sun, 20 Jul 2025 14:09:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56KE9UZ1040547;
Sun, 20 Jul 2025 14:09:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56KE9UU2040543;
Sun, 20 Jul 2025 14:09:30 GMT
(envelope-from git)
Date: Sun, 20 Jul 2025 14:09:30 GMT
Message-Id: <202507201409.56KE9UU2040543@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Zhenlei Huang
Subject: git: 8ef7ad95e915 - stable/14 - qlnx: fix panic at startup
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: